Commit graph

1099 commits

Author SHA1 Message Date
Wladimir J. van der Laan
6041fc85ea
Merge pull request #3751
b881100 convert tabs to whitespace in bitrpc.py (Bryan Bishop)
2014-03-10 09:34:51 +01:00
Wladimir J. van der Laan
d33f69a447
Merge pull request #3796
16bfd68 update bash-completion for v0.9 (Christian von Roques)
2014-03-07 09:26:10 +01:00
Christian von Roques
16bfd689d0 update bash-completion for v0.9
Recognize completable arguments of new and expanded commands.
Now that bitcoin-cli(1) exists, add completion for it as well.
2014-03-04 14:10:35 -04:00
Wladimir J. van der Laan
93c3e21e92 Re-enable UPnP by default in gitian builds
IIRC this was the case with 0.8.6, so let's keep this to avoid the risk
of losing connectable nodes with 0.9 release.

Also our miniupnpc library was recently updated and I've heard
reports that it works better than before now.
2014-02-27 15:44:00 +01:00
Bryan Bishop
b881100aab convert tabs to whitespace in bitrpc.py
This is a minor change to bitrpc.py to conform with the formatting of
the other python source code in the repo.
2014-02-26 10:40:46 -06:00
Wladimir J. van der Laan
31b3d94ef5 gitian: Make protobuf win32 intermediate output deterministic
While building protobuf in different environments we noticed that
the host tool protoc was slightly different between builds (a symbol table
sorting issue).
Add a deterministic seed as well as disable zlib support.

Exected output is now:

    e2e403e1a08869c7eed4d4293bce13d51ec6a63592918b90ae215a0eceb44cb4 protobuf-win32-2.5.0-gitian-r4.zip
    a0999037e8b0ef9ade13efd88fee261ba401f5ca910068b7e0cd3262ba667db0 protobuf-win64-2.5.0-gitian-r4.zip

No effect on final executables so no version bump.
2014-02-25 07:58:11 +01:00
Wladimir J. van der Laan
0f0a70623d
Merge pull request #3728
6c0276a gitian: add libz-dev dependency package for linux boost (Wladimir J. van der Laan)
2014-02-23 09:02:13 +01:00
freewil
6fe6a448ea fix broken link to contrib/devtools 2014-02-22 23:26:11 -08:00
Wladimir J. van der Laan
6c0276ae69 gitian: add libz-dev dependency package for linux boost
Boost iostreams was picking up libz-dev in VirtualBox, as the recommended
way to build is now to make a VM with all dependency packages installed.

This caused a divergence between KVM/LXC build and VirtualBox
build results.

Fix this in the simplest possible way: add the libz-dev package.
2014-02-22 08:18:07 +01:00
Wladimir J. van der Laan
256a71b835
Merge pull request #3649
3078b58 linearize.py: Harmonize rpcpass to rpcpassword (Subo1978)
2014-02-17 10:52:41 +01:00
Wladimir J. van der Laan
b8d9058a4d
Merge pull request #3646
5770254 Copyright header updates s/2013/2014 on files whose last git commit was done in 2014. contrib/devtools/fix-copyright-headers.py script to be able to perform this maintenance task with ease during the rest of the year, every year. Modifications to contrib/devtools/README.md to document what fix-copyright-headers.py does. (gubatron)
2014-02-16 11:44:48 +01:00
Wladimir J. van der Laan
d5fa3eff03
Merge pull request #3622
c13a13e gitian: add -D flag to ar for deterministic output for linux deps (Wladimir J. van der Laan)
1552145 gitian: Sort generated source distribution archive (Wladimir J. van der Laan)
aabcd11 gitian: Make linux boost dependency completely deterministic (Wladimir J. van der Laan)
aa93485 gitian: Make linux build of OpenSSL deterministic (Wladimir J. van der Laan)
2014-02-10 18:35:04 +01:00
Wladimir J. van der Laan
4ce9106ff8 gitian: sort generated source distribution archive for windows
Make the bitcoin-X.X.X.tar.gz deterministic.
2014-02-10 17:07:36 +01:00
Wladimir J. van der Laan
6b55e6b97d gitian: Post-process .a libraries for win to be deterministic 2014-02-10 17:07:35 +01:00
Wladimir J. van der Laan
c13a13efec gitian: add -D flag to ar for deterministic output for linux deps
ar -D: Operate in deterministic mode. When adding files and the archive
index use zero for UIDs, GIDs, timestamps, and use consistent file modes
for all files.  When this option is used, if ar is used with identical
options and identical input files, multiple runs will create identical
output files regardless of the input files' owners, groups, file modes,
or modification times.
2014-02-10 16:20:13 +01:00
Subo1978
3078b582cc linearize.py: Harmonize rpcpass to rpcpassword
linearize.py: harmonize rpcpass to rpcpassword according settings in
bitcoin.conf
2014-02-10 15:52:31 +01:00
Wladimir J. van der Laan
1552145ae5 gitian: Sort generated source distribution archive
Sort the filenames in the resulting tar, normalize the time/date
and user/group information.
2014-02-10 10:01:06 +01:00
gubatron
57702541a2 Copyright header updates s/2013/2014 on files whose last git commit was done in 2014.
contrib/devtools/fix-copyright-headers.py script to be able to perform this maintenance task with ease during the rest of the year, every year. Modifications to contrib/devtools/README.md to document what fix-copyright-headers.py does.
2014-02-09 21:06:06 -05:00
Wladimir J. van der Laan
c43d1e5549 gitian: Make windows dependencies outputs fully deterministic
Sort .zip order, and other determinism changes to make sure builds
are repeatable for windows deps.
2014-02-08 09:33:05 +01:00
Wladimir J. van der Laan
aabcd11ba6 gitian: Make linux boost dependency completely deterministic
It appears that the output was different every time.

This doesn't affect the final bitcoind/bitcoin-qt, but is confusing
nevertheless.

