diff -uNr a/bitcoin/Makefile b/bitcoin/Makefile --- a/bitcoin/Makefile f303997e3bb440a93e576faf956e7bf939e06055e9518316367986347162d7be932a6707cd2c8ad64e2a31c3f4e2bfa2693f780570d79e82af5cbe173e428632 +++ b/bitcoin/Makefile d4f19d36babd68365d37f49e1a81b41a6cae98f95546c4b25250957878e80e9a59786a4084719618d2a15f7636ce3ccf2c62d84860506cf9d42f2907b6cc995c @@ -1,9 +1,4 @@ -# Required Public Keys: -# 0x027A8D7C0FB8A16643720F40721705A8B71EADAF -# (For "make ONLINE=1".) - all: - $(MAKE) -C deps $(MAKE) -C build clean: diff -uNr a/bitcoin/deps/Makefile b/bitcoin/deps/Makefile --- a/bitcoin/deps/Makefile 071592ba649e8911593a73dbe36de0aa81777ee252571ce4ea5032f07303212b46eed1788d8f134faacd8fc531cc183165b8d3964cf1dc6bab0c54ef8894eb50 +++ b/bitcoin/deps/Makefile false @@ -1,37 +0,0 @@ -SHA512=sha512sum -CHECKSUM_OR_DIE=grep " $@$$" Manifest.sha512 | $(SHA512) -c || (mv $@ $@.badsum && false) -DECODE_DEED=cat $@.asc | sed -e '1,/begin-base64/d' -e '/====/,$$d' | base64 -d > $@ -VERIFY_DEED_OR_DIE=gpg --verify $@.asc || (mv $@.asc $@.asc.badsig && false) - -TURDS = boost_1_52_0.tar.bz2 db-4.8.30.tar.gz openssl-1.0.1g.tar.gz -all: $(TURDS) - -check: - $(SHA512) -c Manifest.sha512 - -clean: - rm -f $(TURDS) boost_1_52_0.tar.bz2.asc db-4.8.30.tar.gz.asc openssl-1.0.1g.tar.gz.asc - -boost_1_52_0.tar.bz2: -ifdef ONLINE - curl -s http://deedbot.org/deed-422651-1.txt -o $@.asc -endif - $(VERIFY_DEED_OR_DIE) - $(DECODE_DEED) - $(CHECKSUM_OR_DIE) - -db-4.8.30.tar.gz: -ifdef ONLINE - curl -s http://deedbot.org/deed-422651-3.txt -o $@.asc -endif - $(VERIFY_DEED_OR_DIE) - $(DECODE_DEED) - $(CHECKSUM_OR_DIE) - -openssl-1.0.1g.tar.gz: -ifdef ONLINE - curl -s http://deedbot.org/deed-422651-4.txt -o $@.asc -endif - $(VERIFY_DEED_OR_DIE) - $(DECODE_DEED) - $(CHECKSUM_OR_DIE) diff -uNr a/bitcoin/deps/Manifest.keccak b/bitcoin/deps/Manifest.keccak --- a/bitcoin/deps/Manifest.keccak false +++ b/bitcoin/deps/Manifest.keccak 9f00414a41b8f5a13e1ac1a39e3c1b0146d7f285623db4a329b4ac85d275627ea26a1f1b5dc59f26bbd8b41d7ed5e2df10ed5bcb3b0987df26011d9a22cfb3f1 @@ -0,0 +1,3 @@ +4fbf118eddcb959dad0977c55f95bfc788caea7c55221b1d978db55a3d563df6ba6a08f1d1e23c19ab5c5e0c3c8f60bed8b79c31fbade913e9ba0ffff1f53c7f boost_1_52_0.tar.bz2 +13a6e31c52d3ee616c457bd6b6167b92da9646b033f751120c23d30776d9b469f9ee5dde1ed425d2ed7e5abfccbf5ccb97f8bd3cd7e5aa038222841140afd62e db-4.8.30.tar.gz +972c8ae4ca6487d100ba8ee32bb208b7d0e1a5cb3a69760a4e797f33cf1ffee88a2351159eae6d8bb18b89adc6fb48813f3407441878ea19f6c2f9195e49dfac openssl-1.0.1g.tar.gz diff -uNr a/bitcoin/deps/Manifest.sha512 b/bitcoin/deps/Manifest.sha512 --- a/bitcoin/deps/Manifest.sha512 cf25c02269bebcde4aac90513ad758bf8eeaff97081c17ca4ae2d8fa5850e91b60e7a9c53aa1a040c3904d7e1add653c02b82d3989c9e33785290420d8ddf696 +++ b/bitcoin/deps/Manifest.sha512 false @@ -1,3 +0,0 @@ -fc512d3bfa6a39a60fee548775c97239271cf757587b8df7ed739c800844a819a359dca172be0e69ad7752753753139bf11f0813d650066d58386662fe32842d boost_1_52_0.tar.bz2 -d1a3c52b0ab54ae3fd6792e6396c9f74d25f36b2eb9e853b67ef9c872508a58c784c7818108d06d184f59601b70cc877916e67dfea6f0ee1ca2b07468c1041f1 db-4.8.30.tar.gz -66ebbad3c8ad98a07b486d39d0c3ae62b00133f8f2877cf8b97c461e7c7f40b29cf9c3cae82cf73a92dcf1daa63d33aa76c910fbcbe60158589fc7cb48f41e6d openssl-1.0.1g.tar.gz diff -uNr a/bitcoin/manifest b/bitcoin/manifest --- a/bitcoin/manifest be308814fb804ce1acf810e0174b2ce4835b603dba43672f7953c2a14602bb396f1eba2e0e0810f7a80695cd5952317f0df49f308c0afb31161e9020198ad0f0 +++ b/bitcoin/manifest 67267d31fbc4215b9d584711c5c333fdc8f34ae19ce8609d682e24a5a0ed74a4dacc45b1ce25ecccb235f431b877b04686a4e678725df71dffac20ec158f3a79 @@ -42,3 +42,4 @@ 712609 bitcoin_fsync_all_blocks jfw Don't skip fsync of blocks to disk during sync, because this can leave the raw block collection unrecoverably inconsistent with the BDB block index in the event of a crash. 713908 bitcoin_checkblocks_cleanup jfw Let the -checkblocks option take a positive integer value to set the the check depth limit or zero for no limit. Drop the default from 2500 to 144. Break the implementation out from a long-winded CTxDB member function whose class context was irrelevant to it. Simplify its loop bounds (which revealed a corner case of genesis block possibly going unchecked), fix off-by-one on the nominal depth limit and make it count from the first *good* block found. Add progress reporting and improve error messages and commentary. Exit before loading other things when it fails. *NOTE:* This breaks CLI/config file compatibility with the prior sloppy undocumented situation where any -checkblocks value at all would enable full checking. 732505 bitcoin_getblockindex_etc_corrected jfw Add 'getblockindex' RPC command to view CBlockIndex objects as found in the memory block index and ultimately the database. Also corrects the InvalidChainFound log message for consistency with the safe mode warning changed in bitcoin_help_tuneups, and adds 'eatblock' to the safe mode command whitelist (since it's equivalent to receiving blocks from the network, which is not restricted in safe mode). (Prior patch version missed the newline in the log message.) +732509 bitcoin_drop_online_build jfw Remove code and comments pertaining to the ONLINE=1 option which fetched dependency libs from deedbot, and upgrade their manifest hashes from sha512sum to keksum format.