Fix it by using FAKETIME and zipping files in deterministic order.
2014-02-06 19:37:17 +01:00
Wladimir J. van der Laan
aa9348563c gitian: Make linux build of OpenSSL deterministic
OpenSSL was embedding a timestamp causing its build to be
non-deterministic.
Change deps-linux to be deterministic by using FAKETIME
as needed and disabling it when it gets in the way.
2014-02-06 19:37:16 +01:00
Wladimir J. van der Laan
65615a3a78 Gitian fixes for 0.9.0rc1 build
- Add 'g++' package (virtualbox images don't have this by default)
- Workaround for determinism in Qt5 resources
- Pass --disable-maintainer-mode --disable-dependency-tracking to
  configure for libqrencode to avoid random errors about missing m4
  directory
- Fix typo -with-pic -> --with-pic

It is not necessary to rebuild dependencies after this commit.
Fixes #3610 and #3612.
2014-02-03 14:43:51 +01:00
Wladimir J. van der Laan
f9a2f08882 Bump version numbers for 0.9.0rc1 release 2014-01-29 16:09:11 +01:00
Wladimir J. van der Laan
f622232bcf gitian: Windows 64 bit support
- Build a 64 bit version of all dependencies
- Show 32/64 bit version in "About..." for x86
- Export 64-bit .exes and installer from gitian build
2014-01-21 14:02:13 +01:00
Wladimir J. van der Laan
77a1607ce8
Merge pull request #3548
7b50bb2 [Qt] add utilitydialog.cpp/h and helpmessage class (Philip Kaufmann)
2014-01-21 09:01:38 +01:00
Micha
6873cfb6c0
Update linearize.py defaults to block 279,000 2014-01-18 21:53:07 +02:00
Philip Kaufmann
7b50bb2f1b [Qt] add utilitydialog.cpp/h and helpmessage class
- adds a nice and well formated dialog, which displays our -? help message
  (all options/paramaters)
- moves aboutdialog.cpp/h to the new utilitydialog
- move GUI shutdown window to utilitydialog
2014-01-18 16:57:02 +01:00
Wladimir J. van der Laan
490d6a3046
Merge pull request #3545
1cbbeb6 gitian: Add openssl to linux deps (Wladimir J. van der Laan)
64be7f7 gitian: Build boost dependency for linux (Wladimir J. van der Laan)
7eb99a8 gitian: Reduce build time for boost windows dependency (Wladimir J. van der Laan)
714cdec build: Pass BOOST_CPPFLAGS to sleep implementation test (Wladimir J. van der Laan)
0d40f5a build: Allow providing extra libs for Boost Chrono (Wladimir J. van der Laan)
e4b991e build: Auto-detect whether -DBOOST_TEST_DYN_LINK is needed (Wladimir J. van der Laan)
2014-01-18 16:02:31 +01:00
Wladimir J. van der Laan
77f1b4ae19 gitian: add optimization to win32 protobuf
When overriding CXXFLAGS, also provide optimization flags, otherwise
we're building without optimization.
2014-01-18 13:16:08 +01:00
Wladimir J. van der Laan
1cbbeb6a27 gitian: Add openssl to linux deps
Build OpenSSL instead of using distribution-provided
library.
2014-01-16 12:45:04 +01:00
Wladimir J. van der Laan
64be7f7892 gitian: Build boost dependency for linux
Instead of using the boost provided by Ubuntu 12.04, build our own
dependency like we do for Windows.

This allows using a much newer version (1.55 versus 1.46) as well as
building with `-fPIC` so that `-pie` can be used in the x86-64 build.
2014-01-16 12:45:03 +01:00
Wladimir J. van der Laan
7eb99a844f gitian: Reduce build time for boost windows dependency
Build only the mt-s (multithreaded, static runtime link)
variant of the library.

This cuts the build time in half.

Also prevent unpacked boost from ending up in output directory,
checking and hashing all the source files as output files this
takes a lot of time and is pointless.
2014-01-16 12:45:03 +01:00
Micha
f4e72bf8d2
Make gitian builds consistent across platforms
Change Linux deps to use a zip archive rather than a gzipped tarball to
match win32
Rename Linux descriptor to gitian-linux.yml to match win32
2014-01-15 22:56:17 +02:00
Wladimir J. van der Laan
4b4b578cb3
Merge pull request #3536
0425715 gitian: add explicit dependency build for linux (Wladimir J. van der Laan)
279af1a build: use Ubuntu 12.04 for linux gitian build (Wladimir J. van der Laan)
2014-01-15 14:29:19 +01:00
Gavin Andresen
8c31f037b1 Merge pull request #3527 from laanwj/2014_01_gitian_win32_qt5
build: update win32 deps
2014-01-15 04:20:58 -08:00
Wladimir J. van der Laan
04257151b1 gitian: add explicit dependency build for linux
Create a dependency file per architecture:

- bitcoin-deps-linux32-gitian-r1.tar.gz
- bitcoin-deps-linux64-gitian-r1.tar.gz
2014-01-15 12:39:01 +01:00
Wladimir J. van der Laan
279af1a2af build: use Ubuntu 12.04 for linux gitian build 2014-01-14 15:12:44 +01:00
Wladimir J. van der Laan
b26de9d951
qt: Update remaining "The Bitcoin Core Developers" 2014-01-14 11:19:52 +01:00
Wladimir J. van der Laan
1e3abb4e3d build: upgrade Qt used by windows build to 5.2.0 2014-01-14 11:03:21 +01:00
Wladimir J. van der Laan
2f158dfc93 build: Update the other win32 deps
- miniupnpc-1.8
- openssl-1.0.1e
- zlib-1.2.8
- libpng-1.6.8
- qrencode-3.4.3
2014-01-14 11:03:21 +01:00
Wladimir J. van der Laan
f10b2d70d0 qt: use series of pngs for spinner
Use a series of .png frames for the spinner instead of a .mng.
`mng` is an obscure image format and is not built by default into Qt5.

This appears to improve the crispness of the spinner as well.

Does not noticably increase the size (still ~27k) and the code
is not more complicated either.
2014-01-13 14:45:23 +01:00
Micha
7a29fb5940
Tweak linearize.py to give more flexibility
Add the ability to start at a non-zero height, and allow for appending to
an existing file.
2014-01-12 13:48:39 +02:00
Wladimir J. van der Laan
5c72e3df3c
Merge pull request #3501
56fce1f Upgrade gitian win32 to boost-1.55. (Warren Togami)
2014-01-10 11:35:59 +01:00
Wladimir J. van der Laan
6b06e4fd0d
Merge pull request #3503
0d512a9 gitian: Add -O2 for win32 build (Wladimir J. van der Laan)
2014-01-10 11:35:30 +01:00
Wladimir J. van der Laan
0d512a9ee7 gitian: Add -O2 for win32 build
In the win32 gitian descriptor the C*FLAGS are being overridden on
`configure`, which causes the built-in optimization flags to be removed.
Add `-O2` manually (but not `-g` as we're not doing anything with the
debug information).

Improves performance of win32 gitian builds.

As a bonus, fixes issue #3497.
2014-01-10 09:41:15 +01:00
Warren Togami
56fce1fdbb Upgrade gitian win32 to boost-1.55.
Fixes issue where all network activity just stops.
2014-01-09 14:18:43 -10:00
Philip Kaufmann
b960fcb86a [Qt] update bitcoin-qt.pro and assets-attribution.md
- remove unused and unmentioned file notsynced.png (we use an animation
  for this)
- add missing coincontroldialog.ui to bitcoin-qt.pro
- also unify formating in assets-attribution.md
2014-01-09 07:38:08 +01:00
Matt Corallo
4d46da20ea Update debian/ 2013-12-27 22:09:37 -08:00
Lake Denman
131c3db8fb Fix typos in spendfrom README 2013-12-16 12:49:34 -08:00
Michagogo
c51e49b1a3 Fix file hash verification error in deps-win32.yml
libpng was being sha256summed twice, and miniupnpc wasn't being checked at all.
2013-12-03 02:04:50 +02:00
Wladimir J. van der Laan
e5adec35c6 contrib: add sipa's github-merge script 2013-11-24 12:44:31 +01:00
Wladimir J. van der Laan
96aaf006a5 Merge pull request #3234 from super3/master
Remove Wallet Tools
2013-11-19 10:25:42 -08:00
super3
43bba5d012 Remove Wallet Tools
We already have the exact same funtionality in /contrib/bitrpc/bitrpc.py

If we really do need standalone scripts, then I'll write something to
pull it from that file, rather than having duplicate code.

Forgot to remove wallet tools from index.

Wallet Tools Follow Up Info
2013-11-15 12:31:59 -05:00
Wladimir J. van der Laan
4c60358604 qt: add Open URI dialog 2013-11-11 14:29:49 +01:00
Warren Togami
b31482844b Check integrity of gitian input source tarballs 2013-10-31 17:56:55 -10:00
Philip Kaufmann
d57a496c51 [Qt] misc small fixes for #3099 (new receive flow)
- changes some strings that were forgotton or made no sense in the conext
  they are used
- remove an orphan file from the qt project file
- revert a small change in signverifymessagedialog.ui
- guard #include "bitcoin-config.h" with #if defined(HAVE_CONFIG_H)
- remove windowTitle from addressbookpage.ui
2013-10-25 14:28:34 +02:00
Wladimir J. van der Laan
74fb765e29 qt: rework "receive coins" workflow 2013-10-23 09:15:24 +02:00
Wladimir J. van der Laan
9686459359 Merge pull request #3123 from super3/master
Prettify some /Contrib READMEs
2013-10-22 08:10:17 -07:00
super3
14f870cee5 Prettify some /Contrib READMEs
SYN

Remove Dead Readme-Qt Links.
2013-10-21 20:07:31 -04:00
Gavin Andresen
896853a011 Merge pull request #3106 from super3/master
Added better WalletTools description.
2013-10-19 23:13:42 -07:00
super3
6e01daae43 Added better WalletTools description. 2013-10-17 19:42:56 -04:00
Wladimir J. van der Laan
0487cc4137 Merge pull request #3098 from super3/master
Finished /Contrib Index. Standardized READMEs.
2013-10-16 07:17:00 -07:00
super3
27e2d8bfb5 Finished /Contrib Index. Standardized READMEs.
File and Link Fix.
2013-10-15 23:37:30 -04:00
Gavin Andresen
e16c2b4422 Merge pull request #3085 from super3/master
Documentation Cleanup and Contrib Index
2013-10-15 18:27:54 -07:00
super3
0aa9851b18 Documentation Cleanup in /Doc
Added some help text, and bumped version numbers.

Added a Readable Index for /Contrib

Fixing /Contrib Index URLs

Revert Version Numbers.
2013-10-12 18:39:26 -04:00
Micha
c00237de9d
Update michagogo's gitian pgp key, adding UIDs 2013-10-12 23:33:19 +03:00
Gavin Andresen
d922c85716 Merge pull request #2999 from TheBlueMatt/master
Update contrib/debian: proper desktop category and update changelog
2013-10-03 21:52:27 -07:00
Warren Togami
738b8598ae Hardcode string in miniupnpcstring.h and remove wine requirement from deps-win32.yml
Credit: sipa, cfields, Luke-Jr and michagogo contributed to this fix.

Removing wine as a win32 build dep is beneficial to fixing Gitian LXC,
which would enable many more people to join in the gitian.sigs process
by being able to build with a linux VM instead of a virt capable host.
2013-09-30 22:05:20 -10:00
Warren Togami
b5ab7f34f8 Fix gitian qt-win32.yml build
The final revision of PR 3029 incorporated a review suggestion of replacing
i686-w64-mingw32 with $HOST. But we forgot that $HOST is not expanded when
within single quotes so it actually broke qt-win32.yml build.  This is the
minimal changes necessary to fix the qt-win32.yml build.
2013-09-30 18:01:05 -10:00
Gavin Andresen
b2180d82a4 Merge pull request #3029 from wtogami/gitianwin32
Upgrade gitian win32 to Precise 12.04.
2013-09-29 01:44:07 -07:00
Wladimir J. van der Laan
b41fa66ba7 Merge pull request #3034 from fanquake/corect-qt-download-link
Update Qt 4.8.3 download link in Gitian Descriptors README
2013-09-28 04:52:34 -07:00
fanquake
cd4d495ed4 Update Qt 4.8.3 download link 2013-09-27 09:38:44 +08:00
Warren Togami
f2bc1d35d6 Upgrade gitian win32 to boost-1.54.0
Workaround 1.54.0 build bug, upstream #9156
Workaround 1.51.0+ human bug, upstream #7262

This commit also demonstrates a method to verify the integrity of inputs.
2013-09-26 04:10:17 -10:00
Warren Togami
af6c2c71ed Upgrade gitian win32 to Precise 12.04.
mingw upgrade allows more hardening, compiler bug fixes and possibily win64 later.
Rename deps .zip files to be more consistent in revision format.
Boost #4258 build fix for mingw32
2013-09-25 23:52:56 -10:00
fanquake
619e76e6e6 Removes obselete HomeBrew patches 2013-09-26 16:00:18 +08:00
Gavin Andresen
8e782e924e Merge pull request #3023 from Michagogo/pgp
Add michagogo to gitian download scripts
2013-09-23 00:33:32 -07:00
Micha
7010e505f5 Adjust weight for michagogo in gitian download scripts
Following a discussion in #bitcoin-dev, around
19:00 UTC, 20132209
2013-09-22 23:11:54 +03:00
Micha
0766e6ced5 Add michagogo to gitian download scripts 2013-09-21 23:44:16 +03:00
Gavin Andresen
d969c2c073 Fix gitian: bitcoin-deps is at version 0.0.7 2013-09-19 12:40:02 +10:00
Cory Fields
7f1c162aae gitian: remove obsolete --disable-debug flag 2013-09-18 15:37:54 -04:00
Cory Fields
8d36b2dcfb gitian: fix win32 build after configure bdb changes
bitcoin incorrectly linked against the dll after the configure changes, so
ensure that only the static lib is installed.
2013-09-18 15:36:48 -04:00
Matt Corallo
9085c8c7c3 Update contrib/debian: proper desktop category and update changelog 2013-09-17 22:41:46 -04:00
Cory Fields
08081e393b included-tests: update gitian descriptors for hexdump dependency 2013-09-16 12:53:11 -04:00
Philip Kaufmann
d78900cc1b fix some cosmetic glitches in the codebase
- rename URL into URI in paymentserver where correct
- add some missing Qt-coding-stuff in paymentserver
- change QSpinBox to QLineEdit as base for BitcoinAmountField in .ui files
  (as this is the result when converting the BAF back into base)
- remove some c_str() and replace with QString::fromStdString()
- remove several new-lines
- remove unneeded spaces
- indentation fixes
2013-09-09 12:36:04 +02:00
Gavin Andresen
8394f4a2dc Merge pull request #2977 from laanwj/2013_09_release_process_protobuf
Add protobuf 2.5.0 download to gitian release process
2013-09-08 17:31:04 -07:00
Cory Fields
35b8af9226 autotools: switch to autotools buildsystem 2013-09-05 21:31:03 -04:00
Wladimir J. van der Laan
51c2fa16bb Qt 4.8.3 r2 in gitian and release process
Also needed to add `unzip` package for the added unzip command for
OpenSSL in the Qt build.
2013-09-05 14:38:59 +02:00
Johnathan Corgan
71bc3a4b9f fix the typo fix in linearize.py 2013-08-30 13:06:16 -07:00
Rav3nPL
63dc00d104 fix help prompt 2013-08-30 18:44:40 +02:00
Jeff Garzik
df6c5433e7 contrib/misc/mkbootstrap: rename to linearize.py 2013-08-30 07:41:29 -04:00
Jeff Garzik
701f6c35bc Add "mkbootstrap" script to contrib, for creating bootstrap.dat. 2013-08-30 07:37:26 -04:00
Gavin Andresen
a41d5fe019 Payment Protocol: X509-validated payment requests
Add support for a Payment Protocol to Bitcoin-Qt.

Payment messages are protocol-buffer encoded and communicated over
http(s), so this adds a dependency on the Google protocol buffer
library, and requires Qt with OpenSSL support.
2013-08-22 16:18:25 +10:00
Warren Togami
a6635f6e95 Add wtogami to gitian download scripts. 2013-07-07 03:25:22 -10:00
Gavin Andresen
89781d00dd README for contrib/debian 2013-06-27 11:11:02 -04:00
Gavin Andresen
bf81a3ef78 Fix Gnome bitcoin: URI handler 2013-06-26 20:31:34 -04:00
Pieter Wuille
cccd17a1b2 Merge pull request #2768 from fanquake/brew-makefile-patch-fix
Update HomeBrew makefile patch
2013-06-22 10:04:58 -07:00
Mike Hearn
0e4b317555 Introduce a CChainParameters singleton class and regtest mode.
The new class is accessed via the Params() method and holds
most things that vary between main, test and regtest networks.
The regtest mode has two purposes, one is to run the
bitcoind/bitcoinj comparison tool which compares two separate
implementations of the Bitcoin protocol looking for divergence.

The other is that when run, you get a local node which can mine
a single block instantly, which is highly convenient for testing
apps during development as there's no need to wait 10 minutes for
a block on the testnet.
2013-06-19 16:28:52 +02:00
Michael Ford
025daac74b Update HomeBrew osx makefile patch to account for recent changes to makefile 2013-06-14 18:00:13 +08:00
Rune K. Svendsen
2002bceac5 Add Linux script to limit outgoing bandwidth used by Bitcoin
This commit adds a Linux script that uses tc and iptables to
limit outgoing bandwidth to Bitcoin nodes. All tcp connections with
a source or destination port of 8333 are limited to the chosen rate.
It does not alter the incoming bandwidth. Additionally, outgoing
bandwidth to a host on a local LAN (defined by the LOCALNET variable)
is not limited.
2013-06-03 12:15:12 +02:00
Jeff Garzik
d397715661 Merge pull request #2644 from sipa/constfindblock
Make FindBlockByHeight constant-time
2013-05-30 08:06:44 -07:00
Jeff Garzik
af93273799 Merge pull request #2657 from gmaxwell/its_after_may15_forever
It's after 2013-05-15 forever now, so remove the code for the May 15 fork
2013-05-30 07:35:44 -07:00
Gavin Andresen
36dc41f427 doc/README was replaced by README.md 2013-05-22 17:21:12 -04:00
Warren Togami
5ada394edf gitian deps-win32.yml needs psmisc package for killall to end the build 2013-05-22 00:20:07 -10:00
Gregory Maxwell
a824121eb8 It's after 2013-05-15 forever now, so remove the code for the May 15 fork. 2013-05-16 13:34:01 -07:00
Jonas Schnelli
d0d4080013 new icons for linux, etc.
- new xpm resources for different linux window managers
- new png files for autoresizing on different linux window managers
- favicon with new logo
- window .ico with new logo
- updated debian package script
- updated changelog
2013-05-13 20:18:35 +02:00
Pieter Wuille
0fe8010a10 Make FindBlockByHeight constant-time.
Remove the pnext pointer in CBlockIndex, and replace it with a
vBlockIndexByHeight vector (no effect on memory usage). pnext can
now be replaced by vBlockIndexByHeight[nHeight+1], but
FindBlockByHeight becomes constant-time.

This also means the entire mapBlockIndex structure and the block
index entries in it become purely blocktree-related data, and
independent from the currently active chain, potentially allowing
them to be protected by separate mutexes in the future.
2013-05-12 19:52:16 +02:00
Gavin Andresen
5b5d399593 Update version numbers for 0.8.2rc1 release 2013-05-10 09:50:33 -04:00
Wladimir J. van der Laan
6e40d79860 Merge pull request #2559 from maqifrnswa/manpages
added bitcoin-qt manpage and corrected a few minus signs
2013-04-27 02:08:43 -07:00
Scott Howard
ab20cd76f2 re-remove irc reference in bitcoin.conf.5 2013-04-24 14:10:07 -03:00
Scott Howard
765f702310 added bitcoin-qt manpage and corrected a few minus signs used as hyphens in other manpages 2013-04-23 19:50:51 -04:00
Michael Ford
a3d0dec78e Add bitcoin-qt.pro homebrew patch 2013-04-23 15:55:23 +08:00
Patrick Brown
46bf40de3d Made it point to 0.8.1 2013-04-14 14:50:39 -04:00
Pieter Wuille
1657c4bc49 Use a uint256 for bnChainWork
Every block index entry currently requires a separately-allocated
CBigNum. By replacing them with uint256, it's just 32 bytes extra
in CBlockIndex itself.

This should save us a few megabytes in RAM, and less allocation
overhead.
2013-04-12 12:17:28 +02:00
Matt Corallo
84db464b10 Add test patches for pull-tester to contrib/ 2013-04-11 18:07:22 -04:00
Matt Corallo
97372c2d22 Update contrib/debian (including IRC removal) 2013-03-24 20:02:18 -04:00
Colin Dean
68cb1cd6b6 reformat OS X build instrcs, add 10.8 + Homebrew
* reformatted the entire document to look pretty in both standard text and
  Markdown
* incorporated [my OS X 10.8 build instructions with Homebrew as the package
  manager](http://bitcoin.stackexchange.com/questions/3672/trouble-compiling-bitcoind-on-osx-with-homebrew/5253#5253)
* incorporated @gavinandresen's MacPorts and release build instructions based on
  an earlier revision of this commit
* added makefile patch necessary for Homebrew compilation to `contrib`
2013-02-19 21:45:39 -05:00
Gavin Andresen
efb6d9aae7 Minor build fixes
Two changes: make some linux-specific linker options linux and linker specific.
And in the cross-compile environment, prefer the $HOME/qt/bin tools to
whatever might be somewhere else in the path.
2013-02-15 19:55:44 -05:00
Gavin Andresen
fbd860287e Pass compiler flags down into leveldb make
Fixes issue#2288. Includes cleanups from Luke's pull 2243.
2013-02-15 19:55:44 -05:00
Pieter Wuille
33c055c4f1 Add script to clean up datadirs 2013-02-10 21:19:25 +01:00
Gavin Andresen
f50706796b Merge commit 'd38c6488d067c2e88726e2ca99bc76fd67dab49b' 2013-02-06 16:06:43 -05:00
fanquake
ced7f77df5 Update default URL in verify.sh
The current default URL doesn't seem to exist.

Unsure wether this should be updated to point to 0.7.2 now or wether
just to wait untill 0.8.0 is out and point there?

Commit also fixes a minor typo in the macdeploy notes.txt
2013-02-01 13:10:44 +08:00
Gavin Andresen
d38c6488d0 Bump version numbers for 0.8 release
Version numbers changed from 0.7.99 to 0.8.0
Set CLIENT_VERSION_IS_RELEASE to remove pre-release warning
Updated copyright in COPYING and doc/READMEs to 2013
Updated doc/release-notes.txt
2013-01-30 14:19:09 -05:00
Gavin Andresen
9126e08739 Utility to create pnSeed array 2013-01-29 22:24:21 -05:00
Jeff Garzik
0d3d6094fa Merge pull request #2162 from gavinandresen/spendfrom
spendfrom.py sends coins from a particular address or addresses
2013-01-26 12:13:39 -08:00
Gavin Andresen
dba91a9a67 spendfrom.py sends coins from a particular address or addresses
Should be both useful and also a pretty good demonstration of
using the raw transactions API.
2013-01-24 20:04:18 -05:00
Gavin Andresen
33b377a016 Port macdeployqtplus to OSX 10.8
Use 'osascript' to run AppleScript, instead of using (broken-in-10.8)
python appscript package.

And added support for code-signing the .app bundle, to make OSX's
GateKeeper happy.
2013-01-18 10:08:28 -05:00
default
fe703deae7 Deploy properly with Nokia Qt installer's Frameworks 2012-11-21 19:38:56 +00:00
Pieter Wuille
cfec6b2c70 Merge pull request #1967 from TheBlueMatt/leveldbmakefile
Undo bad gitian update.
2012-10-29 14:11:55 -07:00
Matt Corallo
b478337312 Undo bad gitian update. 2012-10-29 16:36:25 -04:00
Gavin Andresen
a77bcaddbf Merge pull request #1935 from runeksvendsen/master
Add script to contrib/ that verifies authenticity of binaries hosted on SourceForge
2012-10-29 12:59:28 -07:00
Matt Corallo
325a064c68 Upgrade to Qt 4.8.3 (because 4.8.2 was removed from qt repos?) 2012-10-29 15:43:18 -04:00
Rune K. Svendsen
de91ea0c0c Added script that verifies authenticity of binaries on SourceForge 2012-10-15 22:44:39 +02:00
Gavin Andresen
00a757375c Merge branch '2012_09_base58tests' of github.com:laanwj/bitcoin 2012-10-01 11:22:38 -04:00
Wladimir J. van der Laan
d6b13283d1 data-driven base58 CBitcoinAddress/CBitcoinSecret tests
Arbitrary numbers of test vectors can be generated using the script
`gen_base58_test_vectors.py`.
2012-10-01 04:57:26 +02:00
Wladimir J. van der Laan
a5ba586669 Merge pull request #1864 from Diapolo/Qt_4.8.2
switch to Qt 4.8.2 for Windows builds
2012-09-29 00:58:29 -07:00
Philip Kaufmann
26809acbf9 switch to Qt 4.8.2 for Windows builds 2012-09-25 19:37:22 +02:00
fanquake
0eaaa83ba5 Update Bitcoin to use OpenSSL 1.0.1c
Bump deps tp 0.0.5
Small docs corrections
2012-09-22 14:51:03 +08:00
Wladimir J. van der Laan
eabc8f2c81 Merge pull request #1803 from luke-jr/md2k7_license
Apply MIT license to md2k7 art
2012-09-09 01:58:00 -07:00
Luke Dashjr
23a44a7ad6 Apply MIT license to md2k7 art
[21:48:14] <md2k7> feel free to make it MIT if you like
2012-09-08 21:51:52 +00:00
Wladimir J. van der Laan
b9a4aaad1e Merge pull request #1726 from laanwj/2012_08_gitian_qt_styles
Remove unused styles on Windows from gitian qt build
2012-09-06 23:34:43 -07:00
Gavin Andresen
3c28b335af Minor build documentation fix 2012-09-06 16:27:39 -04:00
Gavin Andresen
004fa1441c Merge branch 'master' of github.com:bitcoin/bitcoin 2012-09-06 16:27:08 -04:00
Gavin Andresen
4dc89fa875 Build doc updates 2012-09-06 15:51:16 -04:00
Gavin Andresen
ace35a1997 Fix mac .dmg packager for latest macports qt4 2012-09-05 17:54:37 -04:00
Gavin Andresen
21327ebe93 Update gitian build setup notes 2012-09-05 11:37:33 -04:00
Wladimir J. van der Laan
e598b5b5c2 Remove unused styles on Windows from gitian qt build
Keeps the "windows", "windowsxp", "windowsvista" styles.

Reduces the size of a static bitcoin-qt.exe by ~400 kB.
2012-08-28 19:27:31 +02:00
Matt Corallo
a1755ec426 Upgrade to Boost 1.50 2012-08-27 14:20:56 -04:00
Luke Dashjr
d0377a70e2 Bugfix: Adjust gitian-win32 to use Boost 1.49 for real 2012-08-27 00:49:27 +00:00
Luke Dashjr
1837696580 Bugfix: Move boost::interprocess Win32 workaround to Bitcoin-Qt sources, rather than hacking boost in gitian 2012-08-27 00:49:23 +00:00
Luke Dashjr
90d95b6323 Replace all occurances of license.txt with COPYING, including naming the file COPYING.txt on Windows 2012-07-22 21:49:09 +00:00
fanquake
f00a0dcfed Docs Tidy up 2012-07-18 22:11:56 +08:00
Gavin Andresen
50fc02d063 Merge branch 'uri' of https://github.com/TheBlueMatt/bitcoin 2012-07-05 16:38:12 -04:00
Matt Corallo
3563824c60 Update contrib/debian and remove system json_spirit patch.
That patch has been broken for a long, long time (forever?) and
doesn't make sense.
2012-06-25 23:59:19 +02:00
Gregory Maxwell
a08e182698 Merge pull request #1490 from luke-jr/gd_ljr_key
gitian-downloader: Update luke-jr's key
2012-06-21 14:25:17 -07:00
Luke Dashjr
0783bcceef gitian-downloader: Update luke-jr's key 2012-06-20 16:15:46 +00:00
Pieter Wuille
d65e959bae Update my GPG key 2012-06-20 18:13:16 +02:00
Matt Corallo
1d42878adb Fix #956 the Boost 1.49 way. 2012-06-15 17:19:09 +02:00
Matt Corallo
39471861d5 Upgrade to Boost 1.49 on Win32 2012-06-15 17:15:37 +02:00
Matt Corallo
993928cfcc Fix broken config files 2012-06-12 01:52:34 +02:00
Matt Corallo
8f6111bb9c Update contrib/debian.
* Updates package description to note that blockchain now takes
  2+ GB instead of 150+ MB.

* Stop creating DB_CONFIG with DB_LOG_AUTO_REMOVE as that is set
  in Bitcoin itself now.

* Update changelog with 0.6.2 and the current updates.
2012-06-02 16:45:14 +02:00
Christian von Roques
dbd9c486bb Use debhelper to install bitcoind.bash-completion 2012-05-23 15:27:41 -04:00
Christian von Roques
33d7d93298 Bash programmable completion for bitcoind(1) 2012-05-23 14:26:45 -04:00
Matt Corallo
3d0a83aeb2 Update changelog to match reality. 2012-05-06 21:09:37 -04:00
Gavin Andresen
cedcec2dec Bump win32.deps version number for new openssl 2012-04-27 11:53:11 -04:00
Gavin Andresen
2b4d7735b6 Windows build: compile against openssl 1.0.1b 2012-04-27 10:52:14 -04:00
Pieter Wuille
702764f53b Merge pull request #1054 from sipa/buildinfo
Build identification strings
2012-04-10 13:31:12 -07:00
Pieter Wuille
a20c0d0f67 Build identification strings
All client version information is moved to version.cpp, which optionally
(-DHAVE_BUILD_INFO) includes build.h. build.h is automatically generated
on supporting platforms via contrib/genbuild.sh, using git describe.

The git export-subst attribute is used to put the commit id statically
in version.cpp inside generated archives, and this value is used if no
build.h is present.

The gitian descriptors are modified to use git archive instead of a
copy, to create the src/ directory in the output. This way,
src/src/version.cpp will contain the static commit id. To prevent
gitian builds from getting the "-dirty" marker in their git-describe
generated identifiers, no touching of files or running sed on the
makefile is performed anymore. This does not seem to influence
determinism.
2012-04-10 18:16:53 +02:00
cardpuncher
9c2c932f8c Added comment lines in French & Turkish which basically mean "Bitcoin, virtual P2P cryptocurrency". 2012-04-09 22:22:38 +03:00
Gavin Andresen
5ce4c2a23a Remove USE_SSL #define 2012-04-04 21:19:27 -04:00
Gregory Maxwell
703d64469e Merge pull request #934 from luke-jr/gitian_luke
Add Luke-Jr's PGP key to gitian-downloader
2012-04-03 08:09:13 -07:00
Pieter Wuille
94e6967e98 Updated my GPG key 2012-03-31 15:39:14 +02:00
Luke Dashjr
a41957b873 Add Luke-Jr's PGP key to gitian-downloader 2012-03-22 20:32:41 -04:00
Luke Dashjr
49e1501b5d Move QMAKE_LIBS_QT_ENTRY adjustment to bitcoin side of build
It could just as well be on either part of the gitian build, but to safely put it on the Qt side would require bumping the filename, and every gitian user rebuilding it.
v0.5.3.1 put it on the Bitcoin side, and this is easier to work with and keep safe, so I'm moving it.

Use `qmake MINGW_THREAD_BUGFIX=0` to disable
2012-03-22 12:46:47 -04:00
Matt Corallo
8864019f6d Fix Win32 RPC Crashes. 2012-03-16 14:28:54 -04:00
Matt Corallo
3d0a0a9b9e Make deps build deterministic and upgrade to libpng 1.5.9. 2012-02-22 22:09:06 -05:00
Wladimir J. van der Laan
ec2ed58232 Merge pull request #834 from sje397/BackupWallet
Added 'Backup Wallet' menu option to GUI
2012-02-17 10:30:15 -08:00
Matt Corallo
b03cb15789 Make bitcoin-qt static-link libqrcode and add it for debian pkgs. 2012-02-15 16:39:01 -05:00
sje397
4efbda3f25 Added 'Backup Wallet' menu option
- icon from the LGPL Nuvola set (like the tick) - http://www.icon-king.com/projects/nuvola/
- include 'boost/version.hpp' in db.cpp so that the overwrite version of copy can be used
- catch exceptions in BackupWallet (e.g. filesystem_error thrown when trying to overwrite without the overwrite flag set)
- include db.h in walletmodel.cpp for BackupWallet function
- updated doc/assets-attribution.txt and contrib/debian/copyright with copyright info for new icon
2012-02-15 23:29:59 +11:00
Luke Dashjr
9909340f37 Split smaller dependencies out of gitian-win32 into deps-win32 2012-02-07 11:52:40 -05:00
Luke Dashjr
f051ee5f96 Update zlib and libpng (previous version had a security issue) 2012-02-06 11:46:49 -05:00
Gavin Andresen
0104e36d4b Mac deploy tool: make dylibs writeable when copying into app bundle, so they can be stripped/nametool'ed 2012-02-06 09:33:13 -05:00
p2k
f118b5fc5d miniupnpc Porfile removed; new and improved macdeployqtplus
* My patch for miniupnpc has made it into the latest MacPorts release: https://trac.macports.org/ticket/31354
* Documentation has been changed appropriately
* New pure-Python macdeployqt; leverages all problems with the stock macdeployqt
2012-02-06 09:33:12 -05:00
Wladimir J. van der Laan
70f55355e2 Merge pull request #593 (Full URL Support in bitcoin-qt) 2012-01-26 19:00:02 +01:00
Matt Corallo
65c82be021 Remove mentions on anonymity in debian folder.
These should never have been there, bitcoin isnt anonymous without
a ton of work that virtually no users will ever be willing and
capable of doing.
2012-01-07 13:38:43 -05:00
Matt Corallo
7d145a0f59 Add support for opening bitcoin: URIs directly. 2012-01-05 00:29:28 -05:00
Matt Corallo
0b5d6f1e26 Add QR Code support to Win32 Gitian build. 2011-12-25 02:15:16 -08:00
Matt Corallo
1194739745 Fix Linux gitian descriptor to use QRCode support. 2011-12-23 15:35:59 -08:00
Wladimir J. van der Laan
5ad2ca011e Merge pull request #723 from TheBlueMatt/gitianfix
Fix #722.
2011-12-23 03:53:31 -08:00
Matt Corallo
7415b805c4 Fix #722. 2011-12-23 02:24:46 -08:00
sje397
22123c85f3 Added QRCode generation functions via libqrencode. Switch on with USE_QRENCODE=1.
Amended build docs for Linux and OSX, and OSX makefile.
Added package 'qrencode' to gitian.yml
2011-12-20 22:11:24 +11:00
Gavin Andresen
8214620178 Merge pull request #704 from TheBlueMatt/master
Update debian changelog to 0.5.1.
2011-12-16 14:19:32 -08:00
Matt Corallo
fdaf1dfd2e Add laanwj to gitian download scripts. 2011-12-16 15:06:17 -05:00
Matt Corallo
4051e79887 Update debian changelog to 0.5.1. 2011-12-16 13:27:52 -05:00
Matt Corallo
a22535144c Re-enable RPCSSL in gitian builds. 2011-12-07 10:28:01 -05:00
Matt Corallo
555d1cd02f Update contrib/debian/ for 0.5.0 release and fix copyright file. 2011-11-21 11:55:45 -05:00
Luke Dashjr
aa1ed9265f update debian copyright file for MIT icon relicensing 2011-11-20 16:32:16 -05:00
Gavin Andresen
e6a729d2d8 Merge pull request #631 from luke-jr/free_icons
Free icons
2011-11-14 06:57:46 -08:00
Luke Dashjr
0fe19a3a2c Replace kfm_home with go-home for "overview" 2011-11-11 11:11:07 -05:00
Gavin Andresen
6be6be2ed9 Tool/process for including correct qt translations in mac .App 2011-11-10 13:01:40 -05:00
Luke Dashjr
81dd7aa4c1 Replace icons with Nuvola (LGPL 2.1): some (but not all) GPL-licensed 2011-11-10 12:59:01 -05:00
Luke Dashjr
5a7321562d Replace icons with Nuvola (LGPL 2.1): all non-free except for those by Wladimir van der Laan (who will hopefully relicense) 2011-11-10 12:48:31 -05:00
Matt Corallo
38f33ce4a3 Add debian build folder 2011-11-08 11:57:05 -05:00
Gavin Andresen
a5f07cbea0 Static link on Linux. And better document release process on OSX. 2011-11-07 10:17:30 -05:00
Gavin Andresen
ab15ebaae8 Merge branch 'master' of github.com:bitcoin/bitcoin 2011-11-04 11:30:05 -04:00
Gavin Andresen
f6aacbfe6d Mac releases use macdeployqtplus 2011-11-04 10:22:55 -04:00
Wladimir J. van der Laan
c589f09115 Make qt-win32 gitian build deterministic 2011-11-03 20:26:51 +01:00
Gavin Andresen
8c69b6621c Merge git://github.com/p2k/bitcoin-qt 2011-11-03 11:06:57 -04:00
p2k
a8fe4b7a5f Added a copy of the GPLv3 to macdeployqtplus 2011-11-02 19:26:32 +01:00
p2k
6eaa1b36fc Mac Deployment Script
See notes.txt in contrib/macdeploy.

Also added a dash to the application name in src/qt/bitcoin.cpp
2011-11-02 14:58:50 +01:00
Wladimir J. van der Laan
8fb6134aa5 attempt to make build deterministic 2011-11-01 10:49:39 -04:00
Matt Corallo
fca0e799c2 Update Win32 gitian descriptor for bitcoin-qt. 2011-11-01 10:49:11 -04:00
Matt Corallo
2f91039c70 Add gitian descriptor for qt cross compile via MinGW. 2011-11-01 10:49:02 -04:00
Gavin Andresen
383ad8b8a6 Add notes on getting gitian builds going 2011-10-25 12:27:09 -04:00
Matt Corallo
472bbb750c Update openssl to 1.0.0e. 2011-10-25 11:54:46 -04:00
Matt Corallo
438adb6c25 Decrease number of installed packages for Linux Gitian build. 2011-10-25 11:52:51 -04:00
Matt Corallo
f5e760268b Remove wxWidgets gitian descriptors. 2011-10-25 11:52:36 -04:00
Matt Corallo
8ab246297b Update Linux gitian descriptor for bitcoin-qt. 2011-10-25 11:52:15 -04:00
Gavin Andresen
ab877a2dde Merge pull request #576 from luke-jr/bitcoind_build_improvements
bitcoind build improvements
2011-10-10 08:20:28 -07:00
Gavin Andresen
b50ac8f73e Mac OSX release process changes
Rename App Bundle "Bitcoin-Qt.app" instead of "Bitcoin Qt" for
consistency with Windows/Linux.
Update create_osx_dmg.sh script to use macdeployqt tool.
Add ifdef STATIC to makefile.osx to build bitcoind static or dynamic.
2011-10-10 11:13:32 -04:00
Luke Dashjr
b4d0588d06 Add support to makefile.unix for the same parameters used by bitcoin-qt.pro, dynamic linking unless STATIC=1 is passed 2011-10-09 14:23:20 -04:00
Gavin Andresen
0b3f3657c8 Remove old wx translations, updated qt translations 2011-10-08 17:29:21 -04:00
David Perry
5a105cdb7d Added bitrpc.py which allows for sending of all standard Bitcoin commands via RPC rather than as command line args.
Signed-off-by: David Perry <enmaku@gmail.com>
2011-10-03 16:10:03 -07:00
David Perry
8ad100a55b Added wallet tools
Signed-off-by: David Perry <enmaku@gmail.com>
2011-10-03 14:04:11 -07:00
Gavin Andresen
6b8a5ab622 Bump version to 0.4.1 2011-09-26 09:16:56 -04:00
Gavin Andresen
f7f2a36925 Merge pull request #521 from laanwj/qt
Qt GUI
2011-09-26 06:05:11 -07:00
Jeff Garzik
f8937b2d3b Merge pull request #528 from TheBlueMatt/gitian-downloader
Add win32 gitian download config.
2011-09-23 10:56:25 -07:00
Matt Corallo
3fc4c3a9f1 Add win32 gitian download config. 2011-09-23 00:52:08 -04:00
Gavin Andresen
a4f2c8419f Script to create OSX .dmg diskimage file. 2011-09-22 17:16:13 -04:00
Matt Corallo
0920ad152f Restructure gitian files and add download config files. 2011-09-22 16:52:49 -04:00
Wladimir J. van der Laan
5dd7318db7 Merge branch 'master' of https://github.com/bitcoin/bitcoin 2011-09-16 06:55:47 +02:00
p2k
2c1fd3c395 Some Mac OS X specific things
* Added application icon for Mac OS X * Added instructions for compiling
under Mac OS X * Added Portfile for compiling miniupnpc with MacPorts
2011-09-11 17:42:20 +02:00
Matt Corallo
0295912479 Update gitian build descriptors to produce proper builds.
Thanks to makomk for finding the bugs here and devrandom
for passing them along (see
https://bitcointalk.org/index.php?topic=42198.msg514312#msg514312)
2011-09-09 12:35:42 -04:00
Matt Corallo
7b7d46be89 Fix build process to actually work. 2011-09-03 12:38:20 -04:00
Gavin Andresen
7464e647de Bumped version numbers to 0.4.0rc1 2011-09-02 13:34:56 -04:00
Jeff Garzik
927aaa0f27 Add reference python miner, in contrib/pyminer/ 2011-08-31 12:27:41 -04:00
Dev Random
e40bef3c0a Add Gitian Build descriptors for Boost and wxWidgets. 2011-08-25 14:34:41 -04:00
Dev Random
3bb23e5c8b Mingw gitian build with deterministic bitcoin.exe by use of faketime 2011-08-23 13:00:34 -04:00
Dev Random
bef41ada0d Mingw gitian with separate wxWidgets and boost 2011-08-23 13:00:34 -04:00
Dev Random
d2cbb14d7c Linux gitian config with separate wxWidgets build 2011-08-23 13:00:34 -04:00
Matt Corallo
b4ada906c0 Upgrade dependancies and tweak build process.
* Upgrade to use miniupnpc 1.6
* Upgrade to wxWidgets 2.9.2
* Upgrade to Bost 1.47 for Win32 Builds
2011-08-23 13:00:34 -04:00
Jeff Garzik
24a0def8cd Bump version to 0.3.25
Yes, we might release as v0.4, but let's just do a simple increment
for now.
2011-07-13 01:19:26 -04:00
Matt Corallo
09923991e5 Enable UPnP by default on bitcoin, but not on bitcoind (on gitian)
Also fix a minor type in gitian.yml
2011-07-05 18:21:35 +02:00
Matt Corallo
fa105b1d3a Added a couple minor things to match newer build process.
This adds the relevent patches which are applied to wx,
and updates for cross compiling.
2011-07-05 00:59:00 +02:00
Jeff Garzik
fc27eb188f Bump OSX version to 0.3.24 (missed in previous commit) 2011-07-02 16:57:45 -04:00
Doug Huff
d8dda9de84 Add OSX App bundle and correct build instructions to reflect reality. 2011-06-27 15:11:35 -05:00
Matt Corallo
6c5064b5c3 Update Gitian Build Descriptor to match new directory layout. 2011-05-18 16:04:38 +02:00
devrandom
dec289e821 gitian: strip binaries 2011-04-28 11:01:28 -07:00
devrandom
26e0de41c3 gitian descriptor with miniupnpc 2011-04-27 16:26:14 -07:00
devrandom
0d0bd331ae move gitian descriptor file 2011-02-17 01:53:52 -08:00