Merge #5765: Implement BIP66 (0.8)

Add some defensive programming on top of #5634.

This copies the respective OpenSSL code in ECDSA_verify in
OpenSSL pre-1.0.1k (e.g. https://github.com/openssl/openssl/blob/OpenSSL_1_0_1j/crypto/ecdsa/ecs_vrf.c#L89)
more closely.

As reported by @sergiodemianlerner.

Github-Pull: #5640
Rebased-From: c6b7b29f23

.gitignore

@@ -1,52 +1,15 @@
-*.tar.gz
-
-*.exe
+src/*.exe
 src/bitcoin
 src/bitcoind
-src/bitcoin-cli
-src/test/test_bitcoin
-src/qt/test/test_bitcoin-qt
-
-Makefile.in
-aclocal.m4
-autom4te.cache/
-config.log
-config.status
-configure
-src/bitcoin-config.h
-src/bitcoin-config.h.in
-src/build-aux/
-src/stamp-h1
-share/setup.nsi
-share/qt/Info.plist
-
-src/qt/*.moc
-src/qt/moc_*.cpp
-src/qt/forms/ui_*.h
-
-src/qt/test/moc*.cpp
-
-.deps
-.dirstamp
+src/test_bitcoin
 .*.swp
 *.*~*
 *.bak
 *.rej
 *.orig
 *.o
-*.o-*
 *.patch
 .bitcoin
-*.a
-*.pb.cc
-*.pb.h
-
-*.log
-*.trs
-*.dmg
-
-*.json.h
-*.raw.h
 
 # Compilation and Qt preprocessor part
 *.qm
@@ -68,18 +31,4 @@ qrc_*.cpp
 .DS_Store
 build
 
-#lcov
-*.gcno
-/*.info
-test_bitcoin.coverage/
-total.coverage/
-coverage_percent.txt
-
-#build tests
-linux-coverage-build
-linux-build
-win32-build
-qa/pull-tester/run-bitcoind-for-test.sh
-qa/pull-tester/build-tests.sh
-
-!src/leveldb*/Makefile
+!src/leveldb-*/Makefile

.tx/config

@@ -1,7 +0,0 @@
-[main]
-host = https://www.transifex.com
-
-[bitcoin.tx]
-file_filter = src/qt/locale/bitcoin_<lang>.ts
-source_file = src/qt/locale/bitcoin_en.ts
-source_lang = en

INSTALL

@@ -1,5 +1,9 @@
 Building Bitcoin
 
-See doc/build-*.md for instructions on building bitcoind,
+See doc/readme-qt.rst for instructions on building Bitcoin-Qt,
+the intended-for-end-users, nice-graphical-interface, reference
+implementation of Bitcoin.
+
+See doc/build-*.txt for instructions on building bitcoind,
 the intended-for-services, no-graphical-interface, reference
 implementation of Bitcoin.

Makefile.am

@@ -1,172 +0,0 @@
-ACLOCAL_AMFLAGS = -I src/m4
-SUBDIRS = src
-.PHONY: deploy
-
-GZIP_ENV="-9n"
-
-BITCOIND_BIN=$(top_builddir)/src/bitcoind$(EXEEXT)
-BITCOIN_QT_BIN=$(top_builddir)/src/qt/bitcoin-qt$(EXEEXT)
-BITCOIN_CLI_BIN=$(top_builddir)/src/bitcoin-cli$(EXEEXT)
-BITCOIN_WIN_INSTALLER=$(PACKAGE)-$(PACKAGE_VERSION)-win$(WINDOWS_BITS)-setup$(EXEEXT)
-
-OSX_APP=Bitcoin-Qt.app
-OSX_DMG=Bitcoin-Qt.dmg
-OSX_DEPLOY_SCRIPT=$(top_srcdir)/contrib/macdeploy/macdeployqtplus
-OSX_FANCY_PLIST=$(top_srcdir)/contrib/macdeploy/fancy.plist
-OSX_INSTALLER_ICONS=$(top_srcdir)/src/qt/res/icons/bitcoin.icns
-OSX_PLIST=$(top_srcdir)/share/qt/Info.plist #not installed
-OSX_QT_TRANSLATIONS = da,de,es,hu,ru,uk,zh_CN,zh_TW
-
-DIST_DOCS = $(wildcard doc/*.md) $(wildcard doc/release-notes/*.md)
-
-WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
-  $(top_srcdir)/share/pixmaps/nsis-header.bmp \
-  $(top_srcdir)/share/pixmaps/nsis-wizard.bmp \
-  $(top_srcdir)/doc/README_windows.txt
-
-OSX_PACKAGING = $(OSX_DEPLOY_SCRIPT) $(OSX_FANCY_PLIST) $(OSX_INSTALLER_ICONS) \
-  $(top_srcdir)/contrib/macdeploy/background.png \
-  $(top_srcdir)/contrib/macdeploy/DS_Store
-
-COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
-  leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
-  baseline_filtered.info block_test_filtered.info \
-  leveldb_baseline_filtered.info test_bitcoin_coverage.info test_bitcoin.info
-
-dist-hook:
-	-$(MAKE) -C $(top_distdir)/src/leveldb clean
-	-$(GIT) archive --format=tar HEAD -- src/version.cpp | $(AMTAR) -C $(top_distdir) -xf -
-
-distcheck-hook:
-	$(MKDIR_P) $(top_distdir)/_build/src/leveldb
-	cp -rf $(top_srcdir)/src/leveldb/* $(top_distdir)/_build/src/leveldb/
-	-$(MAKE) -C $(top_distdir)/_build/src/leveldb clean
-
-distcleancheck:
-	@:
-
-$(BITCOIN_WIN_INSTALLER): $(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN)
-	$(MKDIR_P) $(top_builddir)/release
-	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
-	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
-	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
-	@test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \
-	  echo error: could not build $@
-
-$(BITCOIND_BIN) $(BITCOIN_QT_BIN) $(BITCOIN_CLI_BIN):
-	make -C $(dir $@) $(notdir $@)
-
-$(OSX_APP)/Contents/PkgInfo:
-	$(MKDIR_P) $(@D)
-	@echo "APPL????" > $@
-
-$(OSX_APP)/Contents/Resources/empty.lproj:
-	$(MKDIR_P) $(@D)
-	@touch $@
-
-$(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
-	$(MKDIR_P) $(@D)
-	$(INSTALL_DATA) $< $@
-
-$(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
-	$(MKDIR_P) $(@D)
-	$(INSTALL_DATA) $< $@
-
-$(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
-	$(MKDIR_P) $(@D)
-	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM)  $< $@
-
-OSX_APP_BUILT=$(OSX_APP)/Contents/PkgInfo $(OSX_APP)/Contents/Resources/empty.lproj \
-  $(OSX_APP)/Contents/Resources/bitcoin.icns $(OSX_APP)/Contents/Info.plist \
-  $(OSX_APP)/Contents/MacOS/Bitcoin-Qt
-
-if BUILD_DARWIN
-$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
-	$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -dmg -fancy $(OSX_FANCY_PLIST) -verbose 2
-
-else
-$(OSX_DMG): $(OSX_APP_BUILT) $(OSX_PACKAGING)
-	INSTALLNAMETOOL=$(INSTALLNAMETOOL)  OTOOL=$(OTOOL) STRIP=$(STRIP) $(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr $(OSX_QT_TRANSLATIONS) -verbose 2
-	$(MKDIR_P) dist/.background
-	$(INSTALL) contrib/macdeploy/background.png dist/.background
-	$(INSTALL) contrib/macdeploy/DS_Store dist/.DS_Store
-	cd dist; $(LN_S) /Applications Applications
-	$(GENISOIMAGE) -no-cache-inodes -l -probe -V "Bitcoin-Qt" -no-pad -r -apple -o $@ dist
-endif
-
-if TARGET_DARWIN
-appbundle: $(OSX_APP_BUILT)
-deploy: $(OSX_DMG)
-endif
-if TARGET_WINDOWS
-deploy: $(BITCOIN_WIN_INSTALLER)
-endif
-
-if USE_LCOV
-
-baseline.info:
-	$(LCOV) -c -i -d $(abs_builddir)/src -o $@
-
-baseline_filtered.info: baseline.info
-	$(LCOV) -r $< "/usr/include/*" -o $@
-
-leveldb_baseline.info: baseline_filtered.info
-	$(LCOV) -c -i -d $(abs_builddir)/src/leveldb -b $(abs_builddir)/src/leveldb -o $@
-
-leveldb_baseline_filtered.info: leveldb_baseline.info
-	$(LCOV) -r $< "/usr/include/*" -o $@
-
-baseline_filtered_combined.info: leveldb_baseline_filtered.info baseline_filtered.info
-	$(LCOV) -a leveldb_baseline_filtered.info -a baseline_filtered.info -o $@
-
-test_bitcoin.info: baseline_filtered_combined.info
-	$(MAKE) -C src/ check
-	$(LCOV) -c -d $(abs_builddir)/src -t test_bitcoin -o $@
-	$(LCOV) -z -d $(abs_builddir)/src
-	$(LCOV) -z -d $(abs_builddir)/src/leveldb
-
-test_bitcoin_filtered.info: test_bitcoin.info
-	$(LCOV) -r $< "/usr/include/*" -o $@
-
-block_test.info: test_bitcoin_filtered.info
-	$(MKDIR_P) qa/tmp
-	-@TIMEOUT=15 qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool 0
-	$(LCOV) -c -d $(abs_builddir)/src --t BitcoinJBlockTest -o $@
-	$(LCOV) -z -d $(abs_builddir)/src
-	$(LCOV) -z -d $(abs_builddir)/src/leveldb
-
-block_test_filtered.info: block_test.info
-	$(LCOV) -r $< "/usr/include/*" -o $@
-
-test_bitcoin_coverage.info: baseline_filtered_combined.info test_bitcoin_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -o $@
-
-total_coverage.info:  baseline_filtered_combined.info test_bitcoin_filtered.info block_test_filtered.info
-	$(LCOV) -a baseline_filtered.info -a leveldb_baseline_filtered.info -a test_bitcoin_filtered.info -a block_test_filtered.info -o $@ | $(GREP) "\%" | $(AWK) '{ print substr($$3,2,50) "/" $$5 }' > coverage_percent.txt
-
-test_bitcoin.coverage/.dirstamp:  test_bitcoin_coverage.info
-	$(GENHTML) -s $< -o $(@D)
-	@touch $@
-
-total.coverage/.dirstamp: total_coverage.info
-	$(GENHTML) -s $< -o $(@D)
-	@touch $@
-
-cov: test_bitcoin.coverage/.dirstamp total.coverage/.dirstamp
-
-endif
-
-if USE_COMPARISON_TOOL
-check-local:
-	$(MKDIR_P) qa/tmp
-	@qa/pull-tester/run-bitcoind-for-test.sh $(JAVA) -jar $(JAVA_COMPARISON_TOOL) qa/tmp/compTool $(COMPARISON_TOOL_REORG_TESTS)
-endif
-
-EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh qa/rpc-tests $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
-
-CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
-
-.INTERMEDIATE: $(COVERAGE_INFO)
-
-clean-local:
-	rm -rf test_bitcoin.coverage/ total.coverage/ $(OSX_APP)

README.md

@@ -1,9 +1,9 @@
-Bitcoin Core integration/staging tree
-=====================================
+Bitcoin integration/staging tree
+================================
 
 http://www.bitcoin.org
 
-Copyright (c) 2009-2015 Bitcoin Core Developers
+Copyright (c) 2009-2013 Bitcoin Developers
 
 What is Bitcoin?
 ----------------
@@ -11,16 +11,16 @@ What is Bitcoin?
 Bitcoin is an experimental new digital currency that enables instant payments to
 anyone, anywhere in the world. Bitcoin uses peer-to-peer technology to operate
 with no central authority: managing transactions and issuing money are carried
-out collectively by the network. Bitcoin Core is the name of open source
+out collectively by the network. Bitcoin is also the name of the open source
 software which enables the use of this currency.
 
 For more information, as well as an immediately useable, binary version of
-the Bitcoin Core software, see http://www.bitcoin.org/en/download.
+the Bitcoin client software, see http://www.bitcoin.org.
 
 License
 -------
 
-Bitcoin Core is released under the terms of the MIT license. See [COPYING](COPYING) for more
+Bitcoin is released under the terms of the MIT license. See `COPYING` for more
 information or see http://opensource.org/licenses/MIT.
 
 Development process
@@ -38,7 +38,7 @@ submitter will be asked to start a discussion (if they haven't already) on the
 
 The patch will be accepted if there is broad consensus that it is a good thing.
 Developers should expect to rework and resubmit patches if the code doesn't
-match the project's coding conventions (see [doc/coding.md](doc/coding.md)) or are
+match the project's coding conventions (see `doc/coding.md`) or are
 controversial.
 
 The `master` branch is regularly built and tested, but is not guaranteed to be
@@ -56,7 +56,17 @@ lots of money.
 ### Automated Testing
 
 Developers are strongly encouraged to write unit tests for new code, and to
-submit new unit tests for old code. Unit tests can be compiled and run (assuming they weren't disabled in configure) with: `make check`
+submit new unit tests for old code.
+
+Unit tests for the core code are in `src/test/`. To compile and run them:
+
+    cd src; make -f makefile.unix test
+
+Unit tests for the GUI code are in `src/qt/test/`. To compile and run them:
+
+    qmake BITCOIN_QT_TEST=1 -o Makefile.test bitcoin-qt.pro
+    make -f Makefile.test
+    ./bitcoin-qt_test
 
 Every pull request is built for both Windows and Linux on a dedicated server,
 and unit and sanity tests are automatically run. The binaries produced may be
@@ -68,51 +78,5 @@ for the build/test scripts.
 
 Large changes should have a test plan, and should be tested by somebody other
 than the developer who wrote the code.
+
 See https://github.com/bitcoin/QA/ for how to create a test plan.
-
-Translations
-------------
-
-Changes to translations as well as new translations can be submitted to
-[Bitcoin Core's Transifex page](https://www.transifex.com/projects/p/bitcoin/).
-
-Periodically the translations are pulled from Transifex and merged into the git repository. See the
-[translation process](doc/translation_process.md) for details on how this works.
-
-**Important**: We do not accept translation changes as github pull request because the next
-pull from Transifex would automatically overwrite them again.
-
-Development tips and tricks
----------------------------
-
-**compiling for debugging**
-
-Run configure with the --enable-debug option, then make. Or run configure with
-CXXFLAGS="-g -ggdb -O0" or whatever debug flags you need.
-
-**debug.log**
-
-If the code is behaving strangely, take a look in the debug.log file in the data directory;
-error and debugging message are written there.
-
-The -debug=... command-line option controls debugging; running with just -debug will turn
-on all categories (and give you a very large debug.log file).
-
-The Qt code routes qDebug() output to debug.log under category "qt": run with -debug=qt
-to see it.
-
-**testnet and regtest modes**
-
-Run with the -testnet option to run with "play bitcoins" on the test network, if you
-are testing multi-machine code that needs to operate across the internet.
-
-If you are testing something that can run on one machine, run with the -regtest option.
-In regression test mode blocks can be created on-demand; see qa/rpc-tests/ for tests
-that run in -regest mode.
-
-**DEBUG_LOCKORDER**
-
-Bitcoin Core is a multithreaded application, and deadlocks or other multithreading bugs
-can be very difficult to track down. Compiling with -DDEBUG_LOCKORDER (configure
-CXXFLAGS="-DDEBUG_LOCKORDER -g") inserts run-time checks to keep track of what locks
-are held, and adds warning to the debug.log file if inconsistencies are detected.

autogen.sh

@@ -1,5 +0,0 @@
-#!/bin/sh
-set -e
-srcdir="$(dirname $0)"
-cd "$srcdir"
-autoreconf --install --force

bitcoin-qt.pro

@@ -0,0 +1,422 @@
+TEMPLATE = app
+TARGET = bitcoin-qt
+macx:TARGET = "Bitcoin-Qt"
+VERSION = 0.8.6
+INCLUDEPATH += src src/json src/qt
+QT += network
+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE
+CONFIG += no_include_pwd
+CONFIG += thread
+
+# for boost 1.37, add -mt to the boost libraries
+# use: qmake BOOST_LIB_SUFFIX=-mt
+# for boost thread win32 with _win32 sufix
+# use: BOOST_THREAD_LIB_SUFFIX=_win32-...
+# or when linking against a specific BerkelyDB version: BDB_LIB_SUFFIX=-4.8
+
+# Dependency library locations can be customized with:
+#    BOOST_INCLUDE_PATH, BOOST_LIB_PATH, BDB_INCLUDE_PATH,
+#    BDB_LIB_PATH, OPENSSL_INCLUDE_PATH and OPENSSL_LIB_PATH respectively
+
+OBJECTS_DIR = build
+MOC_DIR = build
+UI_DIR = build
+
+# use: qmake "RELEASE=1"
+contains(RELEASE, 1) {
+    # Mac: compile for maximum compatibility (10.5, 32-bit)
+    macx:QMAKE_CXXFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+    macx:QMAKE_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+    macx:QMAKE_OBJECTIVE_CFLAGS += -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
+
+    !win32:!macx {
+        # Linux: static link and extra security (see: https://wiki.debian.org/Hardening)
+        LIBS += -Wl,-Bstatic -Wl,-z,relro -Wl,-z,now
+    }
+}
+
+!win32 {
+    # for extra security against potential buffer overflows: enable GCCs Stack Smashing Protection
+    QMAKE_CXXFLAGS *= -fstack-protector-all
+    QMAKE_LFLAGS *= -fstack-protector-all
+    # Exclude on Windows cross compile with MinGW 4.2.x, as it will result in a non-working executable!
+    # This can be enabled for Windows, when we switch to MinGW >= 4.4.x.
+}
+# for extra security (see: https://wiki.debian.org/Hardening): this flag is GCC compiler-specific
+QMAKE_CXXFLAGS *= -D_FORTIFY_SOURCE=2
+# for extra security on Windows: enable ASLR and DEP via GCC linker flags
+win32:QMAKE_LFLAGS *= -Wl,--dynamicbase -Wl,--nxcompat
+# on Windows: enable GCC large address aware linker flag
+win32:QMAKE_LFLAGS *= -Wl,--large-address-aware
+
+# use: qmake "USE_QRCODE=1"
+# libqrencode (http://fukuchi.org/works/qrencode/index.en.html) must be installed for support
+contains(USE_QRCODE, 1) {
+    message(Building with QRCode support)
+    DEFINES += USE_QRCODE
+    LIBS += -lqrencode
+}
+
+# use: qmake "USE_UPNP=1" ( enabled by default; default)
+#  or: qmake "USE_UPNP=0" (disabled by default)
+#  or: qmake "USE_UPNP=-" (not supported)
+# miniupnpc (http://miniupnp.free.fr/files/) must be installed for support
+contains(USE_UPNP, -) {
+    message(Building without UPNP support)
+} else {
+    message(Building with UPNP support)
+    count(USE_UPNP, 0) {
+        USE_UPNP=1
+    }
+    DEFINES += USE_UPNP=$$USE_UPNP STATICLIB
+    INCLUDEPATH += $$MINIUPNPC_INCLUDE_PATH
+    LIBS += $$join(MINIUPNPC_LIB_PATH,,-L,) -lminiupnpc
+    win32:LIBS += -liphlpapi
+}
+
+# use: qmake "USE_DBUS=1"
+contains(USE_DBUS, 1) {
+    message(Building with DBUS (Freedesktop notifications) support)
+    DEFINES += USE_DBUS
+    QT += dbus
+}
+
+# use: qmake "USE_IPV6=1" ( enabled by default; default)
+#  or: qmake "USE_IPV6=0" (disabled by default)
+#  or: qmake "USE_IPV6=-" (not supported)
+contains(USE_IPV6, -) {
+    message(Building without IPv6 support)
+} else {
+    count(USE_IPV6, 0) {
+        USE_IPV6=1
+    }
+    DEFINES += USE_IPV6=$$USE_IPV6
+}
+
+contains(BITCOIN_NEED_QT_PLUGINS, 1) {
+    DEFINES += BITCOIN_NEED_QT_PLUGINS
+    QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets
+}
+
+INCLUDEPATH += src/leveldb/include src/leveldb/helpers
+LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a
+!win32 {
+    # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences
+    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a
+} else {
+    # make an educated guess about what the ranlib command is called
+    isEmpty(QMAKE_RANLIB) {
+        QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib)
+    }
+    LIBS += -lshlwapi
+    genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a
+}
+genleveldb.target = $$PWD/src/leveldb/libleveldb.a
+genleveldb.depends = FORCE
+PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a
+QMAKE_EXTRA_TARGETS += genleveldb
+# Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it.
+QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean
+
+# regenerate src/build.h
+!win32|contains(USE_BUILD_INFO, 1) {
+    genbuild.depends = FORCE
+    genbuild.commands = cd $$PWD; /bin/sh share/genbuild.sh $$OUT_PWD/build/build.h
+    genbuild.target = $$OUT_PWD/build/build.h
+    PRE_TARGETDEPS += $$OUT_PWD/build/build.h
+    QMAKE_EXTRA_TARGETS += genbuild
+    DEFINES += HAVE_BUILD_INFO
+}
+
+QMAKE_CXXFLAGS_WARN_ON = -fdiagnostics-show-option -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter -Wstack-protector
+
+# Input
+DEPENDPATH += src src/json src/qt
+HEADERS += src/qt/bitcoingui.h \
+    src/qt/transactiontablemodel.h \
+    src/qt/addresstablemodel.h \
+    src/qt/optionsdialog.h \
+    src/qt/sendcoinsdialog.h \
+    src/qt/addressbookpage.h \
+    src/qt/signverifymessagedialog.h \
+    src/qt/aboutdialog.h \
+    src/qt/editaddressdialog.h \
+    src/qt/bitcoinaddressvalidator.h \
+    src/alert.h \
+    src/addrman.h \
+    src/base58.h \
+    src/bignum.h \
+    src/checkpoints.h \
+    src/compat.h \
+    src/sync.h \
+    src/util.h \
+    src/hash.h \
+    src/uint256.h \
+    src/serialize.h \
+    src/main.h \
+    src/net.h \
+    src/key.h \
+    src/db.h \
+    src/walletdb.h \
+    src/script.h \
+    src/init.h \
+    src/bloom.h \
+    src/mruset.h \
+    src/checkqueue.h \
+    src/json/json_spirit_writer_template.h \
+    src/json/json_spirit_writer.h \
+    src/json/json_spirit_value.h \
+    src/json/json_spirit_utils.h \
+    src/json/json_spirit_stream_reader.h \
+    src/json/json_spirit_reader_template.h \
+    src/json/json_spirit_reader.h \
+    src/json/json_spirit_error_position.h \
+    src/json/json_spirit.h \
+    src/qt/clientmodel.h \
+    src/qt/guiutil.h \
+    src/qt/transactionrecord.h \
+    src/qt/guiconstants.h \
+    src/qt/optionsmodel.h \
+    src/qt/monitoreddatamapper.h \
+    src/qt/transactiondesc.h \
+    src/qt/transactiondescdialog.h \
+    src/qt/bitcoinamountfield.h \
+    src/wallet.h \
+    src/keystore.h \
+    src/qt/transactionfilterproxy.h \
+    src/qt/transactionview.h \
+    src/qt/walletmodel.h \
+    src/qt/walletview.h \
+    src/qt/walletstack.h \
+    src/qt/walletframe.h \
+    src/bitcoinrpc.h \
+    src/qt/overviewpage.h \
+    src/qt/csvmodelwriter.h \
+    src/crypter.h \
+    src/qt/sendcoinsentry.h \
+    src/qt/qvalidatedlineedit.h \
+    src/qt/bitcoinunits.h \
+    src/qt/qvaluecombobox.h \
+    src/qt/askpassphrasedialog.h \
+    src/protocol.h \
+    src/qt/notificator.h \
+    src/qt/paymentserver.h \
+    src/allocators.h \
+    src/ui_interface.h \
+    src/qt/rpcconsole.h \
+    src/version.h \
+    src/netbase.h \
+    src/clientversion.h \
+    src/txdb.h \
+    src/leveldb.h \
+    src/threadsafety.h \
+    src/limitedmap.h \
+    src/qt/splashscreen.h
+
+SOURCES += src/qt/bitcoin.cpp \
+    src/qt/bitcoingui.cpp \
+    src/qt/transactiontablemodel.cpp \
+    src/qt/addresstablemodel.cpp \
+    src/qt/optionsdialog.cpp \
+    src/qt/sendcoinsdialog.cpp \
+    src/qt/addressbookpage.cpp \
+    src/qt/signverifymessagedialog.cpp \
+    src/qt/aboutdialog.cpp \
+    src/qt/editaddressdialog.cpp \
+    src/qt/bitcoinaddressvalidator.cpp \
+    src/alert.cpp \
+    src/version.cpp \
+    src/sync.cpp \
+    src/util.cpp \
+    src/hash.cpp \
+    src/netbase.cpp \
+    src/key.cpp \
+    src/script.cpp \
+    src/main.cpp \
+    src/init.cpp \
+    src/net.cpp \
+    src/bloom.cpp \
+    src/checkpoints.cpp \
+    src/addrman.cpp \
+    src/db.cpp \
+    src/walletdb.cpp \
+    src/qt/clientmodel.cpp \
+    src/qt/guiutil.cpp \
+    src/qt/transactionrecord.cpp \
+    src/qt/optionsmodel.cpp \
+    src/qt/monitoreddatamapper.cpp \
+    src/qt/transactiondesc.cpp \
+    src/qt/transactiondescdialog.cpp \
+    src/qt/bitcoinstrings.cpp \
+    src/qt/bitcoinamountfield.cpp \
+    src/wallet.cpp \
+    src/keystore.cpp \
+    src/qt/transactionfilterproxy.cpp \
+    src/qt/transactionview.cpp \
+    src/qt/walletmodel.cpp \
+    src/qt/walletview.cpp \
+    src/qt/walletstack.cpp \
+    src/qt/walletframe.cpp \
+    src/bitcoinrpc.cpp \
+    src/rpcdump.cpp \
+    src/rpcnet.cpp \
+    src/rpcmining.cpp \
+    src/rpcwallet.cpp \
+    src/rpcblockchain.cpp \
+    src/rpcrawtransaction.cpp \
+    src/qt/overviewpage.cpp \
+    src/qt/csvmodelwriter.cpp \
+    src/crypter.cpp \
+    src/qt/sendcoinsentry.cpp \
+    src/qt/qvalidatedlineedit.cpp \
+    src/qt/bitcoinunits.cpp \
+    src/qt/qvaluecombobox.cpp \
+    src/qt/askpassphrasedialog.cpp \
+    src/protocol.cpp \
+    src/qt/notificator.cpp \
+    src/qt/paymentserver.cpp \
+    src/qt/rpcconsole.cpp \
+    src/noui.cpp \
+    src/leveldb.cpp \
+    src/txdb.cpp \
+    src/qt/splashscreen.cpp
+
+RESOURCES += src/qt/bitcoin.qrc
+
+FORMS += src/qt/forms/sendcoinsdialog.ui \
+    src/qt/forms/addressbookpage.ui \
+    src/qt/forms/signverifymessagedialog.ui \
+    src/qt/forms/aboutdialog.ui \
+    src/qt/forms/editaddressdialog.ui \
+    src/qt/forms/transactiondescdialog.ui \
+    src/qt/forms/overviewpage.ui \
+    src/qt/forms/sendcoinsentry.ui \
+    src/qt/forms/askpassphrasedialog.ui \
+    src/qt/forms/rpcconsole.ui \
+    src/qt/forms/optionsdialog.ui
+
+contains(USE_QRCODE, 1) {
+HEADERS += src/qt/qrcodedialog.h
+SOURCES += src/qt/qrcodedialog.cpp
+FORMS += src/qt/forms/qrcodedialog.ui
+}
+
+contains(BITCOIN_QT_TEST, 1) {
+SOURCES += src/qt/test/test_main.cpp \
+    src/qt/test/uritests.cpp
+HEADERS += src/qt/test/uritests.h
+DEPENDPATH += src/qt/test
+QT += testlib
+TARGET = bitcoin-qt_test
+DEFINES += BITCOIN_QT_TEST
+  macx: CONFIG -= app_bundle
+}
+
+CODECFORTR = UTF-8
+
+# for lrelease/lupdate
+# also add new translations to src/qt/bitcoin.qrc under translations/
+TRANSLATIONS = $$files(src/qt/locale/bitcoin_*.ts)
+
+isEmpty(QMAKE_LRELEASE) {
+    win32:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]\\lrelease.exe
+    else:QMAKE_LRELEASE = $$[QT_INSTALL_BINS]/lrelease
+}
+isEmpty(QM_DIR):QM_DIR = $$PWD/src/qt/locale
+# automatically build translations, so they can be included in resource file
+TSQM.name = lrelease ${QMAKE_FILE_IN}
+TSQM.input = TRANSLATIONS
+TSQM.output = $$QM_DIR/${QMAKE_FILE_BASE}.qm
+TSQM.commands = $$QMAKE_LRELEASE ${QMAKE_FILE_IN} -qm ${QMAKE_FILE_OUT}
+TSQM.CONFIG = no_link
+QMAKE_EXTRA_COMPILERS += TSQM
+
+# "Other files" to show in Qt Creator
+OTHER_FILES += README.md \
+    doc/*.rst \
+    doc/*.txt \
+    src/qt/res/bitcoin-qt.rc \
+    src/test/*.cpp \
+    src/test/*.h \
+    src/qt/test/*.cpp \
+    src/qt/test/*.h
+
+# platform specific defaults, if not overridden on command line
+isEmpty(BOOST_LIB_SUFFIX) {
+    macx:BOOST_LIB_SUFFIX = -mt
+    win32:BOOST_LIB_SUFFIX = -mgw44-mt-s-1_50
+}
+
+isEmpty(BOOST_THREAD_LIB_SUFFIX) {
+    BOOST_THREAD_LIB_SUFFIX = $$BOOST_LIB_SUFFIX
+}
+
+isEmpty(BDB_LIB_PATH) {
+    macx:BDB_LIB_PATH = /opt/local/lib/db48
+}
+
+isEmpty(BDB_LIB_SUFFIX) {
+    macx:BDB_LIB_SUFFIX = -4.8
+}
+
+isEmpty(BDB_INCLUDE_PATH) {
+    macx:BDB_INCLUDE_PATH = /opt/local/include/db48
+}
+
+isEmpty(BOOST_LIB_PATH) {
+    macx:BOOST_LIB_PATH = /opt/local/lib
+}
+
+isEmpty(BOOST_INCLUDE_PATH) {
+    macx:BOOST_INCLUDE_PATH = /opt/local/include
+}
+
+win32:DEFINES += WIN32
+win32:RC_FILE = src/qt/res/bitcoin-qt.rc
+
+win32:!contains(MINGW_THREAD_BUGFIX, 0) {
+    # At least qmake's win32-g++-cross profile is missing the -lmingwthrd
+    # thread-safety flag. GCC has -mthreads to enable this, but it doesn't
+    # work with static linking. -lmingwthrd must come BEFORE -lmingw, so
+    # it is prepended to QMAKE_LIBS_QT_ENTRY.
+    # It can be turned off with MINGW_THREAD_BUGFIX=0, just in case it causes
+    # any problems on some untested qmake profile now or in the future.
+    DEFINES += _MT
+    QMAKE_LIBS_QT_ENTRY = -lmingwthrd $$QMAKE_LIBS_QT_ENTRY
+}
+
+!win32:!macx {
+    DEFINES += LINUX
+    LIBS += -lrt
+    # _FILE_OFFSET_BITS=64 lets 32-bit fopen transparently support large files.
+    DEFINES += _FILE_OFFSET_BITS=64
+}
+
+macx:HEADERS += src/qt/macdockiconhandler.h
+macx:OBJECTIVE_SOURCES += src/qt/macdockiconhandler.mm
+macx:LIBS += -framework Foundation -framework ApplicationServices -framework AppKit
+macx:DEFINES += MAC_OSX MSG_NOSIGNAL=0
+macx:ICON = src/qt/res/icons/bitcoin.icns
+macx:QMAKE_CFLAGS_THREAD += -pthread
+macx:QMAKE_LFLAGS_THREAD += -pthread
+macx:QMAKE_CXXFLAGS_THREAD += -pthread
+macx:QMAKE_INFO_PLIST = share/qt/Info.plist
+
+# Set libraries and includes at end, to use platform-defined defaults if not overridden
+INCLUDEPATH += $$BOOST_INCLUDE_PATH $$BDB_INCLUDE_PATH $$OPENSSL_INCLUDE_PATH $$QRENCODE_INCLUDE_PATH
+LIBS += $$join(BOOST_LIB_PATH,,-L,) $$join(BDB_LIB_PATH,,-L,) $$join(OPENSSL_LIB_PATH,,-L,) $$join(QRENCODE_LIB_PATH,,-L,)
+LIBS += -lssl -lcrypto -ldb_cxx$$BDB_LIB_SUFFIX
+# -lgdi32 has to happen after -lcrypto (see  #681)
+win32:LIBS += -lws2_32 -lshlwapi -lmswsock -lole32 -loleaut32 -luuid -lgdi32
+LIBS += -lboost_system$$BOOST_LIB_SUFFIX -lboost_filesystem$$BOOST_LIB_SUFFIX -lboost_program_options$$BOOST_LIB_SUFFIX -lboost_thread$$BOOST_THREAD_LIB_SUFFIX
+win32:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
+macx:LIBS += -lboost_chrono$$BOOST_LIB_SUFFIX
+
+contains(RELEASE, 1) {
+    !win32:!macx {
+        # Linux: turn dynamic linking back on for c/c++ runtime libraries
+        LIBS += -Wl,-Bdynamic
+    }
+}
+
+system($$QMAKE_LRELEASE -silent $$TRANSLATIONS)

configure.ac

@@ -1,717 +0,0 @@
-dnl require autoconf 2.60 (AS_ECHO/AS_ECHO_N)
-AC_PREREQ([2.60])
-define(_CLIENT_VERSION_MAJOR, 0)
-define(_CLIENT_VERSION_MINOR, 9)
-define(_CLIENT_VERSION_REVISION, 5)
-define(_CLIENT_VERSION_BUILD, 0)
-define(_CLIENT_VERSION_IS_RELEASE, true)
-define(_COPYRIGHT_YEAR, 2015)
-AC_INIT([Bitcoin Core],[_CLIENT_VERSION_MAJOR._CLIENT_VERSION_MINOR._CLIENT_VERSION_REVISION],[info@bitcoin.org],[bitcoin])
-AC_CONFIG_AUX_DIR([src/build-aux])
-AC_CONFIG_MACRO_DIR([src/m4])
-AC_CANONICAL_HOST
-AH_TOP([#ifndef BITCOIN_CONFIG_H])
-AH_TOP([#define BITCOIN_CONFIG_H])
-AH_BOTTOM([#endif //BITCOIN_CONFIG_H])
-
-# This m4 will only be used if a system copy cannot be found. This is helpful
-# on systems where autotools are installed but the pkg-config macros are not in
-# a default location. It is currently used for building on OSX where autotools
-# are preinstalled but pkg-config comes from macports or homebrew. It should
-# probably be removed when building on <= 10.6 is no longer supported.
-m4_include([pkg.m4])
-
-dnl faketime breaks configure and is only needed for make. Disable it here.
-unset FAKETIME
-
-if test "x${CXXFLAGS+set}" = "xset"; then
-  CXXFLAGS_overridden=yes
-else
-  CXXFLAGS_overridden=no
-fi
-
-dnl ==============================================================
-dnl Setup for automake
-dnl ==============================================================
-
-AM_INIT_AUTOMAKE([no-define subdir-objects foreign])
-
-dnl faketime messes with timestamps and causes configure to be re-run.
-dnl --disable-maintainer-mode can be used to bypass this.
-AM_MAINTAINER_MODE([enable])
-
-dnl make the compilation flags quiet unless V=1 is used
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES([yes])])
-
-# Enable wallet
-AC_ARG_ENABLE([wallet],
-  [AS_HELP_STRING([--enable-wallet],
-  [enable wallet (default is yes)])],
-  [enable_wallet=$enableval],
-  [enable_wallet=yes])
-
-AC_ARG_WITH([miniupnpc],
-  [AS_HELP_STRING([--with-miniupnpc],
-  [enable UPNP (default is yes if libminiupnpc is found)])],
-  [use_upnp=$withval],
-  [use_upnp=auto])
-
-AC_ARG_ENABLE([upnp-default],
-  [AS_HELP_STRING([--enable-upnp-default],
-  [if UPNP is enabled, turn it on at startup (default is no)])],
-  [use_upnp_default=$enableval],
-  [use_upnp_default=no])
-
-AC_ARG_ENABLE(tests,
-    AS_HELP_STRING([--enable-tests],[compile tests (default is yes)]),
-    [use_tests=$enableval],
-    [use_tests=yes])
-
-AC_ARG_WITH([comparison-tool],
-    AS_HELP_STRING([--with-comparison-tool],[path to java comparison tool (requires --enable-tests)]),
-    [use_comparison_tool=$withval],
-    [use_comparison_tool=no])
-
-AC_ARG_ENABLE([comparison-tool-reorg-tests],
-    AS_HELP_STRING([--enable-comparison-tool-reorg-tests],[enable expensive reorg tests in the comparison tool (default no)]),
-    [use_comparison_tool_reorg_tests=$enableval],
-    [use_comparison_tool_reorg_tests=no])
-
-AC_ARG_WITH([qrencode],
-  [AS_HELP_STRING([--with-qrencode],
-  [enable QR code support (default is yes if qt is enabled and libqrencode is found)])],
-  [use_qr=$withval],
-  [use_qr=auto])
-
-AC_ARG_ENABLE([hardening],
-  [AS_HELP_STRING([--enable-hardening],
-  [attempt to harden the resulting executables (default is yes)])],
-  [use_hardening=$enableval],
-  [use_hardening=yes])
-
-AC_ARG_ENABLE([ccache],
-  [AS_HELP_STRING([--enable-ccache],
-  [use ccache for building (default is yes if ccache is found)])],
-  [use_ccache=$enableval],
-  [use_ccache=auto])
-
-AC_ARG_ENABLE([lcov],
-  [AS_HELP_STRING([--enable-lcov],
-  [enable lcov testing (default is no)])],
-  [use_lcov=yes],
-  [use_lcov=no])
-
-AC_ARG_ENABLE([glibc-back-compat],
-  [AS_HELP_STRING([--enable-glibc-back-compat],
-  [enable backwards compatibility with glibc and libstdc++])],
-  [use_glibc_compat=$enableval],
-  [use_glibc_compat=no])
-
-AC_ARG_WITH([protoc-bindir],[AS_HELP_STRING([--with-protoc-bindir=BIN_DIR],[specify protoc bin path])], [protoc_bin_path=$withval], [])
-
-
-AC_CONFIG_SRCDIR([src])
-AC_CONFIG_HEADERS([src/bitcoin-config.h])
-
-dnl Checks for programs.
-AC_PROG_CXX
-AC_PROG_CC
-AC_PROG_CPP
-AC_PROG_CXXCPP
-AC_PROG_INSTALL
-AC_PROG_OBJC
-AC_PROG_LN_S
-m4_ifdef([AC_PROG_OBJCXX],[AC_PROG_OBJCXX])
-AC_PROG_MKDIR_P
-AC_PROG_SED
-AC_PATH_TOOL(AR, ar)
-AC_PATH_TOOL(RANLIB, ranlib)
-AC_PATH_TOOL(STRIP, strip)
-AC_PATH_TOOL(GCOV, gcov)
-AC_PATH_PROG(LCOV, lcov)
-AC_PATH_PROG(JAVA, java)
-AC_PATH_PROG(GENHTML, genhtml)
-AC_PATH_PROG([GIT], [git])
-AC_PATH_PROG(CCACHE,ccache)
-AC_PATH_PROG(XGETTEXT,xgettext)
-AC_PATH_PROG(HEXDUMP,hexdump)
-PKG_PROG_PKG_CONFIG
-
-# Enable debug 
-AC_ARG_ENABLE([debug],
-    [AS_HELP_STRING([--enable-debug],
-                    [use debug compiler flags and macros (default is no)])],
-    [enable_debug=$enableval],
-    [enable_debug=no])
-
-if test "x$enable_debug" = xyes; then
-    if test "x$GCC" = xyes; then
-        CFLAGS="-g3 -O0 -DDEBUG"
-    fi
-    
-    if test "x$GXX" = xyes; then
-        CXXFLAGS="-g3 -O0 -DDEBUG"
-    fi
-fi 
-
-## TODO: Remove these hard-coded paths and flags. They are here for the sake of
-##       compatibility with the legacy buildsystem.
-##
-if test "x$CXXFLAGS_overridden" = "xno"; then
-  CXXFLAGS="$CXXFLAGS -Wall -Wextra -Wformat -Wformat-security -Wno-unused-parameter"
-fi
-CPPFLAGS="$CPPFLAGS -DBOOST_SPIRIT_THREADSAFE -DHAVE_BUILD_INFO -D__STDC_FORMAT_MACROS"
-
-AC_LANG_PUSH([C++])
-
-use_pkgconfig=yes
-case $host in
-  *mingw*)
-
-     #pkgconfig does more harm than good with MinGW
-     use_pkgconfig=no
-
-     TARGET_OS=windows
-     AC_CHECK_LIB([mingwthrd],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([kernel32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([user32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([gdi32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([comdlg32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([winspool],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([winmm],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([shell32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([comctl32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([ole32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([oleaut32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([uuid],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([rpcrt4],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([advapi32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([ws2_32],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([mswsock],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([shlwapi],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([iphlpapi],      [main],, AC_MSG_ERROR(lib missing))
-     AC_CHECK_LIB([crypt32],      [main],, AC_MSG_ERROR(lib missing))
-
-     AX_CHECK_LINK_FLAG([[-static]],[LDFLAGS="$LDFLAGS -static"])
-     AX_CHECK_LINK_FLAG([[-static-libgcc]],[LDFLAGS="$LDFLAGS -static-libgcc"])
-     AX_CHECK_LINK_FLAG([[-static-libstdc++]],[LDFLAGS="$LDFLAGS -static-libstdc++"])
-
-     AC_PATH_PROG([MAKENSIS], [makensis], none)
-     if test x$MAKENSIS = xnone; then
-       AC_MSG_WARN("makensis not found. Cannot create installer.")
-     fi
-
-     AC_PATH_TOOL(WINDRES, windres, none)
-     if test x$WINDRES = xnone; then
-       AC_MSG_ERROR("windres not found")
-     fi
-
-     CPPFLAGS="$CPPFLAGS -D_MT -DWIN32 -D_WINDOWS -DBOOST_THREAD_USE_LIB"
-     LEVELDB_TARGET_FLAGS="TARGET_OS=OS_WINDOWS_CROSSCOMPILE"
-     if test "x$CXXFLAGS_overridden" = "xno"; then
-       CXXFLAGS="$CXXFLAGS -w"
-     fi
-     case $host in
-       i?86-*) WINDOWS_BITS=32 ;;
-       x86_64-*) WINDOWS_BITS=64 ;;
-       *) AC_MSG_ERROR("Could not determine win32/win64 for installer") ;;
-     esac
-     AC_SUBST(WINDOWS_BITS)
-     ;;
-  *darwin*)
-     TARGET_OS=darwin
-     LEVELDB_TARGET_FLAGS="TARGET_OS=Darwin"
-     if  test x$cross_compiling != xyes; then
-       BUILD_OS=darwin
-       AC_CHECK_PROG([PORT],port, port)
-       if test x$PORT = xport; then
-         dnl add default macports paths
-         CPPFLAGS="$CPPFLAGS -isystem /opt/local/include -I/opt/local/include/db48"
-         LIBS="$LIBS -L/opt/local/lib -L/opt/local/lib/db48"
-       fi
-
-       AC_CHECK_PROG([BREW],brew, brew)
-       if test x$BREW = xbrew; then
-         dnl These Homebrew packages may be bottled, meaning that they won't be found
-         dnl in expected paths because they may conflict with system files. Ask
-         dnl Homebrew where each one is located, then adjust paths accordingly.
-         dnl It's safe to add these paths even if the functionality is disabled by
-         dnl the user (--without-wallet or --without-gui for example).
-
-         openssl_prefix=`$BREW --prefix openssl 2>/dev/null`
-         bdb_prefix=`$BREW --prefix berkeley-db4 2>/dev/null`
-         qt5_prefix=`$BREW --prefix qt5 2>/dev/null`
-         if test x$openssl_prefix != x; then
-           export PKG_CONFIG_PATH="$openssl_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
-         fi
-         if test x$bdb_prefix != x; then
-           CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include"
-           LIBS="$LIBS -L$bdb_prefix/lib"
-         fi
-         if test x$qt5_prefix != x; then
-           export PKG_CONFIG_PATH="$qt5_prefix/lib/pkgconfig:$PKG_CONFIG_PATH"
-         fi
-       fi
-     else
-       case $build_os in
-         *darwin*)
-           BUILD_OS=darwin
-           ;;
-         *)
-           AC_PATH_TOOL([INSTALLNAMETOOL], [install_name_tool], install_name_tool)
-           AC_PATH_TOOL([OTOOL], [otool], otool)
-           AC_PATH_PROGS([GENISOIMAGE], [genisoimage mkisofs],genisoimage)
-           ;;
-       esac
-     fi
-
-     CPPFLAGS="$CPPFLAGS -DMAC_OSX"
-     ;;
-   *)
-     ;;
-esac
-
-if test x$use_comparison_tool != xno; then
-  AC_SUBST(JAVA_COMPARISON_TOOL, $use_comparison_tool)
-fi
-
-if test x$use_comparison_tool_reorg_tests != xno; then
-  if test x$use_comparison_tool == x; then
-    AC_MSG_ERROR("comparison tool reorg tests but comparison tool was not specified")
-  fi
-  AC_SUBST(COMPARISON_TOOL_REORG_TESTS, 1)
-else
-  AC_SUBST(COMPARISON_TOOL_REORG_TESTS, 0)
-fi
-
-if test x$use_lcov == xyes; then
-  if test x$LCOV == x; then
-    AC_MSG_ERROR("lcov testing requested but lcov not found")
-  fi
-  if test x$GCOV == x; then
-    AC_MSG_ERROR("lcov testing requested but gcov not found")
-  fi
-  if test x$JAVA == x; then
-    AC_MSG_ERROR("lcov testing requested but java not found")
-  fi
-  if test x$GENHTML == x; then
-    AC_MSG_ERROR("lcov testing requested but genhtml not found")
-  fi
-  if test x$use_comparison_tool == x; then
-    AC_MSG_ERROR("lcov testing requested but comparison tool was not specified")
-  fi
-  LCOV="$LCOV --gcov-tool=$GCOV"
-  AX_CHECK_COMPILE_FLAG([--coverage],[CXXFLAGS="$CXXFLAGS --coverage"],
-    [AC_MSG_ERROR("lcov testing requested but --coverage flag does not work")])
-fi
-
-dnl Require little endian
-AC_C_BIGENDIAN([AC_MSG_ERROR("Big Endian not supported")])
-
-dnl Check for pthread compile/link requirements
-AX_PTHREAD
-INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
-
-# The following macro will add the necessary defines to bitcoin-config.h, but
-# they also need to be passed down to any subprojects. Pull the results out of
-# the cache and add them to CPPFLAGS.
-AC_SYS_LARGEFILE
-# detect POSIX or GNU variant of strerror_r
-AC_FUNC_STRERROR_R
-
-if test x$ac_cv_sys_file_offset_bits != x &&
-   test x$ac_cv_sys_file_offset_bits != xno &&
-   test x$ac_cv_sys_file_offset_bits != xunknown; then
-  CPPFLAGS="$CPPFLAGS -D_FILE_OFFSET_BITS=$ac_cv_sys_file_offset_bits"
-fi
-
-if test x$ac_cv_sys_large_files != x &&
-   test x$ac_cv_sys_large_files != xno &&
-   test x$ac_cv_sys_large_files != xunknown; then
-  CPPFLAGS="$CPPFLAGS -D_LARGE_FILES=$ac_cv_sys_large_files"
-fi
-
-AX_CHECK_LINK_FLAG([[-Wl,--large-address-aware]], [LDFLAGS="$LDFLAGS -Wl,--large-address-aware"])
-
-if test x$use_glibc_compat != xno; then
-
-  #__fdelt_chk's params and return type have changed from long unsigned int to long int.
-  # See which one is present here.
-  AC_MSG_CHECKING(__fdelt_chk type)
-  AC_TRY_COMPILE([#ifdef _FORTIFY_SOURCE
-                    #undef _FORTIFY_SOURCE
-                  #endif
-                  #define _FORTIFY_SOURCE 2
-                  #include <sys/select.h>
-     extern "C" long unsigned int __fdelt_warn(long unsigned int);],[],
-    [ fdelt_type="long unsigned int"],
-    [ fdelt_type="long int"])
-  AC_MSG_RESULT($fdelt_type)
-  AC_DEFINE_UNQUOTED(FDELT_TYPE, $fdelt_type,[parameter and return value type for __fdelt_chk])
-
-fi
-
-if test x$use_hardening != xno; then
-  AX_CHECK_COMPILE_FLAG([-Wstack-protector],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -Wstack-protector"])
-  AX_CHECK_COMPILE_FLAG([-fstack-protector-all],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fstack-protector-all"])
-  AX_CHECK_COMPILE_FLAG([-fPIE],[HARDENED_CXXFLAGS="$HARDENED_CXXFLAGS -fPIE"])
-
-  AX_CHECK_PREPROC_FLAG([-D_FORTIFY_SOURCE=2],[
-    AX_CHECK_PREPROC_FLAG([-U_FORTIFY_SOURCE],[
-      HARDENED_CPPFLAGS="$HARDENED_CPPFLAGS -U_FORTIFY_SOURCE"
-    ])
-    HARDENED_CPPFLAGS="$HARDENED_CPPFLAGS -D_FORTIFY_SOURCE=2"
-  ])
-
-  AX_CHECK_LINK_FLAG([[-Wl,--dynamicbase]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--dynamicbase"])
-  AX_CHECK_LINK_FLAG([[-Wl,--nxcompat]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,--nxcompat"])
-  AX_CHECK_LINK_FLAG([[-Wl,-z,relro]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,relro"])
-  AX_CHECK_LINK_FLAG([[-Wl,-z,now]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -Wl,-z,now"])
-
-  if test x$TARGET_OS != xwindows; then
-    # -pie will link successfully with MinGW, but it's unsupported and leads to undeterministic binaries
-    AX_CHECK_LINK_FLAG([[-pie]], [HARDENED_LDFLAGS="$HARDENED_LDFLAGS -pie"])
-  fi
-
-  CXXFLAGS="$CXXFLAGS $HARDENED_CXXFLAGS"
-  CPPFLAGS="$CPPFLAGS $HARDENED_CPPFLAGS"
-  LDFLAGS="$LDFLAGS $HARDENED_LDFLAGS"
-  OBJCXXFLAGS="$CXXFLAGS"
-fi
-
-dnl this flag screws up non-darwin gcc even when the check fails. special-case it.
-if test x$TARGET_OS = xdarwin; then
-  AX_CHECK_LINK_FLAG([[-Wl,-dead_strip]], [LDFLAGS="$LDFLAGS -Wl,-dead_strip"])
-fi
-
-AC_CHECK_HEADERS([stdio.h stdlib.h unistd.h strings.h sys/types.h sys/stat.h])
-
-dnl Check for MSG_NOSIGNAL
-AC_MSG_CHECKING(for MSG_NOSIGNAL)
-AC_TRY_COMPILE([#include <sys/socket.h>],
- [ int f = MSG_NOSIGNAL; ],
- [ AC_MSG_RESULT(yes); AC_DEFINE(HAVE_MSG_NOSIGNAL, 1,[Define this symbol if you have MSG_NOSIGNAL]) ],
- [ AC_MSG_RESULT(no)]
-)
-
-LEVELDB_CPPFLAGS=
-LIBLEVELDB=
-LIBMEMENV=
-AM_CONDITIONAL([EMBEDDED_LEVELDB],[true])
-AC_SUBST(LEVELDB_CPPFLAGS)
-AC_SUBST(LIBLEVELDB)
-AC_SUBST(LIBMEMENV)
-
-if test x$enable_wallet != xno; then
-    dnl Check for libdb_cxx only if wallet enabled
-    BITCOIN_FIND_BDB48
-fi
-
-dnl Check for libminiupnpc (optional)
-if test x$use_upnp != xno; then
-  AC_CHECK_HEADERS(
-    [miniupnpc/miniwget.h miniupnpc/miniupnpc.h miniupnpc/upnpcommands.h miniupnpc/upnperrors.h],
-    [AC_CHECK_LIB([miniupnpc], [main],, [have_miniupnpc=no])],
-    [have_miniupnpc=no]
-  )
-fi
-
-dnl Check for boost libs
-AX_BOOST_BASE
-AX_BOOST_SYSTEM
-AX_BOOST_FILESYSTEM
-AX_BOOST_PROGRAM_OPTIONS
-AX_BOOST_THREAD
-AX_BOOST_CHRONO
-
-if test x$use_tests = xyes; then
-
-  if test x$HEXDUMP = x; then
-    AC_MSG_ERROR(hexdump is required for tests)
-  fi
-
-
-  AX_BOOST_UNIT_TEST_FRAMEWORK
-
-  dnl Determine if -DBOOST_TEST_DYN_LINK is needed
-  AC_MSG_CHECKING([for dynamic linked boost test])
-  TEMP_LIBS="$LIBS"
-  LIBS="$LIBS $BOOST_LDFLAGS $BOOST_UNIT_TEST_FRAMEWORK_LIB"
-  TEMP_CPPFLAGS="$CPPFLAGS"
-  CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-  AC_LINK_IFELSE([AC_LANG_SOURCE([
-       #define BOOST_TEST_DYN_LINK
-       #define BOOST_TEST_MAIN
-        #include <boost/test/unit_test.hpp>
-
-       ])],
-    [AC_MSG_RESULT(yes)]
-    [TESTDEFS="$TESTDEFS -DBOOST_TEST_DYN_LINK"],
-    [AC_MSG_RESULT(no)])
-  LIBS="$TEMP_LIBS"
-  CPPFLAGS="$TEMP_CPPFLAGS"
-fi
-
-BOOST_LIBS="$BOOST_LDFLAGS $BOOST_SYSTEM_LIB $BOOST_FILESYSTEM_LIB $BOOST_PROGRAM_OPTIONS_LIB $BOOST_THREAD_LIB"
-BOOST_INCLUDES="$BOOST_CPPFLAGS"
-
-dnl Boost >= 1.50 uses sleep_for rather than the now-deprecated sleep, however
-dnl it was broken from 1.50 to 1.52 when backed by nanosleep. Use sleep_for if
-dnl a working version is available, else fall back to sleep. sleep was removed
-dnl after 1.56.
-dnl If neither is available, abort.
-dnl If sleep_for is used, boost_chrono becomes a requirement.
-if test x$ax_cv_boost_chrono = xyes; then
-dnl Allow passing extra needed dependency libraries for boost-chrono from static gitian build
-BOOST_CHRONO_LIB="$BOOST_CHRONO_LIB $BOOST_CHRONO_EXTRALIBS"
-
-TEMP_LIBS="$LIBS"
-LIBS="$LIBS $BOOST_LIBS $BOOST_CHRONO_LIB"
-TEMP_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-AC_TRY_LINK([
-  #include <boost/thread/thread.hpp>
-  #include <boost/version.hpp>
-  ],[
-  #if BOOST_VERSION >= 105000 && (!defined(BOOST_HAS_NANOSLEEP) || BOOST_VERSION >= 105200)
-      boost::this_thread::sleep_for(boost::chrono::milliseconds(0));
-  #else
-   choke me
-  #endif
-  ],
-  [boost_sleep=yes; BOOST_LIBS="$BOOST_LIBS $BOOST_CHRONO_LIB";
-     AC_DEFINE(HAVE_WORKING_BOOST_SLEEP_FOR, 1, [Define this symbol if boost sleep_for works])],
-  [boost_sleep=no])
-LIBS="$TEMP_LIBS"
-CPPFLAGS="$TEMP_CPPFLAGS"
-fi
-
-if test x$boost_sleep != xyes; then
-TEMP_LIBS="$LIBS"
-LIBS="$LIBS $BOOST_LIBS"
-TEMP_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CPPFLAGS $BOOST_CPPFLAGS"
-AC_TRY_LINK([
-  #include <boost/version.hpp>
-  #include <boost/thread.hpp>
-  #include <boost/date_time/posix_time/posix_time_types.hpp>
-  ],[
-  #if BOOST_VERSION <= 105600
-      boost::this_thread::sleep(boost::posix_time::milliseconds(0));
-  #else
-   choke me
-  #endif
-  ],
-  [boost_sleep=yes; AC_DEFINE(HAVE_WORKING_BOOST_SLEEP, 1, [Define this symbol if boost sleep works])],
-  [boost_sleep=no])
-LIBS="$TEMP_LIBS"
-CPPFLAGS="$TEMP_CPPFLAGS"
-fi
-
-if test x$boost_sleep != xyes; then
-  AC_MSG_ERROR(No working boost sleep implementation found.)
-fi
-
-AC_ARG_WITH([cli],
-  [AS_HELP_STRING([--with-cli],
-  [with CLI (default is yes)])],
-  [build_bitcoin_cli=$withval],
-  [build_bitcoin_cli=yes])
-
-AC_ARG_WITH([daemon],
-  [AS_HELP_STRING([--with-daemon],
-  [with daemon (default is yes)])],
-  [build_bitcoind=$withval],
-  [build_bitcoind=yes])
-
-BITCOIN_QT_INIT
-
-if test x$use_pkgconfig = xyes; then
-
-  if test x$PKG_CONFIG == x; then
-    AC_MSG_ERROR(pkg-config not found.)
-  fi
-
-  : #NOP
-  m4_ifdef(
-    [PKG_CHECK_MODULES],
-    [
-      PKG_CHECK_MODULES([SSL], [libssl], [INCLUDES="$INCLUDES $SSL_CFLAGS"; LIBS="$LIBS $SSL_LIBS"], [AC_MSG_ERROR(openssl  not found.)])
-      PKG_CHECK_MODULES([CRYPTO], [libcrypto], [INCLUDES="$INCLUDES $CRYPTO_CFLAGS"; LIBS="$LIBS $CRYPTO_LIBS"], [AC_MSG_ERROR(libcrypto  not found.)])
-      BITCOIN_QT_CHECK([PKG_CHECK_MODULES([PROTOBUF], [protobuf], [have_protobuf=yes], [BITCOIN_QT_FAIL(libprotobuf not found)])])
-      if test x$use_qr != xno; then
-        BITCOIN_QT_CHECK([PKG_CHECK_MODULES([QR], [libqrencode], [have_qrencode=yes], [have_qrencode=no])])
-      fi
-    ]
-  )
-else
-  AC_CHECK_HEADER([openssl/crypto.h],,AC_MSG_ERROR(libcrypto headers missing))
-  AC_CHECK_LIB([crypto],      [main],, AC_MSG_ERROR(libcrypto missing))
-
-  AC_CHECK_HEADER([openssl/ssl.h],, AC_MSG_ERROR(libssl headers missing),)
-  AC_CHECK_LIB([ssl],         [main],, AC_MSG_ERROR(libssl missing))
-
-  BITCOIN_QT_CHECK(AC_CHECK_LIB([protobuf] ,[main],,BITCOIN_QT_FAIL(libprotobuf not found)))
-  if test x$use_qr != xno; then
-    BITCOIN_QT_CHECK([AC_CHECK_LIB([qrencode], [main],, [have_qrencode=no])])
-    BITCOIN_QT_CHECK([AC_CHECK_HEADER([qrencode.h],, have_qrencode=no)])
-  fi
-fi
-
-BITCOIN_QT_PATH_PROGS([PROTOC], [protoc],$protoc_bin_path)
-
-AC_MSG_CHECKING([whether to build bitcoind])
-AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes])
-AC_MSG_RESULT($build_bitcoind)
-
-AC_MSG_CHECKING([whether to build bitcoin-cli])
-AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes])
-AC_MSG_RESULT($build_bitcoin_cli)
-
-dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus
-BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4])
-
-AC_LANG_POP
-
-if test "x$use_ccache" != "xno"; then
-  AC_MSG_CHECKING(if ccache should be used)
-  if test x$CCACHE = x; then
-    if test "x$use_ccache" = "xyes"; then
-      AC_MSG_ERROR([ccache not found.]);
-    else
-      use_ccache=no
-    fi
-  else
-    use_ccache=yes
-    CC="$ac_cv_path_CCACHE $CC"
-    CXX="$ac_cv_path_CCACHE $CXX"
-  fi
-  AC_MSG_RESULT($use_ccache)
-fi
-
-dnl enable wallet
-AC_MSG_CHECKING([if wallet should be enabled])
-if test x$enable_wallet != xno; then
-  AC_MSG_RESULT(yes)
-  AC_DEFINE_UNQUOTED([ENABLE_WALLET],[1],[Define to 1 to enable wallet functions])
-
-else
-  AC_MSG_RESULT(no)
-fi
-
-dnl enable upnp support
-AC_MSG_CHECKING([whether to build with support for UPnP])
-if test x$have_miniupnpc = xno; then
-  if test x$use_upnp = xyes; then
-     AC_MSG_ERROR("UPnP requested but cannot be built. use --without-miniupnpc")
-  fi
-  AC_MSG_RESULT(no)
-else
-  if test x$use_upnp != xno; then
-    AC_MSG_RESULT(yes)
-    AC_MSG_CHECKING([whether to build with UPnP enabled by default])
-    use_upnp=yes
-    upnp_setting=0
-    if test x$use_upnp_default != xno; then
-      use_upnp_default=yes
-      upnp_setting=1
-    fi
-    AC_MSG_RESULT($use_upnp_default)
-    AC_DEFINE_UNQUOTED([USE_UPNP],[$upnp_setting],[UPnP support not compiled if undefined, otherwise value (0 or 1) determines default state])
-    if test x$TARGET_OS = xwindows; then
-      CPPFLAGS="$CPPFLAGS -DMINIUPNP_STATICLIB"
-    fi
-  else
-    AC_MSG_RESULT(no)
-  fi
-fi
-
-dnl these are only used when qt is enabled
-if test x$bitcoin_enable_qt != xno; then
-  BUILD_QT=qt
-  dnl enable dbus support
-  AC_MSG_CHECKING([whether to build GUI with support for D-Bus])
-  if test x$bitcoin_enable_qt_dbus != xno; then
-    AC_DEFINE([USE_DBUS],[1],[Define if dbus support should be compiled in])
-  fi
-  AC_MSG_RESULT($bitcoin_enable_qt_dbus)
-
-  dnl enable qr support
-  AC_MSG_CHECKING([whether to build GUI with support for QR codes])
-  if test x$have_qrencode = xno; then
-    if test x$use_qr == xyes; then
-     AC_MSG_ERROR("QR support requested but cannot be built. use --without-qrencode")
-    fi
-    AC_MSG_RESULT(no)
-  else
-    if test x$use_qr != xno; then
-      AC_MSG_RESULT(yes)
-      AC_DEFINE([USE_QRCODE],[1],[Define if QR support should be compiled in])
-      use_qr=yes
-    else
-      AC_MSG_RESULT(no)
-    fi
-  fi
-
-  if test x$XGETTEXT == x; then
-    AC_MSG_WARN("xgettext is required to update qt translations")
-  fi
-
-  AC_MSG_CHECKING([whether to build test_bitcoin-qt])
-  if test x$use_tests$bitcoin_enable_qt_test = xyesyes; then
-    AC_MSG_RESULT([yes])
-    BUILD_TEST_QT="test"
-  else
-    AC_MSG_RESULT([no])
-  fi
-fi
-
-AC_MSG_CHECKING([whether to build test_bitcoin])
-if test x$use_tests = xyes; then
-  AC_MSG_RESULT([yes])
-  BUILD_TEST="test"
-else
-  AC_MSG_RESULT([no])
-fi
-
-if test "x$use_tests$build_bitcoind$use_qt" = "xnonono"; then
-  AC_MSG_ERROR([No targets! Please specify at least one of: --enable-cli --enable-daemon --enable-gui or --enable-tests])
-fi
-
-AM_CONDITIONAL([TARGET_DARWIN], [test x$TARGET_OS = xdarwin])
-AM_CONDITIONAL([BUILD_DARWIN], [test x$BUILD_OS = xdarwin])
-AM_CONDITIONAL([TARGET_WINDOWS], [test x$TARGET_OS = xwindows])
-AM_CONDITIONAL([ENABLE_WALLET],[test x$enable_wallet == xyes])
-AM_CONDITIONAL([USE_QRCODE], [test x$use_qr = xyes])
-AM_CONDITIONAL([USE_LCOV],[test x$use_lcov == xyes])
-AM_CONDITIONAL([USE_COMPARISON_TOOL],[test x$use_comparison_tool != xno])
-AM_CONDITIONAL([USE_COMPARISON_TOOL_REORG_TESTS],[test x$use_comparison_tool_reorg_test != xno])
-AM_CONDITIONAL([GLIBC_BACK_COMPAT],[test x$use_glibc_compat = xyes])
-
-AC_DEFINE(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR, [Major version])
-AC_DEFINE(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR, [Minor version])
-AC_DEFINE(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION, [Build revision])
-AC_DEFINE(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD, [Version Build])
-AC_DEFINE(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE, [Version is release])
-AC_DEFINE(COPYRIGHT_YEAR, _COPYRIGHT_YEAR, [Version is release])
-AC_SUBST(CLIENT_VERSION_MAJOR, _CLIENT_VERSION_MAJOR)
-AC_SUBST(CLIENT_VERSION_MINOR, _CLIENT_VERSION_MINOR)
-AC_SUBST(CLIENT_VERSION_REVISION, _CLIENT_VERSION_REVISION)
-AC_SUBST(CLIENT_VERSION_BUILD, _CLIENT_VERSION_BUILD)
-AC_SUBST(CLIENT_VERSION_IS_RELEASE, _CLIENT_VERSION_IS_RELEASE)
-AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)
-
-
-AC_SUBST(USE_UPNP)
-AC_SUBST(USE_QRCODE)
-AC_SUBST(INCLUDES)
-AC_SUBST(BOOST_LIBS)
-AC_SUBST(TESTDEFS)
-AC_SUBST(LEVELDB_TARGET_FLAGS)
-AC_SUBST(BUILD_TEST)
-AC_SUBST(BUILD_QT)
-AC_SUBST(BUILD_TEST_QT)
-AC_CONFIG_FILES([Makefile src/Makefile src/test/Makefile src/qt/Makefile src/qt/test/Makefile share/setup.nsi share/qt/Info.plist])
-AC_CONFIG_FILES([qa/pull-tester/run-bitcoind-for-test.sh],[chmod +x qa/pull-tester/run-bitcoind-for-test.sh])
-AC_CONFIG_FILES([qa/pull-tester/build-tests.sh],[chmod +x qa/pull-tester/build-tests.sh])
-AC_OUTPUT

contrib/README.md

@@ -1,60 +0,0 @@
-Wallet Tools
----------------------
-
-### [BitRPC](/contrib/bitrpc) ###
-Allows for sending of all standard Bitcoin commands via RPC rather than as command line args.
-
-### [SpendFrom](/contrib/spendfrom) ###
-
-Use the raw transactions API to send coins received on a particular
-address (or addresses).
-
-Repository Tools
----------------------
-
-### [Developer tools](/contrib/devtools) ###
-Specific tools for developers working on this repository.
-Contains the script `github-merge.sh` for merging github pull requests securely and signing them using GPG.
-
-### [Linearize](/contrib/linearize) ###
-Construct a linear, no-fork, best version of the blockchain.
-
-### [PyMiner](/contrib/pyminer) ###
-
-This is a 'getwork' CPU mining client for Bitcoin. It is pure-python, and therefore very, very slow.  The purpose is to provide a reference implementation of a miner, for study.
-
-### [Qos](/contrib/qos) ###
-
-A Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.
-
-### [Seeds](/contrib/seeds) ###
-Utility to generate the pnSeed[] array that is compiled into the client.
-
-Build Tools and Keys
----------------------
-
-### [Debian](/contrib/debian) ###
-Contains files used to package bitcoind/bitcoin-qt
-for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here.
-
-### [Gitian-descriptors](/contrib/gitian-descriptors) ###
-Gavin's notes on getting gitian builds up and running using KVM.
-
-### [Gitian-downloader](/contrib/gitian-downloader)
-Various PGP files of core developers. 
-
-### [MacDeploy](/contrib/macdeploy) ###
-Scripts and notes for Mac builds. 
-
-Test and Verify Tools 
----------------------
-
-### [TestGen](/contrib/testgen) ###
-Utilities to generate test vectors for the data-driven Bitcoin tests.
-
-### [Test Patches](/contrib/test-patches) ###
-These patches are applied when the automated pull-tester
-tests each pull and when master is tested using jenkins.
-
-### [Verify SF Binaries](/contrib/verifysfbinaries) ###
-This script attempts to download and verify the signature file SHA256SUMS.asc from SourceForge.

contrib/bitcoin-qt.pro

@@ -1,21 +0,0 @@
-FORMS += \
-    ../src/qt/forms/aboutdialog.ui \
-    ../src/qt/forms/addressbookpage.ui \
-    ../src/qt/forms/askpassphrasedialog.ui \
-    ../src/qt/forms/coincontroldialog.ui \
-    ../src/qt/forms/editaddressdialog.ui \
-    ../src/qt/forms/helpmessagedialog.ui \
-    ../src/qt/forms/intro.ui \
-    ../src/qt/forms/openuridialog.ui \
-    ../src/qt/forms/optionsdialog.ui \
-    ../src/qt/forms/overviewpage.ui \
-    ../src/qt/forms/receivecoinsdialog.ui \
-    ../src/qt/forms/receiverequestdialog.ui \
-    ../src/qt/forms/rpcconsole.ui \
-    ../src/qt/forms/sendcoinsdialog.ui \
-    ../src/qt/forms/sendcoinsentry.ui \
-    ../src/qt/forms/signverifymessagedialog.ui \
-    ../src/qt/forms/transactiondescdialog.ui \
-
-RESOURCES += \
-    ../src/qt/bitcoin.qrc

contrib/bitcoind.bash-completion

@@ -1,5 +1,5 @@
-# bash programmable completion for bitcoind(1) and bitcoin-cli(1)
-# Copyright (c) 2012,2014 Christian von Roques <roques@mti.ag>
+# bash programmable completion for bitcoind(1)
+# Copyright (c) 2012 Christian von Roques <roques@mti.ag>
 # Distributed under the MIT/X11 software license, see the accompanying
 # file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
@@ -37,35 +37,9 @@ _bitcoind() {
     COMPREPLY=()
     _get_comp_words_by_ref -n = cur prev words cword
 
-    if ((cword > 4)); then
-        case ${words[cword-4]} in
-            signrawtransaction)
-                COMPREPLY=( $( compgen -W "ALL NONE SINGLE ALL|ANYONECANPAY NONE|ANYONECANPAY SINGLE|ANYONECANPAY" -- "$cur" ) )
-                return 0
-                ;;
-        esac
-    fi
-
-    if ((cword > 3)); then
-        case ${words[cword-3]} in
-            addmultisigaddress)
-                _bitcoin_accounts
-                return 0
-                ;;
-            gettxout|importprivkey)
-                COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
-                return 0
-                ;;
-        esac
-    fi
-
     if ((cword > 2)); then
         case ${words[cword-2]} in
-            addnode)
-                COMPREPLY=( $( compgen -W "add remove onetry" -- "$cur" ) )
-                return 0
-                ;;
-            getblock|getrawtransaction|listreceivedbyaccount|listreceivedbyaddress|sendrawtransaction)
+            listreceivedbyaccount|listreceivedbyaddress)
                 COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
                 return 0
                 ;;
@@ -77,11 +51,11 @@ _bitcoind() {
     fi
 
     case "$prev" in
-        backupwallet|dumpwallet|importwallet)
+        backupwallet)
             _filedir
             return 0
             ;;
-        getmempool|lockunspent|setgenerate)
+        setgenerate)
             COMPREPLY=( $( compgen -W "true false" -- "$cur" ) )
             return 0
             ;;
@@ -92,7 +66,7 @@ _bitcoind() {
     esac
 
     case "$cur" in
-        -conf=*|-pid=*|-loadblock=*|-wallet=*|-rpcsslcertificatechainfile=*|-rpcsslprivatekeyfile=*)
+        -conf=*|-pid=*|-rpcsslcertificatechainfile=*|-rpcsslprivatekeyfile=*)
             cur="${cur#*=}"
             _filedir
             return 0
@@ -129,7 +103,7 @@ _bitcoind() {
     esac
 }
 
-complete -F _bitcoind bitcoind bitcoin-cli
+complete -F _bitcoind bitcoind
 }
 
 # Local variables:

contrib/bitrpc/README.md

@@ -1,8 +0,0 @@
-### BitRPC
-Allows for sending of all standard Bitcoin commands via RPC rather than as command line args.
-
-### Looking for Wallet Tools?
-BitRPC.py is able to do the exact same thing as `walletchangepass.py` and `walletunlock.py`. Their respective commands in BitRPC.py are:
-
-	bitrpc.py walletpassphrasechange
-	bitrpc.py walletpassphrase

contrib/bitrpc/bitrpc.py

@@ -1,7 +1,6 @@
 from jsonrpc import ServiceProxy
 import sys
 import string
-import getpass
 
 # ===== BEGIN USER SETTINGS =====
 # if you do not set these you will be prompted for a password for every command
@@ -11,315 +10,315 @@ rpcpass = ""
 
 
 if rpcpass == "":
-    access = ServiceProxy("http://127.0.0.1:8332")
+	access = ServiceProxy("http://127.0.0.1:8332")
 else:
-    access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:8332")
+	access = ServiceProxy("http://"+rpcuser+":"+rpcpass+"@127.0.0.1:8332")
 cmd = sys.argv[1].lower()
 
 if cmd == "backupwallet":
-    try:
-        path = raw_input("Enter destination path/filename: ")
-        print access.backupwallet(path)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		path = raw_input("Enter destination path/filename: ")
+		print access.backupwallet(path)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getaccount":
-    try:
-        addr = raw_input("Enter a Bitcoin address: ")
-        print access.getaccount(addr)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		addr = raw_input("Enter a Bitcoin address: ")
+		print access.getaccount(addr)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getaccountaddress":
-    try:
-        acct = raw_input("Enter an account name: ")
-        print access.getaccountaddress(acct)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		acct = raw_input("Enter an account name: ")
+		print access.getaccountaddress(acct)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getaddressesbyaccount":
-    try:
-        acct = raw_input("Enter an account name: ")
-        print access.getaddressesbyaccount(acct)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		acct = raw_input("Enter an account name: ")
+		print access.getaddressesbyaccount(acct)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getbalance":
-    try:
-        acct = raw_input("Enter an account (optional): ")
-        mc = raw_input("Minimum confirmations (optional): ")
-        try:
-            print access.getbalance(acct, mc)
-        except:
-            print access.getbalance()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		acct = raw_input("Enter an account (optional): ")
+		mc = raw_input("Minimum confirmations (optional): ")
+		try:
+			print access.getbalance(acct, mc)
+		except:
+			print access.getbalance()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getblockbycount":
-    try:
-        height = raw_input("Height: ")
-        print access.getblockbycount(height)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		height = raw_input("Height: ")
+		print access.getblockbycount(height)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getblockcount":
-    try:
-        print access.getblockcount()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		print access.getblockcount()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getblocknumber":
-    try:
-        print access.getblocknumber()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		print access.getblocknumber()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getconnectioncount":
-    try:
-        print access.getconnectioncount()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		print access.getconnectioncount()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getdifficulty":
-    try:
-        print access.getdifficulty()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		print access.getdifficulty()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getgenerate":
-    try:
-        print access.getgenerate()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		print access.getgenerate()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "gethashespersec":
-    try:
-        print access.gethashespersec()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		print access.gethashespersec()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getinfo":
-    try:
-        print access.getinfo()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		print access.getinfo()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getnewaddress":
-    try:
-        acct = raw_input("Enter an account name: ")
-        try:
-            print access.getnewaddress(acct)
-        except:
-            print access.getnewaddress()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		acct = raw_input("Enter an account name: ")
+		try:
+			print access.getnewaddress(acct)
+		except:
+			print access.getnewaddress()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getreceivedbyaccount":
-    try:
-        acct = raw_input("Enter an account (optional): ")
-        mc = raw_input("Minimum confirmations (optional): ")
-        try:
-            print access.getreceivedbyaccount(acct, mc)
-        except:
-            print access.getreceivedbyaccount()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		acct = raw_input("Enter an account (optional): ")
+		mc = raw_input("Minimum confirmations (optional): ")
+		try:
+			print access.getreceivedbyaccount(acct, mc)
+		except:
+			print access.getreceivedbyaccount()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getreceivedbyaddress":
-    try:
-        addr = raw_input("Enter a Bitcoin address (optional): ")
-        mc = raw_input("Minimum confirmations (optional): ")
-        try:
-            print access.getreceivedbyaddress(addr, mc)
-        except:
-            print access.getreceivedbyaddress()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		addr = raw_input("Enter a Bitcoin address (optional): ")
+		mc = raw_input("Minimum confirmations (optional): ")
+		try:
+			print access.getreceivedbyaddress(addr, mc)
+		except:
+			print access.getreceivedbyaddress()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "gettransaction":
-    try:
-        txid = raw_input("Enter a transaction ID: ")
-        print access.gettransaction(txid)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		txid = raw_input("Enter a transaction ID: ")
+		print access.gettransaction(txid)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "getwork":
-    try:
-        data = raw_input("Data (optional): ")
-        try:
-            print access.gettransaction(data)
-        except:
-            print access.gettransaction()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		data = raw_input("Data (optional): ")
+		try:
+			print access.gettransaction(data)
+		except:
+			print access.gettransaction()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "help":
-    try:
-        cmd = raw_input("Command (optional): ")
-        try:
-            print access.help(cmd)
-        except:
-            print access.help()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		cmd = raw_input("Command (optional): ")
+		try:
+			print access.help(cmd)
+		except:
+			print access.help()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "listaccounts":
-    try:
-        mc = raw_input("Minimum confirmations (optional): ")
-        try:
-            print access.listaccounts(mc)
-        except:
-            print access.listaccounts()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		mc = raw_input("Minimum confirmations (optional): ")
+		try:
+			print access.listaccounts(mc)
+		except:
+			print access.listaccounts()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "listreceivedbyaccount":
-    try:
-        mc = raw_input("Minimum confirmations (optional): ")
-        incemp = raw_input("Include empty? (true/false, optional): ")
-        try:
-            print access.listreceivedbyaccount(mc, incemp)
-        except:
-            print access.listreceivedbyaccount()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		mc = raw_input("Minimum confirmations (optional): ")
+		incemp = raw_input("Include empty? (true/false, optional): ")
+		try:
+			print access.listreceivedbyaccount(mc, incemp)
+		except:
+			print access.listreceivedbyaccount()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "listreceivedbyaddress":
-    try:
-        mc = raw_input("Minimum confirmations (optional): ")
-        incemp = raw_input("Include empty? (true/false, optional): ")
-        try:
-            print access.listreceivedbyaddress(mc, incemp)
-        except:
-            print access.listreceivedbyaddress()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		mc = raw_input("Minimum confirmations (optional): ")
+		incemp = raw_input("Include empty? (true/false, optional): ")
+		try:
+			print access.listreceivedbyaddress(mc, incemp)
+		except:
+			print access.listreceivedbyaddress()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "listtransactions":
-    try:
-        acct = raw_input("Account (optional): ")
-        count = raw_input("Number of transactions (optional): ")
-        frm = raw_input("Skip (optional):")
-        try:
-            print access.listtransactions(acct, count, frm)
-        except:
-            print access.listtransactions()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		acct = raw_input("Account (optional): ")
+		count = raw_input("Number of transactions (optional): ")
+		frm = raw_input("Skip (optional):")
+		try:
+			print access.listtransactions(acct, count, frm)
+		except:
+			print access.listtransactions()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "move":
-    try:
-        frm = raw_input("From: ")
-        to = raw_input("To: ")
-        amt = raw_input("Amount:")
-        mc = raw_input("Minimum confirmations (optional): ")
-        comment = raw_input("Comment (optional): ")
-        try:
-            print access.move(frm, to, amt, mc, comment)
-        except:
-            print access.move(frm, to, amt)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		frm = raw_input("From: ")
+		to = raw_input("To: ")
+		amt = raw_input("Amount:")
+		mc = raw_input("Minimum confirmations (optional): ")
+		comment = raw_input("Comment (optional): ")
+		try:
+			print access.move(frm, to, amt, mc, comment)
+		except:
+			print access.move(frm, to, amt)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "sendfrom":
-    try:
-        frm = raw_input("From: ")
-        to = raw_input("To: ")
-        amt = raw_input("Amount:")
-        mc = raw_input("Minimum confirmations (optional): ")
-        comment = raw_input("Comment (optional): ")
-        commentto = raw_input("Comment-to (optional): ")
-        try:
-            print access.sendfrom(frm, to, amt, mc, comment, commentto)
-        except:
-            print access.sendfrom(frm, to, amt)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		frm = raw_input("From: ")
+		to = raw_input("To: ")
+		amt = raw_input("Amount:")
+		mc = raw_input("Minimum confirmations (optional): ")
+		comment = raw_input("Comment (optional): ")
+		commentto = raw_input("Comment-to (optional): ")
+		try:
+			print access.sendfrom(frm, to, amt, mc, comment, commentto)
+		except:
+			print access.sendfrom(frm, to, amt)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "sendmany":
-    try:
-        frm = raw_input("From: ")
-        to = raw_input("To (in format address1:amount1,address2:amount2,...): ")
-        mc = raw_input("Minimum confirmations (optional): ")
-        comment = raw_input("Comment (optional): ")
-        try:
-            print access.sendmany(frm,to,mc,comment)
-        except:
-            print access.sendmany(frm,to)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		frm = raw_input("From: ")
+		to = raw_input("To (in format address1:amount1,address2:amount2,...): ")
+		mc = raw_input("Minimum confirmations (optional): ")
+		comment = raw_input("Comment (optional): ")
+		try:
+			print access.sendmany(frm,to,mc,comment)
+		except:
+			print access.sendmany(frm,to)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "sendtoaddress":
-    try:
-        to = raw_input("To (in format address1:amount1,address2:amount2,...): ")
-        amt = raw_input("Amount:")
-        comment = raw_input("Comment (optional): ")
-        commentto = raw_input("Comment-to (optional): ")
-        try:
-            print access.sendtoaddress(to,amt,comment,commentto)
-        except:
-            print access.sendtoaddress(to,amt)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		to = raw_input("To (in format address1:amount1,address2:amount2,...): ")
+		amt = raw_input("Amount:")
+		comment = raw_input("Comment (optional): ")
+		commentto = raw_input("Comment-to (optional): ")
+		try:
+			print access.sendtoaddress(to,amt,comment,commentto)
+		except:
+			print access.sendtoaddress(to,amt)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "setaccount":
-    try:
-        addr = raw_input("Address: ")
-        acct = raw_input("Account:")
-        print access.setaccount(addr,acct)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		addr = raw_input("Address: ")
+		acct = raw_input("Account:")
+		print access.setaccount(addr,acct)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "setgenerate":
-    try:
-        gen= raw_input("Generate? (true/false): ")
-        cpus = raw_input("Max processors/cores (-1 for unlimited, optional):")
-        try:
-            print access.setgenerate(gen, cpus)
-        except:
-            print access.setgenerate(gen)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		gen= raw_input("Generate? (true/false): ")
+		cpus = raw_input("Max processors/cores (-1 for unlimited, optional):")
+		try:
+			print access.setgenerate(gen, cpus)
+		except:
+			print access.setgenerate(gen)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "settxfee":
-    try:
-        amt = raw_input("Amount:")
-        print access.settxfee(amt)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		amt = raw_input("Amount:")
+		print access.settxfee(amt)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "stop":
-    try:
-        print access.stop()
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		print access.stop()
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "validateaddress":
-    try:
-        addr = raw_input("Address: ")
-        print access.validateaddress(addr)
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		addr = raw_input("Address: ")
+		print access.validateaddress(addr)
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "walletpassphrase":
-    try:
-        pwd = getpass.getpass(prompt="Enter wallet passphrase: ")
-        access.walletpassphrase(pwd, 60)
-        print "\n---Wallet unlocked---\n"
-    except:
-        print "\n---An error occurred---\n"
+	try:
+		pwd = raw_input("Enter wallet passphrase: ")
+		access.walletpassphrase(pwd, 60)
+		print "\n---Wallet unlocked---\n"
+	except:
+		print "\n---An error occurred---\n"
 
 elif cmd == "walletpassphrasechange":
-    try:
-        pwd = getpass.getpass(prompt="Enter old wallet passphrase: ")
-        pwd2 = getpass.getpass(prompt="Enter new wallet passphrase: ")
-        access.walletpassphrasechange(pwd, pwd2)
-        print
-        print "\n---Passphrase changed---\n"
-    except:
-        print
-        print "\n---An error occurred---\n"
-        print
+	try:
+		pwd = raw_input("Enter old wallet passphrase: ")
+		pwd2 = raw_input("Enter new wallet passphrase: ")
+		access.walletpassphrasechange(pwd, pwd2)
+		print
+		print "\n---Passphrase changed---\n"
+	except:
+		print
+		print "\n---An error occurred---\n"
+		print
 
 else:
-    print "Command not found or not supported"
+	print "Command not found or not supported"

contrib/debian/README.md

@@ -1,21 +0,0 @@
-
-Debian
-====================
-This directory contains files used to package bitcoind/bitcoin-qt
-for Debian-based Linux systems. If you compile bitcoind/bitcoin-qt yourself, there are some useful files here.
-
-## bitcoin: URI support ##
-
-
-bitcoin-qt.desktop  (Gnome / Open Desktop)
-To install:
-
-	sudo desktop-file-install bitcoin-qt.desktop
-	sudo update-desktop-database
-
-If you build yourself, you will either need to modify the paths in
-the .desktop file or copy or symlink your bitcoin-qt binary to `/usr/bin`
-and the `../../share/pixmaps/bitcoin128.png` to `/usr/share/pixmaps`
-
-bitcoin-qt.protocol (KDE)
-

contrib/debian/bitcoin-qt.desktop

@@ -4,9 +4,9 @@ Name=Bitcoin
 Comment=Bitcoin P2P Cryptocurrency
 Comment[fr]=Bitcoin, monnaie virtuelle cryptographique pair à pair
 Comment[tr]=Bitcoin, eşten eşe kriptografik sanal para birimi
-Exec=bitcoin-qt %u
+Exec=/usr/bin/bitcoin-qt %u
 Terminal=false
 Type=Application
-Icon=bitcoin128
+Icon=/usr/share/pixmaps/bitcoin128.png
 MimeType=x-scheme-handler/bitcoin;
-Categories=Office;Finance;
+Categories=Office;

contrib/debian/bitcoin-qt.install

@@ -1,4 +1,4 @@
-usr/local/bin/bitcoin-qt usr/bin
+bitcoin-qt usr/bin
 share/pixmaps/bitcoin32.xpm usr/share/pixmaps
 share/pixmaps/bitcoin16.xpm usr/share/pixmaps
 share/pixmaps/bitcoin128.png usr/share/pixmaps

contrib/debian/bitcoind.install

@@ -1,2 +1 @@
-usr/local/bin/bitcoind usr/bin
-usr/local/bin/bitcoin-cli usr/bin
+src/bitcoind usr/bin

contrib/debian/changelog

@@ -1,47 +1,3 @@
-bitcoin (0.9.1-precise1) precise; urgency=medium
-
-  * New upstream release.
-  * Backport pull #4019
-
- -- Matt Corallo <matt@bluematt.me>  Sat, 19 Apr 2014 17:29:00 -0400
-
-bitcoin (0.9.0-precise1) precise; urgency=medium
-
-  * New upstream release.
-
- -- Matt Corallo <matt@bluematt.me>  Thu, 20 Mar 2014 13:10:00 -0400
-
-bitcoin (0.8.6-precise1) precise; urgency=medium
-
-  * New upstream release.
-  * Make .desktop paths non-fixed (suggested by prusnak@github)
-
- -- Matt Corallo <matt@bluematt.me>  Fri, 13 Dec 2013 13:31:00 -0400
-
-bitcoin (0.8.5-precise1) precise; urgency=medium
-
-  * New upstream release.
-
- -- Matt Corallo <matt@bluematt.me>  Sun, 15 Sep 2013 14:02:00 -0400
-
-bitcoin (0.8.4-precise1) precise; urgency=medium
-
-  * New upstream release.
-
- -- Matt Corallo <matt@bluematt.me>  Wed, 4 Sep 2013 10:25:00 -0400
-
-bitcoin (0.8.3-natty1) natty; urgency=low
-
-  * New upstream release.
-
- -- Matt Corallo <matt@bluematt.me>  Wed, 26 Jun 2013 00:18:00 +0100
-
-bitcoin (0.8.2-natty1) natty; urgency=low
-
-  * New upstream release.
-
- -- Matt Corallo <matt@bluematt.me>  Wed, 29 Mar 2013 23:23:00 +0100
-
 bitcoin (0.8.1-natty3) natty; urgency=low
 
   * New pixmaps

contrib/debian/control

@@ -5,7 +5,6 @@ Maintainer: Jonas Smedegaard <dr@jones.dk>
 Uploaders: Micah Anderson <micah@debian.org>
 Build-Depends: debhelper,
  devscripts,
- automake,
  bash-completion,
  libboost-system-dev (>> 1.35) | libboost-system1.35-dev,
  libdb4.8++-dev,
@@ -18,8 +17,7 @@ Build-Depends: debhelper,
  libboost-test-dev (>> 1.35) | libboost-test1.35-dev,
  qt4-qmake,
  libqt4-dev,
- libqrencode-dev,
- libprotobuf-dev, protobuf-compiler
+ libqrencode-dev
 Standards-Version: 3.9.2
 Homepage: http://www.bitcoin.org/
 Vcs-Git: git://github.com/bitcoin/bitcoin.git
@@ -36,11 +34,10 @@ Description: peer-to-peer network based digital currency - daemon
  check for double-spending.
  .
  Full transaction history is stored locally at each client.  This
- requires 20+ GB of space, slowly growing.
+ requires 2+ GB of space, slowly growing.
  .
-
- This package provides the daemon, bitcoind, and the CLI tool
- bitcoin-cli to interact with the daemon.
+ This package provides bitcoind, a combined daemon and CLI tool to
+ interact with the daemon.
 
 Package: bitcoin-qt
 Architecture: any
@@ -53,6 +50,6 @@ Description: peer-to-peer network based digital currency - Qt GUI
  check for double-spending.
  .
  Full transaction history is stored locally at each client.  This
- requires 20+ GB of space, slowly growing.
+ requires 2+ GB of space, slowly growing.
  .
  This package provides Bitcoin-Qt, a GUI for Bitcoin based on Qt.

contrib/debian/copyright

@@ -6,9 +6,9 @@ Source: http://sourceforge.net/projects/bitcoin/files/
  https://github.com/bitcoin/bitcoin
 
 Files: *
-Copyright: 2009-2012, Bitcoin Core Developers
+Copyright: 2009-2012, Bitcoin Developers
 License: Expat
-Comment: The Bitcoin Core Developers encompasses the current developers listed on bitcoin.org,
+Comment: The Bitcoin Developers encompasses the current developers listed on bitcoin.org,
          as well as the numerous contributors to the project.
 
 Files: src/json/*
@@ -71,7 +71,7 @@ Copyright: Bitboy (optimized for 16x16 by Wladimir van der Laan)
 License: PUB-DOM
 Comment: Site: https://bitcointalk.org/?topic=1756.0
 
-Files:  scripts/img/reload.xcf, src/qt/res/movies/*.png
+Files:  scripts/img/reload.xcf, src/qt/res/movies/update_spinner.mng
 Copyright: Everaldo (Everaldo Coelho)
 License: GPL-3+
 Comment: Icon Pack: Kids

contrib/debian/manpages/bitcoin.conf.5

@@ -37,6 +37,9 @@ You must set *rpcuser* to secure the JSON-RPC api.
 \fBrpcpassword=\fR\fI'password'\fR
 You must set *rpcpassword* to secure the JSON-RPC api.
 .TP
+\fBrpctimeout=\fR\fI'30'\fR
+How many seconds *bitcoin* will wait for a complete RPC HTTP request, after the HTTP connection is established.
+.TP
 \fBrpcallowip=\fR\fI'192.168.1.*'\fR
 By default, only RPC connections from localhost are allowed. Specify as many *rpcallowip=* settings as you like to allow connections from other hosts (and you may use * as a wildcard character).
 .TP

contrib/debian/rules

@@ -11,14 +11,23 @@ DEB_INSTALL_MANPAGES_bitcoind += debian/manpages/*
 %:
 	dh --with bash-completion $@
 
-override_dh_auto_clean:
-	if [ -f Makefile ]; then $(MAKE) distclean; fi
-	rm -rf Makefile.in aclocal.m4 configure src/Makefile.in src/bitcoin-config.h.in src/build-aux src/qt/Makefile.in src/qt/test/Makefile.in src/test/Makefile.in
+override_dh_auto_build:
+	cd src; $(MAKE) -f makefile.unix bitcoind
+	$(MAKE)
+
+override_dh_auto_clean:
+	if [ -f Makefile ]; then $(MAKE) clean; else rm -rf build/; rm -f bitcoin-qt; fi
+	cd src; $(MAKE) -f makefile.unix clean
 
-# Yea, autogen should be run on the source archive, but I like doing git archive
 override_dh_auto_configure:
-	./autogen.sh
-	./configure
+	qmake bitcoin-qt.pro USE_QRCODE=1
 
 override_dh_auto_test:
-	make check
+	cd src; $(MAKE) -f makefile.unix test_bitcoin
+	src/test_bitcoin
+
+# Ensure wrapper is set executable
+binary-post-install/bitcoind:
+	chmod +x $(cdbs_curdestdir)usr/bin/bitcoind
+binary-post-install/bitcoin-qt:
+	chmod +x $(cdbs_curdestdir)usr/bin/bitcoin-qt

contrib/devtools/README.md

@@ -1,83 +0,0 @@
-Contents
-===========
-This directory contains tools for developers working on this repository.
-
-github-merge.sh
-==================
-
-A small script to automate merging pull-requests securely and sign them with GPG.
-
-For example:
-
-  ./github-merge.sh bitcoin/bitcoin 3077
-
-(in any git repository) will help you merge pull request #3077 for the
-bitcoin/bitcoin repository.
-
-What it does:
-* Fetch master and the pull request.
-* Locally construct a merge commit.
-* Show the diff that merge results in.
-* Ask you to verify the resulting source tree (so you can do a make
-check or whatever).
-* Ask you whether to GPG sign the merge commit.
-* Ask you whether to push the result upstream.
-
-This means that there are no potential race conditions (where a
-pullreq gets updated while you're reviewing it, but before you click
-merge), and when using GPG signatures, that even a compromised github
-couldn't mess with the sources.
-
-Setup
----------
-Configuring the github-merge tool for the bitcoin repository is done in the following way:
-
-    git config githubmerge.repository bitcoin/bitcoin
-    git config githubmerge.testcmd "make -j4 check" (adapt to whatever you want to use for testing)
-    git config --global user.signingkey mykeyid (if you want to GPG sign)
-
-fix-copyright-headers.py
-===========================
-
-Every year newly updated files need to have its copyright headers updated to reflect the current year.
-If you run this script from src/ it will automatically update the year on the copyright header for all
-.cpp and .h files if these have a git commit from the current year.
-
-For example a file changed in 2014 (with 2014 being the current year):
-```// Copyright (c) 2009-2013 The Bitcoin developers```
-
-would be changed to:
-```// Copyright (c) 2009-2014 The Bitcoin developers```
-
-symbol-check.py
-==================
-
-A script to check that the (Linux) executables produced by gitian only contain
-allowed gcc, glibc and libstdc++ version symbols.  This makes sure they are
-still compatible with the minimum supported Linux distribution versions.
-
-Example usage after a gitian build:
-
-    find ../gitian-builder/build -type f -executable | xargs python contrib/devtools/symbol-check.py 
-
-If only supported symbols are used the return value will be 0 and the output will be empty.
-
-If there are 'unsupported' symbols, the return value will be 1 a list like this will be printed:
-
-    .../64/test_bitcoin: symbol memcpy from unsupported version GLIBC_2.14
-    .../64/test_bitcoin: symbol __fdelt_chk from unsupported version GLIBC_2.15
-    .../64/test_bitcoin: symbol std::out_of_range::~out_of_range() from unsupported version GLIBCXX_3.4.15
-    .../64/test_bitcoin: symbol _ZNSt8__detail15_List_nod from unsupported version GLIBCXX_3.4.15
-
-update-translations.py
-=======================
-
-Run this script from the root of the repository to update all translations from transifex.
-It will do the following automatically:
-
-- fetch all translations
-- post-process them into valid and committable format
-- add missing translations to the build system (TODO)
-
-See doc/translation-process.md for more information.
-

contrib/devtools/fix-copyright-headers.py

@@ -1,53 +0,0 @@
-#!/usr/bin/env python
-'''
-Run this script inside of src/ and it will look for all the files
-that were changed this year that still have the last year in the
-copyright headers, and it will fix the headers on that file using
-a perl regex one liner.
-
-For example: if it finds something like this and we're in 2014
-
-// Copyright (c) 2009-2013 The Bitcoin developers
-
-it will change it to
-
-// Copyright (c) 2009-2014 The Bitcoin developers
-
-It will do this for all the files in the folder and its children.
-
-Author: @gubatron
-'''
-import os
-import time
-
-year = time.gmtime()[0]
-last_year = year - 1
-command = "perl -pi -e 's/%s The Bitcoin/%s The Bitcoin/' %s"
-listFilesCommand = "find . | grep %s"
-
-extensions = [".cpp",".h"]
-
-def getLastGitModifiedDate(filePath):
-  gitGetLastCommitDateCommand = "git log " + filePath +" | grep Date | head -n 1"
-  p = os.popen(gitGetLastCommitDateCommand)
-  result = ""
-  for l in p:
-    result = l
-    break
-  result = result.replace("\n","")
-  return result
-
-n=1
-for extension in extensions:
-  foundFiles = os.popen(listFilesCommand % extension)
-  for filePath in foundFiles:
-    filePath = filePath[1:-1]
-    if filePath.endswith(extension):
-      filePath = os.getcwd() + filePath
-      modifiedTime = getLastGitModifiedDate(filePath)
-      if len(modifiedTime) > 0 and str(year) in modifiedTime:
-        print n,"Last Git Modified: ", modifiedTime, " - ", filePath
-        os.popen(command % (last_year,year,filePath))
-        n = n + 1
-
-

contrib/devtools/github-merge.sh

@@ -1,173 +0,0 @@
-#!/bin/bash
-
-# This script will locally construct a merge commit for a pull request on a
-# github repository, inspect it, sign it and optionally push it.
-
-# The following temporary branches are created/overwritten and deleted:
-# * pull/$PULL/base (the current master we're merging onto)
-# * pull/$PULL/head (the current state of the remote pull request)
-# * pull/$PULL/merge (github's merge)
-# * pull/$PULL/local-merge (our merge)
-
-# In case of a clean merge that is accepted by the user, the local branch with
-# name $BRANCH is overwritten with the merged result, and optionally pushed.
-
-REPO="$(git config --get githubmerge.repository)"
-if [[ "d$REPO" == "d" ]]; then
-  echo "ERROR: No repository configured. Use this command to set:" >&2
-  echo "git config githubmerge.repository <owner>/<repo>" >&2
-  echo "In addition, you can set the following variables:" >&2
-  echo "- githubmerge.host (default git@github.com)" >&2
-  echo "- githubmerge.branch (default master)" >&2
-  echo "- githubmerge.testcmd (default none)" >&2
-  exit 1
-fi
-
-HOST="$(git config --get githubmerge.host)"
-if [[ "d$HOST" == "d" ]]; then
-  HOST="git@github.com"
-fi
-
-BRANCH="$(git config --get githubmerge.branch)"
-if [[ "d$BRANCH" == "d" ]]; then
-  BRANCH="master"
-fi
-
-TESTCMD="$(git config --get githubmerge.testcmd)"
-
-PULL="$1"
-
-if [[ "d$PULL" == "d" ]]; then
-  echo "Usage: $0 pullnumber [branch]" >&2
-  exit 2
-fi
-
-if [[ "d$2" != "d" ]]; then
-  BRANCH="$2"
-fi
-
-# Initialize source branches.
-git checkout -q "$BRANCH"
-if git fetch -q "$HOST":"$REPO" "+refs/pull/$PULL/*:refs/heads/pull/$PULL/*"; then
-  if ! git log -1q "refs/heads/pull/$PULL/head" >/dev/null 2>&1; then
-    echo "ERROR: Cannot find head of pull request #$PULL on $HOST:$REPO." >&2
-    exit 3
-  fi
-  if ! git log -1q "refs/heads/pull/$PULL/merge" >/dev/null 2>&1; then
-    echo "ERROR: Cannot find merge of pull request #$PULL on $HOST:$REPO." >&2
-    exit 3
-  fi
-else
-  echo "ERROR: Cannot find pull request #$PULL on $HOST:$REPO." >&2
-  exit 3
-fi
-if git fetch -q "$HOST":"$REPO" +refs/heads/"$BRANCH":refs/heads/pull/"$PULL"/base; then
-  true
-else
-  echo "ERROR: Cannot find branch $BRANCH on $HOST:$REPO." >&2
-  exit 3
-fi
-git checkout -q pull/"$PULL"/base
-git branch -q -D pull/"$PULL"/local-merge 2>/dev/null
-git checkout -q -b pull/"$PULL"/local-merge
-TMPDIR="$(mktemp -d -t ghmXXXXX)"
-
-function cleanup() {
-  git checkout -q "$BRANCH"
-  git branch -q -D pull/"$PULL"/head 2>/dev/null
-  git branch -q -D pull/"$PULL"/base 2>/dev/null
-  git branch -q -D pull/"$PULL"/merge 2>/dev/null
-  git branch -q -D pull/"$PULL"/local-merge 2>/dev/null
-  rm -rf "$TMPDIR"
-}
-
-# Create unsigned merge commit.
-(
-  echo "Merge pull request #$PULL"
-  echo ""
-  git log --no-merges --topo-order --pretty='format:%h %s (%an)' pull/"$PULL"/base..pull/"$PULL"/head
-)>"$TMPDIR/message"
-if git merge -q --commit --no-edit --no-ff -m "$(<"$TMPDIR/message")" pull/"$PULL"/head; then
-  if [ "d$(git log --pretty='format:%s' -n 1)" != "dMerge pull request #$PULL" ]; then
-    echo "ERROR: Creating merge failed (already merged?)." >&2
-    cleanup
-    exit 4
-  fi
-else
-  echo "ERROR: Cannot be merged cleanly." >&2
-  git merge --abort
-  cleanup
-  exit 4
-fi
-
-# Run test command if configured.
-if [[ "d$TESTCMD" != "d" ]]; then
-  # Go up to the repository's root.
-  while [ ! -d .git ]; do cd ..; done
-  if ! $TESTCMD; then
-    echo "ERROR: Running $TESTCMD failed." >&2
-    cleanup
-    exit 5
-  fi
-  # Show the created merge.
-  git diff pull/"$PULL"/merge..pull/"$PULL"/local-merge >"$TMPDIR"/diff
-  git diff pull/"$PULL"/base..pull/"$PULL"/local-merge
-  if [[ "$(<"$TMPDIR"/diff)" != "" ]]; then
-    echo "WARNING: merge differs from github!" >&2
-    read -p "Type 'ignore' to continue. " -r >&2
-    if [[ "d$REPLY" =~ ^d[iI][gG][nN][oO][rR][eE]$ ]]; then
-      echo "Difference with github ignored." >&2
-    else
-      cleanup
-      exit 6
-    fi
-  fi
-  read -p "Press 'd' to accept the diff. " -n 1 -r >&2
-  echo
-  if [[ "d$REPLY" =~ ^d[dD]$ ]]; then
-    echo "Diff accepted." >&2
-  else
-    echo "ERROR: Diff rejected." >&2
-    cleanup
-    exit 6
-  fi
-else
-  # Verify the result.
-  echo "Dropping you on a shell so you can try building/testing the merged source." >&2
-  echo "Run 'git diff HEAD~' to show the changes being merged." >&2
-  echo "Type 'exit' when done." >&2
-  bash -i
-  read -p "Press 'm' to accept the merge. " -n 1 -r >&2
-  echo
-  if [[ "d$REPLY" =~ ^d[Mm]$ ]]; then
-    echo "Merge accepted." >&2
-  else
-    echo "ERROR: Merge rejected." >&2
-    cleanup
-    exit 7
-  fi
-fi
-
-# Sign the merge commit.
-read -p "Press 's' to sign off on the merge. " -n 1 -r >&2
-echo
-if [[ "d$REPLY" =~ ^d[Ss]$ ]]; then
-  if [[ "$(git config --get user.signingkey)" == "" ]]; then
-    echo "WARNING: No GPG signing key set, not signing. Set one using:" >&2
-    echo "git config --global user.signingkey <key>" >&2
-    git commit -q --signoff --amend --no-edit
-  else
-    git commit -q --gpg-sign --amend --no-edit
-  fi
-fi
-
-# Clean up temporary branches, and put the result in $BRANCH.
-git checkout -q "$BRANCH"
-git reset -q --hard pull/"$PULL"/local-merge
-cleanup
-
-# Push the result.
-read -p "Type 'push' to push the result to $HOST:$REPO, branch $BRANCH. " -r >&2
-if [[ "d$REPLY" =~ ^d[Pp][Uu][Ss][Hh]$ ]]; then
-  git push "$HOST":"$REPO" refs/heads/"$BRANCH"
-fi

contrib/devtools/symbol-check.py

@@ -1,113 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2014 Wladimir J. van der Laan
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-'''
-A script to check that the (Linux) executables produced by gitian only contain
-allowed gcc, glibc and libstdc++ version symbols.  This makes sure they are
-still compatible with the minimum supported Linux distribution versions.
-
-Example usage:
-
-    find ../gitian-builder/build -type f -executable | xargs python contrib/devtools/symbol-check.py
-'''
-from __future__ import division, print_function
-import subprocess
-import re
-import sys
-
-# Debian 6.0.9 (Squeeze) has:
-#
-# - g++ version 4.4.5 (https://packages.debian.org/search?suite=default&section=all&arch=any&searchon=names&keywords=g%2B%2B)
-# - libc version 2.11.3 (https://packages.debian.org/search?suite=default&section=all&arch=any&searchon=names&keywords=libc6)
-# - libstdc++ version 4.4.5 (https://packages.debian.org/search?suite=default&section=all&arch=any&searchon=names&keywords=libstdc%2B%2B6)
-#
-# Ubuntu 10.04.4 (Lucid Lynx) has:
-#
-# - g++ version 4.4.3 (http://packages.ubuntu.com/search?keywords=g%2B%2B&searchon=names&suite=lucid&section=all)
-# - libc version 2.11.1 (http://packages.ubuntu.com/search?keywords=libc6&searchon=names&suite=lucid&section=all)
-# - libstdc++ version 4.4.3 (http://packages.ubuntu.com/search?suite=lucid&section=all&arch=any&keywords=libstdc%2B%2B&searchon=names)
-#
-# Taking the minimum of these as our target.
-#
-# According to GNU ABI document (http://gcc.gnu.org/onlinedocs/libstdc++/manual/abi.html) this corresponds to:
-#   GCC 4.4.0: GCC_4.4.0
-#   GCC 4.4.2: GLIBCXX_3.4.13, CXXABI_1.3.3
-#   (glibc)    GLIBC_2_11
-#
-MAX_VERSIONS = {
-'GCC':     (4,4,0),
-'CXXABI':  (1,3,3),
-'GLIBCXX': (3,4,13),
-'GLIBC':   (2,11)
-}
-READELF_CMD = '/usr/bin/readelf'
-CPPFILT_CMD = '/usr/bin/c++filt'
-
-class CPPFilt(object):
-    '''
-    Demangle C++ symbol names.
-
-    Use a pipe to the 'c++filt' command.
-    '''
-    def __init__(self):
-        self.proc = subprocess.Popen(CPPFILT_CMD, stdin=subprocess.PIPE, stdout=subprocess.PIPE)
-
-    def __call__(self, mangled):
-        self.proc.stdin.write(mangled + '\n')
-        return self.proc.stdout.readline().rstrip()
-
-    def close(self):
-        self.proc.stdin.close()
-        self.proc.stdout.close()
-        self.proc.wait()
-
-def read_symbols(executable, imports=True):
-    '''
-    Parse an ELF executable and return a list of (symbol,version) tuples
-    for dynamic, imported symbols.
-    '''
-    p = subprocess.Popen([READELF_CMD, '--dyn-syms', '-W', executable], stdout=subprocess.PIPE, stderr=subprocess.PIPE, stdin=subprocess.PIPE)
-    (stdout, stderr) = p.communicate()
-    if p.returncode:
-        raise IOError('Could not read symbols for %s: %s' % (executable, stderr.strip()))
-    syms = []
-    for line in stdout.split('\n'):
-        line = line.split()
-        if len(line)>7 and re.match('[0-9]+:$', line[0]):
-            (sym, _, version) = line[7].partition('@')
-            is_import = line[6] == 'UND'
-            if version.startswith('@'):
-                version = version[1:]
-            if is_import == imports:
-                syms.append((sym, version))
-    return syms
-
-def check_version(max_versions, version):
-    if '_' in version:
-        (lib, _, ver) = version.rpartition('_')
-    else:
-        lib = version
-        ver = '0'
-    ver = tuple([int(x) for x in ver.split('.')])
-    if not lib in max_versions:
-        return False
-    return ver <= max_versions[lib]
-
-if __name__ == '__main__':
-    cppfilt = CPPFilt()
-    retval = 0
-    for filename in sys.argv[1:]:
-        # Check imported symbols
-        for sym,version in read_symbols(filename, True):
-            if version and not check_version(MAX_VERSIONS, version):
-                print('%s: symbol %s from unsupported version %s' % (filename, cppfilt(sym), version))
-                retval = 1
-        # Check exported symbols
-        for sym,version in read_symbols(filename, False):
-            print('%s: export of symbol %s not allowed' % (filename, cppfilt(sym)))
-            retval = 1
-
-    exit(retval)
-
-

contrib/devtools/update-translations.py

@@ -1,186 +0,0 @@
-#!/usr/bin/python
-# Copyright (c) 2014 Wladimir J. van der Laan
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-'''
-Run this script from the root of the repository to update all translations from
-transifex.
-It will do the following automatically:
-
-- fetch all translations using the tx tool
-- post-process them into valid and committable format
-  - remove invalid control characters
-  - remove location tags (makes diffs less noisy)
-
-TODO:
-- auto-add new translations to the build system according to the translation process
-'''
-from __future__ import division, print_function
-import subprocess
-import re
-import sys
-import os
-import io
-import xml.etree.ElementTree as ET
-
-# Name of transifex tool
-TX = 'tx'
-# Name of source language file
-SOURCE_LANG = 'bitcoin_en.ts'
-# Directory with locale files
-LOCALE_DIR = 'src/qt/locale'
-
-def check_at_repository_root():
-    if not os.path.exists('.git'):
-        print('No .git directory found')
-        print('Execute this script at the root of the repository', file=sys.stderr)
-        exit(1)
-
-def fetch_all_translations():
-    if subprocess.call([TX, 'pull', '-f']):
-        print('Error while fetching translations', file=sys.stderr)
-        exit(1)
-
-def find_format_specifiers(s):
-    '''Find all format specifiers in a string.'''
-    pos = 0
-    specifiers = []
-    while True:
-        percent = s.find('%', pos)
-        if percent < 0:
-            break
-        specifiers.append(s[percent+1])
-        pos = percent+2
-    return specifiers
-
-def split_format_specifiers(specifiers):
-    '''Split format specifiers between numeric (Qt) and others (strprintf)'''
-    numeric = []
-    other = []
-    for s in specifiers:
-        if s in {'1','2','3','4','5','6','7','8','9'}:
-            numeric.append(s)
-        else:
-            other.append(s)
-
-    # numeric (Qt) can be present in any order, others (strprintf) must be in specified order
-    return set(numeric),other
-
-def sanitize_string(s):
-    '''Sanitize string for printing'''
-    return s.replace('\n',' ')
-
-def check_format_specifiers(source, translation, errors):
-    source_f = split_format_specifiers(find_format_specifiers(source))
-    # assert that no source messages contain both Qt and strprintf format specifiers
-    # if this fails, go change the source as this is hacky and confusing!
-    assert(not(source_f[0] and source_f[1]))
-    try:
-        translation_f = split_format_specifiers(find_format_specifiers(translation))
-    except IndexError:
-        errors.append("Parse error in translation '%s'" % sanitize_string(translation))
-        return False
-    else:
-        if source_f != translation_f:
-            errors.append("Mismatch between '%s' and '%s'" % (sanitize_string(source), sanitize_string(translation)))
-            return False
-    return True
-
-def all_ts_files(suffix=''):
-    for filename in os.listdir(LOCALE_DIR):
-        # process only language files, and do not process source language
-        if not filename.endswith('.ts'+suffix) or filename == SOURCE_LANG+suffix:
-            continue
-        if suffix: # remove provided suffix
-            filename = filename[0:-len(suffix)]
-        filepath = os.path.join(LOCALE_DIR, filename)
-        yield(filename, filepath)
-
-FIX_RE = re.compile(b'[\x00-\x09\x0b\x0c\x0e-\x1f]')
-def remove_invalid_characters(s):
-    '''Remove invalid characters from translation string'''
-    return FIX_RE.sub(b'', s)
-
-# Override cdata escape function to make our output match Qt's (optional, just for cleaner diffs for
-# comparison, disable by default)
-_orig_escape_cdata = None
-def escape_cdata(text):
-    text = _orig_escape_cdata(text)
-    text = text.replace("'", '&apos;')
-    text = text.replace('"', '&quot;')
-    return text
-
-def postprocess_translations(reduce_diff_hacks=False):
-    print('Checking and postprocessing...')
-
-    if reduce_diff_hacks:
-        global _orig_escape_cdata
-        _orig_escape_cdata = ET._escape_cdata
-        ET._escape_cdata = escape_cdata
-
-    for (filename,filepath) in all_ts_files():
-        os.rename(filepath, filepath+'.orig')
-
-    have_errors = False
-    for (filename,filepath) in all_ts_files('.orig'):
-        # pre-fixups to cope with transifex output
-        parser = ET.XMLParser(encoding='utf-8') # need to override encoding because 'utf8' is not understood only 'utf-8'
-        with open(filepath + '.orig', 'rb') as f:
-            data = f.read()
-        # remove control characters; this must be done over the entire file otherwise the XML parser will fail
-        data = remove_invalid_characters(data)
-        tree = ET.parse(io.BytesIO(data), parser=parser)
-
-        # iterate over all messages in file
-        root = tree.getroot()
-        for context in root.findall('context'):
-            for message in context.findall('message'):
-                numerus = message.get('numerus') == 'yes'
-                source = message.find('source').text
-                translation_node = message.find('translation')
-                # pick all numerusforms
-                if numerus:
-                    translations = [i.text for i in translation_node.findall('numerusform')]
-                else:
-                    translations = [translation_node.text]
-
-                for translation in translations:
-                    if translation is None:
-                        continue
-                    errors = []
-                    valid = check_format_specifiers(source, translation, errors)
-
-                    for error in errors:
-                        print('%s: %s' % (filename, error))
-
-                    if not valid: # set type to unfinished and clear string if invalid
-                        translation_node.clear()
-                        translation_node.set('type', 'unfinished')
-                        have_errors = True
-
-                # Remove location tags
-                for location in message.findall('location'):
-                    message.remove(location)
-
-                # Remove entire message if it is an unfinished translation
-                if translation_node.get('type') == 'unfinished':
-                    context.remove(message)
-
-        # write fixed-up tree
-        # if diff reduction requested, replace some XML to 'sanitize' to qt formatting
-        if reduce_diff_hacks:
-            out = io.BytesIO()
-            tree.write(out, encoding='utf-8')
-            out = out.getvalue()
-            out = out.replace(b' />', b'/>')
-            with open(filepath, 'wb') as f:
-                f.write(out)
-        else:
-            tree.write(filepath, encoding='utf-8')
-    return have_errors
-
-if __name__ == '__main__':
-    check_at_repository_root()
-    fetch_all_translations()
-    postprocess_translations()
-

contrib/gitian-descriptors/README

@@ -0,0 +1,86 @@
+Gavin's notes on getting gitian builds up and running using KVM:
+
+These instructions distilled from:
+  https://help.ubuntu.com/community/KVM/Installation
+... see there for complete details.
+
+You need the right hardware: you need a 64-bit-capable CPU with hardware virtualization support (Intel VT-x or AMD-V). Not all modern CPUs support hardware virtualization.
+
+You probably need to enable hardware virtualization in your machine's BIOS.
+
+You need to be running a recent version of 64-bit-Ubuntu, and you need to install several prerequisites:
+  sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm
+
+Sanity checks:
+  sudo service apt-cacher-ng status   # Should return apt-cacher-ng is running
+  ls -l /dev/kvm   # Should show a /dev/kvm device
+
+
+Once you've got the right hardware and software:
+
+    git clone git://github.com/bitcoin/bitcoin.git
+    git clone git://github.com/devrandom/gitian-builder.git
+    mkdir gitian-builder/inputs
+    cd gitian-builder/inputs
+    # Inputs for Linux and Win32:
+    wget -O miniupnpc-1.6.tar.gz 'http://miniupnp.tuxfamily.org/files/download.php?file=miniupnpc-1.6.tar.gz'
+    wget 'http://fukuchi.org/works/qrencode/qrencode-3.2.0.tar.bz2'
+    # Inputs for Win32: (Linux has packages for these)
+    wget 'https://downloads.sourceforge.net/project/boost/boost/1.50.0/boost_1_50_0.tar.bz2'
+    wget 'http://www.openssl.org/source/openssl-1.0.1c.tar.gz'
+    wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
+    wget 'https://downloads.sourceforge.net/project/libpng/zlib/1.2.6/zlib-1.2.6.tar.gz'
+    wget 'https://downloads.sourceforge.net/project/libpng/libpng15/older-releases/1.5.9/libpng-1.5.9.tar.gz'
+    wget 'http://releases.qt-project.org/qt4/source/qt-everywhere-opensource-src-4.8.3.tar.gz'
+    cd ../..
+
+    cd gitian-builder
+    bin/make-base-vm --arch i386
+    bin/make-base-vm --arch amd64
+    cd ..
+
+    # Build Linux release:
+    cd bitcoin
+    git pull
+    cd ../gitian-builder
+    git pull
+    ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian.yml
+
+    # Build Win32 dependencies: (only needs to be done once, or when dependency versions change)
+    ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/boost-win32.yml
+    ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/deps-win32.yml
+    ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/qt-win32.yml
+
+    # Build Win32 release:
+    ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
+
+---------------------
+
+gitian-builder now also supports building using LXC. See
+  https://help.ubuntu.com/12.04/serverguide/lxc.html
+... for how to get LXC up and running under Ubuntu.
+
+If your main machine is a 64-bit Mac or PC with a few gigabytes of memory
+and at least 10 gigabytes of free disk space, you can gitian-build using
+LXC running inside a virtual machine.
+
+Here's a description of Gavin's setup on OSX 10.6:
+
+1. Download and install VirtualBox from https://www.virtualbox.org/
+
+2. Download the 64-bit Ubuntu Desktop 12.04 LTS .iso CD image from
+  http://www.ubuntu.com/
+
+3. Run VirtualBox and create a new virtual machine, using the
+  Ubuntu .iso (see the VirtualBox documentation for details).
+  Create it with at least 2 gigabytes of memory and a disk
+  that is at least 20 gigabytes big.
+
+4. Inside the running Ubuntu desktop, install:
+  sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder
+
+5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right
+  hardware and software" instructions above:
+  export USE_LXC=1
+  git clone git://github.com/bitcoin/bitcoin.git
+  ... etc

contrib/gitian-descriptors/README.md

@@ -1,67 +0,0 @@
-### Gavin's notes on getting gitian builds up and running using KVM:###
-
-These instructions distilled from:
-[  https://help.ubuntu.com/community/KVM/Installation](  https://help.ubuntu.com/community/KVM/Installation)
-... see there for complete details.
-
-You need the right hardware: you need a 64-bit-capable CPU with hardware virtualization support (Intel VT-x or AMD-V). Not all modern CPUs support hardware virtualization.
-
-You probably need to enable hardware virtualization in your machine's BIOS.
-
-You need to be running a recent version of 64-bit-Ubuntu, and you need to install several prerequisites:
-
-	sudo apt-get install ruby apache2 git apt-cacher-ng python-vm-builder qemu-kvm
-
-Sanity checks:
-
-	sudo service apt-cacher-ng status  # Should return apt-cacher-ng is running
-	ls -l /dev/kvm   # Should show a /dev/kvm device
-
-
-Once you've got the right hardware and software:
-
-    git clone git://github.com/bitcoin/bitcoin.git
-    git clone git://github.com/devrandom/gitian-builder.git
-    mkdir gitian-builder/inputs
-    cd gitian-builder/inputs
-
-    # Create base images
-    cd gitian-builder
-    bin/make-base-vm --suite precise --arch i386
-    bin/make-base-vm --suite precise --arch amd64
-    cd ..
-
-    # Get inputs (see doc/release-process.md for exact inputs needed and where to get them)
-    ...
-
-    # For further build instructions see doc/release-notes.md
-    ...
-
----------------------
-
-`gitian-builder` now also supports building using LXC. See
-[  https://help.ubuntu.com/12.04/serverguide/lxc.html](  https://help.ubuntu.com/12.04/serverguide/lxc.html)
-... for how to get LXC up and running under Ubuntu.
-
-If your main machine is a 64-bit Mac or PC with a few gigabytes of memory
-and at least 10 gigabytes of free disk space, you can `gitian-build` using
-LXC running inside a virtual machine.
-
-Here's a description of Gavin's setup on OSX 10.6:
-
-1. Download and install VirtualBox from [https://www.virtualbox.org/](https://www.virtualbox.org/)
-
-2. Download the 64-bit Ubuntu Desktop 12.04 LTS .iso CD image from
-   [http://www.ubuntu.com/](http://www.ubuntu.com/)
-
-3. Run VirtualBox and create a new virtual machine, using the Ubuntu .iso (see the [VirtualBox documentation](https://www.virtualbox.org/wiki/Documentation) for details). Create it with at least 2 gigabytes of memory and a disk that is at least 20 gigabytes big.
-
-4. Inside the running Ubuntu desktop, install:
-
-	sudo apt-get install debootstrap lxc ruby apache2 git apt-cacher-ng python-vm-builder
-
-5. Still inside Ubuntu, tell gitian-builder to use LXC, then follow the "Once you've got the right hardware and software" instructions above:
-
-	export USE_LXC=1
-	git clone git://github.com/bitcoin/bitcoin.git
-	... etc

contrib/gitian-descriptors/boost-linux.yml

@@ -1,55 +0,0 @@
----
-name: "boost"
-suites:
-- "precise"
-architectures:
-- "i386"
-- "amd64"
-packages:
-- "g++"
-- "unzip"
-- "pkg-config"
-- "libtool"
-- "faketime"
-- "bsdmainutils"
-- "zip"
-- "libz-dev"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "boost_1_55_0.tar.bz2"
-script: |
-  STAGING="$HOME/install"
-  TEMPDIR="$HOME/tmp"
-  export LIBRARY_PATH="$STAGING/lib"
-  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-  export FAKETIME=$REFERENCE_DATETIME
-  export TZ=UTC
-  # Input Integrity Check
-  echo "fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52  boost_1_55_0.tar.bz2" | shasum -c
-
-  mkdir -p "$STAGING"
-  tar --warning=no-timestamp -xjf boost_1_55_0.tar.bz2
-  cd boost_1_55_0
-  GCCVERSION=$(g++ -E -dM $(mktemp --suffix=.h) | grep __VERSION__ | cut -d ' ' -f 3 | cut -d '"' -f 2)
-  # note: bjam with -d+2 reveals that -O3 is implied by default, no need to provide it in cxxflags
-  echo "using gcc : $GCCVERSION : g++
-        :
-        <cxxflags>\"-frandom-seed=boost1 -fPIC\"
-  ;" > user-config.jam
-
-  ./bootstrap.sh --without-icu
-
-  ./bjam toolset=gcc threadapi=pthread threading=multi variant=release link=static runtime-link=shared --user-config=user-config.jam --without-mpi --without-python -sNO_BZIP2=1 --layout=tagged --build-type=complete --prefix="$STAGING" $MAKEOPTS -d+2 install
-
-  # post-process all generated libraries to be deterministic
-  # extract them to a temporary directory then re-build them deterministically
-  for LIB in $(find $STAGING -name \*.a); do
-    rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
-    ar xv $LIB | cut -b5- > /tmp/list.txt
-    rm $LIB
-    ar crsD $LIB $(cat /tmp/list.txt)
-  done
-  #
-  cd "$STAGING"
-  find | sort | zip -X@ $OUTDIR/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip

contrib/gitian-descriptors/boost-win.yml

@@ -1,86 +0,0 @@
----
-name: "boost"
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages:
-- "mingw-w64"
-- "g++-mingw-w64"
-- "faketime"
-- "zip"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "boost_1_55_0.tar.bz2"
-- "boost-mingw-gas-cross-compile-2013-03-03.patch"
-script: |
-  # Defines
-  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-  export FAKETIME=$REFERENCE_DATETIME
-  export TZ=UTC
-  INDIR=$HOME/build
-  TEMPDIR=$HOME/tmp
-  # Input Integrity Check
-  echo "fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52  boost_1_55_0.tar.bz2" | shasum -c
-  echo "d2b7f6a1d7051faef3c9cf41a92fa3671d905ef1e1da920d07651a43299f6268  boost-mingw-gas-cross-compile-2013-03-03.patch" | shasum -c
-
-  for BITS in 32 64; do # for architectures
-    #
-    INSTALLPREFIX=$HOME/staging${BITS}
-    BUILDDIR=$HOME/build${BITS}
-    if [ "$BITS" == "32" ]; then
-      HOST=i686-w64-mingw32
-    else
-      HOST=x86_64-w64-mingw32
-    fi
-    #
-    mkdir -p $INSTALLPREFIX $BUILDDIR
-    cd $BUILDDIR
-    #
-    tar --warning=no-timestamp -xjf $INDIR/boost_1_55_0.tar.bz2
-    cd boost_1_55_0
-    GCCVERSION=$($HOST-g++ -E -dM $(mktemp --suffix=.h) | grep __VERSION__ | cut -d ' ' -f 3 | cut -d '"' -f 2)
-    echo "using gcc : $GCCVERSION : $HOST-g++
-        :
-        <rc>$HOST-windres
-        <archiver>$HOST-ar
-        <cxxflags>-frandom-seed=boost1
-        <ranlib>$HOST-ranlib
-  ;" > user-config.jam
-    ./bootstrap.sh --without-icu
-
-    # Workaround: Upstream boost dev refuses to include patch that would allow Free Software cross-compile toolchain to work
-    #             This patch was authored by the Fedora package developer and ships in Fedora's mingw32-boost.
-    #             Please obtain the exact patch that matches the above sha256sum from one of the following mirrors.
-    #
-    # Read History:   https://svn.boost.org/trac/boost/ticket/7262
-    # History Mirror: http://rose.makesad.us/~paulproteus/mirrors/7262%20Boost.Context%20fails%20to%20build%20using%20MinGW.html
-    #
-    # Patch:          https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/boost-mingw.patch
-    # Patch Mirror:   http://wtogami.fedorapeople.org/boost-mingw-gas-cross-compile-2013-03-03.patch
-    # Patch Mirror:   http://mindstalk.net/host/boost-mingw-gas-cross-compile-2013-03-03.patch
-    # Patch Mirror:   http://rose.makesad.us/~paulproteus/mirrors/boost-mingw-gas-cross-compile-2013-03-03.patch
-    patch -p0 < $INDIR/boost-mingw-gas-cross-compile-2013-03-03.patch
-
-    # Bug Workaround: boost-1.54.0 broke the ability to disable zlib, still broken in 1.55
-    # https://svn.boost.org/trac/boost/ticket/9156
-    sed -i 's^\[ ac.check-library /zlib//zlib : <library>/zlib//zlib^^' libs/iostreams/build/Jamfile.v2
-    sed -i 's^<source>zlib.cpp <source>gzip.cpp \]^^' libs/iostreams/build/Jamfile.v2
-
-    # http://statmt.org/~s0565741/software/boost_1_52_0/libs/context/doc/html/context/requirements.html
-    # "For cross-compiling the lib you must specify certain additional properties at bjam command line: target-os, abi, binary-format, architecture and address-model."
-    ./bjam toolset=gcc binary-format=pe target-os=windows threadapi=win32 address-model=$BITS threading=multi variant=release link=static runtime-link=static --user-config=user-config.jam --without-mpi --without-python -sNO_BZIP2=1 -sNO_ZLIB=1 --layout=tagged --build-type=complete --prefix="$INSTALLPREFIX" $MAKEOPTS install
-    # post-process all generated libraries to be deterministic
-    # extract them to a temporary directory then re-build them deterministically
-    for LIB in $(find $INSTALLPREFIX -name \*.a); do
-        rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
-        $HOST-ar xv $LIB | cut -b5- > /tmp/list.txt
-        rm $LIB
-        $HOST-ar crsD $LIB $(cat /tmp/list.txt)
-    done
-    #
-    cd "$INSTALLPREFIX"
-    find | sort | zip -X@ $OUTDIR/boost-win$BITS-1.55.0-gitian-r6.zip
-  done # for BITS in
-

contrib/gitian-descriptors/boost-win32.yml

@@ -0,0 +1,38 @@
+---
+name: "boost"
+suites:
+- "lucid"
+architectures:
+- "i386"
+packages: 
+- "mingw32"
+- "faketime"
+- "zip"
+reference_datetime: "2011-01-30 00:00:00"
+remotes: []
+files:
+- "boost_1_50_0.tar.bz2"
+script: |
+  TMPDIR="$HOME/tmpdir"
+  mkdir -p $TMPDIR/bin/$GBUILD_BITS $TMPDIR/include
+  tar xjf boost_1_50_0.tar.bz2
+  cd boost_1_50_0
+  echo "using gcc : 4.4 : i586-mingw32msvc-g++
+        :
+        <rc>i586-mingw32msvc-windres
+        <archiver>i586-mingw32msvc-ar
+        <cxxflags>-frandom-seed=boost1
+  ;" > user-config.jam
+  ./bootstrap.sh --without-icu
+  ./bjam toolset=gcc target-os=windows threadapi=win32 threading=multi variant=release link=static --user-config=user-config.jam --without-mpi --without-python -sNO_BZIP2=1 -sNO_ZLIB=1 --layout=tagged --build-type=complete $MAKEOPTS stage
+  for lib in chrono date_time exception filesystem graph iostreams math_c99f math_c99l math_c99 math_tr1f math_tr1l math_tr1 prg_exec_monitor program_options random regex serialization signals system test_exec_monitor thread_win32 unit_test_framework wave wserialization; do
+      mkdir $lib
+      (cd $lib ; ar xf ../stage/lib/libboost_${lib}-mt-s.a)
+      mv $lib $TMPDIR/bin/$GBUILD_BITS
+  done
+  cp -a boost $TMPDIR/include
+  cd $TMPDIR
+  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  export FAKETIME=$REFERENCE_DATETIME
+  zip -r boost-win32-1.50.0-gitian2.zip *
+  cp boost-win32-1.50.0-gitian2.zip $OUTDIR

contrib/gitian-descriptors/deps-linux.yml

@@ -1,98 +0,0 @@
----
-name: "bitcoin"
-suites:
-- "precise"
-architectures:
-- "i386"
-- "amd64"
-packages:
-- "g++"
-- "unzip"
-- "zip"
-- "pkg-config"
-- "libtool"
-- "faketime"
-- "bsdmainutils"
-reference_datetime: "2013-06-01 00:00:00"
-remotes: []
-files:
-- "openssl-1.0.1k.tar.gz"
-- "miniupnpc-1.9.20140701.tar.gz"
-- "qrencode-3.4.3.tar.bz2"
-- "protobuf-2.5.0.tar.bz2"
-- "db-4.8.30.NC.tar.gz"
-script: |
-  STAGING="$HOME/install"
-  TEMPDIR="$HOME/tmp"
-  OPTFLAGS='-O2'
-  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-  export FAKETIME=$REFERENCE_DATETIME
-  export TZ=UTC
-  export LIBRARY_PATH="$STAGING/lib"
-  # Integrity Check
-  echo "8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c  openssl-1.0.1k.tar.gz"  | sha256sum -c
-  echo "26f3985bad7768b8483b793448ae49414cdc4451d0ec83e7c1944367e15f9f07  miniupnpc-1.9.20140701.tar.gz"   | sha256sum -c
-  echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98  qrencode-3.4.3.tar.bz2" | sha256sum -c
-  echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677  protobuf-2.5.0.tar.bz2" | sha256sum -c
-  echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz"    | sha256sum -c
-
-  #
-  tar xzf openssl-1.0.1k.tar.gz
-  cd openssl-1.0.1k
-  #   need -fPIC to avoid relocation error in 64 bit builds
-  ./config no-shared no-zlib no-dso no-krb5 --openssldir=$STAGING -fPIC
-  #   need to build OpenSSL with faketime because a timestamp is embedded into cversion.o
-  make
-  make install_sw
-  cd ..
-  #
-  tar xzfm miniupnpc-1.9.20140701.tar.gz
-  cd miniupnpc-1.9.20140701
-  #   miniupnpc is always built with -fPIC
-  INSTALLPREFIX=$STAGING make $MAKEOPTS install
-  rm -f $STAGING/lib/libminiupnpc.so* # no way to skip shared lib build
-  cd ..
-  #
-  tar xjf qrencode-3.4.3.tar.bz2
-  cd qrencode-3.4.3
-  unset FAKETIME # unset fake time during configure, as it does some clock sanity tests
-  #   need --with-pic to avoid relocation error in 64 bit builds
-  ./configure --prefix=$STAGING --enable-static --disable-shared --with-pic --without-tools --disable-dependency-tracking
-  # Workaround to prevent re-configuring by make; make all files have a date in the past
-  find . -print0 | xargs -r0 touch -t 200001010000
-  export FAKETIME=$REFERENCE_DATETIME
-  make $MAKEOPTS install
-  cd ..
-  #
-  tar xjf protobuf-2.5.0.tar.bz2
-  cd protobuf-2.5.0
-  mkdir -p $STAGING/host/bin
-  unset FAKETIME # unset fake time during configure, as it does some clock sanity tests
-  #   need --with-pic to avoid relocation error in 64 bit builds
-  ./configure --prefix=$STAGING --bindir=$STAGING/host/bin --enable-static --disable-shared --with-pic --without-zlib
-  # Workaround to prevent re-configuring by make; make all files have a date in the past
-  find . -print0 | xargs -r0 touch -t 200001010000
-  export FAKETIME=$REFERENCE_DATETIME
-  make $MAKEOPTS install
-  cd ..
-  #
-  tar xzf db-4.8.30.NC.tar.gz
-  cd db-4.8.30.NC/build_unix
-  #   need --with-pic to avoid relocation error in 64 bit builds
-  ../dist/configure --prefix=$STAGING --enable-cxx --disable-shared --with-pic
-  # Workaround to prevent re-configuring by make; make all files have a date in the past
-  find . -print0 | xargs -r0 touch -t 200001010000
-  make $MAKEOPTS library_build
-  make install_lib install_include
-  cd ../..
-  # post-process all generated libraries to be deterministic
-  # extract them to a temporary directory then re-build them deterministically
-  for LIB in $(find $STAGING -name \*.a); do
-    rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
-    ar xv $LIB | cut -b5- > /tmp/list.txt
-    rm $LIB
-    ar crsD $LIB $(cat /tmp/list.txt)
-  done
-  #
-  cd $STAGING
-  find include lib bin host | sort | zip -X@ $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r9.zip

contrib/gitian-descriptors/deps-win.yml

@@ -1,128 +0,0 @@
----
-name: "bitcoin-deps"
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages:
-- "mingw-w64"
-- "g++-mingw-w64"
-- "git-core"
-- "zip"
-- "faketime"
-- "psmisc"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "openssl-1.0.1k.tar.gz"
-- "db-4.8.30.NC.tar.gz"
-- "miniupnpc-1.9.20140701.tar.gz"
-- "zlib-1.2.8.tar.gz"
-- "libpng-1.6.8.tar.gz"
-- "qrencode-3.4.3.tar.bz2"
-script: |
-  #
-  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-  export FAKETIME=$REFERENCE_DATETIME
-  export TZ=UTC
-  INDIR=$HOME/build
-  TEMPDIR=$HOME/tmp
-  # Input Integrity Check
-  echo "8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c  openssl-1.0.1k.tar.gz"  | sha256sum -c
-  echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz"    | sha256sum -c
-  echo "26f3985bad7768b8483b793448ae49414cdc4451d0ec83e7c1944367e15f9f07  miniupnpc-1.9.20140701.tar.gz"   | sha256sum -c
-  echo "36658cb768a54c1d4dec43c3116c27ed893e88b02ecfcb44f2166f9c0b7f2a0d  zlib-1.2.8.tar.gz"      | sha256sum -c
-  echo "32c7acf1608b9c8b71b743b9780adb7a7b347563dbfb4a5263761056da44cc96  libpng-1.6.8.tar.gz"    | sha256sum -c
-  echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98  qrencode-3.4.3.tar.bz2" | sha256sum -c
-
-  for BITS in 32 64; do # for architectures
-    #
-    INSTALLPREFIX=$HOME/staging${BITS}
-    BUILDDIR=$HOME/build${BITS}
-    if [ "$BITS" == "32" ]; then
-      HOST=i686-w64-mingw32
-    else
-      HOST=x86_64-w64-mingw32
-    fi
-    #
-    mkdir -p $INSTALLPREFIX $BUILDDIR
-    cd $BUILDDIR
-    #
-    tar xzf $INDIR/openssl-1.0.1k.tar.gz
-    cd openssl-1.0.1k
-    if [ "$BITS" == "32" ]; then
-      OPENSSL_TGT=mingw
-    else
-      OPENSSL_TGT=mingw64
-    fi
-    ./Configure --cross-compile-prefix=$HOST- ${OPENSSL_TGT} no-shared no-dso --openssldir=$INSTALLPREFIX
-    make
-    make install_sw
-    cd ..
-    #
-    tar xzf $INDIR/db-4.8.30.NC.tar.gz
-    cd db-4.8.30.NC/build_unix
-    ../dist/configure --prefix=$INSTALLPREFIX --enable-mingw --enable-cxx --host=$HOST --disable-shared
-    make $MAKEOPTS library_build
-    make install_lib install_include
-    cd ../..
-    #
-    tar xzf $INDIR/miniupnpc-1.9.20140701.tar.gz
-    cd miniupnpc-1.9.20140701
-    echo "
-  --- miniupnpc-1.9/Makefile.mingw.orig   2013-09-29 18:52:51.014087958 -1000
-  +++ miniupnpc-1.9/Makefile.mingw        2013-09-29 19:09:29.663318691 -1000
-  @@ -67,8 +67,8 @@
-   
-   wingenminiupnpcstrings.o:	wingenminiupnpcstrings.c
-   
-  -miniupnpcstrings.h: miniupnpcstrings.h.in wingenminiupnpcstrings
-  -	wingenminiupnpcstrings \$< \$@
-  +miniupnpcstrings.h: miniupnpcstrings.h.in 
-  +	sed -e 's|OS/version|MSWindows/5.1.2600|' -e 's|MINIUPNPC_VERSION_STRING \"version\"|MINIUPNPC_VERSION_STRING \"VERSIONHERE\"|' \$< > \$@
-   
-   minixml.o:	minixml.c minixml.h miniupnpcstrings.h
-   
-  " | sed "s/VERSIONHERE/$(cat VERSION)/" | patch -p1
-    mkdir -p dll
-    make -f Makefile.mingw CC=$HOST-gcc AR=$HOST-ar libminiupnpc.a
-    install -d $INSTALLPREFIX/include/miniupnpc
-    install *.h $INSTALLPREFIX/include/miniupnpc
-    install libminiupnpc.a  $INSTALLPREFIX/lib
-    cd ..
-    #
-    tar xzf $INDIR/zlib-1.2.8.tar.gz
-    cd zlib-1.2.8
-    CROSS_PREFIX=$HOST- ./configure --prefix=$INSTALLPREFIX --static
-    make
-    make install
-    cd ..
-    #
-    tar xzf $INDIR/libpng-1.6.8.tar.gz
-    cd libpng-1.6.8
-    OPT="-O2"
-    CPPFLAGS="${OPT} -I$INSTALLPREFIX/include" CFLAGS="${OPT} -I$INSTALLPREFIX/include" LDFLAGS="${OPT} -L$INSTALLPREFIX/lib" ./configure --disable-shared --prefix=$INSTALLPREFIX --host=$HOST
-    make $MAKEOPTS
-    make install
-    cd ..
-    #
-    tar xjf $INDIR/qrencode-3.4.3.tar.bz2
-    cd qrencode-3.4.3
-    png_CFLAGS="-I$INSTALLPREFIX/include" png_LIBS="-L$INSTALLPREFIX/lib -lpng" ./configure --prefix=$INSTALLPREFIX --host=$HOST --enable-static --disable-shared --without-tools --disable-dependency-tracking
-    # Workaround to prevent re-configuring by make (resulting in missing m4 error); make all files have a date in the past
-    find . -print0 | xargs -r0 touch -t 200001010000
-    make
-    make install
-    cd ..
-    # post-process all generated libraries to be deterministic
-    # extract them to a temporary directory then re-build them deterministically
-    for LIB in $(find $INSTALLPREFIX -name \*.a); do
-        rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
-        $HOST-ar xv $LIB | cut -b5- > /tmp/list.txt
-        rm $LIB
-        $HOST-ar crsD $LIB $(cat /tmp/list.txt)
-    done
-    #
-    cd $INSTALLPREFIX
-    find include lib | sort | zip -X@ $OUTDIR/bitcoin-deps-win$BITS-gitian-r16.zip
-  done # for BITS in

contrib/gitian-descriptors/deps-win32.yml

@@ -0,0 +1,72 @@
+---
+name: "bitcoin-deps"
+suites:
+- "lucid"
+architectures:
+- "i386"
+packages:
+- "mingw32"
+- "git-core"
+- "zip"
+- "faketime"
+- "wine"
+- "psmisc"
+reference_datetime: "2011-01-30 00:00:00"
+remotes: []
+files:
+- "openssl-1.0.1c.tar.gz"
+- "db-4.8.30.NC.tar.gz"
+- "miniupnpc-1.6.tar.gz"
+- "zlib-1.2.6.tar.gz"
+- "libpng-1.5.9.tar.gz"
+- "qrencode-3.2.0.tar.bz2"
+script: |
+  #
+  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  export FAKETIME=$REFERENCE_DATETIME
+  export TZ=UTC
+  #
+  tar xzf openssl-1.0.1c.tar.gz
+  cd openssl-1.0.1c
+  ./Configure --cross-compile-prefix=i586-mingw32msvc- mingw
+  make
+  cd ..
+  #
+  tar xzf db-4.8.30.NC.tar.gz
+  cd db-4.8.30.NC/build_unix
+  ../dist/configure --enable-mingw --enable-cxx --host=i586-mingw32msvc CFLAGS="-I/usr/i586-mingw32msvc/include"
+  make $MAKEOPTS
+  cd ../..
+  #
+  tar xzf miniupnpc-1.6.tar.gz
+  cd miniupnpc-1.6
+  sed 's/dllwrap -k --driver-name gcc/$(DLLWRAP) -k --driver-name $(CC)/' -i Makefile.mingw
+  sed 's|wingenminiupnpcstrings $< $@|./wingenminiupnpcstrings $< $@|' -i Makefile.mingw
+  make -f Makefile.mingw DLLWRAP=i586-mingw32msvc-dllwrap CC=i586-mingw32msvc-gcc AR=i586-mingw32msvc-ar
+  cd ..
+  mv miniupnpc-1.6 miniupnpc
+  #
+  tar xzf zlib-1.2.6.tar.gz
+  cd zlib-1.2.6
+  make -f win32/Makefile.gcc PREFIX=i586-mingw32msvc- $MAKEOPTS
+  cd ..
+  #
+  tar xzf libpng-1.5.9.tar.gz
+  cd libpng-1.5.9
+  ./configure -disable-shared CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld LDFLAGS="-L../zlib-1.2.6/" CFLAGS="-I../zlib-1.2.6/"
+  make $MAKEOPTS
+  cd ..
+  #
+  tar xjf qrencode-3.2.0.tar.bz2
+  cd qrencode-3.2.0
+  ./configure CC=i586-mingw32msvc-cc AR=i586-mingw32msvc-ar STRIP=i586-mingw32msvc-strip RANLIB=i586-mingw32msvc-ranlib OBJDUMP=i586-mingw32msvc-objdump LD=i586-mingw32msvc-ld png_LIBS="../libpng-1.5.9/.libs/libpng15.a ../zlib-1.2.6/libz.a" png_CFLAGS="-I../libpng-1.5.9"
+  make $MAKEOPTS
+  cd ..
+  #
+  zip -r $OUTDIR/bitcoin-deps-0.0.5.zip \
+    $(ls qrencode-*/{qrencode.h,.libs/libqrencode.{,l}a} | sort) \
+    $(ls db-*/build_unix/{libdb_cxx.a,db.h,db_cxx.h,libdb.a,.libs/libdb_cxx-?.?.a} | sort) \
+    $(find openssl-* -name '*.a' -o -name '*.h' | sort) \
+    $(find miniupnpc -name '*.h' -o -name 'libminiupnpc.a' | sort)
+  # Kill wine processes as gitian won't figure out we are done otherwise
+  killall wineserver services.exe explorer.exe winedevice.exe

contrib/gitian-descriptors/gitian-linux.yml

@@ -1,86 +0,0 @@
----
-name: "bitcoin"
-suites:
-- "precise"
-architectures:
-- "i386"
-- "amd64"
-packages: 
-- "g++"
-- "git-core"
-- "unzip"
-- "pkg-config"
-- "autoconf2.13"
-- "libtool"
-- "automake"
-- "faketime"
-- "bsdmainutils"
-- "libqt4-core"
-- "libqt4-gui"
-- "libqt4-dbus"
-- "libqt4-network"
-- "libqt4-test"
-reference_datetime: "2013-06-01 00:00:00"
-remotes:
-- "url": "https://github.com/bitcoin/bitcoin.git"
-  "dir": "bitcoin"
-files:
-- "bitcoin-deps-linux32-gitian-r9.zip"
-- "bitcoin-deps-linux64-gitian-r9.zip"
-- "boost-linux32-1.55.0-gitian-r1.zip"
-- "boost-linux64-1.55.0-gitian-r1.zip"
-- "qt-linux32-4.6.4-gitian-r1.tar.gz"
-- "qt-linux64-4.6.4-gitian-r1.tar.gz"
-script: |
-  STAGING="$HOME/install"
-  OPTFLAGS='-O2'
-  BINDIR="${OUTDIR}/bin/${GBUILD_BITS}" # 32/64 bit build specific output directory
-  TEMPDIR="$HOME/tempdir"
-  export TZ=UTC
-  export LIBRARY_PATH="$STAGING/lib"
-  export PATH="$STAGING/bin:$PATH"
-  mkdir -p ${BINDIR}
-  #
-  mkdir -p $STAGING
-  cd $STAGING
-  unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r9.zip
-  unzip ../build/boost-linux${GBUILD_BITS}-1.55.0-gitian-r1.zip
-  tar -zxf ../build/qt-linux${GBUILD_BITS}-4.6.4-gitian-r1.tar.gz
-  cd ../build
-
-  # Avoid exporting *any* symbols from the executable
-  # This avoids conflicts between the libraries statically linked into bitcoin and any
-  # libraries we may link dynamically (such as Qt and OpenSSL, see issue #4094).
-  # It also avoids start-up overhead to not export any unnecessary symbols.
-  # To do this, build a linker script that marks all symbols as local.
-  LINKER_SCRIPT=$HOME/build/linker_version_script
-  echo '
-  {
-    local: *;
-  };' > $LINKER_SCRIPT
-  function do_configure {
-      ./configure "$@" --prefix=$STAGING --with-protoc-bindir=$STAGING/host/bin --with-qt-bindir=$STAGING/bin --with-boost=$STAGING --disable-maintainer-mode --disable-dependency-tracking PKG_CONFIG_PATH="$STAGING/lib/pkgconfig" CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib -Wl,--version-script=$LINKER_SCRIPT ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt" --enable-glibc-back-compat
-  }
-  #
-  cd bitcoin
-  ./autogen.sh
-  do_configure
-  make dist
-  DISTNAME=`echo bitcoin-*.tar.gz`
-
-  # Build dynamic versions of everything
-  # (with static linking to boost and openssl as well a some non-OS deps)
-  mkdir -p distsrc
-  cd distsrc
-  tar --strip-components=1 -xf ../$DISTNAME
-  do_configure --bindir=$BINDIR 
-  make $MAKEOPTS
-  make $MAKEOPTS install-strip
-  make $MAKEOPTS clean
-
-  # sort distribution tar file and normalize user/group/mtime information for deterministic output
-  mkdir -p $OUTDIR/src
-  rm -rf $TEMPDIR
-  mkdir -p $TEMPDIR
-  cd $TEMPDIR
-  tar -xvf $HOME/build/bitcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME

contrib/gitian-descriptors/gitian-osx-bitcoin.yml

@@ -1,60 +0,0 @@
----
-name: "bitcoin"
-suites:
-- "precise"
-architectures:
-- "i386"
-packages:
-- "git-core"
-- "automake"
-- "faketime"
-- "bsdmainutils"
-- "pkg-config"
-- "p7zip-full"
-
-reference_datetime: "2013-06-01 00:00:00"
-remotes:
-- "url": "https://github.com/bitcoin/bitcoin.git"
-  "dir": "bitcoin"
-files:
-- "osx-native-depends-r3.tar.gz"
-- "osx-depends-r8.tar.gz"
-- "osx-depends-qt-5.2.1-r7.tar.gz"
-- "MacOSX10.7.sdk.tar.gz"
-
-script: |
-
-  HOST=x86_64-apple-darwin11
-  PREFIX=`pwd`/osx-cross-depends/prefix
-  SDK=`pwd`/osx-cross-depends/SDKs/MacOSX10.7.sdk
-  NATIVEPREFIX=`pwd`/osx-cross-depends/native-prefix
-  export TAR_OPTIONS="-m --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
-
-  export SOURCES_PATH=`pwd`
-
-  mkdir -p osx-cross-depends/SDKs
-
-  tar -C osx-cross-depends/SDKs -xf ${SOURCES_PATH}/MacOSX10.7.sdk.tar.gz
-
-  tar -C osx-cross-depends -xf osx-native-depends-r3.tar.gz
-  tar -C osx-cross-depends -xf osx-depends-r8.tar.gz
-  tar -C osx-cross-depends -xf osx-depends-qt-5.2.1-r7.tar.gz
-  export PATH=`pwd`/osx-cross-depends/native-prefix/bin:$PATH
-
-  cd bitcoin
-
-  export ZERO_AR_DATE=1
-  export QT_RCC_TEST=1
-  ./autogen.sh
-  ./configure --host=${HOST} --with-boost=${PREFIX} CC=clang CXX=clang++ OBJC=clang OBJCXX=clang++ CFLAGS="-target ${HOST} -mmacosx-version-min=10.6 --sysroot ${SDK} -msse2 -Qunused-arguments" CXXFLAGS="-target ${HOST} -mmacosx-version-min=10.6 --sysroot ${SDK} -msse2 -Qunused-arguments" LDFLAGS="-B${NATIVEPREFIX}/bin -L${PREFIX}/lib -L${SDK}/usr/lib/i686-apple-darwin10/4.2.1" CPPFLAGS="-I${NATIVEPREFIX}/lib/clang/3.2/include -I${PREFIX}/include" SSL_LIBS="-lz -lssl -lcrypto" --disable-tests -with-gui=qt5 PKG_CONFIG_LIBDIR="${PREFIX}/lib/pkgconfig" --disable-dependency-tracking --disable-maintainer-mode
-  make dist
-  mkdir -p distsrc
-  cd distsrc
-  tar --strip-components=1 -xf ../bitcoin-*.tar*
-  ./configure --host=${HOST} --with-boost=${PREFIX} CC=clang CXX=clang++ OBJC=clang OBJCXX=clang++ CFLAGS="-target ${HOST} -mmacosx-version-min=10.6 --sysroot ${SDK} -msse2 -Qunused-arguments" CXXFLAGS="-target ${HOST} -mmacosx-version-min=10.6 --sysroot ${SDK} -msse2 -Qunused-arguments" LDFLAGS="-B${NATIVEPREFIX}/bin -L${PREFIX}/lib -L${SDK}/usr/lib/i686-apple-darwin10/4.2.1" CPPFLAGS="-I${NATIVEPREFIX}/lib/clang/3.2/include -I${PREFIX}/include" SSL_LIBS="-lz -lssl -lcrypto" --disable-tests -with-gui=qt5 PKG_CONFIG_LIBDIR="${PREFIX}/lib/pkgconfig"  --disable-dependency-tracking --disable-maintainer-mode
-  make $MAKEOPTS
-  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-  export FAKETIME=$REFERENCE_DATETIME
-  export TZ=UTC
-  make deploy
-  dmg dmg Bitcoin-Qt.dmg $OUTDIR/Bitcoin-Qt.dmg

contrib/gitian-descriptors/gitian-osx-depends.yml

@@ -1,159 +0,0 @@
----
-name: "osx-depends"
-suites:
-- "precise"
-architectures:
-- "i386"
-packages:
-- "git-core"
-- "automake"
-- "p7zip-full"
-
-reference_datetime: "2013-06-01 00:00:00"
-remotes: []
-files:
-- "boost_1_55_0.tar.bz2"
-- "db-4.8.30.NC.tar.gz"
-- "miniupnpc-1.9.20140701.tar.gz"
-- "openssl-1.0.1k.tar.gz"
-- "protobuf-2.5.0.tar.bz2"
-- "qrencode-3.4.3.tar.bz2"
-- "MacOSX10.7.sdk.tar.gz"
-- "osx-native-depends-r3.tar.gz"
-
-script: |
-
-  echo "fff00023dd79486d444c8e29922f4072e1d451fc5a4d2b6075852ead7f2b7b52  boost_1_55_0.tar.bz2" | sha256sum -c
-  echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz" | sha256sum -c
-  echo "26f3985bad7768b8483b793448ae49414cdc4451d0ec83e7c1944367e15f9f07  miniupnpc-1.9.20140701.tar.gz"   | sha256sum -c
-  echo "8f9faeaebad088e772f4ef5e38252d472be4d878c6b3a2718c10a4fcebe7a41c  openssl-1.0.1k.tar.gz" | sha256sum -c
-  echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677  protobuf-2.5.0.tar.bz2" | sha256sum -c
-  echo "dfd71487513c871bad485806bfd1fdb304dedc84d2b01a8fb8e0940b50597a98  qrencode-3.4.3.tar.bz2" | sha256sum -c
-
-  REVISION=r8
-  export SOURCES_PATH=`pwd`
-  export TAR_OPTIONS="-m --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
-  export PATH=$HOME:$PATH
-  export SOURCES_PATH=`pwd`
-  export ZERO_AR_DATE=1
-
-  mkdir -p osx-cross-depends/build
-  cd osx-cross-depends
-
-  PREFIX=`pwd`/prefix
-  NATIVEPREFIX=`pwd`/native-prefix
-  BUILD_BASE=`pwd`/build
-  SDK=`pwd`/SDKs/MacOSX10.7.sdk
-  HOST=x86_64-apple-darwin11
-  MIN_VERSION=10.6
-
-  INT_CFLAGS="-target ${HOST} -mmacosx-version-min=${MIN_VERSION} --sysroot ${SDK} -msse2 -Qunused-arguments"
-  INT_CXXFLAGS="${INT_CFLAGS}"
-  INT_LDFLAGS="-L${PREFIX}/lib -L${SDK}/usr/lib/i686-apple-darwin10/4.2.1"
-  INT_LDFLAGS_CLANG="-B${NATIVEPREFIX}/bin"
-  INT_CPPFLAGS="-I${PREFIX}/include"
-  INT_CC=clang
-  INT_CXX=clang++
-  INT_OBJC=clang
-  INT_OBJCXX=clang++
-  INT_AR=${HOST}-ar
-  INT_RANLIB=${HOST}-ranlib
-  INT_LIBTOOL=${HOST}-libtool
-  INT_INSTALL_NAME_TOOL=${HOST}-install_name_tool
-
-  export PATH=${NATIVEPREFIX}/bin:${PATH}
-
-  mkdir -p ${NATIVEPREFIX}/bin
-  mkdir -p ${NATIVEPREFIX}/lib
-  mkdir -p ${PREFIX}/bin
-  mkdir -p ${PREFIX}/lib
-  mkdir -p ${BUILD_BASE}
-
-  mkdir -p SDKs
-  tar -C SDKs -xf ${SOURCES_PATH}/MacOSX10.7.sdk.tar.gz
-
-  tar xf /home/ubuntu/build/osx-native-depends-r3.tar.gz
-
-  # bdb
-  SOURCE_FILE=${SOURCES_PATH}/db-4.8.30.NC.tar.gz
-  BUILD_DIR=${BUILD_BASE}/db-4.8.30.NC
-
-  tar -C ${BUILD_BASE} -xf ${SOURCE_FILE}
-  sed -i 's/__atomic_compare_exchange/__atomic_compare_exchange_db/g' ${BUILD_DIR}/dbinc/atomic.h
-  pushd ${BUILD_DIR}
-  cd build_unix;
-  ../dist/configure --host=${HOST} --prefix="${PREFIX}" --disable-shared --enable-cxx CC="${INT_CC}" CXX="${INT_CXX}" AR="${INT_AR}" RANLIB="${INT_RANLIB}" OBJC="${INT_OBJC}" OBJCXX="${INT_OBJCXX}" CFLAGS="${INT_CFLAGS}" CXXFLAGS="${INT_CXXFLAGS}" LDFLAGS="${INT_CLANG_LDFLAGS} ${INT_LDFLAGS}" CPPFLAGS="${INT_CPPFLAGS}"
-  make $MAKEOPTS libdb.a libdb_cxx.a
-  make  install_lib install_include
-  popd
-
-  # openssl
-  SOURCE_FILE=${SOURCES_PATH}/openssl-1.0.1k.tar.gz
-  BUILD_DIR=${BUILD_BASE}/openssl-1.0.1k
-
-  tar -C ${BUILD_BASE} -xf ${SOURCE_FILE}
-  pushd ${BUILD_DIR}
-  sed -ie "s|cc:|${INT_CC}:|" ${BUILD_DIR}/Configure
-  sed -ie "s|\(-arch [_a-zA-Z0-9]*\)|\1 --sysroot ${SDK}  -target ${HOST} -msse2|" ${BUILD_DIR}/Configure
-  sed -i "/define DATE/d" ${BUILD_DIR}/util/mkbuildinf.pl
-  sed -i "s|engines apps test|engines|" ${BUILD_DIR}/Makefile.org
-  AR="${INT_AR}" RANLIB="${INT_RANLIB}" ./Configure --prefix=${PREFIX} --openssldir=${PREFIX}/etc/openssl zlib shared no-krb5 darwin64-x86_64-cc ${INT_LDFLAGS} ${INT_CLANG_LDFLAGS} ${INT_CPPFLAGS}
-  make -j1 build_libs libcrypto.pc libssl.pc openssl.pc
-  make -j1 install_sw
-  popd
-
-  #libminiupnpc
-  SOURCE_FILE=${SOURCES_PATH}/miniupnpc-1.9.20140701.tar.gz
-  BUILD_DIR=${BUILD_BASE}/miniupnpc-1.9.20140701
-
-  tar -C ${BUILD_BASE} -xf ${SOURCE_FILE}
-  pushd ${BUILD_DIR}
-  CFLAGS="${INT_CFLAGS} ${INT_CPPFLAGS}" make $MAKEOPTS OS=Darwin CC="${INT_CC}" AR="${INT_AR}" libminiupnpc.a
-  install -d ${PREFIX}/include/miniupnpc
-  install *.h ${PREFIX}/include/miniupnpc
-  install libminiupnpc.a  ${PREFIX}/lib
-  popd
-
-  # qrencode
-  SOURCE_FILE=${SOURCES_PATH}/qrencode-3.4.3.tar.bz2
-  BUILD_DIR=${BUILD_BASE}/qrencode-3.4.3
-  tar -C ${BUILD_BASE} -xf ${SOURCE_FILE}
-  pushd ${BUILD_DIR}
-
-  # m4 folder is not included in the stable release, which can confuse aclocal
-  # if its timestamp ends up being earlier than configure.ac when extracted
-  touch aclocal.m4
-  ./configure --host=${HOST} --prefix="${PREFIX}" --disable-shared CC="${INT_CC}" CXX="${INT_CXX}" AR="${INT_AR}" RANLIB="${INT_RANLIB}" OBJC="${INT_OBJC}" OBJCXX="${INT_OBJCXX}" CFLAGS="${INT_CFLAGS}" CXXFLAGS="${INT_CXXFLAGS}" LDFLAGS="${INT_CLANG_LDFLAGS} ${INT_LDFLAGS}" CPPFLAGS="${INT_CPPFLAGS}" --disable-shared -without-tools --disable-sdltest --disable-dependency-tracking
-  make $MAKEOPTS
-  make install
-  popd
-
-  # libprotobuf
-  SOURCE_FILE=${SOURCES_PATH}/protobuf-2.5.0.tar.bz2
-  BUILD_DIR=${BUILD_BASE}/protobuf-2.5.0
-
-  tar -C ${BUILD_BASE} -xjf ${SOURCE_FILE}
-  pushd ${BUILD_DIR}
-  ./configure --host=${HOST} --prefix="${PREFIX}" --disable-shared --enable-cxx CC="${INT_CC}" CXX="${INT_CXX}" AR="${INT_AR}" RANLIB="${INT_RANLIB}" OBJC="${INT_OBJC}" OBJCXX="${INT_OBJCXX}" CFLAGS="${INT_CFLAGS}" CXXFLAGS="${INT_CXXFLAGS}" LDFLAGS="${INT_CLANG_LDFLAGS} ${INT_LDFLAGS}" CPPFLAGS="${INT_CPPFLAGS}" --enable-shared=no --disable-dependency-tracking --with-protoc=${NATIVEPREFIX}/bin/protoc
-  cd src
-  make $MAKEOPTS libprotobuf.la
-  make install-libLTLIBRARIES install-nobase_includeHEADERS
-  cd ..
-  make install-pkgconfigDATA
-  popd
-
-  # boost
-  SOURCE_FILE=${SOURCES_PATH}/boost_1_55_0.tar.bz2
-  BUILD_DIR=${BUILD_BASE}/boost_1_55_0
-
-  tar -C ${BUILD_BASE} -xf ${SOURCE_FILE}
-  pushd ${BUILD_DIR}
-  ./bootstrap.sh --with-libraries=chrono,filesystem,program_options,system,thread,test
-  echo "using darwin : : ${INT_CXX} : <cxxflags>\"${INT_CFLAGS} ${INT_CPPFLAGS}\" <linkflags>\"${INT_LDFLAGS} ${INT_CLANG_LDFLAGS}\" <archiver>\"${INT_LIBTOOL}\" <striper>\"${INT_STRIP}\" : ;" > "user-config.jam"
-  ./b2 -d2 --layout=tagged --build-type=complete --prefix="${PREFIX}" --toolset=darwin-4.2.1 --user-config=user-config.jam variant=release threading=multi link=static install
-  popd
-
-  export GZIP="-9n"
-  find prefix | sort | tar --no-recursion -czf osx-depends-${REVISION}.tar.gz -T -
-
-  mv osx-depends-${REVISION}.tar.gz $OUTDIR

contrib/gitian-descriptors/gitian-osx-native.yml

@@ -1,178 +0,0 @@
----
-name: "osx-native"
-suites:
-- "precise"
-architectures:
-- "i386"
-packages:
-- "git-core"
-- "automake"
-- "faketime"
-- "libssl-dev"
-- "libbz2-dev"
-- "libz-dev"
-- "cmake"
-- "libcap-dev"
-- "p7zip-full"
-- "uuid-dev"
-
-reference_datetime: "2013-06-01 00:00:00"
-remotes: []
-files:
-- "10cc648683617cca8bcbeae507888099b41b530c.tar.gz"
-- "cctools-809.tar.gz"
-- "dyld-195.5.tar.gz"
-- "ld64-127.2.tar.gz"
-- "protobuf-2.5.0.tar.bz2"
-- "MacOSX10.7.sdk.tar.gz"
-- "cdrkit-1.1.11.tar.gz"
-- "libdmg-hfsplus-v0.1.tar.gz"
-- "clang-llvm-3.2-x86-linux-ubuntu-12.04.tar.gz"
-- "cdrkit-deterministic.patch"
-
-
-script: |
-
-  echo "18406961fd4a1ec5c7ea35c91d6a80a2f8bb797a2bd243a610bd75e13eff9aca  10cc648683617cca8bcbeae507888099b41b530c.tar.gz" | sha256sum -c
-  echo "03ba62749b843b131c7304a044a98c6ffacd65b1399b921d69add0375f79d8ad  cctools-809.tar.gz" | sha256sum -c
-  echo "2cf0484c87cf79b606b351a7055a247dae84093ae92c747a74e0cde2c8c8f83c  dyld-195.5.tar.gz" | sha256sum -c
-  echo "97b75547b2bd761306ab3e15ae297f01e7ab9760b922bc657f4ef72e4e052142  ld64-127.2.tar.gz" | sha256sum -c
-  echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677  protobuf-2.5.0.tar.bz2" | sha256sum -c
-  echo "d1c030756ecc182defee9fe885638c1785d35a2c2a297b4604c0e0dcc78e47da  cdrkit-1.1.11.tar.gz" | sha256sum -c
-  echo "6569a02eb31c2827080d7d59001869ea14484c281efab0ae7f2b86af5c3120b3  libdmg-hfsplus-v0.1.tar.gz" | sha256sum -c
-  echo "b9d57a88f9514fa1f327a1a703756d0c1c960f4c58494a5bd80313245d13ffff  clang-llvm-3.2-x86-linux-ubuntu-12.04.tar.gz" | sha256sum -c
-  echo "cc12bdbd7a09f71cb2a6a3e6ec3e0abe885ca7111c2b47857f5095e5980caf4f  cdrkit-deterministic.patch" | sha256sum -c
-
-
-  REVISION=r3
-  export REFERENCE_DATETIME
-  export TAR_OPTIONS="-m --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
-  export FAKETIME=$REFERENCE_DATETIME
-  export TZ=UTC
-
-  REAL_AR=`which ar`
-  REAL_RANLIB=`which ranlib`
-  REAL_DATE=`which date`
-
-  echo '#!/bin/bash' > $HOME/ar
-  echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> $HOME/ar
-  echo "$REAL_AR \"\$@\"" >> $HOME/ar
-
-  echo '#!/bin/bash' > $HOME/ranlib
-  echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> $HOME/ranlib
-  echo "$REAL_RANLIB \"\$@\"" >> $HOME/ranlib
-
-  echo '#!/bin/bash' > $HOME/date
-  echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> $HOME/date
-  echo "$REAL_DATE \"\$@\"" >> $HOME/date
-
-  chmod +x $HOME/ar $HOME/ranlib $HOME/date
-
-
-  export PATH=$HOME:$PATH
-  export SOURCES_PATH=`pwd`
-
-  mkdir -p osx-cross-depends/build
-  cd osx-cross-depends
-
-  NATIVEPREFIX=`pwd`/native-prefix
-  BUILD_BASE=`pwd`/build
-  SDK=`pwd`/SDKs/MacOSX10.7.sdk
-  HOST=x86_64-apple-darwin11
-  MIN_VERSION=10.6
-
-  CFLAGS=""
-  CXXFLAGS="${CFLAGS}"
-  LDFLAGS="-L${NATIVEPREFIX}/lib"
-
-  export PATH=${NATIVEPREFIX}/bin:${PATH}
-
-  mkdir -p ${NATIVEPREFIX}/bin
-  mkdir -p ${NATIVEPREFIX}/lib
-
-  mkdir -p SDKs
-  tar -C SDKs -xf ${SOURCES_PATH}/MacOSX10.7.sdk.tar.gz
-
-  #  Clang
-  SOURCE_FILE=${SOURCES_PATH}/clang-llvm-3.2-x86-linux-ubuntu-12.04.tar.gz
-  BUILD_DIR=${BUILD_BASE}/clang+llvm-3.2-x86-linux-ubuntu-12.04
-
-  mkdir -p ${NATIVEPREFIX}/lib/clang/3.2/include
-  tar -C ${BUILD_BASE} -xf ${SOURCE_FILE}
-  cp ${BUILD_DIR}/bin/clang ${NATIVEPREFIX}/bin/
-  cp ${BUILD_DIR}/bin/clang++ ${NATIVEPREFIX}/bin/
-  cp ${BUILD_DIR}/lib/libLTO.so ${NATIVEPREFIX}/lib/
-  cp ${BUILD_DIR}/lib/clang/3.2/include/* ${NATIVEPREFIX}/lib/clang/3.2/include
-
-  # cctools
-  SOURCE_FILE=${SOURCES_PATH}/10cc648683617cca8bcbeae507888099b41b530c.tar.gz
-  BUILD_DIR=${BUILD_BASE}/toolchain4-10cc648683617cca8bcbeae507888099b41b530c
-
-  tar -C ${BUILD_BASE} -xf ${SOURCE_FILE}
-  mkdir -p ${BUILD_DIR}/sdks
-  pushd ${BUILD_DIR}/sdks;
-  ln -sf ${SDK} MacOSX10.7.sdk
-  ln -sf ${SOURCES_PATH}/cctools-809.tar.gz ${BUILD_DIR}/cctools2odcctools/cctools-809.tar.gz
-  ln -sf ${SOURCES_PATH}/ld64-127.2.tar.gz ${BUILD_DIR}/cctools2odcctools/ld64-127.2.tar.gz
-  ln -sf ${SOURCES_PATH}/dyld-195.5.tar.gz ${BUILD_DIR}/cctools2odcctools/dyld-195.5.tar.gz
-
-  tar -C ${BUILD_DIR} -xf ${SOURCES_PATH}/clang-llvm-3.2-x86-linux-ubuntu-12.04.tar.gz
-  #   Hack in the use of our llvm headers rather than grabbing the old llvm-gcc.
-  sed -i "s|GCC_DIR|LLVM_CLANG_DIR|g" ${BUILD_DIR}/cctools2odcctools/extract.sh
-  sed -i "s|llvmgcc42-2336.1|clang+llvm-3.2-x86-linux-ubuntu-12.04|g" ${BUILD_DIR}/cctools2odcctools/extract.sh
-  sed -i "s|\${LLVM_CLANG_DIR}/llvmCore/include/llvm-c|\${LLVM_CLANG_DIR}/include/llvm-c \${LLVM_CLANG_DIR}/include/llvm |" ${BUILD_DIR}/cctools2odcctools/extract.sh
-
-  sed -i "s|fAC_INIT|AC_INIT|" ${BUILD_DIR}/cctools2odcctools/files/configure.ac
-  sed -i 's/\# Dynamically linked LTO/\t ;\&\n\t linux*)\n# Dynamically linked LTO/' ${BUILD_DIR}/cctools2odcctools/files/configure.ac
-
-  cd ${BUILD_DIR}/cctools2odcctools
-  ./extract.sh --osxver 10.7
-  cd odcctools-809
-  ./configure --prefix=${NATIVEPREFIX} --target=${HOST} CFLAGS="${CFLAGS} -I${NATIVEPREFIX}/include -D__DARWIN_UNIX03 -D__STDC_CONSTANT_MACROS -D__STDC_LIMIT_MACROS" LDFLAGS="${LDFLAGS} -Wl,-rpath=\\\$\$ORIGIN/../lib" --with-sysroot=${SDK}
-
-  #   The 'PC' define in sparc/reg.h conflicts but doesn't get used anyway. Just rename it.
-  sed -i "s|define\tPC|define\tPC_|"  ${BUILD_DIR}/cctools2odcctools/odcctools-809/include/architecture/sparc/reg.h
-  make $MAKEOPTS
-  make install
-  popd
-
-  # protoc
-  SOURCE_FILE=${SOURCES_PATH}/protobuf-2.5.0.tar.bz2
-  BUILD_DIR=${BUILD_BASE}/protobuf-2.5.0
-
-  tar -C ${BUILD_BASE} -xjf ${SOURCE_FILE}
-  pushd ${BUILD_DIR};
-  ./configure --enable-shared=no --disable-dependency-tracking --prefix=${NATIVEPREFIX}
-  make $MAKEOPTS
-  cp ${BUILD_DIR}/src/protoc ${NATIVEPREFIX}/bin/
-  popd
-
-  # cdrkit
-  SOURCE_FILE=${SOURCES_PATH}/cdrkit-1.1.11.tar.gz
-  BUILD_DIR=${BUILD_BASE}/cdrkit-1.1.11
-
-  tar -C ${BUILD_BASE} -xf ${SOURCE_FILE}
-  pushd ${BUILD_DIR}
-  patch -p1 < ${SOURCES_PATH}/cdrkit-deterministic.patch
-  cmake -DCMAKE_INSTALL_PREFIX=${NATIVEPREFIX}
-  make $MAKEOPTS genisoimage
-  make -C genisoimage install
-  popd
-
-  # libdmg-hfsplus
-  SOURCE_FILE=${SOURCES_PATH}/libdmg-hfsplus-v0.1.tar.gz
-  BUILD_DIR=${BUILD_BASE}/libdmg-hfsplus-libdmg-hfsplus-v0.1
-
-  tar -C ${BUILD_BASE} -xf ${SOURCE_FILE}
-  mkdir -p ${BUILD_DIR}/build
-  pushd ${BUILD_DIR}/build
-  cmake -DCMAKE_INSTALL_PREFIX:PATH=${NATIVEPREFIX}/bin ..
-  make $MAKEOPTS
-  make install
-  popd
-
-  rm -rf native-prefix/docs
-
-  export GZIP="-9n"
-  find native-prefix | sort | tar --no-recursion -czf osx-native-depends-$REVISION.tar.gz -T -
-  mv osx-native-depends-$REVISION.tar.gz $OUTDIR

contrib/gitian-descriptors/gitian-osx-qt.yml

@@ -1,186 +0,0 @@
----
-name: "osx-qt"
-suites:
-- "precise"
-architectures:
-- "i386"
-packages:
-- "git-core"
-- "automake"
-- "p7zip-full"
-
-reference_datetime: "2013-06-01 00:00:00"
-remotes: []
-files:
-- "qt-everywhere-opensource-src-5.2.1.tar.gz"
-- "osx-native-depends-r3.tar.gz"
-- "osx-depends-r8.tar.gz"
-- "MacOSX10.7.sdk.tar.gz"
-
-script: |
-
-  echo "84e924181d4ad6db00239d87250cc89868484a14841f77fb85ab1f1dbdcd7da1  qt-everywhere-opensource-src-5.2.1.tar.gz" | sha256sum -c
-
-  REVISION=r7
-  export SOURCES_PATH=`pwd`
-  export TAR_OPTIONS="-m --mtime="$REFERENCE_DATE\\\ $REFERENCE_TIME""
-  export ZERO_AR_DATE=1
-
-  export TZ=UTC
-
-  REAL_DATE=`which date`
-  echo '#!/bin/bash' > $HOME/date
-  echo "$REAL_DATE -d \"${REFERENCE_DATETIME}\" \"\$@\"" >> $HOME/date
-
-  chmod +x $HOME/date
-  export PATH=$HOME:$PATH
-
-  mkdir -p osx-cross-depends/build
-  cd osx-cross-depends
-
-  PREFIX=`pwd`/prefix
-  NATIVEPREFIX=`pwd`/native-prefix
-  BUILD_BASE=`pwd`/build
-  SDK=`pwd`/SDKs/MacOSX10.7.sdk
-  HOST=x86_64-apple-darwin11
-  MIN_VERSION=10.6
-
-  INT_CFLAGS="-target ${HOST} -mmacosx-version-min=${MIN_VERSION} --sysroot ${SDK} -msse2 -Qunused-arguments"
-  INT_CXXFLAGS="${INT_CFLAGS}"
-  INT_LDFLAGS="-L${PREFIX}/lib -L${SDK}/usr/lib/i686-apple-darwin10/4.2.1"
-  INT_LDFLAGS_CLANG="-B${NATIVEPREFIX}/bin"
-  INT_CPPFLAGS="-I${PREFIX}/include"
-  INT_CC=clang
-  INT_CXX=clang++
-  INT_OBJC=clang
-  INT_OBJCXX=clang++
-  INT_AR=${HOST}-ar
-  INT_RANLIB=${HOST}-ranlib
-  INT_LIBTOOL=${HOST}-libtool
-  INT_INSTALL_NAME_TOOL=${HOST}-install_name_tool
-
-  export PATH=${NATIVEPREFIX}/bin:${PATH}
-
-  mkdir -p ${NATIVEPREFIX}/bin
-  mkdir -p ${NATIVEPREFIX}/lib
-  mkdir -p ${PREFIX}/bin
-  mkdir -p ${PREFIX}/lib
-  mkdir -p ${BUILD_BASE}
-
-  mkdir -p SDKs
-  tar -C SDKs -xf ${SOURCES_PATH}/MacOSX10.7.sdk.tar.gz
-
-  tar xf /home/ubuntu/build/osx-native-depends-r3.tar.gz
-
-  export PATH=`pwd`/native-prefix/bin:$PATH
-  tar xf /home/ubuntu/build/osx-depends-r8.tar.gz
-
-  SOURCE_FILE=${SOURCES_PATH}/qt-everywhere-opensource-src-5.2.1.tar.gz
-  BUILD_DIR=${BUILD_BASE}/qt-everywhere-opensource-src-5.2.1
-
-
-  tar -C ${BUILD_BASE} -xf ${SOURCE_FILE}
-
-  # Install our mkspec. All files are pulled from the macx-clang spec, except for
-  # our custom qmake.conf
-  SPECFILE=${BUILD_DIR}/qtbase/mkspecs/macx-clang-linux/qmake.conf
-
-  mkdir -p ${BUILD_DIR}/qtbase/mkspecs/macx-clang-linux
-  cp -f ${BUILD_DIR}/qtbase/mkspecs/macx-clang/Info.plist.lib ${BUILD_DIR}/qtbase/mkspecs/macx-clang-linux/
-  cp -f ${BUILD_DIR}/qtbase/mkspecs/macx-clang/Info.plist.app ${BUILD_DIR}/qtbase/mkspecs/macx-clang-linux/
-  cp -f ${BUILD_DIR}/qtbase/mkspecs/macx-clang/qplatformdefs.h ${BUILD_DIR}/qtbase/mkspecs/macx-clang-linux/
-
-  cat > ${SPECFILE} <<ENDCONF
-
-  MAKEFILE_GENERATOR      = UNIX
-  CONFIG                 += app_bundle incremental global_init_link_order lib_version_first plugin_no_soname absolute_library_soname
-  QMAKE_INCREMENTAL_STYLE = sublib
-
-  include(../common/macx.conf)
-  include(../common/gcc-base-mac.conf)
-  include(../common/clang.conf)
-  include(../common/clang-mac.conf)
-
-  QMAKE_XCODE_VERSION=4.3
-  QMAKE_XCODE_DEVELOPER_PATH=/Developer
-
-  QMAKE_MACOSX_DEPLOYMENT_TARGET = ${MIN_VERSION}
-
-  QMAKE_MAC_SDK=macosx
-  QMAKE_MAC_SDK.macosx.path = ${SDK}
-  QMAKE_MAC_SDK.macosx.platform_name = macosx
-  QMAKE_MAC_SDK_PATH=${SDK}
-
-  QMAKE_CFLAGS += -target ${HOST}
-  QMAKE_OBJECTIVE_CFLAGS += -target ${HOST}
-  QMAKE_CXXFLAGS += -target ${HOST}
-
-  QMAKE_LFLAGS += -target ${HOST}
-  QMAKE_AR = ${HOST}-ar cq
-  QMAKE_RANLIB=${HOST}-ranlib
-  QMAKE_LIBTOOL=${HOST}-libtool
-  QMAKE_INSTALL_NAME_TOOL=${HOST}-install_name_tool
-
-  load(qt_config)
-
-  ENDCONF
-
-  pushd ${BUILD_DIR}
-  ./configure -release -opensource -openssl-linked \
-  -no-audio-backend  -no-javascript-jit -no-sql-sqlite -no-sql-tds \
-  -no-cups -no-iconv -no-dbus -no-gif -no-audio-backend -no-freetype \
-  -no-javascript-jit -no-sql-sqlite -no-nis -no-cups -no-iconv -no-pch \
-  -no-dbus -no-gif -no-sm -nomake examples -no-feature-style-plastique \
-  -no-xcb -no-qml-debug -no-pch -no-nis \
-  -no-feature-style-cde -no-feature-style-s60 -no-feature-style-motif \
-  -no-feature-style-windowsmobile -no-feature-style-windowsce \
-  -no-feature-style-cleanlooks \
-  -no-sql-db2 -no-sql-ibase -no-sql-oci -no-sql-tds -no-sql-mysql \
-  -no-sql-odbc -no-sql-psql -no-sql-sqlite -no-sql-sqlite2 \
-  -skip qtsvg -skip qtwebkit -skip qtwebkit-examples -skip qtserialport \
-  -skip qtdeclarative -skip qtmultimedia -skip qtimageformats \
-  -skip qtlocation -skip qtsensors -skip qtquick1 -skip qtxmlpatterns \
-  -skip qtquickcontrols -skip qtactiveqt -skip qtconnectivity \
-  -skip qtwinextras -skip qtscript \
-  -prefix ${PREFIX} -bindir ${NATIVEPREFIX}/bin \
-  -confirm-license -xplatform macx-clang-linux -v ${INT_LDFLAGS}
-
-  # RCC's output is sorted using each file entry's hash as the key. Unfortunately,
-  # the hash function uses a random seed for each run so the results aren't
-  # deterministic. This leads to static resources being defined in a random order,
-  # which in-turn means that object files are not predictable.
-  # Fortunately, this upsets Qt's unit tests as well, so they've added the
-  # QT_RCC_TEST environment variable to set a pre-defined seed. Here, do the same
-  # thing for the same reason.
-  QT_RCC_TEST=1 make $MAKEOPTS module-qtbase-make_first
-
-
-  make $MAKEOPTS module-qttranslations-make_first
-  make $MAKEOPTS module-qttools-make_first
-  make $MAKEOPTS -C qtbase
-  make -C qtbase install
-  make -C qttranslations install
-  make -C qttools/src/linguist install
-  popd
-
-  # This file should not be installed to the destination. It's native and
-  # non-deterministic. Remove it.
-  # See: https://bugreports.qt-project.org/browse/QTBUG-31393
-  rm -f ${PREFIX}/lib/libQt5Bootstrap.a
-
-  rm -f ${PREFIX}/lib/Qt*.framework/Qt*.prl
-  pushd ${PREFIX}/include
-  ln -sf ../lib/QtNetwork.framework/Headers/ QtNetwork
-  ln -sf ../lib/QtWidgets.framework/Headers/ QtWidgets
-  ln -sf ../lib/QtGui.framework/Headers/ QtGui
-  ln -sf ../lib/QtCore.framework/Headers/ QtCore
-  ln -sf ../lib/QtTest.framework/Headers/ QtTest
-  popd
-
-  rm -f ${PREFIX}/lib/*.la
-  find ${PREFIX}/lib -name "*.prl" -delete
-
-  export GZIP="-9n"
-  find native-prefix prefix | sort | tar --no-recursion -czf osx-depends-qt-5.2.1-${REVISION}.tar.gz -T -
-
-  mv osx-depends-qt-5.2.1-${REVISION}.tar.gz $OUTDIR

contrib/gitian-descriptors/gitian-win.yml

@@ -1,97 +0,0 @@
----
-name: "bitcoin"
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages:
-- "mingw-w64"
-- "g++-mingw-w64"
-- "git-core"
-- "unzip"
-- "nsis"
-- "faketime"
-- "autoconf2.13"
-- "libtool"
-- "automake"
-- "pkg-config"
-- "bsdmainutils"
-
-reference_datetime: "2013-06-01 00:00:00"
-remotes:
-- "url": "https://github.com/bitcoin/bitcoin.git"
-  "dir": "bitcoin"
-files:
-- "qt-win32-5.2.0-gitian-r3.zip"
-- "qt-win64-5.2.0-gitian-r3.zip"
-- "boost-win32-1.55.0-gitian-r6.zip"
-- "boost-win64-1.55.0-gitian-r6.zip"
-- "bitcoin-deps-win32-gitian-r16.zip"
-- "bitcoin-deps-win64-gitian-r16.zip"
-- "protobuf-win32-2.5.0-gitian-r4.zip"
-- "protobuf-win64-2.5.0-gitian-r4.zip"
-script: |
-  # Defines
-  export TZ=UTC
-  INDIR=$HOME/build
-  OPTFLAGS='-O2'
-  TEMPDIR="$HOME/tempdir"
-  NEEDDIST=1
-  # Qt: workaround for determinism in resource ordering
-  #  Qt5's rcc uses a QHash to store the files for the resource.
-  #  A security fix in QHash makes the ordering of keys to be different on every run
-  #  (https://qt.gitorious.org/qt/qtbase/commit/c01eaa438200edc9a3bbcd8ae1e8ded058bea268).
-  #  This is good in general but qrc shouldn't be doing a traversal over a randomized container.
-  #  The thorough solution would be to use QMap instead of QHash, but this requires patching Qt.
-  #  For now luckily there is a test mode that forces a fixed seed.
-  export QT_RCC_TEST=1
-  for BITS in 32 64; do # for architectures
-    #
-    STAGING=$HOME/staging${BITS}
-    BUILDDIR=$HOME/build${BITS}
-    BINDIR=$OUTDIR/$BITS
-    if [ "$BITS" == "32" ]; then
-      HOST=i686-w64-mingw32
-    else
-      HOST=x86_64-w64-mingw32
-    fi
-    export PATH=$STAGING/host/bin:$PATH
-    mkdir -p $STAGING $BUILDDIR $BINDIR
-    #
-    cd $STAGING
-    unzip $INDIR/qt-win${BITS}-5.2.0-gitian-r3.zip
-    unzip $INDIR/boost-win${BITS}-1.55.0-gitian-r6.zip
-    unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r16.zip
-    unzip $INDIR/protobuf-win${BITS}-2.5.0-gitian-r4.zip
-    if [ "$NEEDDIST" == "1" ]; then
-      # Make source code archive which is architecture independent so it only needs to be done once
-      cd $HOME/build/bitcoin
-      ./autogen.sh
-      ./configure --bindir=$OUTDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins  --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}"
-      make dist
-      DISTNAME=`echo bitcoin-*.tar.gz`
-      NEEDDIST=0
-    fi
-    # Build platform-dependent executables from source archive
-    cd $BUILDDIR
-    mkdir -p distsrc
-    cd distsrc
-    tar --strip-components=1 -xf $HOME/build/bitcoin/$DISTNAME
-    ./configure --bindir=$BINDIR --prefix=$STAGING --host=$HOST --with-qt-plugindir=$STAGING/plugins  --with-qt-incdir=$STAGING/include --with-qt-bindir=$STAGING/host/bin --with-boost=$STAGING --disable-maintainer-mode --with-protoc-bindir=$STAGING/host/bin --disable-dependency-tracking CPPFLAGS="-I$STAGING/include ${OPTFLAGS}" LDFLAGS="-L$STAGING/lib ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}"
-    export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-    export FAKETIME=$REFERENCE_DATETIME
-    make $MAKEOPTS
-    make deploy
-    make install-strip
-    cp -f bitcoin-*setup*.exe $BINDIR/
-    unset LD_PRELOAD
-    unset FAKETIME
-  done # for BITS in
-
-  # sort distribution tar file and normalize user/group/mtime information for deterministic output
-  mkdir -p $OUTDIR/src
-  rm -rf $TEMPDIR
-  mkdir -p $TEMPDIR
-  cd $TEMPDIR
-  tar -xvf $HOME/build/bitcoin/$DISTNAME | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/src/$DISTNAME
-

contrib/gitian-descriptors/gitian-win32.yml

@@ -0,0 +1,74 @@
+---
+name: "bitcoin"
+suites:
+- "lucid"
+architectures:
+- "i386"
+packages:
+- "mingw32"
+- "git-core"
+- "unzip"
+- "nsis"
+- "faketime"
+reference_datetime: "2011-01-30 00:00:00"
+remotes:
+- "url": "https://github.com/bitcoin/bitcoin.git"
+  "dir": "bitcoin"
+files:
+- "qt-win32-4.8.3-gitian-r1.zip"
+- "boost-win32-1.50.0-gitian2.zip"
+- "bitcoin-deps-0.0.5.zip"
+script: |
+  #
+  mkdir $HOME/qt
+  cd $HOME/qt
+  unzip ../build/qt-win32-4.8.3-gitian-r1.zip
+  cd $HOME/build/
+  export PATH=$HOME/qt/bin/:$PATH
+  #
+  mkdir boost_1_50_0
+  cd boost_1_50_0
+  mkdir -p stage/lib
+  unzip ../boost-win32-1.50.0-gitian2.zip
+  cd bin/$GBUILD_BITS
+  for lib in *; do
+    i586-mingw32msvc-ar rc ../../stage/lib/libboost_${lib}-mt-s.a $lib/*.o
+    i586-mingw32msvc-ranlib ../../stage/lib/libboost_${lib}-mt-s.a
+  done
+  cd ../..
+  mv include/boost .
+  cd ..
+  #
+  unzip bitcoin-deps-0.0.5.zip
+  #
+  find -type f | xargs touch --date="$REFERENCE_DATETIME"
+  #
+  cd bitcoin
+  mkdir -p $OUTDIR/src
+  git archive HEAD | tar -x -C $OUTDIR/src
+  cp $OUTDIR/src/doc/README_windows.txt $OUTDIR/readme.txt
+  cp $OUTDIR/src/COPYING $OUTDIR/COPYING.txt
+  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  export FAKETIME=$REFERENCE_DATETIME
+  export TZ=UTC
+  $HOME/qt/src/bin/qmake -spec unsupported/win32-g++-cross MINIUPNPC_LIB_PATH=$HOME/build/miniupnpc MINIUPNPC_INCLUDE_PATH=$HOME/build/ BDB_LIB_PATH=$HOME/build/db-4.8.30.NC/build_unix BDB_INCLUDE_PATH=$HOME/build/db-4.8.30.NC/build_unix BOOST_LIB_PATH=$HOME/build/boost_1_50_0/stage/lib BOOST_INCLUDE_PATH=$HOME/build/boost_1_50_0 BOOST_LIB_SUFFIX=-mt-s BOOST_THREAD_LIB_SUFFIX=_win32-mt-s OPENSSL_LIB_PATH=$HOME/build/openssl-1.0.1c OPENSSL_INCLUDE_PATH=$HOME/build/openssl-1.0.1c/include QRENCODE_LIB_PATH=$HOME/build/qrencode-3.2.0/.libs QRENCODE_INCLUDE_PATH=$HOME/build/qrencode-3.2.0 USE_QRCODE=1 INCLUDEPATH=$HOME/build DEFINES=BOOST_THREAD_USE_LIB BITCOIN_NEED_QT_PLUGINS=1 QMAKE_LRELEASE=lrelease QMAKE_CXXFLAGS=-frandom-seed=bitcoin USE_BUILD_INFO=1
+  make $MAKEOPTS
+  cp release/bitcoin-qt.exe $OUTDIR/
+  #
+  cd src
+  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  export FAKETIME=$REFERENCE_DATETIME
+  export TZ=UTC
+  make -f makefile.linux-mingw $MAKEOPTS DEPSDIR=$HOME/build bitcoind.exe USE_UPNP=0 DEBUGFLAGS="-frandom-seed=bitcoin"
+  i586-mingw32msvc-strip bitcoind.exe
+  mkdir $OUTDIR/daemon
+  cp bitcoind.exe $OUTDIR/daemon
+  cd ..
+  mkdir nsis
+  git archive HEAD | tar -x -C nsis
+  cd nsis/src
+  mkdir ../release
+  cp ../../release/* ../release/
+  cp ../../src/*.exe .
+  makensis ../share/setup.nsi
+  cp ../share/bitcoin-*-win32-setup.exe $OUTDIR/

contrib/gitian-descriptors/gitian.yml

@@ -0,0 +1,55 @@
+---
+name: "bitcoin"
+suites:
+- "lucid"
+architectures:
+- "i386"
+- "amd64"
+packages: 
+- "libdb4.8++-dev"
+- "qt4-qmake"
+- "libqt4-dev"
+- "libboost-system-dev"
+- "libboost-filesystem-dev"
+- "libboost-program-options-dev"
+- "libboost-thread-dev"
+- "libssl-dev"
+- "git-core"
+- "unzip"
+- "pkg-config"
+- "libpng12-dev"
+reference_datetime: "2011-01-30 00:00:00"
+remotes:
+- "url": "https://github.com/bitcoin/bitcoin.git"
+  "dir": "bitcoin"
+files:
+- "miniupnpc-1.6.tar.gz"
+- "qrencode-3.2.0.tar.bz2"
+script: |
+  INSTDIR="$HOME/install"
+  export LIBRARY_PATH="$INSTDIR/lib"
+  #
+  tar xzf miniupnpc-1.6.tar.gz
+  cd miniupnpc-1.6
+  INSTALLPREFIX=$INSTDIR make $MAKEOPTS install
+  cd ..
+  #
+  tar xjf qrencode-3.2.0.tar.bz2
+  cd qrencode-3.2.0
+  ./configure --prefix=$INSTDIR --enable-static --disable-shared
+  make $MAKEOPTS install
+  cd ..
+  #
+  cd bitcoin
+  mkdir -p $OUTDIR/src
+  git archive HEAD | tar -x -C $OUTDIR/src
+  cp $OUTDIR/src/doc/README.md $OUTDIR
+  cp $OUTDIR/src/COPYING $OUTDIR
+  cd src
+  make -f makefile.unix STATIC=1 OPENSSL_INCLUDE_PATH="$INSTDIR/include" OPENSSL_LIB_PATH="$INSTDIR/lib" $MAKEOPTS bitcoind USE_UPNP=0 DEBUGFLAGS=
+  mkdir -p $OUTDIR/bin/$GBUILD_BITS
+  install -s bitcoind $OUTDIR/bin/$GBUILD_BITS
+  cd ..
+  qmake INCLUDEPATH="$INSTDIR/include" LIBS="-L$INSTDIR/lib" RELEASE=1 USE_QRCODE=1
+  make $MAKEOPTS
+  install bitcoin-qt $OUTDIR/bin/$GBUILD_BITS

contrib/gitian-descriptors/protobuf-win.yml

@@ -1,65 +0,0 @@
----
-name: "protobuf-win32"
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages:
-- "mingw-w64"
-- "g++-mingw-w64"
-- "zip"
-- "faketime"
-reference_datetime: "2013-04-15 00:00:00"
-remotes: []
-files:
-- "protobuf-2.5.0.tar.bz2"
-script: |
-  #
-  export TZ=UTC
-  INDIR=$HOME/build
-  TEMPDIR=$HOME/tmp
-  OPTFLAGS="-O2"
-  # Integrity Check
-  echo "13bfc5ae543cf3aa180ac2485c0bc89495e3ae711fc6fab4f8ffe90dfb4bb677  protobuf-2.5.0.tar.bz2" | sha256sum -c
-
-  for BITS in 32 64; do # for architectures
-    #
-    INSTALLPREFIX=$HOME/staging${BITS}
-    BUILDDIR=$HOME/build${BITS}
-    if [ "$BITS" == "32" ]; then
-      HOST=i686-w64-mingw32
-    else
-      HOST=x86_64-w64-mingw32
-    fi
-    #
-    mkdir -p $INSTALLPREFIX $BUILDDIR
-    cd $BUILDDIR
-    #
-    tar xjf $INDIR/protobuf-2.5.0.tar.bz2
-    cd protobuf-2.5.0
-    # First: build a native (linux) protoc
-    ./configure --enable-shared=no --disable-dependency-tracking --without-zlib CXXFLAGS="-frandom-seed=11 ${OPTFLAGS}"
-    make
-    mkdir -p $INSTALLPREFIX/host/bin
-    cp src/protoc $INSTALLPREFIX/host/bin
-    # Now recompile with the mingw cross-compiler:
-    make distclean
-    ./configure --prefix=$INSTALLPREFIX --enable-shared=no --disable-dependency-tracking --without-zlib --with-protoc=$INSTALLPREFIX/host/bin/protoc --host=$HOST CXXFLAGS="-frandom-seed=11 ${OPTFLAGS}"
-    export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-    export FAKETIME=$REFERENCE_DATETIME
-    make
-    make install
-    # post-process all generated libraries to be deterministic
-    # extract them to a temporary directory then re-build them deterministically
-    for LIB in $(find $INSTALLPREFIX -name \*.a); do
-        rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
-        $HOST-ar xv $LIB | cut -b5- > /tmp/list.txt
-        rm $LIB
-        $HOST-ar crsD $LIB $(cat /tmp/list.txt)
-    done
-    #
-    cd $INSTALLPREFIX
-    find include lib host | sort | zip -X@ $OUTDIR/protobuf-win$BITS-2.5.0-gitian-r4.zip
-    unset LD_PRELOAD
-    unset FAKETIME
-  done # for BITS in

contrib/gitian-descriptors/qt-linux.yml

@@ -1,264 +0,0 @@
----
-name: "qt-linux"
-suites:
-- "precise"
-architectures:
-- "i386"
-- "amd64"
-packages:
-- "zip"
-- "unzip"
-- "faketime"
-- "unzip"
-- "libxext-dev"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "qt-everywhere-opensource-src-4.6.4.tar.gz"
-script: |
-  export FAKETIME=$REFERENCE_DATETIME
-  export TZ=UTC
-  if [ "$GBUILD_BITS" == "32" ]; then
-    ARCH='i386-linux-gnu'
-  else
-    ARCH='x86_64-linux-gnu'
-  fi
-  # The purpose of this gitian build is not to actually build Qt, but to export
-  # the headers as well as pkgconfig files in a useable format so that we can
-  # pretend to link against an older version. The goal is to link to the
-  # system version of Qt 4.
-  # Also build development tools.
-  INSTALLPREFIX="$HOME/install"
-  # Integrity Check
-  echo "9ad4d46c721b53a429ed5a2eecfd3c239a9ab566562f183f99d3125f1a234250  qt-everywhere-opensource-src-4.6.4.tar.gz" | sha256sum -c
-  # Make install directories
-  mkdir -p $INSTALLPREFIX
-  mkdir -p $INSTALLPREFIX/include
-  PKGCONFIGDIR=$INSTALLPREFIX/lib/pkgconfig
-  mkdir -p $PKGCONFIGDIR
-  #
-  tar xzf qt-everywhere-opensource-src-4.6.4.tar.gz
-  cd qt-everywhere-opensource-src-4.6.4
-  QTBUILDDIR=$(pwd)
-  sed 's/TODAY=`date +%Y-%m-%d`/TODAY=2011-01-30/' -i configure
-
-  # Need to build 4.6-versioned host utilities as well (lrelease/qrc/lupdate/...)
-  ./configure -prefix $INSTALLPREFIX -confirm-license -release -opensource -no-qt3support -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -no-script -no-scripttools -no-javascript-jit -no-webkit -no-svg -no-xmlpatterns -no-sql-sqlite -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-libtiff -no-opengl -nomake examples -nomake demos -nomake docs
-  #
-  make $MAKEOPTS -C src/tools install  # (rcc, uic, moc)
-  make $MAKEOPTS -C tools/linguist/lrelease install  # (lrelease)
-  # install includes and pkgconfig files
-  for DIR in src/corelib src/gui src/testlib src/dbus src/network; do
-    (
-    cd $DIR
-    # extract module (QtCore/QtNetwork/...) from Makefile
-    MODULE=$(grep "QMAKE_TARGET *=" Makefile | cut -d = -f 2 | xargs)
-    # patch makefile so that not everything is build first
-    sed -i 's/first: all/first:/g' Makefile
-    make install_flat_headers install_class_headers install_targ_headers
-    # create and install pkgconfig descriptor
-    make ../../lib/pkgconfig/$MODULE.pc
-    sed -e "s,$QTBUILDDIR,$INSTALLPREFIX,g" ../../lib/pkgconfig/$MODULE.pc > $PKGCONFIGDIR/$MODULE.pc
-    # create links to existing Qt libraries
-    ln -sf /usr/lib/${ARCH}/lib${MODULE}.so.4 ${INSTALLPREFIX}/lib/lib${MODULE}.so
-    )
-  done
-
-  # Write our own configuration header, same as Ubuntu
-  # When we don't do this, the configuration will be without STL support (the QString from/to stdString methods)
-  QCONFIG=$INSTALLPREFIX/include/Qt/qconfig.h
-  echo '
-  /* Qt Edition */
-  #ifndef QT_EDITION
-  #  define QT_EDITION QT_EDITION_OPENSOURCE
-  #endif
-  ' > $QCONFIG
-
-  if [ "$GBUILD_BITS" == "32" ]; then
-    echo '
-  /* Machine byte-order */
-  #define Q_BIG_ENDIAN 4321
-  #define Q_LITTLE_ENDIAN 1234
-  #define QT_BUILD_KEY "i386 linux g++-4 full-config"
-  #define QT_BUILD_KEY_COMPAT "i686 Linux g++-4 full-config"
-
-  #ifdef QT_BOOTSTRAPPED
-  #define Q_BYTE_ORDER Q_LITTLE_ENDIAN
-  #else
-  #define Q_BYTE_ORDER Q_LITTLE_ENDIAN
-  #endif
-  /* Machine Architecture */
-  #ifndef QT_BOOTSTRAPPED
-  # define QT_ARCH_I386
-  #else
-  # define QT_ARCH_I386
-  #endif
-  /* Compile time features */
-  #define QT_LARGEFILE_SUPPORT 64
-  #define QT_POINTER_SIZE 4
-  ' >> $QCONFIG
-  else
-    echo '
-  /* Machine byte-order */
-  #define Q_BIG_ENDIAN 4321
-  #define Q_LITTLE_ENDIAN 1234
-  #define QT_BUILD_KEY "x86_64 linux g++-4 full-config"
-  #define QT_BUILD_KEY_COMPAT "x86_64 Linux g++-4 full-config"
-
-  #ifdef QT_BOOTSTRAPPED
-  #define Q_BYTE_ORDER Q_LITTLE_ENDIAN
-  #else
-  #define Q_BYTE_ORDER Q_LITTLE_ENDIAN
-  #endif
-  /* Machine Architecture */
-  #ifndef QT_BOOTSTRAPPED
-  # define QT_ARCH_X86_64
-  #else
-  # define QT_ARCH_X86_64
-  #endif
-  /* Compile time features */
-  #define QT_LARGEFILE_SUPPORT 64
-  #define QT_POINTER_SIZE 8
-  ' >> $QCONFIG
-  fi
-
-  echo '
-  #ifndef QT_BOOTSTRAPPED
-
-  #if defined(QT_NO_EGL) && defined(QT_EGL)
-  # undef QT_NO_EGL
-  #elif !defined(QT_NO_EGL) && !defined(QT_EGL)
-  # define QT_NO_EGL
-  #endif
-
-  #if defined(QT_NO_GSTREAMER) && defined(QT_GSTREAMER)
-  # undef QT_NO_GSTREAMER
-  #elif !defined(QT_NO_GSTREAMER) && !defined(QT_GSTREAMER)
-  # define QT_NO_GSTREAMER
-  #endif
-
-  #if defined(QT_NO_ICD) && defined(QT_ICD)
-  # undef QT_NO_ICD
-  #elif !defined(QT_NO_ICD) && !defined(QT_ICD)
-  # define QT_NO_ICD
-  #endif
-
-  #if defined(QT_NO_IMAGEFORMAT_JPEG) && defined(QT_IMAGEFORMAT_JPEG)
-  # undef QT_NO_IMAGEFORMAT_JPEG
-  #elif !defined(QT_NO_IMAGEFORMAT_JPEG) && !defined(QT_IMAGEFORMAT_JPEG)
-  # define QT_NO_IMAGEFORMAT_JPEG
-  #endif
-
-  #if defined(QT_NO_IMAGEFORMAT_MNG) && defined(QT_IMAGEFORMAT_MNG)
-  # undef QT_NO_IMAGEFORMAT_MNG
-  #elif !defined(QT_NO_IMAGEFORMAT_MNG) && !defined(QT_IMAGEFORMAT_MNG)
-  # define QT_NO_IMAGEFORMAT_MNG
-  #endif
-
-  #if defined(QT_NO_IMAGEFORMAT_TIFF) && defined(QT_IMAGEFORMAT_TIFF)
-  # undef QT_NO_IMAGEFORMAT_TIFF
-  #elif !defined(QT_NO_IMAGEFORMAT_TIFF) && !defined(QT_IMAGEFORMAT_TIFF)
-  # define QT_NO_IMAGEFORMAT_TIFF
-  #endif
-
-  #if defined(QT_NO_MULTIMEDIA) && defined(QT_MULTIMEDIA)
-  # undef QT_NO_MULTIMEDIA
-  #elif !defined(QT_NO_MULTIMEDIA) && !defined(QT_MULTIMEDIA)
-  # define QT_NO_MULTIMEDIA
-  #endif
-
-  #if defined(QT_NO_OPENVG) && defined(QT_OPENVG)
-  # undef QT_NO_OPENVG
-  #elif !defined(QT_NO_OPENVG) && !defined(QT_OPENVG)
-  # define QT_NO_OPENVG
-  #endif
-
-  #if defined(QT_NO_PHONON) && defined(QT_PHONON)
-  # undef QT_NO_PHONON
-  #elif !defined(QT_NO_PHONON) && !defined(QT_PHONON)
-  # define QT_NO_PHONON
-  #endif
-
-  #if defined(QT_NO_PULSEAUDIO) && defined(QT_PULSEAUDIO)
-  # undef QT_NO_PULSEAUDIO
-  #elif !defined(QT_NO_PULSEAUDIO) && !defined(QT_PULSEAUDIO)
-  # define QT_NO_PULSEAUDIO
-  #endif
-
-  #if defined(QT_NO_S60) && defined(QT_S60)
-  # undef QT_NO_S60
-  #elif !defined(QT_NO_S60) && !defined(QT_S60)
-  # define QT_NO_S60
-  #endif
-
-  #if defined(QT_NO_STYLE_S60) && defined(QT_STYLE_S60)
-  # undef QT_NO_STYLE_S60
-  #elif !defined(QT_NO_STYLE_S60) && !defined(QT_STYLE_S60)
-  # define QT_NO_STYLE_S60
-  #endif
-
-  #if defined(QT_NO_SXE) && defined(QT_SXE)
-  # undef QT_NO_SXE
-  #elif !defined(QT_NO_SXE) && !defined(QT_SXE)
-  # define QT_NO_SXE
-  #endif
-
-  #if defined(QT_NO_WEBKIT) && defined(QT_WEBKIT)
-  # undef QT_NO_WEBKIT
-  #elif !defined(QT_NO_WEBKIT) && !defined(QT_WEBKIT)
-  # define QT_NO_WEBKIT
-  #endif
-
-  #if defined(QT_NO_ZLIB) && defined(QT_ZLIB)
-  # undef QT_NO_ZLIB
-  #elif !defined(QT_NO_ZLIB) && !defined(QT_ZLIB)
-  # define QT_NO_ZLIB
-  #endif
-
-  #if defined(QT_RUNTIME_XCURSOR) && defined(QT_NO_RUNTIME_XCURSOR)
-  # undef QT_RUNTIME_XCURSOR
-  #elif !defined(QT_RUNTIME_XCURSOR) && !defined(QT_NO_RUNTIME_XCURSOR)
-  # define QT_RUNTIME_XCURSOR
-  #endif
-
-  #if defined(QT_RUNTIME_XFIXES) && defined(QT_NO_RUNTIME_XFIXES)
-  # undef QT_RUNTIME_XFIXES
-  #elif !defined(QT_RUNTIME_XFIXES) && !defined(QT_NO_RUNTIME_XFIXES)
-  # define QT_RUNTIME_XFIXES
-  #endif
-
-  #if defined(QT_RUNTIME_XINERAMA) && defined(QT_NO_RUNTIME_XINERAMA)
-  # undef QT_RUNTIME_XINERAMA
-  #elif !defined(QT_RUNTIME_XINERAMA) && !defined(QT_NO_RUNTIME_XINERAMA)
-  # define QT_RUNTIME_XINERAMA
-  #endif
-
-  #if defined(QT_RUNTIME_XINPUT) && defined(QT_NO_RUNTIME_XINPUT)
-  # undef QT_RUNTIME_XINPUT
-  #elif !defined(QT_RUNTIME_XINPUT) && !defined(QT_NO_RUNTIME_XINPUT)
-  # define QT_RUNTIME_XINPUT
-  #endif
-
-  #if defined(QT_RUNTIME_XRANDR) && defined(QT_NO_RUNTIME_XRANDR)
-  # undef QT_RUNTIME_XRANDR
-  #elif !defined(QT_RUNTIME_XRANDR) && !defined(QT_NO_RUNTIME_XRANDR)
-  # define QT_RUNTIME_XRANDR
-  #endif
-
-  #if defined(QT_USE_MATH_H_FLOATS) && defined(QT_NO_USE_MATH_H_FLOATS)
-  # undef QT_USE_MATH_H_FLOATS
-  #elif !defined(QT_USE_MATH_H_FLOATS) && !defined(QT_NO_USE_MATH_H_FLOATS)
-  # define QT_USE_MATH_H_FLOATS
-  #endif
-
-  #endif // QT_BOOTSTRAPPED
-
-  #define QT_VISIBILITY_AVAILABLE
-  ' >> $QCONFIG
-  cp $QCONFIG $INSTALLPREFIX/include/QtCore/qconfig.h
-
-  cd $INSTALLPREFIX
-  # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date
-  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-  # Create a .tar.gz because .zip has problems with symbolic links
-  find | sort | tar --no-recursion -cT /dev/stdin --mode='u+rw,go+r-w,a+X' --owner=0 --group=0 --mtime="$REFERENCE_DATETIME" | gzip -n > $OUTDIR/qt-linux${GBUILD_BITS}-4.6.4-gitian-r1.tar.gz

contrib/gitian-descriptors/qt-win.yml

@@ -1,92 +0,0 @@
----
-name: "qt"
-suites:
-- "precise"
-architectures:
-- "amd64"
-packages: 
-- "mingw-w64"
-- "g++-mingw-w64"
-- "zip"
-- "unzip"
-- "faketime"
-- "libz-dev"
-reference_datetime: "2011-01-30 00:00:00"
-remotes: []
-files:
-- "qt-everywhere-opensource-src-5.2.0.tar.gz"
-- "bitcoin-deps-win32-gitian-r16.zip"
-- "bitcoin-deps-win64-gitian-r16.zip"
-script: |
-  # Defines
-  export TZ=UTC
-  INDIR=$HOME/build
-  TEMPDIR=$HOME/tmp
-  # Qt: workaround for determinism in resource ordering
-  #  Qt5's rcc uses a QHash to store the files for the resource.
-  #  A security fix in QHash makes the ordering of keys to be different on every run
-  #  (https://qt.gitorious.org/qt/qtbase/commit/c01eaa438200edc9a3bbcd8ae1e8ded058bea268).
-  #  This is good in general but qrc shouldn't be doing a traversal over a randomized container.
-  #  The thorough solution would be to use QMap instead of QHash, but this requires patching Qt.
-  #  For now luckily there is a test mode that forces a fixed seed.
-  export QT_RCC_TEST=1
-  # Integrity Check
-  echo "395ec72277c5786c65b8163ef5817fd03d0a1f524a6d47f53624baf8056f1081  qt-everywhere-opensource-src-5.2.0.tar.gz" | sha256sum -c
-
-  for BITS in 32 64; do # for architectures
-    #
-    INSTALLPREFIX=$HOME/staging${BITS}
-    BUILDDIR=$HOME/build${BITS}
-    DEPSDIR=$HOME/deps${BITS}
-    if [ "$BITS" == "32" ]; then
-      HOST=i686-w64-mingw32
-    else
-      HOST=x86_64-w64-mingw32
-    fi
-    #
-    mkdir -p $INSTALLPREFIX $INSTALLPREFIX/host/bin $DEPSDIR $BUILDDIR
-    #
-    # Need mingw-compiled openssl from bitcoin-deps:
-    cd $DEPSDIR
-    unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r16.zip
-    #
-    cd $BUILDDIR
-    #
-    tar xzf $INDIR/qt-everywhere-opensource-src-5.2.0.tar.gz
-    cd qt-everywhere-opensource-src-5.2.0
-    SPECNAME="win32-g++"
-    SPECFILE="qtbase/mkspecs/${SPECNAME}/qmake.conf"
-    sed 's/qt_instdate=`date +%Y-%m-%d`/qt_instdate=2011-01-30/' -i qtbase/configure
-    sed --posix "s|QMAKE_CFLAGS            = -pipe -fno-keep-inline-dllexport|QMAKE_CFLAGS\t\t= -pipe -fno-keep-inline-dllexport -isystem /usr/$HOST/include/ -frandom-seed=qtbuild -I$DEPSDIR/include|" -i ${SPECFILE}
-    sed --posix "s|QMAKE_LFLAGS            =|QMAKE_LFLAGS\t\t= -L$DEPSDIR/lib|" -i ${SPECFILE}
-    # Before we tried to pass arguments to ar (static linking) in using QMAKE_LIB, however
-    #  qt removes the arguments for ar and provides a script which makes it impossible to pass the determinism flag -
-    #  so rather than try to replace ar, post-process all libraries and plugins at the end.
-    #
-    # Don't load faketime while compiling Qt, qmake will get stuck in nearly infinite loops
-    #export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-    #export FAKETIME=$REFERENCE_DATETIME
-    #
-    # Compile static libraries, and use statically linked openssl (-openssl-linked):
-    OPENSSL_LIBS="-L$DEPSDIR/lib -lssl -lcrypto -lgdi32" ./configure -prefix $INSTALLPREFIX -bindir $INSTALLPREFIX/host/bin -confirm-license -release -opensource -static -xplatform $SPECNAME -device-option CROSS_COMPILE="$HOST-" -no-audio-backend -no-javascript-jit -no-sql-sqlite -no-sql-odbc -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-opengl -no-compile-examples -no-feature-style-windowsce -no-feature-style-windowsmobile -no-qml-debug -openssl-linked -skip qtsvg -skip qtwebkit -skip qtwebkit-examples -skip qtserialport -skip qtdeclarative -skip qtmultimedia -skip qtimageformats -skip qtlocation -skip qtsensors -skip qtquick1 -skip qtquickcontrols -skip qtactiveqt -skip qtconnectivity -skip qtwinextras -skip qtxmlpatterns -skip qtscript -skip qtdoc -system-libpng -system-zlib
-    make $MAKEOPTS install
-    # post-process all generated libraries and plugins to be deterministic
-    # extract them to a temporary directory then re-build them deterministically
-    for LIB in $(find $INSTALLPREFIX -name *.a); do
-        rm -rf $TEMPDIR && mkdir $TEMPDIR && cd $TEMPDIR
-        $HOST-ar xv $LIB | cut -b5- > /tmp/list.txt
-        rm $LIB
-        $HOST-ar crsD $LIB $(cat /tmp/list.txt)
-    done
-    #
-    cd $INSTALLPREFIX
-    # Remove unused non-deterministic stuff
-    rm host/bin/qtpaths.exe lib/libQt5Bootstrap.a lib/libQt5Bootstrap.la
-    # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date
-    export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
-    export FAKETIME=$REFERENCE_DATETIME
-    find -print0 | xargs -r0 touch # fix up timestamps before packaging
-    find | sort | zip -X@ $OUTDIR/qt-win${BITS}-5.2.0-gitian-r3.zip
-    unset LD_PRELOAD
-    unset FAKETIME
-  done # for BITS in

contrib/gitian-descriptors/qt-win32.yml

@@ -0,0 +1,54 @@
+---
+name: "qt"
+suites:
+- "lucid"
+architectures:
+- "i386"
+packages: 
+- "mingw32"
+- "zip"
+- "faketime"
+reference_datetime: "2011-01-30 00:00:00"
+remotes: []
+files:
+- "qt-everywhere-opensource-src-4.8.3.tar.gz"
+script: |
+  INSTDIR="$HOME/qt/"
+  mkdir $INSTDIR
+  SRCDIR="$INSTDIR/src/"
+  mkdir $SRCDIR
+  #
+  tar xzf qt-everywhere-opensource-src-4.8.3.tar.gz
+  cd qt-everywhere-opensource-src-4.8.3
+  sed 's/$TODAY/2011-01-30/' -i configure
+  sed 's/i686-pc-mingw32-/i586-mingw32msvc-/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed --posix 's|QMAKE_CFLAGS\t\t= -pipe|QMAKE_CFLAGS\t\t= -pipe -isystem /usr/i586-mingw32msvc/include/ -frandom-seed=qtbuild|' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed 's/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions -mthreads/QMAKE_CXXFLAGS_EXCEPTIONS_ON = -fexceptions/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed 's/QMAKE_LFLAGS_EXCEPTIONS_ON = -mthreads/QMAKE_LFLAGS_EXCEPTIONS_ON = -lmingwthrd/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed --posix 's/QMAKE_MOC\t\t= i586-mingw32msvc-moc/QMAKE_MOC\t\t= moc/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed --posix 's/QMAKE_RCC\t\t= i586-mingw32msvc-rcc/QMAKE_RCC\t\t= rcc/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  sed --posix 's/QMAKE_UIC\t\t= i586-mingw32msvc-uic/QMAKE_UIC\t\t= uic/' -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  # ar adds timestamps to every object file included in the static library
+  # providing -D as ar argument is supposed to solve it, but doesn't work as qmake strips off the arguments and adds -M to pass a script...
+  # which somehow cannot be combined with other flags.
+  # use faketime only for ar, as it confuses make/qmake into hanging sometimes
+  sed --posix "s|QMAKE_LIB\t\t= i586-mingw32msvc-ar -ru|QMAKE_LIB\t\t= $HOME/ar -Dr|" -i mkspecs/unsupported/win32-g++-cross/qmake.conf
+  echo '#!/bin/bash' > $HOME/ar
+  echo 'export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1' >> $HOME/ar
+  echo 'i586-mingw32msvc-ar "$@"' >> $HOME/ar
+  chmod +x $HOME/ar
+  #export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  export FAKETIME=$REFERENCE_DATETIME
+  export TZ=UTC
+  ./configure -prefix $INSTDIR -confirm-license -release -opensource -static -no-qt3support -xplatform unsupported/win32-g++-cross -no-multimedia -no-audio-backend -no-phonon -no-phonon-backend -no-declarative -no-script -no-scripttools -no-javascript-jit -no-webkit -no-svg -no-xmlpatterns -no-sql-sqlite -no-nis -no-cups -no-iconv -no-dbus -no-gif -no-libtiff -no-opengl -nomake examples -nomake demos -nomake docs -no-feature-style-plastique -no-feature-style-cleanlooks -no-feature-style-motif -no-feature-style-cde -no-feature-style-windowsce -no-feature-style-windowsmobile -no-feature-style-s60
+  find . -name *.prl | xargs -l sed 's|/\.||' -i
+  find . -name *.prl | xargs -l sed 's|/$||' -i
+  make $MAKEOPTS install
+  cp -a bin $SRCDIR/
+  cd $INSTDIR
+  find . -name *.prl | xargs -l sed 's|/$||' -i
+  #sed 's|QMAKE_PRL_LIBS.*|QMAKE_PRL_LIBS = -lQtDeclarative -lQtScript -lQtSvg -lQtSql -lQtXmlPatterns -lQtGui -lgdi32 -lcomdlg32 -loleaut32 -limm32 -lwinmm -lwinspool -lmsimg32 -lQtNetwork -lQtCore -lole32 -luuid -lws2_32 -ladvapi32 -lshell32 -luser32 -lkernel32|' -i imports/Qt/labs/particles/qmlparticlesplugin.prl
+
+  # as zip stores file timestamps, use faketime to intercept stat calls to set dates for all files to reference date
+  export LD_PRELOAD=/usr/lib/faketime/libfaketime.so.1
+  zip -r $OUTDIR/qt-win32-4.8.3-gitian-r1.zip *

contrib/gitian-downloader/linux-download-config

@@ -8,32 +8,35 @@ rss:
   pattern: bitcoin-\d+.\d+.\d+-linux-gitian.zip
 signers:
   0A82509767C7D4A5D14DA2301AE1D35043E08E54:
+    weight: 40
     name: BlueMatt
     key: bluematt
   BF6273FAEF7CC0BA1F562E50989F6B3048A116B5:
+    weight: 40
     name: Devrandom
     key: devrandom
   E463A93F5F3117EEDE6C7316BD02942421F4889F:
+    weight: 40
     name: Luke-Jr
     key: luke-jr
   D762373D24904A3E42F33B08B9A408E71DAAC974:
+    weight: 40
     name: "Pieter Wuille"
     key: sipa
   77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
+    weight: 40
     name: tcatm
     key: tcatm
   01CDF4627A3B88AAE4A571C87588242FBE38D3A8:
+    weight: 40
     name: "Gavin Andresen"
     key: gavinandresen
   71A3B16735405025D447E8F274810B012346C9A6:
+    weight: 40
     name: "Wladimir J. van der Laan"
     key: laanwj
   AEC1884398647C47413C1C3FB1179EB7347DC10D:
+    weight: 40
     name: "Warren Togami"
     key: wtogami
-  9692B91BBF0E8D34DFD33B1882C5C009628ECF0C:
-    name: michagogo
-    key: michagogo
-  E944AE667CF960B1004BC32FCA662BE18B877A60:
-    name: "Andreas Schildbach"
-    key: aschildbach
+minimum_weight: 120

contrib/gitian-downloader/michagogo-key.pgp

@@ -1,59 +0,0 @@
------BEGIN PGP PUBLIC KEY BLOCK-----
-Version: GnuPG v1.4.12 (GNU/Linux)
-
-mQENBFGeqJ4BCADb7SI3/+q93gIvN0AGRg9Mtz73OLIOzCHeeoyn+tp7JcYNzxkQ
-9lfeXiEfn72Sh8gHkLtLIqr7HlIMo8DxSS8JPRVjlJGkNyAW4SeEwN2wNa5OV8k0
-N4jBa9a1csFyCyrEkPKvkUpBkQDvNXjNxyEhHwyZqPanKxy6NXIHOJji8ObOMQXI
-T9HwJrpjRth3u4uKG968JBTEyAXAmkt0Zidl1Ykgzcedk4mJSE9uZCW8DjSv2wML
-XcQz8+dYsoskT3KRdkowLHxAfj1BNyNc1+rKLghliM5vSQWi+Lbhi1Bxh4sY1UwA
-lKnAGqrnAGyIvCtkwTq5QI6ufF2ZY44bvVgpABEBAAG0IU1pY2hhZ29nbyA8bWlj
-aGFnb2dvQHNlcnZlci5mYWtlPokBOAQTAQIAIgUCUZ6ongIbAwYLCQgHAwIGFQgC
-CQoLBBYCAwECHgECF4AACgkQgsXACWKOzwzMUAgAuqUmK10xE5C3lUym2f72z0t6
-a2NM5Wfjr9//Y1/okC36C5XAMEtN2UwckPzzJ5p5D5y5yzwfZq5Jd8Py29VQIMsV
-7FbC1a0H3D+bCyX+JJ6FAmUbnWOQ/+mydYc74RvD8iwjePNT6kziZNv6dMGctJTl
-0alwjtQYgyGkeYKnIxbcyjHX/IawLUrunb/6mSKun87T8+NM/omfFCTc3l8TakpM
-0wyNYRiUkIfUBvB8sDUU3A80qKN/hqRKvlFu3+/kMiAc9ZYQrbmsB+sYWdmM+4zw
-8NBw3yuYzWyPuoa4PR5ZmS9F11WLMR5vTRCdLudAqYsWu3LtV6vAIvlOUa2LMLRg
-TWljaGFnb2dvIChSZWdpc3RlcmVkIG5pY2sgbWljaGFnb2dvIG9uIGZyZWVub2Rl
-IGFzIG9mIE9jdG9iZXIgMTIsIDIwMTMpIDxtaWNoYWdvZ29Ac2VydmVyLmZha2U+
-iQE4BBMBAgAiBQJSWarzAhsDBgsJCAcDAgYVCAIJCgsEFgIDAQIeAQIXgAAKCRCC
-xcAJYo7PDA7nB/91wAiaMlU5nHLUu0anhNQbGvUdFgKK1zO90S5KzUdJcY438jcS
-UJW1az8l9U9JBRIfPRYVhz/Z1TAJ+dCzD7D8BXHFeGEr0zNOh87ly9aB5du7dpN2
-oSBD6wLcJpqxt4h+XjSS2CX98/2ZIJxXENE2KySaTXP39Xl3eNwvJTUBA4XlcMey
-J8KMp/IERli4H0O7vRyLgu3yYpUArTqAonzG1g2lfB35PQJfeInrRSniQ336otnZ
-A8qwJ63kfUtWVDRz0g1fnvtiLGPivDJaI5hyIaUeJPaXU1+sg7YNroDu60o2NGZh
-F+0IjHlvRfzzA+F9Vw38rpSqR3BmCdjf6Sv3iQEcBBABAgAGBQJSWa9/AAoJEH+r
-EUJn5PoE/hgH/1T2dAthVucA/hzY0nl4SMjbg+dzNlYBq00Qwx8DRKVjk5et8+kY
-oPI3DGILcr+ELnxNekeMv9WQBBtJanUh1K5ohZ6ohoR7lG18LXf5HCdspflB5Me6
-LMA6iMryEP6gIs9GFuoGe2YQavm58YrkqhcPu34dGN7kdurfEXLvDfVlh5ZbKCsP
-Gyd7Pbz04SpqykgK1udiTsLVjc70Xhv+jAMqeaCugDX6TLEwjVmZH/xsyKk2Uh3V
-Oib5FXADAtKH+vSqqhFpXrw7R/NaBzvCbas8l61DFHiUg1/bo8vsV8MtGcyZmzXJ
-C5Gm0njtGOil/g7JF9siUrpxs9Yyt/h+T2W0W01pY2hhZ29nbyAoVXNlciBhY2Nv
-dW50IG1pY2hhZ29nbyBvbiBHaXRodWIgYXMgb2YgT2N0b2JlciAxMiwgMjAxMykg
-PG1pY2hhZ29nb0BzZXJ2ZXIuZmFrZT6JATcEEwECACIFAlJZqxkCGwMGCwkIBwMC
-BhUIAgkKCwQWAgMBAh4BAheAAAoJEILFwAlijs8M+1AH+IU78ARblqTnJeSl0iWH
-mEsg4IBK30Q6/exDAcqOEm1Yc171uw2WnGmIvPYOQqxrRTvj3LoQ816dU6jrj6vY
-s+XX0R2hxy7ILh17D/3UKnHcddu7rmc7pNEqZeBXaMughqQaPOWkAIe52+qK5tsl
-sWllzTYE4jo29uZ3dAtDcKEJjBo/pIXnu1GOslE1+V4X1H9WDlwrS/JXHzyDQAjt
-maPR+3gNesDanhrRmrnT3ZXW2ZVd3vGBibhia8PWUhU1uwOH23ySWXncgsHH0Zad
-UMjd4w3YliZP/mLn2ghAxHB70IO7lgAgN3HYZeFoufP3pcK440A+CezfQiRcjHl/
-oIkBHAQQAQIABgUCUlmvfwAKCRB/qxFCZ+T6BOq9CACItsrUZPKGeWSTkMHknMrV
-K5vxIXJVCBb+Tppc0Q/J5p4EkW/RFhTwIP2zw8NLDKMh5oO9md4LXhvfIZkqQJFo
-6ZtLa3Vf+Kj7uyxezBo4QHA+G7tDsRGaMKVrEMiyLCwS1+hg9VaNzsf7zmQW7mYE
-vTLMHp3cVaSU7Mh2Dl8rnAaM/DpTUZQwZ+32Qrb/Z4HSa4f278iqoFpjEbBE2KCr
-vT5yEVvpCZ4lwSgA2a+uTlRTvVV6NA/kpsxU64tmhuEOjy+ToDqJ8wv4mqvWZxMv
-C6OhfVaXBy3U9gG8aQV0ffXGs+TbCtv8ApHd6E1/AVk0oyZGJaBVrEl688bBIWd/
-uQENBFGeqJ4BCADFmgR7oEGkFFB5qXnuNYFq1nUGDAh0dLNtAD3J6EMxUZEXdmp+
-DQHJw6/eDRQaG9EbjNZheycbVUoI8K2Y/Z268HQueGuIEIJv6cZYXoXdWCbDD4fn
-HMNUX2wNlpDqWxb7PNUEtfU9hI3gmHGlr5OiEh3iV06uiZg4n2rbWPbj45m5LJzv
-wpCrUA+pLcl9Xjw2cajaSTjdXHk9gvXTCo6s2ZS3/3Q4l+xuzZp1MGNzPQHASMKs
-wecSJKkYg6W8I5WsVlPd9a8oQCc/Nfz7BPw31MRVR/SF5FAMqaXx5uLwghVdHB2i
-cLURsOtJlCfP8W06gB7yS+MH45Jq/oxBRiJBABEBAAGJAR8EGAECAAkFAlGeqJ4C
-GwwACgkQgsXACWKOzwwT4wgAy6ICcnBZ9l2jSu+ldy57F6jf5kpKZgB9NV8V2mMA
-NeY1wMQ4VTVpU4t3s4E2LYtGNJNkPQVHbt1Pf4dGPasvMPaHMamgwgyqgYixqs0x
-D5PdKzVrfnjwTTr/ZAFdccSPmvy5/hbY0geQ/+mzdbL07+xaT58JIoG5nySDKhmC
-VeOvhDZtXMVAhEWBDPEgh/H9sEuBgMgZrzfE1j3q802qiXeQs6WtadWlQ1RN9Iq1
-ZzIi6u9/BifEIRI0pO/WwKOZdXLTemFUoakoe7uT3A74N96t0G9LZVihYbEoO+Pc
-5IaHPBV5VLeR3TB1LnnjHVf/Fwi8cnGy50kNWjcbMyEDag==
-=jyQ4
------END PGP PUBLIC KEY BLOCK-----

contrib/gitian-downloader/win32-download-config

@@ -8,32 +8,35 @@ rss:
   pattern: bitcoin-\d+.\d+.\d+-win32-gitian.zip
 signers:
   0A82509767C7D4A5D14DA2301AE1D35043E08E54:
+    weight: 40
     name: BlueMatt
     key: bluematt
   BF6273FAEF7CC0BA1F562E50989F6B3048A116B5:
+    weight: 40
     name: Devrandom
     key: devrandom
   E463A93F5F3117EEDE6C7316BD02942421F4889F:
+    weight: 40
     name: Luke-Jr
     key: luke-jr
   D762373D24904A3E42F33B08B9A408E71DAAC974:
+    weight: 40
     name: "Pieter Wuille"
     key: sipa
   77E72E69DA7EE0A148C06B21B34821D4944DE5F7:
+    weight: 40
     name: tcatm
     key: tcatm
   01CDF4627A3B88AAE4A571C87588242FBE38D3A8:
+    weight: 40
     name: "Gavin Andresen"
     key: gavinandresen
   71A3B16735405025D447E8F274810B012346C9A6:
+    weight: 40
     name: "Wladimir J. van der Laan"
     key: laanwj
   AEC1884398647C47413C1C3FB1179EB7347DC10D:
+    weight: 40
     name: "Warren Togami"
     key: wtogami
-  9692B91BBF0E8D34DFD33B1882C5C009628ECF0C:
-    name: michagogo
-    key: michagogo
-  E944AE667CF960B1004BC32FCA662BE18B877A60:
-    name: "Andreas Schildbach"
-    key: aschildbach
+minimum_weight: 120

contrib/homebrew/bitcoin.qt.pro.patch

@@ -0,0 +1,32 @@
+diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro
+index d938c07..e1dd4ec 100644
+--- a/bitcoin-qt.pro
++++ b/bitcoin-qt.pro
+@@ -353,7 +353,7 @@
+ }
+ 
+ isEmpty(BDB_LIB_PATH) {
+-    macx:BDB_LIB_PATH = /opt/local/lib/db48
++    macx:BDB_LIB_PATH = /usr/local/opt/berkeley-db4/lib
+ }
+ 
+ isEmpty(BDB_LIB_SUFFIX) {
+@@ -361,15 +361,15 @@
+ }
+ 
+ isEmpty(BDB_INCLUDE_PATH) {
+-    macx:BDB_INCLUDE_PATH = /opt/local/include/db48
++    macx:BDB_INCLUDE_PATH = /usr/local/opt/berkeley-db4/include
+ }
+ 
+ isEmpty(BOOST_LIB_PATH) {
+-    macx:BOOST_LIB_PATH = /opt/local/lib
++    macx:BOOST_LIB_PATH = /usr/local/opt/boost/lib
+ }
+ 
+ isEmpty(BOOST_INCLUDE_PATH) {
+-    macx:BOOST_INCLUDE_PATH = /opt/local/include
++    macx:BOOST_INCLUDE_PATH = /usr/local/opt/boost/include
+ }
+ 
+ win32:DEFINES += WIN32

contrib/homebrew/makefile.osx.patch

@@ -0,0 +1,48 @@
+diff --git a/src/makefile.osx b/src/makefile.osx
+index bef0ef3..07ef8d3 100644
+--- a/src/makefile.osx
++++ b/src/makefile.osx
+@@ -7,17 +7,21 @@
+ # Originally by Laszlo Hanyecz (solar@heliacal.net)
+ 
+ CXX=llvm-g++
+-DEPSDIR=/opt/local
++DEPSDIR=/usr/local
++DB4DIR=/usr/local/opt/berkeley-db4
++OPENSSLDIR=/usr/local/opt/openssl
+ 
+ INCLUDEPATHS= \
+  -I"$(CURDIR)" \
+- -I"$(CURDIR)"/obj \
++ -I"$(CURDIR)/obj" \
+  -I"$(DEPSDIR)/include" \
+- -I"$(DEPSDIR)/include/db48"
++ -I"$(DB4DIR)/include" \
++ -I"$(OPENSSLDIR)/include"
+ 
+ LIBPATHS= \
+  -L"$(DEPSDIR)/lib" \
+- -L"$(DEPSDIR)/lib/db48"
++ -L"$(DB4DIR)/lib" \
++ -L"$(OPENSSLDIR)/lib"
+ 
+ USE_UPNP:=1
+ USE_IPV6:=1
+@@ -31,14 +35,14 @@ ifdef STATIC
+ TESTLIBS += \
+  $(DEPSDIR)/lib/libboost_unit_test_framework-mt.a
+ LIBS += \
+- $(DEPSDIR)/lib/db48/libdb_cxx-4.8.a \
++ $(DB4DIR)/lib/libdb_cxx-4.8.a \
+  $(DEPSDIR)/lib/libboost_system-mt.a \
+  $(DEPSDIR)/lib/libboost_filesystem-mt.a \
+  $(DEPSDIR)/lib/libboost_program_options-mt.a \
+  $(DEPSDIR)/lib/libboost_thread-mt.a \
+  $(DEPSDIR)/lib/libboost_chrono-mt.a \
+- $(DEPSDIR)/lib/libssl.a \
+- $(DEPSDIR)/lib/libcrypto.a \
++ $(OPENSSLDIR)/lib/libssl.a \
++ $(OPENSSLDIR)/lib/libcrypto.a \
+  -lz
+ else
+ TESTLIBS += \

contrib/linearize/README.md

@@ -1,2 +0,0 @@
-### Linearize ###
-Construct a linear, no-fork, best version of the blockchain.

contrib/linearize/example-linearize.cfg

@@ -1,12 +0,0 @@
-
-# bitcoind RPC settings
-rpcuser=someuser
-rpcpassword=somepassword
-host=127.0.0.1
-port=8332
-
-# bootstrap.dat settings
-netmagic=f9beb4d9
-max_height=279000
-output=bootstrap.dat
-

contrib/linearize/linearize.py

@@ -1,132 +0,0 @@
-#!/usr/bin/python
-#
-# linearize.py:  Construct a linear, no-fork, best version of the blockchain.
-#
-#
-# Copyright (c) 2013 The Bitcoin developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
-
-import json
-import struct
-import re
-import base64
-import httplib
-import sys
-
-ERR_SLEEP = 15
-MAX_NONCE = 1000000L
-
-settings = {}
-
-class BitcoinRPC:
-	OBJID = 1
-
-	def __init__(self, host, port, username, password):
-		authpair = "%s:%s" % (username, password)
-		self.authhdr = "Basic %s" % (base64.b64encode(authpair))
-		self.conn = httplib.HTTPConnection(host, port, False, 30)
-	def rpc(self, method, params=None):
-		self.OBJID += 1
-		obj = { 'version' : '1.1',
-			'method' : method,
-			'id' : self.OBJID }
-		if params is None:
-			obj['params'] = []
-		else:
-			obj['params'] = params
-		self.conn.request('POST', '/', json.dumps(obj),
-			{ 'Authorization' : self.authhdr,
-			  'Content-type' : 'application/json' })
-
-		resp = self.conn.getresponse()
-		if resp is None:
-			print "JSON-RPC: no response"
-			return None
-
-		body = resp.read()
-		resp_obj = json.loads(body)
-		if resp_obj is None:
-			print "JSON-RPC: cannot JSON-decode body"
-			return None
-		if 'error' in resp_obj and resp_obj['error'] != None:
-			return resp_obj['error']
-		if 'result' not in resp_obj:
-			print "JSON-RPC: no result in object"
-			return None
-
-		return resp_obj['result']
-	def getblock(self, hash, verbose=True):
-		return self.rpc('getblock', [hash, verbose])
-	def getblockhash(self, index):
-		return self.rpc('getblockhash', [index])
-
-def getblock(rpc, settings, n):
-	hash = rpc.getblockhash(n)
-	hexdata = rpc.getblock(hash, False)
-	data = hexdata.decode('hex')
-
-	return data
-
-def get_blocks(settings):
-	rpc = BitcoinRPC(settings['host'], settings['port'],
-			 settings['rpcuser'], settings['rpcpassword'])
-
-	outf = open(settings['output'], 'ab')
-
-	for height in xrange(settings['min_height'], settings['max_height']+1):
-		data = getblock(rpc, settings, height)
-
-		outhdr = settings['netmagic']
-		outhdr += struct.pack("<i", len(data))
-
-		outf.write(outhdr)
-		outf.write(data)
-
-		if (height % 1000) == 0:
-			sys.stdout.write("Wrote block " + str(height) + "\n")
-
-if __name__ == '__main__':
-	if len(sys.argv) != 2:
-		print "Usage: linearize.py CONFIG-FILE"
-		sys.exit(1)
-
-	f = open(sys.argv[1])
-	for line in f:
-		# skip comment lines
-		m = re.search('^\s*#', line)
-		if m:
-			continue
-
-		# parse key=value lines
-		m = re.search('^(\w+)\s*=\s*(\S.*)$', line)
-		if m is None:
-			continue
-		settings[m.group(1)] = m.group(2)
-	f.close()
-
-	if 'netmagic' not in settings:
-		settings['netmagic'] = 'f9beb4d9'
-	if 'output' not in settings:
-		settings['output'] = 'bootstrap.dat'
-	if 'host' not in settings:
-		settings['host'] = '127.0.0.1'
-	if 'port' not in settings:
-		settings['port'] = 8332
-	if 'min_height' not in settings:
-		settings['min_height'] = 0
-	if 'max_height' not in settings:
-		settings['max_height'] = 279000
-	if 'rpcuser' not in settings or 'rpcpassword' not in settings:
-		print "Missing username and/or password in cfg file"
-		sys.exit(1)
-
-	settings['netmagic'] = settings['netmagic'].decode('hex')
-	settings['port'] = int(settings['port'])
-	settings['min_height'] = int(settings['min_height'])
-	settings['max_height'] = int(settings['max_height'])
-
-	get_blocks(settings)
-
-

contrib/macdeploy/README.md

@@ -1,19 +0,0 @@
-### MacDeploy ###
-
-You will need the appscript package for the fancy disk image creation to work:
-
-	sudo easy_install appscript
-
-For Snow Leopard (which uses [Python 2.6](http://www.python.org/download/releases/2.6/)), you will need the param_parser package:
-	
-	sudo easy_install argparse
-
-This script should not be run manually, instead, after building as usual:
-
-	make deploy
-
-During the process, the disk image window will pop up briefly where the fancy
-settings are applied. This is normal, please do not interfere.
-
-When finished, it will produce `Bitcoin-Qt.dmg`.
-

contrib/macdeploy/macdeployqtplus

@@ -38,10 +38,7 @@ class FrameworkInfo(object):
         self.sourceFilePath = ""
         self.destinationDirectory = ""
         self.sourceResourcesDirectory = ""
-        self.sourceVersionContentsDirectory = ""
-        self.sourceContentsDirectory = ""
         self.destinationResourcesDirectory = ""
-        self.destinationVersionContentsDirectory = ""
     
     def __eq__(self, other):
         if self.__class__ == other.__class__:
@@ -145,11 +142,7 @@ class FrameworkInfo(object):
             info.destinationDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, info.binaryDirectory)
             
             info.sourceResourcesDirectory = os.path.join(info.frameworkPath, "Resources")
-            info.sourceContentsDirectory = os.path.join(info.frameworkPath, "Contents")
-            info.sourceVersionContentsDirectory = os.path.join(info.frameworkPath, "Versions", info.version, "Contents")
             info.destinationResourcesDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, "Resources")
-            info.destinationContentsDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, "Contents")
-            info.destinationVersionContentsDirectory = os.path.join(cls.bundleFrameworkDirectory, info.frameworkName, "Versions", info.version, "Contents")
         
         return info
 
@@ -203,8 +196,7 @@ class DeploymentInfo(object):
 def getFrameworks(binaryPath, verbose):
     if verbose >= 3:
         print "Inspecting with otool: " + binaryPath
-    otoolbin=os.getenv("OTOOL", "otool")
-    otool = subprocess.Popen([otoolbin, "-L", binaryPath], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
+    otool = subprocess.Popen(["otool", "-L", binaryPath], stdout=subprocess.PIPE, stderr=subprocess.PIPE)
     o_stdout, o_stderr = otool.communicate()
     if otool.returncode != 0:
         if verbose >= 1:
@@ -229,8 +221,7 @@ def getFrameworks(binaryPath, verbose):
     return libraries
 
 def runInstallNameTool(action, *args):
-    installnametoolbin=os.getenv("INSTALLNAMETOOL", "install_name_tool")
-    subprocess.check_call([installnametoolbin, "-"+action] + list(args))
+    subprocess.check_call(["install_name_tool", "-"+action] + list(args))
 
 def changeInstallName(oldName, newName, binaryPath, verbose):
     if verbose >= 3:
@@ -248,11 +239,10 @@ def changeIdentification(id, binaryPath, verbose):
     runInstallNameTool("id", id, binaryPath)
 
 def runStrip(binaryPath, verbose):
-    stripbin=os.getenv("STRIP", "strip")
     if verbose >= 3:
         print "Using strip:"
         print " stripped", binaryPath
-    subprocess.check_call([stripbin, "-x", binaryPath])
+    subprocess.check_call(["strip", "-x", binaryPath])
 
 def copyFramework(framework, path, verbose):
     if framework.sourceFilePath.startswith("Qt"):
@@ -282,35 +272,18 @@ def copyFramework(framework, path, verbose):
       os.chmod(toPath, permissions.st_mode | stat.S_IWRITE)
 
     if not framework.isDylib(): # Copy resources for real frameworks
-
-        linkfrom = os.path.join(path, "Contents","Frameworks", framework.frameworkName, "Versions", "Current")
-        linkto = framework.version
-        if not os.path.exists(linkfrom):
-            os.symlink(linkto, linkfrom)
-            if verbose >= 2:
-                print "Linked:", linkfrom, "->", linkto
         fromResourcesDir = framework.sourceResourcesDirectory
         if os.path.exists(fromResourcesDir):
             toResourcesDir = os.path.join(path, framework.destinationResourcesDirectory)
-            shutil.copytree(fromResourcesDir, toResourcesDir, symlinks=True)
+            shutil.copytree(fromResourcesDir, toResourcesDir)
             if verbose >= 3:
                 print "Copied resources:", fromResourcesDir
                 print " to:", toResourcesDir
-        fromContentsDir = framework.sourceVersionContentsDirectory
-        if not os.path.exists(fromContentsDir):
-            fromContentsDir = framework.sourceContentsDirectory
-        if os.path.exists(fromContentsDir):
-            toContentsDir = os.path.join(path, framework.destinationVersionContentsDirectory)
-            shutil.copytree(fromContentsDir, toContentsDir, symlinks=True)
-            contentslinkfrom = os.path.join(path, framework.destinationContentsDirectory)
-            if verbose >= 3:
-                print "Copied Contents:", fromContentsDir
-                print " to:", toContentsDir
     elif framework.frameworkName.startswith("libQtGui"): # Copy qt_menu.nib (applies to non-framework layout)
         qtMenuNibSourcePath = os.path.join(framework.frameworkDirectory, "Resources", "qt_menu.nib")
         qtMenuNibDestinationPath = os.path.join(path, "Contents", "Resources", "qt_menu.nib")
         if os.path.exists(qtMenuNibSourcePath) and not os.path.exists(qtMenuNibDestinationPath):
-            shutil.copytree(qtMenuNibSourcePath, qtMenuNibDestinationPath, symlinks=True)
+            shutil.copytree(qtMenuNibSourcePath, qtMenuNibDestinationPath)
             if verbose >= 3:
                 print "Copied for libQtGui:", qtMenuNibSourcePath
                 print " to:", qtMenuNibDestinationPath
@@ -374,8 +347,6 @@ def deployFrameworksForAppBundle(applicationBundle, strip, verbose):
 def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):
     # Lookup available plugins, exclude unneeded
     plugins = []
-    if deploymentInfo.pluginPath is None:
-        return
     for dirpath, dirnames, filenames in os.walk(deploymentInfo.pluginPath):
         pluginDirectory = os.path.relpath(dirpath, deploymentInfo.pluginPath)
         if pluginDirectory == "designer":
@@ -450,8 +421,8 @@ def deployPlugins(appBundleInfo, deploymentInfo, strip, verbose):
                 deployFrameworks([dependency], appBundleInfo.path, destinationPath, strip, verbose, deploymentInfo)
 
 qt_conf="""[Paths]
-Translations=Resources
-Plugins=PlugIns
+translations=Resources
+plugins=PlugIns
 """
 
 ap = ArgumentParser(description="""Improved version of macdeployqt.
@@ -584,7 +555,7 @@ if verbose >= 3:
     print app_bundle, "->", target
 
 os.mkdir("dist")
-shutil.copytree(app_bundle, target, symlinks=True)
+shutil.copytree(app_bundle, target)
 
 applicationBundle = ApplicationBundleInfo(target)
 
@@ -664,7 +635,7 @@ for p in config.add_resources:
     if verbose >= 3:
         print p, "->", t
     if os.path.isdir(p):
-        shutil.copytree(p, t, symlinks=True)
+        shutil.copytree(p, t)
     else:
         shutil.copy2(p, t)
 
@@ -680,23 +651,6 @@ elif config.sign:
 # ------------------------------------------------
 
 if config.dmg is not None:
-
-    #Patch in check_output for Python 2.6
-    if "check_output" not in dir( subprocess ):
-        def f(*popenargs, **kwargs):
-            if 'stdout' in kwargs:
-                raise ValueError('stdout argument not allowed, it will be overridden.')
-            process = subprocess.Popen(stdout=subprocess.PIPE, *popenargs, **kwargs)
-            output, unused_err = process.communicate()
-            retcode = process.poll()
-            if retcode:
-                cmd = kwargs.get("args")
-                if cmd is None:
-                    cmd = popenargs[0]
-                raise CalledProcessError(retcode, cmd)
-            return output
-        subprocess.check_output = f
-
     def runHDIUtil(verb, image_basename, **kwargs):
         hdiutil_args = ["hdiutil", verb, image_basename + ".dmg"]
         if kwargs.has_key("capture_stdout"):

contrib/macdeploy/notes.txt

@@ -0,0 +1,26 @@
+
+macdeployqtplus works best on OS X Lion, for Snow Leopard you'd need to install
+Python 2.7 and make it your default Python installation.
+
+You will need the appscript package for the fancy disk image creation to work.
+Install it by invoking "sudo easy_install appscript".
+
+This script should be invoked in the target directory like this:
+$source_dir/contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy $source_dir/contrib/macdeploy/fancy.plist -verbose 2
+
+During the process, the disk image window will pop up briefly where the fancy
+settings are applied. This is normal, please do not interfere.
+
+You can also set up Qt Creator for invoking the script. For this, go to the
+"Projects" tab on the left side, switch to "Run Settings" above and add a
+deploy configuration. Next add a deploy step choosing "Custom Process Step".
+Fill in the following.
+
+Enable custom process step: [x]
+Command: %{sourceDir}/contrib/macdeploy/macdeployqtplus
+Working directory: %{buildDir}
+Command arguments: Bitcoin-Qt.app -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -dmg -fancy %{sourceDir}/contrib/macdeploy/fancy.plist -verbose 2
+
+After that you can start the deployment process through the menu with
+Build -> Deploy Project "bitcoin-qt"
+

contrib/pyminer/README

@@ -0,0 +1,6 @@
+
+This is a 'getwork' CPU mining client for bitcoin.
+
+It is pure-python, and therefore very, very slow.  The purpose is to
+provide a reference implementation of a miner, for study.
+

contrib/pyminer/README.md

@@ -1,8 +0,0 @@
-### PyMiner ###
-
-This is a 'getwork' CPU mining client for Bitcoin. It is pure-python, and therefore very, very slow.  The purpose is to provide a reference implementation of a miner, for study.
-
-### Other Resources ###
-
-- [BitcoinTalk Thread](https://bitcointalk.org/index.php?topic=3546.0)
-- [Jgarzik Repo](https://github.com/jgarzik/pyminer)

contrib/qos/README.md

@@ -1,5 +0,0 @@
-### Qos ###
-
-This is a Linux bash script that will set up tc to limit the outgoing bandwidth for connections to the Bitcoin network. It limits outbound TCP traffic with a source or destination port of 8333, but not if the destination IP is within a LAN (defined as 192.168.x.x).
-
-This means one can have an always-on bitcoind instance running, and another local bitcoind/bitcoin-qt instance which connects to this node and receives blocks from it.

contrib/qos/tc.sh

@@ -1,41 +0,0 @@
-#network interface on which to limit traffic
-IF="eth0"
-#limit of the network interface in question
-LINKCEIL="1gbit"
-#limit outbound Bitcoin protocol traffic to this rate
-LIMIT="160kbit"
-#defines the address space for which you wish to disable rate limiting
-LOCALNET="192.168.0.0/16"
-
-#delete existing rules
-tc qdisc del dev ${IF} root
-
-#add root class
-tc qdisc add dev ${IF} root handle 1: htb default 10
-
-#add parent class
-tc class add dev ${IF} parent 1: classid 1:1 htb rate ${LINKCEIL} ceil ${LINKCEIL}
-
-#add our two classes. one unlimited, another limited
-tc class add dev ${IF} parent 1:1 classid 1:10 htb rate ${LINKCEIL} ceil ${LINKCEIL} prio 0
-tc class add dev ${IF} parent 1:1 classid 1:11 htb rate ${LIMIT} ceil ${LIMIT} prio 1
-
-#add handles to our classes so packets marked with <x> go into the class with "... handle <x> fw ..."
-tc filter add dev ${IF} parent 1: protocol ip prio 1 handle 1 fw classid 1:10
-tc filter add dev ${IF} parent 1: protocol ip prio 2 handle 2 fw classid 1:11
-
-#delete any existing rules
-#disable for now
-#ret=0
-#while [ $ret -eq 0 ]; do
-#	iptables -t mangle -D OUTPUT 1
-#	ret=$?
-#done
-
-#limit outgoing traffic to and from port 8333. but not when dealing with a host on the local network
-#	(defined by $LOCALNET)
-#	--set-mark marks packages matching these criteria with the number "2"
-#	these packages are filtered by the tc filter with "handle 2"
-#	this filter sends the packages into the 1:11 class, and this class is limited to ${LIMIT}
-iptables -t mangle -A OUTPUT -p tcp -m tcp --dport 8333 ! -d ${LOCALNET} -j MARK --set-mark 0x2
-iptables -t mangle -A OUTPUT -p tcp -m tcp --sport 8333 ! -d ${LOCALNET} -j MARK --set-mark 0x2

contrib/seeds/README

@@ -1,11 +1,9 @@
-### Seeds ###
-
 Utility to generate the pnSeed[] array that is compiled into the client
-(see [src/net.cpp](/src/net.cpp)).
+(see src/net.cpp).
 
 The 600 seeds compiled into the 0.8 release were created from sipa's DNS seed data, like this:
 
-	curl -s http://bitcoin.sipa.be/seeds.txt | head -1000 | makeseeds.py
+curl -s http://bitcoin.sipa.be/seeds.txt | head -1000 | makeseeds.py
 
 The input to makeseeds.py is assumed to be approximately sorted from most-reliable to least-reliable,
 with IP:port first on each line (lines that don't match IPv4:port are ignored).

contrib/spendfrom/README

@@ -0,0 +1,32 @@
+Use the raw transactions API to send coins received on a particular
+address (or addresses).
+
+Depends on jsonrpc
+
+Usage:
+
+spendfrom.py --from=FROMADDRESS1[,FROMADDRESS2] --to=TOADDRESS --amount=amount \
+             --fee=fee --datadir=/path/to/.bitcoin --testnet --dry_run
+
+With no arguments, outputs a list of amounts associated with addresses.
+
+With arguments, sends coins received by the FROMADDRESS addresses to the TOADDRESS.
+
+You may explictly specify how much fee to pay (a fee more than 1% of the amount
+will fail,  though, to prevent bitcoin-losing accidents). Spendfrom may fail if
+it thinks the transaction would never be confirmed (if the amount being sent is
+too small, or if the transaction is too many bytes for the fee).
+
+If a change output needs to be created, the change will be sent to the last
+FROMADDRESS (if you specify just one FROMADDRESS, change will go back to it).
+
+If --datadir is not specified, the default datadir is used.
+
+The --dry_run option will just create and sign the the transaction and print
+the transaction data (as hexadecimal), instead of broadcasting it.
+
+If the transaction is created and broadcast successfully, a transaction id
+is printed.
+
+If this was a tool for end-users and not programmers, it would have much friendlier
+error-handling.

contrib/spendfrom/README.md

@@ -1,35 +0,0 @@
-### SpendFrom ###
-
-Use the raw transactions API to send coins received on a particular
-address (or addresses). 
-
-### Usage: ###
-Depends on [jsonrpc](http://json-rpc.org/).
-
-	spendfrom.py --from=FROMADDRESS1[,FROMADDRESS2] --to=TOADDRESS --amount=amount \
-	             --fee=fee --datadir=/path/to/.bitcoin --testnet --dry_run
-
-With no arguments, outputs a list of amounts associated with addresses.
-
-With arguments, sends coins received by the `FROMADDRESS` addresses to the `TOADDRESS`.
-
-### Notes ###
-
-- You may explicitly specify how much fee to pay (a fee more than 1% of the amount
-will fail,  though, to prevent bitcoin-losing accidents). Spendfrom may fail if
-it thinks the transaction would never be confirmed (if the amount being sent is
-too small, or if the transaction is too many bytes for the fee).
-
-- If a change output needs to be created, the change will be sent to the last
-`FROMADDRESS` (if you specify just one `FROMADDRESS`, change will go back to it).
-
-- If `--datadir` is not specified, the default datadir is used.
-
-- The `--dry_run` option will just create and sign the transaction and print
-the transaction data (as hexadecimal), instead of broadcasting it.
-
-- If the transaction is created and broadcast successfully, a transaction id
-is printed.
-
-- If this was a tool for end-users and not programmers, it would have much friendlier
-error-handling.

contrib/test-patches/README

@@ -1,7 +1,4 @@
-### Test Patches ###
-
 These patches are applied when the automated pull-tester
 tests each pull and when master is tested using jenkins.
 You can find more information about the tests run at
-[http://jenkins.bluematt.me/pull-tester/files/
-](http://jenkins.bluematt.me/pull-tester/files/)
+http://jenkins.bluematt.me/pull-tester/files/

contrib/test-patches/bitcoind-comparison.patch

@@ -0,0 +1,196 @@
+diff --git a/contrib/test-patches/bitcoind-comparison.patch b/contrib/test-patches/bitcoind-comparison.patch
+index 04a8618..519429a 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -31,8 +31,8 @@ CTxMemPool mempool;
+ unsigned int nTransactionsUpdated = 0;
+ 
+ map<uint256, CBlockIndex*> mapBlockIndex;
+-uint256 hashGenesisBlock("0x000000000019d6689c085ae165831e934ff763ae46a2a6c172b3f1b60a8ce26f");
+-static CBigNum bnProofOfWorkLimit(~uint256(0) >> 32);
++uint256 hashGenesisBlock("0x0f9188f13cb7b2c71f2a335e3a4fc328bf5beb436012afca590b1a11466e2206");
++static CBigNum bnProofOfWorkLimit(~uint256(0) >> 1);
+ CBlockIndex* pindexGenesisBlock = NULL;
+ int nBestHeight = -1;
+ uint256 nBestChainWork = 0;
+@@ -1055,7 +1055,7 @@ int64 static GetBlockValue(int nHeight, int64 nFees)
+     int64 nSubsidy = 50 * COIN;
+ 
+     // Subsidy is cut in half every 210000 blocks, which will occur approximately every 4 years
+-    nSubsidy >>= (nHeight / 210000);
++    nSubsidy >>= (nHeight / 150);
+ 
+     return nSubsidy + nFees;
+ }
+@@ -2736,9 +2736,9 @@ bool InitBlockIndex() {
+         block.hashPrevBlock = 0;
+         block.hashMerkleRoot = block.BuildMerkleTree();
+         block.nVersion = 1;
+-        block.nTime    = 1231006505;
+-        block.nBits    = 0x1d00ffff;
+-        block.nNonce   = 2083236893;
++        block.nTime    = 1296688602;
++        block.nBits    = 0x207fffff;
++        block.nNonce   = 2;
+ 
+         if (fTestNet)
+         {
+@@ -3024,7 +3024,7 @@ bool static AlreadyHave(const CInv& inv)
+ // The message start string is designed to be unlikely to occur in normal data.
+ // The characters are rarely used upper ASCII, not valid as UTF-8, and produce
+ // a large 4-byte int at any alignment.
+-unsigned char pchMessageStart[4] = { 0xf9, 0xbe, 0xb4, 0xd9 };
++unsigned char pchMessageStart[4] = { 0xfa, 0xbf, 0xb5, 0xda };
+ 
+ 
+ void static ProcessGetData(CNode* pfrom)
+diff --git a/src/test/miner_tests.cpp b/src/test/miner_tests.cpp
+index af28465..ee9a4db 100644
+--- a/src/test/miner_tests.cpp
++++ b/src/test/miner_tests.cpp
+@@ -15,34 +15,117 @@ struct {
+     unsigned char extranonce;
+     unsigned int nonce;
+ } blockinfo[] = {
+-    {4, 0xa4a3e223}, {2, 0x15c32f9e}, {1, 0x0375b547}, {1, 0x7004a8a5},
+-    {2, 0xce440296}, {2, 0x52cfe198}, {1, 0x77a72cd0}, {2, 0xbb5d6f84},
+-    {2, 0x83f30c2c}, {1, 0x48a73d5b}, {1, 0xef7dcd01}, {2, 0x6809c6c4},
+-    {2, 0x0883ab3c}, {1, 0x087bbbe2}, {2, 0x2104a814}, {2, 0xdffb6daa},
+-    {1, 0xee8a0a08}, {2, 0xba4237c1}, {1, 0xa70349dc}, {1, 0x344722bb},
+-    {3, 0xd6294733}, {2, 0xec9f5c94}, {2, 0xca2fbc28}, {1, 0x6ba4f406},
+-    {2, 0x015d4532}, {1, 0x6e119b7c}, {2, 0x43e8f314}, {2, 0x27962f38},
+-    {2, 0xb571b51b}, {2, 0xb36bee23}, {2, 0xd17924a8}, {2, 0x6bc212d9},
+-    {1, 0x630d4948}, {2, 0x9a4c4ebb}, {2, 0x554be537}, {1, 0xd63ddfc7},
+-    {2, 0xa10acc11}, {1, 0x759a8363}, {2, 0xfb73090d}, {1, 0xe82c6a34},
+-    {1, 0xe33e92d7}, {3, 0x658ef5cb}, {2, 0xba32ff22}, {5, 0x0227a10c},
+-    {1, 0xa9a70155}, {5, 0xd096d809}, {1, 0x37176174}, {1, 0x830b8d0f},
+-    {1, 0xc6e3910e}, {2, 0x823f3ca8}, {1, 0x99850849}, {1, 0x7521fb81},
+-    {1, 0xaacaabab}, {1, 0xd645a2eb}, {5, 0x7aea1781}, {5, 0x9d6e4b78},
+-    {1, 0x4ce90fd8}, {1, 0xabdc832d}, {6, 0x4a34f32a}, {2, 0xf2524c1c},
+-    {2, 0x1bbeb08a}, {1, 0xad47f480}, {1, 0x9f026aeb}, {1, 0x15a95049},
+-    {2, 0xd1cb95b2}, {2, 0xf84bbda5}, {1, 0x0fa62cd1}, {1, 0xe05f9169},
+-    {1, 0x78d194a9}, {5, 0x3e38147b}, {5, 0x737ba0d4}, {1, 0x63378e10},
+-    {1, 0x6d5f91cf}, {2, 0x88612eb8}, {2, 0xe9639484}, {1, 0xb7fabc9d},
+-    {2, 0x19b01592}, {1, 0x5a90dd31}, {2, 0x5bd7e028}, {2, 0x94d00323},
+-    {1, 0xa9b9c01a}, {1, 0x3a40de61}, {1, 0x56e7eec7}, {5, 0x859f7ef6},
+-    {1, 0xfd8e5630}, {1, 0x2b0c9f7f}, {1, 0xba700e26}, {1, 0x7170a408},
+-    {1, 0x70de86a8}, {1, 0x74d64cd5}, {1, 0x49e738a1}, {2, 0x6910b602},
+-    {0, 0x643c565f}, {1, 0x54264b3f}, {2, 0x97ea6396}, {2, 0x55174459},
+-    {2, 0x03e8779a}, {1, 0x98f34d8f}, {1, 0xc07b2b07}, {1, 0xdfe29668},
+-    {1, 0x3141c7c1}, {1, 0xb3b595f4}, {1, 0x735abf08}, {5, 0x623bfbce},
+-    {2, 0xd351e722}, {1, 0xf4ca48c9}, {1, 0x5b19c670}, {1, 0xa164bf0e},
+-    {2, 0xbbbeb305}, {2, 0xfe1c810a},
++{4, 2762203683},
++{2, 365113248},
++{1, 58045772},
++{1, 1879353512},
++{2, 3460563607},
++{2, 1389355416},
++{1, 2007444690},
++{2, 3143462790},
++{2, 2213743660},
++{1, 1218919771},
++{1, 4017999107},
++{2, 1745471173},
++{2, 142846780},
++{1, 142326754},
++{2, 553953301},
++{2, 3757796778},
++{1, 4002023946},
++{2, 3124901826},
++{1, 2802010589},
++{1, 877077181},
++{3, 3593029427},
++{2, 3969866902},
++{2, 3392125996},
++{1, 1805972490},
++{2, 22889779},
++{1, 1846647676},
++{2, 1139340052},
++{2, 664153912},
++{2, 3044128027},
++{2, 3010194979},
++{2, 3514377385},
++{2, 1807880922},
++{1, 1661815113},
++{2, 2588692156},
++{2, 1431037239},
++{1, 3594379210},
++{2, 2701839377},
++{1, 1973060452},
++{2, 4218620174},
++{1, 3895224884},
++{1, 3812528857},
++{3, 1703867851},
++{2, 3123904294},
++{5, 36151564},
++{1, 2846294357},
++{5, 3499546633},
++{1, 924279160},
++{1, 2198572304},
++{1, 3336802574},
++{2, 2185182379},
++{1, 2575632458},
++{1, 1965161345},
++{1, 2865408940},
++{1, 3594887915},
++{5, 2062161796},
++{5, 2641251194},
++{1, 1290342362},
++{1, 2883355438},
++{6, 1244984107},
++{2, 4065479712},
++{2, 465481866},
++{1, 2907174016},
++{1, 2667735788},
++{1, 363417673},
++{2, 3519780275},
++{2, 4165713317},
++{1, 262548689},
++{1, 3764359529},
++{1, 2027001003},
++{5, 1043862655},
++{5, 1937481940},
++{1, 1664585233},
++{1, 1834979792},
++{2, 2288070330},
++{2, 3915617412},
++{1, 3086662813},
++{2, 430970259},
++{1, 1519443249},
++{2, 1540874280},
++{2, 2496660261},
++{1, 2847522842},
++{1, 977329763},
++{1, 1458040519},
++{5, 2241822454},
++{1, 4253963824},
++{1, 722247551},
++{1, 3127905834},
++{1, 1903207432},
++{1, 1893631657},
++{1, 1960201429},
++{1, 1239890082},
++{2, 1762702850},
++{0, 1681675873},
++{1, 1411795775},
++{2, 2548720534},
++{2, 1427588186},
++{2, 65566621},
++{1, 2566081936},
++{1, 3229297415},
++{1, 3756168812},
++{1, 826394561},
++{1, 3015022068},
++{1, 1935326986},
++{5, 1648098256},
++{2, 3545360164},
++{1, 4106897609},
++{1, 1528415857},
++{1, 2707734286},
++{2, 3149837061},
++{2, 4263280906},
++
+ };
+ 
+ // NOTE: These tests rely on CreateNewBlock doing its own self-validation!

contrib/test-patches/temp-revert-1.patch

@@ -0,0 +1,21 @@
+commit 4dcc8701ac0eb09d8992d19fb411cee3c9aaf394
+Author: Matt Corallo <git@bluematt.me>
+Date:   Sun Mar 24 20:45:44 2013 -0400
+
+    Revert "Update unit test to match rule enforcement starts 21 March"
+    
+    This reverts commit d3e8c6a9d3fad68b0eee4434401ec7b3066399a2.
+
+diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
+index 3cfb6db..e167def 100644
+--- a/src/test/checkblock_tests.cpp
++++ b/src/test/checkblock_tests.cpp
+@@ -52,7 +52,7 @@ BOOST_AUTO_TEST_CASE(May15)
+     if (read_block("Mar12Fork.dat", forkingBlock))
+     {
+         CValidationState state;
+-        forkingBlock.nTime = tMay15-1; // Invalidates PoW
++        BOOST_CHECK(!forkingBlock.CheckBlock(state, true, true));
+         BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false));
+ 
+         // After May 15'th, big blocks are OK:

contrib/test-patches/temp-revert-3.patch

@@ -0,0 +1,34 @@
+commit ba84709c65b911798ddae1285d807f4cd036990d
+Author: Matt Corallo <git@bluematt.me>
+Date:   Sun Mar 24 20:45:56 2013 -0400
+
+    Revert "Before 15 May, limit created block size to 500K"
+    
+    This reverts commit 402f19b64530775a7e4ded025c80d8c16a55e454.
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 22baf0f..51ada0a 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -2057,8 +2057,8 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
+         return state.DoS(100, error("CheckBlock() : size limits failed"));
+ 
+     // Special short-term limits to avoid 10,000 BDB lock limit:
+-    if (GetBlockTime() >= 1363867200 && // start enforcing 21 March 2013, noon GMT
+-        GetBlockTime() < 1368576000)  // stop enforcing 15 May 2013 00:00:00
++    if (GetBlockTime() > 1363039171 && // 11 March 2013, timestamp of block before the big fork
++        GetBlockTime() < 1368576000)  // 15 May 2013 00:00:00
+     {
+         // Rule is: #unique txids referenced <= 4,500
+         // ... to prevent 10,000 BDB lock exhaustion on old clients
+@@ -4155,10 +4155,6 @@ CBlockTemplate* CreateNewBlock(CReserveKey& reservekey)
+     // Limit to betweeen 1K and MAX_BLOCK_SIZE-1K for sanity:
+     nBlockMaxSize = std::max((unsigned int)1000, std::min((unsigned int)(MAX_BLOCK_SIZE-1000), nBlockMaxSize));
+ 
+-    // Special compatibility rule before 15 May: limit size to 500,000 bytes:
+-    if (GetAdjustedTime() < 1368576000)
+-        nBlockMaxSize = std::min(nBlockMaxSize, (unsigned int)(MAX_BLOCK_SIZE_GEN));
+-
+     // How much of the block should be dedicated to high-priority transactions,
+     // included regardless of the fees they pay
+     unsigned int nBlockPrioritySize = GetArg("-blockprioritysize", 27000);

contrib/test-patches/temp-revert-4.patch

@@ -0,0 +1,110 @@
+commit ca96b88b61f647d4f56d5d06321dda08a43bf92f
+Author: Matt Corallo <git@bluematt.me>
+Date:   Sun Mar 24 20:46:01 2013 -0400
+
+    Revert "CheckBlock rule until 15-May for 10,000 BDB lock compatibility"
+    
+    This reverts commit 8c222dca4f961ad13ec64d690134a40d09b20813.
+
+diff --git a/src/main.cpp b/src/main.cpp
+index 51ada0a..9a06dbf 100644
+--- a/src/main.cpp
++++ b/src/main.cpp
+@@ -2056,25 +2056,6 @@ bool CBlock::CheckBlock(CValidationState &state, bool fCheckPOW, bool fCheckMerk
+     if (vtx.empty() || vtx.size() > MAX_BLOCK_SIZE || ::GetSerializeSize(*this, SER_NETWORK, PROTOCOL_VERSION) > MAX_BLOCK_SIZE)
+         return state.DoS(100, error("CheckBlock() : size limits failed"));
+ 
+-    // Special short-term limits to avoid 10,000 BDB lock limit:
+-    if (GetBlockTime() > 1363039171 && // 11 March 2013, timestamp of block before the big fork
+-        GetBlockTime() < 1368576000)  // 15 May 2013 00:00:00
+-    {
+-        // Rule is: #unique txids referenced <= 4,500
+-        // ... to prevent 10,000 BDB lock exhaustion on old clients
+-        set<uint256> setTxIn;
+-        for (size_t i = 0; i < vtx.size(); i++)
+-        {
+-            setTxIn.insert(vtx[i].GetHash());
+-            if (i == 0) continue; // skip coinbase txin
+-            BOOST_FOREACH(const CTxIn& txin, vtx[i].vin)
+-                setTxIn.insert(txin.prevout.hash);
+-        }
+-        size_t nTxids = setTxIn.size();
+-        if (nTxids > 4500)
+-            return error("CheckBlock() : 15 May maxlocks violation");
+-    }
+-
+     // Check proof of work matches claimed amount
+     if (fCheckPOW && !CheckProofOfWork(GetHash(), nBits))
+         return state.DoS(50, error("CheckBlock() : proof of work failed"));
+diff --git a/src/test/checkblock_tests.cpp b/src/test/checkblock_tests.cpp
+deleted file mode 100644
+index e167def..0000000
+--- a/src/test/checkblock_tests.cpp
++++ /dev/null
+@@ -1,66 +0,0 @@
+-//
+-// Unit tests for block.CheckBlock()
+-//
+-#include <algorithm>
+-
+-#include <boost/assign/list_of.hpp> // for 'map_list_of()'
+-#include <boost/date_time/posix_time/posix_time_types.hpp>
+-#include <boost/test/unit_test.hpp>
+-#include <boost/foreach.hpp>
+-
+-#include "main.h"
+-#include "wallet.h"
+-#include "net.h"
+-#include "util.h"
+-
+-BOOST_AUTO_TEST_SUITE(CheckBlock_tests)
+-
+-bool
+-read_block(const std::string& filename, CBlock& block)
+-{
+-    namespace fs = boost::filesystem;
+-    fs::path testFile = fs::current_path() / "test" / "data" / filename;
+-#ifdef TEST_DATA_DIR
+-    if (!fs::exists(testFile))
+-    {
+-        testFile = fs::path(BOOST_PP_STRINGIZE(TEST_DATA_DIR)) / filename;
+-    }
+-#endif
+-    FILE* fp = fopen(testFile.string().c_str(), "rb");
+-    if (!fp) return false;
+-
+-    fseek(fp, 8, SEEK_SET); // skip msgheader/size
+-
+-    CAutoFile filein = CAutoFile(fp, SER_DISK, CLIENT_VERSION);
+-    if (!filein) return false;
+-
+-    filein >> block;
+-
+-    return true;
+-}
+-
+-BOOST_AUTO_TEST_CASE(May15)
+-{
+-    // Putting a 1MB binary file in the git repository is not a great
+-    // idea, so this test is only run if you manually download
+-    // test/data/Mar12Fork.dat from
+-    // http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/Mar12Fork.dat/download
+-    unsigned int tMay15 = 1368576000;
+-    SetMockTime(tMay15); // Test as if it was right at May 15
+-
+-    CBlock forkingBlock;
+-    if (read_block("Mar12Fork.dat", forkingBlock))
+-    {
+-        CValidationState state;
+-        BOOST_CHECK(!forkingBlock.CheckBlock(state, true, true));
+-        BOOST_CHECK(!forkingBlock.CheckBlock(state, false, false));
+-
+-        // After May 15'th, big blocks are OK:
+-        forkingBlock.nTime = tMay15; // Invalidates PoW
+-        BOOST_CHECK(forkingBlock.CheckBlock(state, false, false));
+-    }
+-
+-    SetMockTime(0);
+-}
+-
+-BOOST_AUTO_TEST_SUITE_END()

contrib/testgen/README

@@ -0,0 +1 @@
+Utilities to generate test vectors for the data-driven Bitcoin tests

contrib/testgen/README.md

@@ -1,8 +0,0 @@
-### TestGen ###
-
-Utilities to generate test vectors for the data-driven Bitcoin tests.
-
-Usage: 
-
-    gen_base58_test_vectors.py valid 50 > ../../src/test/data/base58_keys_valid.json
-    gen_base58_test_vectors.py invalid 50 > ../../src/test/data/base58_keys_invalid.json

contrib/verifysfbinaries/README.md

@@ -1,6 +0,0 @@
-### Verify SF Binaries ###
-This script attempts to download the signature file `SHA256SUMS.asc` from SourceForge.
-
-It first checks if the signature passes, and then downloads the files specified in the file, and checks if the hashes of these files match those that are specified in the signature file.
-
-The script returns 0 if everything passes the checks. It returns 1 if either the signature check or the hash check doesn't pass. If an error occurs the return value is 2.

contrib/verifysfbinaries/verify.sh

@@ -18,7 +18,7 @@ WORKINGDIR="/tmp/bitcoin"
 TMPFILE="hashes.tmp"
 
 #this URL is used if a version number is not specified as an argument to the script
-SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.9.0rc1/SHA256SUMS.asc"
+SIGNATUREFILE="http://downloads.sourceforge.net/project/bitcoin/Bitcoin/bitcoin-0.8.6/SHA256SUMS.asc"
 
 SIGNATUREFILENAME="SHA256SUMS.asc"
 RCSUBDIR="test/"

contrib/wallettools/walletchangepass.py

@@ -0,0 +1,5 @@
+from jsonrpc import ServiceProxy
+access = ServiceProxy("http://127.0.0.1:8332")
+pwd = raw_input("Enter old wallet passphrase: ")
+pwd2 = raw_input("Enter new wallet passphrase: ")
+access.walletpassphrasechange(pwd, pwd2)

contrib/wallettools/walletunlock.py

@@ -0,0 +1,4 @@
+from jsonrpc import ServiceProxy
+access = ServiceProxy("http://127.0.0.1:8332")
+pwd = raw_input("Enter wallet passphrase: ")
+access.walletpassphrase(pwd, 60)

doc/Doxyfile

@@ -34,7 +34,7 @@ PROJECT_NAME           = Bitcoin
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 0.9.5
+PROJECT_NUMBER         = 0.8.6
 
 # Using the PROJECT_BRIEF tag one can provide an optional one line description 
 # for a project that appears at the top of each page and should give viewer 
@@ -683,7 +683,7 @@ RECURSIVE              = YES
 # excluded from the INPUT source files. This way you can easily exclude a 
 # subdirectory from a directory tree whose root is specified with the INPUT tag.
 
-EXCLUDE                = src/leveldb src/json src/test /src/qt/test
+EXCLUDE                = 
 
 # The EXCLUDE_SYMLINKS tag can be used select whether or not files or 
 # directories that are symbolic links (a Unix file system feature) are excluded 
@@ -705,7 +705,7 @@ EXCLUDE_PATTERNS       =
 # wildcard * is used, a substring. Examples: ANamespace, AClass, 
 # AClass::ANamespace, ANamespace::*Test
 
-EXCLUDE_SYMBOLS        = boost google
+EXCLUDE_SYMBOLS        = 
 
 # The EXAMPLE_PATH tag can be used to specify one or more files or 
 # directories that contain example code fragments that are included (see 
@@ -1577,7 +1577,7 @@ HIDE_UNDOC_RELATIONS   = YES
 # toolkit from AT&T and Lucent Bell Labs. The other options in this section 
 # have no effect if this option is set to NO (the default)
 
-HAVE_DOT               = YES
+HAVE_DOT               = NO
 
 # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is 
 # allowed to run in parallel. When set to 0 (the default) doxygen will 
@@ -1659,7 +1659,7 @@ INCLUDED_BY_GRAPH      = YES
 # the time of a run. So in most cases it will be better to enable call graphs 
 # for selected functions only using the \callgraph command.
 
-CALL_GRAPH             = YES
+CALL_GRAPH             = NO
 
 # If the CALLER_GRAPH and HAVE_DOT tags are set to YES then 
 # doxygen will generate a caller dependency graph for every global function 
@@ -1667,7 +1667,7 @@ CALL_GRAPH             = YES
 # the time of a run. So in most cases it will be better to enable caller 
 # graphs for selected functions only using the \callergraph command.
 
-CALLER_GRAPH           = YES
+CALLER_GRAPH           = NO
 
 # If the GRAPHICAL_HIERARCHY and HAVE_DOT tags are set to YES then doxygen 
 # will generate a graphical hierarchy of all classes instead of a textual one.
@@ -1685,7 +1685,7 @@ DIRECTORY_GRAPH        = YES
 # generated by dot. Possible values are svg, png, jpg, or gif. 
 # If left blank png will be used.
 
-DOT_IMAGE_FORMAT       = svg
+DOT_IMAGE_FORMAT       = png
 
 # The tag DOT_PATH can be used to specify the path where the dot tool can be 
 # found. If left blank, it is assumed the dot tool can be found in the path.

doc/README.md

@@ -1,76 +1,46 @@
-Bitcoin 0.9.5 BETA
-=====================
+Bitcoin 0.8.6 BETA
+====================
 
-Copyright (c) 2009-2015 Bitcoin Developers
+Copyright (c) 2009-2013 Bitcoin Developers
+
+Distributed under the MIT/X11 software license, see the accompanying
+file COPYING or http://www.opensource.org/licenses/mit-license.php.
+This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes
+cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard.
+
+
+Intro
+---------------------
+Bitcoin is a free open source peer-to-peer electronic cash system that is
+completely decentralized, without the need for a central server or trusted
+parties.  Users hold the crypto keys to their own money and transact directly
+with each other, with the help of a P2P network to check for double-spending.
 
 
 Setup
 ---------------------
-[Bitcoin Core](http://bitcoin.org/en/download) is the original Bitcoin client and it builds the backbone of the network. However, it downloads and stores the entire history of Bitcoin transactions (which is currently several GBs); depending on the speed of your computer and network connection, the synchronization process can take anywhere from a few hours to a day or more. Thankfully you only have to do this once. If you would like the process to go faster you can [download the blockchain directly](bootstrap.md).
-
-Running
----------------------
-The following are some helpful notes on how to run Bitcoin on your native platform. 
-
-### Unix
-
 You need the Qt4 run-time libraries to run Bitcoin-Qt. On Debian or Ubuntu:
-
-	sudo apt-get install libqtgui4
+	`sudo apt-get install libqtgui4`
 
 Unpack the files into a directory and run:
 
-- bin/32/bitcoin-qt (GUI, 32-bit) or bin/32/bitcoind (headless, 32-bit)
-- bin/64/bitcoin-qt (GUI, 64-bit) or bin/64/bitcoind (headless, 64-bit)
+- bin/32/bitcoin-qt (GUI, 32-bit)
+- bin/32/bitcoind (headless, 32-bit)
+- bin/64/bitcoin-qt (GUI, 64-bit)
+- bin/64/bitcoind (headless, 64-bit)
 
-
-
-### Windows
-
-Unpack the files into a directory, and then run bitcoin-qt.exe.
-
-### OSX
-
-Drag Bitcoin-Qt to your applications folder, and then run Bitcoin-Qt.
-
-### Need Help?
-
-* See the documentation at the [Bitcoin Wiki](https://en.bitcoin.it/wiki/Main_Page)
+See the documentation at the [Bitcoin Wiki](https://en.bitcoin.it/wiki/Main_Page)
 for help and more information.
-* Ask for help on [#bitcoin](http://webchat.freenode.net?channels=bitcoin) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net?channels=bitcoin).
-* Ask for help on the [BitcoinTalk](https://bitcointalk.org/) forums, in the [Technical Support board](https://bitcointalk.org/index.php?board=4.0).
 
-Building
+
+Other Pages
 ---------------------
-The following are developer notes on how to build Bitcoin on your native platform. They are not complete guides, but include notes on the necessary libraries, compile flags, etc.
-
-- [OSX Build Notes](build-osx.md)
 - [Unix Build Notes](build-unix.md)
+- [OSX Build Notes](build-osx.md)
 - [Windows Build Notes](build-msw.md)
-
-Development
----------------------
-The Bitcoin repo's [root README](https://github.com/bitcoin/bitcoin/blob/master/README.md) contains relevant information on the development process and automated testing.
-
 - [Coding Guidelines](coding.md)
-- [Multiwallet Qt Development](multiwallet-qt.md)
-- [Release Notes](release-notes.md)
 - [Release Process](release-process.md)
-- [Source Code Documentation (External Link)](https://dev.visucore.com/bitcoin/doxygen/)
-- [Translation Process](translation_process.md)
+- [Release Notes](release-notes.md)
+- [Multiwallet Qt Development](multiwallet-qt.md)
 - [Unit Tests](unit-tests.md)
-
-### Resources
-* Discuss on the [BitcoinTalk](https://bitcointalk.org/) forums, in the [Development & Technical Discussion board](https://bitcointalk.org/index.php?board=6.0).
-* Discuss on [#bitcoin-dev](http://webchat.freenode.net/?channels=bitcoin) on Freenode. If you don't have an IRC client use [webchat here](http://webchat.freenode.net/?channels=bitcoin-dev).
-
-### Miscellaneous
-- [Assets Attribution](assets-attribution.md)
-- [Files](files.md)
-- [Tor Support](tor.md)
-
-License
----------------------
-Distributed under the [MIT/X11 software license](http://www.opensource.org/licenses/mit-license.php).
-This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes
-cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard.
+- [Translation Process](translation_process.md)

doc/README_osx.txt

@@ -1,75 +0,0 @@
-Deterministic OSX Dmg Notes.
-
-Working OSX DMG's are created in Linux by combining a recent clang,
-the Apple's binutils (ld, ar, etc), and DMG authoring tools.
-
-Apple uses clang extensively for development and has upstreamed the necessary
-functionality so that a vanilla clang can take advantage. It supports the use
-of -F, -target, -mmacosx-version-min, and --sysroot, which are all necessary
-when building for OSX. A pre-compiled version of 3.2 is used because it was not
-available in the Precise repositories at the time this work was started. In the
-future, it can be switched to use system packages instead.
-
-Apple's version of binutils (called cctools) contains lots of functionality
-missing in the FSF's binutils. In addition to extra linker options for
-frameworks and sysroots, several other tools are needed as well such as
-install_name_tool, lipo, and nmedit. These do not build under linux, so they
-have been patched to do so. The work here was used as a starting point:
-https://github.com/mingwandroid/toolchain4
-
-In order to build a working toolchain, the following source packages are needed
-from Apple: cctools, dyld, and ld64.
-
-Beware. This part is ugly. Very very very ugly. In the future, this should be
-broken out into a new repository and cleaned up. Additionally, the binaries
-only work when built as x86 and not x86_64. This is an especially nasty
-limitation because it must be linked with the toolchain's libLTO.so, meaning
-that the entire toolchain must be x86. Gitian x86_64 should not be used until
-this has been fixed, because it would mean that several native dependencies
-(openssl, libuuid, etc) would need to be built as x86 first.
-
-These tools inject timestamps by default, which produce non-deterministic
-binaries. The ZERO_AR_DATE environment variable is used to disable that.
-
-This version of cctools has been patched to use the current version of clang's
-headers and and its libLTO.so rather than those from llvmgcc, as it was
-originally done in toolchain4.
-
-To complicate things further, all builds must target an Apple SDK. These SDKs
-are free to download, but not redistributable.
-To obtain it, register for a developer account, then download xcode4630916281a.dmg:
-https://developer.apple.com/downloads/download.action?path=Developer_Tools/xcode_4.6.3/xcode4630916281a.dmg
-This file is several gigabytes in size, but only a single directory inside is
-needed: Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.7.sdk
-
-Unfortunately, the usual linux tools (7zip, hpmount, loopback mount) are incapable of opening this file.
-To create a tarball suitable for gitian input, mount the dmg in OSX, then create it with:
-  $ tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.7.sdk.tar.gz MacOSX10.7.sdk
-
-
-The gitian descriptors build 2 sets of files: Linux tools, then Apple binaries
-which are created using these tools. The build process has been designed to
-avoid including the SDK's files in Gitian's outputs. All interim tarballs are
-fully deterministic and may be freely redistributed.
-
-genisoimage is used to create the initial DMG. It is not deterministic as-is,
-so it has been patched. A system genisoimage will work fine, but it will not
-be deterministic because the file-order will change between invocations.
-The patch can be seen here:
-https://raw.githubusercontent.com/theuni/osx-cross-depends/master/patches/cdrtools/genisoimage.diff
-No effort was made to fix this cleanly, so it likely leaks memory badly. But
-it's only used for a single invocation, so that's no real concern.
-
-genisoimage cannot compress DMGs, so afterwards, the 'dmg' tool from the
-libdmg-hfsplus project is used to compress it. There are several bugs in this
-tool and its maintainer has seemingly abandoned the project. It has been forked
-and is available (with fixes) here: https://github.com/theuni/libdmg-hfsplus .
-
-The 'dmg' tool has the ability to create DMG's from scratch as well, but this
-functionality is broken. Only the compression feature is currently used.
-Ideally, the creation could be fixed and genisoimage would no longer be necessary.
-
-Background images and other features can be added to DMG files by inserting a
-.DS_Store before creation. The easiest way to create this file is to build a
-DMG without one, move it to a device running OSX, customize the layout, then
-grab the .DS_Store file for later use. That is the approach taken here.

doc/README_windows.txt

@@ -1,7 +1,6 @@
-Bitcoin 0.9.4 BETA
-
-Copyright (c) 2009-2015 Bitcoin Core Developers
+Bitcoin 0.8.5 BETA
 
+Copyright (c) 2009-2013 Bitcoin Developers
 Distributed under the MIT/X11 software license, see the accompanying
 file COPYING or http://www.opensource.org/licenses/mit-license.php.
 This product includes software developed by the OpenSSL Project for use in
@@ -21,7 +20,7 @@ Setup
 -----
 Unpack the files into a directory and run bitcoin-qt.exe.
 
-Bitcoin Core is the original Bitcoin client and it builds the backbone of the network.
+Bitcoin-Qt is the original Bitcoin client and it builds the backbone of the network.
 However, it downloads and stores the entire history of Bitcoin transactions;
 depending on the speed of your computer and network connection, the synchronization
 process can take anywhere from a few hours to a day or more.

doc/Tor.txt

@@ -0,0 +1,92 @@
+TOR SUPPORT IN BITCOIN
+======================
+
+It is possible to run Bitcoin as a Tor hidden service, and connect to such services.
+
+The following directions assume you have a Tor proxy running on port 9050. Many distributions
+default to having a SOCKS proxy listening on port 9050, but others may not.
+In particular, the Tor Browser Bundle defaults to listening on a random port. See
+https://www.torproject.org/docs/faq.html.en#TBBSocksPort for how to properly
+configure Tor.
+
+
+1. Run bitcoin behind a Tor proxy
+---------------------------------
+
+The first step is running Bitcoin behind a Tor proxy. This will already make all
+outgoing connections be anonimized, but more is possible.
+
+-socks=5        SOCKS5 supports connecting-to-hostname, which can be used instead
+                of doing a (leaking) local DNS lookup. SOCKS5 is the default,
+                but SOCKS4 does not support this. (SOCKS4a does, but isn't
+                implemented).
+
+-proxy=ip:port  Set the proxy server. If SOCKS5 is selected (default), this proxy
+                server will be used to try to reach .onion addresses as well.
+
+-tor=ip:port    Set the proxy server to use for tor hidden services. You do not
+                need to set this if it's the same as -proxy. You can use -notor
+                to explicitly disable access to hidden service.
+
+-listen         When using -proxy, listening is disabled by default. If you want
+                to run a hidden service (see next section), you'll need to enable
+                it explicitly.
+
+-connect=X      When behind a Tor proxy, you can specify .onion addresses instead
+-addnode=X      of IP addresses or hostnames in these parameters. It requires
+-seednode=X     SOCKS5. In Tor mode, such addresses can also be exchanged with
+                other P2P nodes.
+
+In a typical situation, this suffices to run behind a Tor proxy:
+
+  ./bitcoin -proxy=127.0.0.1:9050
+
+
+2. Run a bitcoin hidden server
+------------------------------
+
+If you configure your Tor system accordingly, it is possible to make your node also
+reachable from the Tor network. Add these lines to your /etc/tor/torrc (or equivalent
+config file):
+
+  HiddenServiceDir /var/lib/tor/bitcoin-service/
+  HiddenServicePort 8333 127.0.0.1:8333
+
+The directory can be different of course, but (both) port numbers should be equal to
+your bitcoind's P2P listen port (8333 by default).
+
+-externalip=X   You can tell bitcoin about its publicly reachable address using
+                this option, and this can be a .onion address. Given the above
+                configuration, you can find your onion address in
+                /var/lib/tor/bitcoin-service/hostname. Onion addresses are given
+                preference for your node to advertize itself with, for connections
+                coming from unroutable addresses (such as 127.0.0.1, where the
+                Tor proxy typically runs).
+
+-listen         You'll need to enable listening for incoming connections, as this
+                is off by default behind a proxy.
+
+-discover       When -externalip is specified, no attempt is made to discover local
+                IPv4 or IPv6 addresses. If you want to run a dual stack, reachable
+                from both Tor and IPv4 (or IPv6), you'll need to either pass your
+                other addresses using -externalip, or explicitly enable -discover.
+                Note that both addresses of a dual-stack system may be easily
+                linkable using traffic analysis.
+
+In a typical situation, where you're only reachable via Tor, this should suffice:
+
+  ./bitcoind -proxy=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -listen
+
+(obviously, replace the Onion address with your own). If you don't care too much
+about hiding your node, and want to be reachable on IPv4 as well, additionally
+specify:
+
+  ./bitcoind ... -discover
+
+and open port 8333 on your firewall (or use -upnp).
+
+If you only want to use Tor to reach onion addresses, but not use it as a proxy
+for normal IPv4/IPv6 communication, use:
+
+  ./bitcoin -tor=127.0.0.1:9050 -externalip=57qr3yd1nyntf5k.onion -discover
+

doc/assets-attribution.md

@@ -1,104 +0,0 @@
-The following is a list of assets used in the bitcoin source and their proper attribution.
-
-[Wladimir van der Laan](https://github.com/laanwj)
------------------------
-#### Info
-* License: MIT
-
-### Assets Used
-	src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
-	src/qt/res/src/clock_green.svg, src/qt/res/src/clock1.svg,
-	src/qt/res/src/clock2.svg, src/qt/res/src/clock3.svg,
-	src/qt/res/src/clock4.svg, src/qt/res/src/clock5.svg,
-	src/qt/res/src/inout.svg, src/qt/res/src/questionmark.svg
-
-[David Vignoni](http://www.icon-king.com)
------------------------
-
-### Info
-* Icon Pack: NUVOLA ICON THEME for KDE 3.x
-* Designer: David Vignoni (david@icon-king.com)
-* License: LGPL
-* Site: [http://www.icon-king.com/projects/nuvola](http://www.icon-king.com/projects/nuvola)
-
-### Assets Used
-	src/qt/res/icons/address-book.png, src/qt/res/icons/export.png,
-	src/qt/res/icons/history.png, src/qt/res/icons/key.png,
-	src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png,
-	src/qt/res/icons/receive.png, src/qt/res/icons/send.png,
-	src/qt/res/icons/synced.png, src/qt/res/icons/filesave.png
-
-schollidesign
------------------------
-
-### Info
-* Icon Pack: Human-O2
-* Designer: schollidesign
-* License: GNU/GPL
-* Site: [http://findicons.com/icon/93743/blocks_gnome_netstatus_0](http://findicons.com/icon/93743/blocks_gnome_netstatus_0)
-
-### Assets Used
-	src/qt/res/icons/connect*.png
-
-md2k7
------------------------
-
-### Info
-* Designer: md2k7
-* License: You are free to do with these icons as you wish, including selling, copying, modifying etc.
-* License: MIT
-* Site: [https://bitcointalk.org/index.php?topic=15276.0](https://bitcointalk.org/index.php?topic=15276.0)
-
-### Assets Used
-	src/qt/res/icons/transaction*.png
-
-[Everaldo.com](http://www.everaldo.com)
------------------------
-
-### Info
-* Icon Pack: Crystal SVG
-* Designer: [http://www.everaldo.com](http://www.everaldo.com)
-* License: LGPL
-
-### Assets Used
-	src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
-	src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
-	src/qt/res/icons/add.png, src/qt/res/icons/edit.png,
-	src/qt/res/icons/remove.png (edited)
-
-Everaldo (Everaldo Coelho)
------------------------
-
-### Info
-* Icon Pack: Kids
-* Designer: Everaldo (Everaldo Coelho)
-* License: GNU/GPL 
-* Site: [http://findicons.com/icon/17102/reload?id=17102](http://findicons.com/icon/17102/reload?id=17102)
-
-### Assets Used
-	scripts/img/reload.xcf (modified), src/qt/res/movies/*.png
-
-[Vignoni David](http://techbase.kde.org/Projects/Oxygen)
------------------------
-
-### Info
-* Designer: Vignoni David
-* License: Oxygen icon theme is dual licensed. You may copy it under the Creative Common Attribution-ShareAlike 3.0 License or the GNU Library General Public License.
-* Site: [http://techbase.kde.org/Projects/Oxygen](http://techbase.kde.org/Projects/Oxygen)
-
-### Assets Used
-	src/qt/res/icons/debugwindow.png
-
-Jonas Schnelli
------------------------
-
-### Info
-* Designer: Jonas Schnelli (based on the original bitcoin logo from Bitboy)
-* License: MIT
-
-### Assets Used
-	src/qt/res/icons/bitcoin.icns, src/qt/res/src/bitcoin.svg,
-	src/qt/res/src/bitcoin.ico, src/qt/res/src/bitcoin.png,
-	src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png,
-	src/qt/res/icons/toolbar.png, src/qt/res/icons/toolbar_testnet.png,
-	src/qt/res/images/splash.png, src/qt/res/images/splash_testnet.png

doc/assets-attribution.txt

@@ -0,0 +1,58 @@
+Icon: src/qt/res/icons/clock*.png, src/qt/res/icons/tx*.png,
+      src/qt/res/src/clock_green.svg, src/qt/res/src/clock1.svg,
+      src/qt/res/src/clock2.svg, src/qt/res/src/clock3.svg,
+      src/qt/res/src/clock4.svg, src/qt/res/src/clock5.svg,
+      src/qt/res/src/inout.svg, src/qt/res/src/questionmark.svg
+Designer: Wladimir van der Laan
+License: MIT
+
+Icon: src/qt/res/icons/address-book.png, src/qt/res/icons/export.png,
+      src/qt/res/icons/history.png, src/qt/res/icons/key.png,
+      src/qt/res/icons/lock_*.png, src/qt/res/icons/overview.png,
+      src/qt/res/icons/receive.png, src/qt/res/icons/send.png,
+      src/qt/res/icons/synced.png, src/qt/res/icons/filesave.png
+Icon Pack: NUVOLA ICON THEME for KDE 3.x
+Designer: David Vignoni (david@icon-king.com)
+          ICON KING - www.icon-king.com
+License: LGPL
+Site: http://www.icon-king.com/projects/nuvola/
+
+Icon: src/qt/res/icons/connect*.png
+Icon Pack: Human-O2
+Designer: schollidesign
+License: GNU/GPL
+Site: http://findicons.com/icon/93743/blocks_gnome_netstatus_0
+
+Icon: src/qt/res/icons/transaction*.png
+Designer: md2k7
+Site: https://bitcointalk.org/index.php?topic=15276.0
+License: You are free to do with these icons as you wish, including selling,
+ copying, modifying etc.
+License: MIT
+
+Icon: src/qt/res/icons/configure.png, src/qt/res/icons/quit.png,
+      src/qt/res/icons/editcopy.png, src/qt/res/icons/editpaste.png,
+      src/qt/res/icons/add.png, src/qt/res/icons/edit.png,
+      src/qt/res/icons/remove.png (edited)
+Designer: http://www.everaldo.com
+Icon Pack: Crystal SVG
+License: LGPL
+
+Icon:  scripts/img/reload.xcf (modified), src/qt/res/movies/update_spinner.mng
+Icon Pack: Kids
+Designer: Everaldo (Everaldo Coelho)
+License: GNU/GPL 
+Site: http://findicons.com/icon/17102/reload?id=17102
+
+Icon: src/qt/res/icons/debugwindow.png
+Designer: Vignoni David
+Site: http://www.oxygen-icons.org/
+License: Oxygen icon theme is dual licensed. You may copy it under the Creative Common Attribution-ShareAlike 3.0 License or the GNU Library General Public License.
+
+Icon: src/qt/res/icons/bitcoin.icns, src/qt/res/src/bitcoin.svg,
+      src/qt/res/src/bitcoin.ico, src/qt/res/src/bitcoin.png,
+      src/qt/res/src/bitcoin_testnet.png, docs/bitcoin_logo_doxygen.png,
+      src/qt/res/icons/toolbar.png, src/qt/res/icons/toolbar_testnet.png,
+      src/qt/res/images/splash.png, src/qt/res/images/splash_testnet.png
+Designer: Jonas Schnelli (based on the original bitcoin logo from Bitboy)
+License: MIT

doc/bootstrap.md

@@ -1,66 +0,0 @@
-### Bootstrap the Blockchain Synchronization
-
-Normally the Bitcoin client will download the transaction and network information, called the blockchain, from the network by syncing with the other clients. This can be a process that can take multiple days as the [Bitcoin block chain](https://blockchain.info/charts/blocks-size) has grown to more than 15 gigabytes, and is growing almost a gigabyte every month. Luckily there is a safe and fast way to speed up this process. We’ll show you how to bootstrap your blockchain to bring your client up to speed in just a few simple steps.
-
-### Requirements
-
-A fresh install of the Bitcoin client software.
-
-### Download the blockchain via Bittorent
-
-Jeff Garzik, Bitcoin core developer, offers an [torrent file](https://bitcointalk.org/index.php?topic=145386.0) for bootstrapping purposes that is updated often. Bittorrent is a protocol that speeds up the downloading of large files by using the other clients in the network. Examples of free and safe open-source clients are [Deluge](http://deluge-torrent.org/) or [QBittorent](http://www.qbittorrent.org/). A guide to installing and configuring the torrent clients can be found [here](http://dev.deluge-torrent.org/wiki/UserGuide) for Deluge and [here](http://qbforums.shiki.hu/) for QBittorent. A further in-depth tutorial on Bittorent can be found [here](http://www.howtogeek.com/howto/31846/bittorrent-for-beginners-how-get-started-downloading-torrents/).
-
-With the client installed we’ll proceed to download the blockchain torrent file. Use the following magnet link:
-
-	magnet:?xt=urn:btih:2d4e6c1f96c5d5fb260dff92aea4e600227f1aea&dn=bootstrap.dat&tr=udp://tracker.openbittorrent.com:80&tr=udp://tracker.publicbt.com:80&tr=udp://tracker.ccc.de:80&tr=udp://tracker.istole.it:80
-	
- or go to [Jeff Garzik's topic](https://bitcointalk.org/index.php?topic=145386.0) for a signed magnet link. Alternately you can use the [.torrent file](http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/bootstrap.dat.torrent/download) found on Sourceforge.
-     
-![Fig1](img/bootstrap1.png)
-
-The download page should look like this, with a countdown to the download. If it does not work click the direct download link.
-
-The torrent client installed will recognize the download of the torrent file. Save the bootstrap.dat file to a folder you use for downloads. The image below shows the torrent download in QBittorent, with current speed and ETA highlighted.
-
-![Fig2](img/bootstrap2.png)
-
-### Download the block chain directly from official repositories
-The Bittorent version, see above, of the block chain download is refreshed more often than the direct download available. If Bittorent is blocked on your network then you can use the direct download method. Be sure to only use official repositories as the link displayed below. This download will only update the client to March 2013.
-
-Click [here](http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/bitcoin_blockchain_170000.zip/download) to download or copy and paste the link below.
-
-	http://sourceforge.net/projects/bitcoin/files/Bitcoin/blockchain/bitcoin_blockchain_170000.zip/download
-    
-The download page should look like this, with a countdown to the download. If it does not work directly click the download. Save the file to a folder you use for downloads.
-![Fig3](img/bootstrap3.png)
-
-### Importing the blockchain
-Exit the Bitcoin Client software if you have it running. Be sure not to have an actively used wallet in use. We are going to copy the download of the blockchain to the Bitcoin client data directory. You should run the client software at least once so it can generate the data directory. Copy the downloaded bootstrap.dat file into the Bitcoin data folder.
-
-**For Windows users:**
-Open explorer, and type into the address bar:
-
-	%APPDATA%\Bitcoin
-    
-This will open up the data folder. It should look like the image below. Copy over the bootstrap.dat from your download folder to this directory.
-![Fig4](img/bootstrap4.png)
-
-**For OSX users:**
-Open Finder by pressing Press [shift] + [cmd] + [g] and enter:
-
-	~/Library/Application Support/Bitcoin/
-    
-**For Linux users:**
-The directory is hidden in your User folder. Go to:
-
-	~/.bitcoin/
-    
-### Importing the blockchain
-Now start the Bitcoin client software. It should show "Importing blocks from disk" like the image below. 
-![Fig5](img/bootstrap5.png)
-
-Wait until the import finishes. The client will download the last days not covered by the import. Congratulations you have successfully imported the blockchain!
-
-### Is this safe?
-
-Yes, the above method is safe. The download contains only raw block chain data and the client verifies this on import. Do not download the blockchain from unofficial sources, especially if they provide `*.rev` and `*.sst` files. These files are not verified and can contain malicious edits.

doc/build-msw.md

@@ -1,7 +1,17 @@
+Copyright (c) 2009-2013 Bitcoin Developers
+
+Distributed under the MIT/X11 software license, see the accompanying
+file COPYING or http://www.opensource.org/licenses/mit-license.php.
+This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes
+cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard.
+
+
+See readme-qt.rst for instructions on building Bitcoin-Qt, the
+graphical user interface.
+
 WINDOWS BUILD NOTES
 ===================
 
-
 Compilers Supported
 -------------------
 TODO: What works?
@@ -12,12 +22,11 @@ Dependencies
 ------------
 Libraries you need to download separately and build:
 
-	name            default path               download
-	--------------------------------------------------------------------------------------------------------------------
-	OpenSSL         \openssl-1.0.1c-mgw        http://www.openssl.org/source/
-	Berkeley DB     \db-4.8.30.NC-mgw          http://www.oracle.com/technology/software/products/berkeley-db/index.html
-	Boost           \boost-1.50.0-mgw          http://www.boost.org/users/download/
-	miniupnpc       \miniupnpc-1.6-mgw         http://miniupnp.tuxfamily.org/files/
+                default path               download
+OpenSSL         \openssl-1.0.1c-mgw        http://www.openssl.org/source/
+Berkeley DB     \db-4.8.30.NC-mgw          http://www.oracle.com/technology/software/products/berkeley-db/index.html
+Boost           \boost-1.50.0-mgw          http://www.boost.org/users/download/
+miniupnpc       \miniupnpc-1.6-mgw         http://miniupnp.tuxfamily.org/files/
 
 Their licenses:
 
@@ -55,7 +64,7 @@ MSYS shell:
 
 Boost
 -----
-MSYS shell:
+DOS prompt:
 
 	downloaded boost jam 3.1.18
 	cd \boost-1.50.0-mgw
@@ -74,10 +83,8 @@ MSYS shell:
 
 Bitcoin
 -------
-MSYS shell:
+DOS prompt:
 
-	cd \bitcoin
-	sh autogen.sh
-	sh configure
-	mingw32-make
+	cd \bitcoin\src
+	mingw32-make -f makefile.mingw
 	strip bitcoind.exe

doc/build-osx.md

@@ -1,14 +1,38 @@
-Mac OS X Build Instructions and Notes
+Mac OS X bitcoind build instructions
 ====================================
-This guide will show you how to build bitcoind(headless client) for OSX.
+
+Authors
+-------
+
+* Laszlo Hanyecz <solar@heliacal.net>
+* Douglas Huff <dhuff@jrbobdobbs.org>
+* Colin Dean <cad@cad.cx>
+* Gavin Andresen <gavinandresen@gmail.com>
+
+License
+-------
+
+Copyright (c) 2009-2012 Bitcoin Developers
+
+Distributed under the MIT/X11 software license, see the accompanying
+file COPYING or http://www.opensource.org/licenses/mit-license.php.
+
+This product includes software developed by the OpenSSL Project for use in
+the OpenSSL Toolkit (http://www.openssl.org/).
+
+This product includes cryptographic software written by
+Eric Young (eay@cryptsoft.com) and UPnP software written by Thomas Bernard.
 
 Notes
 -----
 
-* Tested on OS X 10.6 through 10.9 on 64-bit Intel processors only.
-Older OSX releases or 32-bit processors are no longer supported.
+See `doc/readme-qt.rst` for instructions on building Bitcoin-Qt, the
+graphical user interface.
 
-* All of the commands should be executed in a Terminal application. The
+Tested on OS X 10.5 through 10.8 on Intel processors only. PPC is not
+supported because it is big-endian.
+
+All of the commands should be executed in a Terminal application. The
 built-in one is located in `/Applications/Utilities`.
 
 Preparation
@@ -26,92 +50,118 @@ There's an assumption that you already have `git` installed, as well. If
 not, it's the path of least resistance to install [Github for Mac](https://mac.github.com/)
 (OS X 10.7+) or
 [Git for OS X](https://code.google.com/p/git-osx-installer/). It is also
-available via Homebrew.
+available via Homebrew or MacPorts.
 
-You will also need to install [Homebrew](http://brew.sh)
-in order to install library dependencies.
+You will also need to install [Homebrew](http://mxcl.github.io/homebrew/)
+or [MacPorts](https://www.macports.org/) in order to install library
+dependencies. It's largely a religious decision which to choose, but, as of
+December 2012, MacPorts is a little easier because you can just install the
+dependencies immediately - no other work required. If you're unsure, read
+the instructions through first in order to assess what you want to do.
+Homebrew is a little more popular among those newer to OS X.
 
 The installation of the actual dependencies is covered in the Instructions
 sections below.
 
-Instructions: Homebrew
+Instructions: MacPorts
 ----------------------
 
-#### Install dependencies using Homebrew
+### Install dependencies
 
-        brew install autoconf automake libtool boost miniupnpc openssl pkg-config protobuf qt
-
-Note: After you have installed the dependencies, you should check that the Homebrew installed version of OpenSSL is the one available for compilation. You can check this by typing
-
-        openssl version
-
-into Terminal. You should see OpenSSL 1.0.1f 6 Jan 2014.
-
-If not, you can ensure that the Homebrew OpenSSL is correctly linked by running
-
-        brew link openssl --force
-
-Rerunning "openssl version" should now return the correct version. If it
-doesn't, make sure `/usr/local/bin` comes before `/usr/bin` in your
-PATH. 
-
-#### Installing berkeley-db4 using Homebrew
-
-The homebrew package for berkeley-db4 has been broken for some time.  It will install without Java though.
-
-Running this command takes you into brew's interactive mode, which allows you to configure, make, and install by hand:
-```
-$ brew install https://raw.github.com/mxcl/homebrew/master/Library/Formula/berkeley-db4.rb -–without-java 
-```
-
-These rest of these commands are run inside brew interactive mode:
-```
-/private/tmp/berkeley-db4-UGpd0O/db-4.8.30 $ cd ..
-/private/tmp/berkeley-db4-UGpd0O $ db-4.8.30/dist/configure --prefix=/usr/local/Cellar/berkeley-db4/4.8.30 --mandir=/usr/local/Cellar/berkeley-db4/4.8.30/share/man --enable-cxx
-/private/tmp/berkeley-db4-UGpd0O $ make
-/private/tmp/berkeley-db4-UGpd0O $ make install
-/private/tmp/berkeley-db4-UGpd0O $ exit
-```
-
-After exiting, you'll get a warning that the install is keg-only, which means it wasn't symlinked to `/usr/local`.  You don't need it to link it to build bitcoin, but if you want to, here's how:
-
-    $ brew --force link berkeley-db4
+Installing the dependencies using MacPorts is very straightforward.
 
+    sudo port install boost db48@+no_java openssl miniupnpc
 
 ### Building `bitcoind`
 
 1. Clone the github tree to get the source code and go into the directory.
 
-        git clone https://github.com/bitcoin/bitcoin.git
+        git clone git@github.com:bitcoin/bitcoin.git bitcoin
         cd bitcoin
 
 2.  Build bitcoind:
 
-        ./autogen.sh
-        ./configure
-        make
+        cd src
+        make -f makefile.osx
 
 3.  It is a good idea to build and run the unit tests, too:
 
-        make check
+        make -f makefile.osx test
+
+Instructions: HomeBrew
+----------------------
+
+#### Install dependencies using Homebrew
+
+        brew install boost miniupnpc openssl berkeley-db4
+
+Note: After you have installed the dependencies, you should check that the Brew installed version of OpenSSL is the one available for compilation. You can check this by typing
+
+        openssl version
+
+into Terminal. You should see OpenSSL 1.0.1e 11 Feb 2013.
+
+If not, you can ensure that the Brew OpenSSL is correctly linked by running
+
+        brew link openssl --force
+
+Rerunning "openssl version" should now return the correct version.
+
+### Building `bitcoind`
+
+1. Clone the github tree to get the source code and go into the directory.
+
+        git clone git@github.com:bitcoin/bitcoin.git bitcoin
+        cd bitcoin
+
+2.  Modify source in order to pick up the `openssl` library.
+
+    Edit `makefile.osx` to account for library location differences. There's a
+    diff in `contrib/homebrew/makefile.osx.patch` that shows what you need to
+    change, or you can just patch by doing
+
+        patch -p1 < contrib/homebrew/makefile.osx.patch
+
+3.  Build bitcoind:
+
+        cd src
+        make -f makefile.osx
+
+4.  It is a good idea to build and run the unit tests, too:
+
+        make -f makefile.osx test
 
 Creating a release build
 ------------------------
-You can ignore this section if you are building `bitcoind` for your own use.
 
-bitcoind/bitcoin-cli binaries are not included in the Bitcoin-Qt.app bundle.
+A bitcoind binary is not included in the Bitcoin-Qt.app bundle. You can ignore
+this section if you are building `bitcoind` for your own use.
 
-If you are building `bitcoind` or `Bitcoin-Qt` for others, your build machine should be set up
+If you are building `bitcoind` for others, your build machine should be set up
 as follows for maximum compatibility:
 
 All dependencies should be compiled with these flags:
 
- -mmacosx-version-min=10.6
- -arch x86_64
- -isysroot $(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
+    -mmacosx-version-min=10.5 -arch i386 -isysroot /Developer/SDKs/MacOSX10.5.sdk
 
-Once dependencies are compiled, see release-process.md for how the Bitcoin-Qt.app
-bundle is packaged and signed to create the .dmg disk image that is distributed.
+For MacPorts, that means editing your macports.conf and setting
+`macosx_deployment_target` and `build_arch`:
+
+    macosx_deployment_target=10.5
+    build_arch=i386
+
+... and then uninstalling and re-installing, or simply rebuilding, all ports.
+
+As of December 2012, the `boost` port does not obey `macosx_deployment_target`.
+Download `http://gavinandresen-bitcoin.s3.amazonaws.com/boost_macports_fix.zip`
+for a fix. Some ports also seem to obey either `build_arch` or
+`macosx_deployment_target`, but not both at the same time. For example, building
+on an OS X 10.6 64-bit machine fails. Official release builds of Bitcoin-Qt are
+compiled on an OS X 10.6 32-bit machine to workaround that problem.
+
+Once dependencies are compiled, creating `Bitcoin-Qt.app` is easy:
+
+    make -f Makefile.osx RELEASE=1
 
 Running
 -------
@@ -126,13 +176,10 @@ commands:
     chmod 600 "/Users/${USER}/Library/Application Support/Bitcoin/bitcoin.conf"
 
 When next you run it, it will start downloading the blockchain, but it won't
-output anything while it's doing this. This process may take several hours;
-you can monitor its process by looking at the debug.log file, like this:
-
-    tail -f $HOME/Library/Application\ Support/Bitcoin/debug.log
+output anything while it's doing this. This process may take several hours.
 
 Other commands:
 
+    ./bitcoind --help  # for a list of command-line options.
     ./bitcoind -daemon # to start the bitcoin daemon.
-    ./bitcoin-cli --help  # for a list of command-line options.
-    ./bitcoin-cli help    # When the daemon is running, to get a list of RPC commands
+    ./bitcoind help    # When the daemon is running, to get a list of RPC commands

doc/build-unix.md

@@ -1,36 +1,42 @@
+Copyright (c) 2009-2013 Bitcoin Developers
+
+Distributed under the MIT/X11 software license, see the accompanying
+file COPYING or http://www.opensource.org/licenses/mit-license.php.
+This product includes software developed by the OpenSSL Project for use in the [OpenSSL Toolkit](http://www.openssl.org/). This product includes
+cryptographic software written by Eric Young ([eay@cryptsoft.com](mailto:eay@cryptsoft.com)), and UPnP software written by Thomas Bernard.
+
 UNIX BUILD NOTES
 ====================
-Some notes on how to build Bitcoin in Unix. 
 
 To Build
 ---------------------
 
-	./autogen.sh
-	./configure
-	make
+	cd src/
+	make -f makefile.unix		# Headless bitcoin
 
-This will build bitcoin-qt as well if the dependencies are met.
+See readme-qt.rst for instructions on building Bitcoin-Qt, the graphical user interface.
 
 Dependencies
 ---------------------
 
- Library     | Purpose          | Description
- ------------|------------------|----------------------
- libssl      | SSL Support      | Secure communications
- libdb4.8    | Berkeley DB      | Wallet storage
- libboost    | Boost            | C++ Library
- miniupnpc   | UPnP Support     | Optional firewall-jumping support
- qt          | GUI              | GUI toolkit
- protobuf    | Payments in GUI  | Data interchange format used for payment protocol
- libqrencode | QR codes in GUI  | Optional for generating QR codes
+ Library     Purpose           Description
+ -------     -------           -----------
+ libssl      SSL Support       Secure communications
+ libdb4.8    Berkeley DB       Blockchain & wallet storage
+ libboost    Boost             C++ Library
+ miniupnpc   UPnP Support      Optional firewall-jumping support
 
 [miniupnpc](http://miniupnp.free.fr/) may be used for UPnP port mapping.  It can be downloaded from [here](
 http://miniupnp.tuxfamily.org/files/).  UPnP support is compiled in and
-turned off by default.  See the configure options for upnp behavior desired:
+turned off by default.  Set USE_UPNP to a different value to control this:
 
-	--without-miniupnpc      No UPnP support miniupnp not required
-	--disable-upnp-default   (the default) UPnP support turned off by default at runtime
-	--enable-upnp-default    UPnP support turned on by default at runtime
+	USE_UPNP=     No UPnP support miniupnp not required
+	USE_UPNP=0    (the default) UPnP support turned off by default at runtime
+	USE_UPNP=1    UPnP support turned on by default at runtime
+
+IPv6 support may be disabled by setting:
+
+	USE_IPV6=0    Disable IPv6 support
 
 Licenses of statically linked libraries:
  Berkeley DB   New BSD license with additional requirement that linked
@@ -38,78 +44,55 @@ Licenses of statically linked libraries:
  Boost         MIT-like license
  miniupnpc     New (3-clause) BSD license
 
-- For the versions used in the release, see doc/release-process.md under *Fetch and build inputs*.
-
-System requirements
---------------------
-
-C++ compilers are memory-hungry. It is recommended to have at least 1 GB of
-memory available when compiling Bitcoin Core. With 512MB of memory or less
-compilation will take much longer due to swap thrashing.
+- Versions used in this release:
+-  GCC           4.3.3
+-  OpenSSL       1.0.1c
+-  Berkeley DB   4.8.30.NC
+-  Boost         1.37
+-  miniupnpc     1.6
 
 Dependency Build Instructions: Ubuntu & Debian
 ----------------------------------------------
 Build requirements:
 
 	sudo apt-get install build-essential
-	sudo apt-get install libtool autotools-dev autoconf
 	sudo apt-get install libssl-dev
 
-for Ubuntu 12.04 and later:
+for Ubuntu 12.04:
 
 	sudo apt-get install libboost-all-dev
 
  db4.8 packages are available [here](https://launchpad.net/~bitcoin/+archive/bitcoin).
- You can add the repository using the following command:
 
-        sudo add-apt-repository ppa:bitcoin/bitcoin
-        sudo apt-get update
-
- Ubuntu 12.04 and later have packages for libdb5.1-dev and libdb5.1++-dev,
+ Ubuntu precise has packages for libdb5.1-dev and libdb5.1++-dev,
  but using these will break binary wallet compatibility, and is not recommended.
 
-for Debian 7 (Wheezy) and later:
- The oldstable repository contains db4.8 packages.
- Add the following line to /etc/apt/sources.list,
- replacing [mirror] with any official debian mirror.
-
-	deb http://[mirror]/debian/ oldstable main
-
-To enable the change run
-
-	sudo apt-get update
-
 for other Ubuntu & Debian:
 
 	sudo apt-get install libdb4.8-dev
 	sudo apt-get install libdb4.8++-dev
+	sudo apt-get install libboost1.37-dev
+ (If using Boost 1.37, append -mt to the boost libraries in the makefile)
 
 Optional:
 
-	sudo apt-get install libminiupnpc-dev (see --with-miniupnpc and --enable-upnp-default)
+	sudo apt-get install libminiupnpc-dev (see USE_UPNP compile flag)
 
-Dependencies for the GUI: Ubuntu & Debian
------------------------------------------
 
-If you want to build Bitcoin-Qt, make sure that the required packages for Qt development
-are installed. Either Qt 4 or Qt 5 are necessary to build the GUI.
-If both Qt 4 and Qt 5 are installed, Qt 4 will be used. Pass `--with-gui=qt5` to configure to choose Qt5.
-To build without GUI pass `--without-gui`.
+Dependency Build Instructions: Gentoo
+-------------------------------------
 
-To build with Qt 4 you need the following:
+Note: If you just want to install bitcoind on Gentoo, you can add the Bitcoin overlay and use your package manager:
 
-    sudo apt-get install libqt4-dev libprotobuf-dev protobuf-compiler
+	layman -a bitcoin && emerge bitcoind
+	emerge -av1 --noreplace boost glib openssl sys-libs/db:4.8
 
-For Qt 5 you need the following:
+Take the following steps to build (no UPnP support):
 
-    sudo apt-get install libqt5gui5 libqt5core5 libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev
+	cd ${BITCOIN_DIR}/src
+	make -f makefile.unix USE_UPNP= USE_IPV6=1 BDB_INCLUDE_PATH='/usr/include/db4.8'
+	strip bitcoind
 
-libqrencode (optional) can be installed with:
-
-    sudo apt-get install libqrencode-dev
-
-Once these are installed, they will be found by configure and a bitcoin-qt executable will be
-built by default.
 
 Notes
 -----
@@ -128,33 +111,11 @@ miniupnpc
 
 Berkeley DB
 -----------
-It is recommended to use Berkeley DB 4.8. If you have to build it yourself:
+You need Berkeley DB 4.8.  If you have to build Berkeley DB yourself:
 
-```bash
-BITCOIN_ROOT=$(pwd)
+	../dist/configure --enable-cxx
+	make
 
-# Pick some path to install BDB to, here we create a directory within the bitcoin directory
-BDB_PREFIX="${BITCOIN_ROOT}/db4"
-mkdir -p $BDB_PREFIX
-
-# Fetch the source and verify that it is not tampered with
-wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
-echo '12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz' | sha256sum -c
-# -> db-4.8.30.NC.tar.gz: OK
-tar -xzvf db-4.8.30.NC.tar.gz
-
-# Build the library and install to our prefix
-cd db-4.8.30.NC/build_unix/
-#  Note: Do a static build so that it can be embedded into the exectuable, instead of having to find a .so at runtime
-../dist/configure --enable-cxx --disable-shared --with-pic --prefix=$BDB_PREFIX
-make install
-
-# Configure Bitcoin Core to use our own-built instance of BDB
-cd $BITCOIN_ROOT
-./configure (other args...) LDFLAGS="-L${BDB_PREFIX}/lib/" CPPFLAGS="-I${BDB_PREFIX}/include/"
-```
-
-**Note**: You only need Berkeley DB if the wallet is enabled (see the section *Disable-Wallet mode* below).
 
 Boost
 -----
@@ -168,16 +129,7 @@ If you need to build Boost yourself:
 Security
 --------
 To help make your bitcoin installation more secure by making certain attacks impossible to
-exploit even if a vulnerability is found, binaries are hardened by default.
-This can be disabled with:
-
-Hardening Flags:
-
-	./configure --enable-hardening
-	./configure --disable-hardening
-
-
-Hardening enables the following features:
+exploit even if a vulnerability is found, you can take the following measures:
 
 * Position Independent Executable
     Build position independent code to take advantage of Address Space Layout Randomization
@@ -189,6 +141,10 @@ Hardening enables the following features:
     On an Amd64 processor where a library was not compiled with -fPIC, this will cause an error
     such as: "relocation R_X86_64_32 against `......' can not be used when making a shared object;"
 
+    To build with PIE, use:
+
+    	make -f makefile.unix ... -e PIE=1
+
     To test that you have built PIE executable, install scanelf, part of paxutils, and use:
 
     	scanelf -e ./bitcoin
@@ -212,16 +168,3 @@ Hardening enables the following features:
 	RW- R-- RW-
 
     The STK RW- means that the stack is readable and writeable but not executable.
-
-Disable-wallet mode
---------------------
-When the intention is to run only a P2P node without a wallet, bitcoin may be compiled in
-disable-wallet mode with:
-
-    ./configure --disable-wallet
-
-In this case there is no dependency on Berkeley DB 4.8.
-
-Mining is also possible in disable-wallet mode, but only using the `getblocktemplate` RPC
-call not `getwork`.
-

doc/coding.md

@@ -43,61 +43,8 @@ Common types:
 	set     set or multiset
 	bn      CBigNum
 
-Doxygen comments
------------------
-
-To facilitate the generation of documentation, use doxygen-compatible comment blocks for functions, methods and fields.
-
-For example, to describe a function use:
-```c++
-/**
- * ... text ...
- * @param[in] arg1    A description
- * @param[in] arg2    Another argument description
- * @pre Precondition for function...
- */
-bool function(int arg1, const char *arg2)
-```
-A complete list of `@xxx` commands can be found at http://www.stack.nl/~dimitri/doxygen/manual/commands.html.
-As Doxygen recognizes the comments by the delimiters (`/**` and `*/` in this case), you don't
-*need* to provide any commands for a comment to be valid, just a description text is fine. 
-
-To describe a class use the same construct above the class definition:
-```c++
-/** 
- * Alerts are for notifying old versions if they become too obsolete and
- * need to upgrade. The message is displayed in the status bar.
- * @see GetWarnings()
- */
-class CAlert
-{
-```
-
-To describe a member or variable use:
-```c++
-int var; //!< Detailed description after the member
-```
-
-Also OK:
-```c++
-///
-/// ... text ...
-///
-bool function2(int arg1, const char *arg2)
-```
-
-Not OK (used plenty in the current source, but not picked up):
-```c++
-//
-// ... text ...
-//
-```
-
-A full list of comment syntaxes picked up by doxygen can be found at http://www.stack.nl/~dimitri/doxygen/manual/docblocks.html,
-but if possible use one of the above styles.
-
-Locking/mutex usage notes
 -------------------------
+Locking/mutex usage notes
 
 The code is multi-threaded, and uses mutexes and the
 LOCK/TRY_LOCK macros to protect data structures.
@@ -113,35 +60,35 @@ between the various components is a goal, with any necessary locking
 done by the components (e.g. see the self-contained CKeyStore class
 and its cs_KeyStore lock for example).
 
-Threads
 -------
-
-- ThreadScriptCheck : Verifies block scripts.
-
-- ThreadImport : Loads blocks from blk*.dat files or bootstrap.dat.
+Threads
 
 - StartNode : Starts other threads.
 
-- ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it.
-
-- ThreadDNSAddressSeed : Loads addresses of peers from the DNS.
-
-- ThreadMapPort : Universal plug-and-play startup/shutdown
+- ThreadGetMyExternalIP : Determines outside-the-firewall IP address, sends addr message to connected peers when it determines it. 
 
 - ThreadSocketHandler : Sends/Receives data from peers on port 8333.
-
-- ThreadOpenAddedConnections : Opens network connections to added nodes.
-
+ 
+- ThreadMessageHandler : Higher-level message handling (sending and receiving).
+ 
 - ThreadOpenConnections : Initiates new connections to peers.
 
-- ThreadMessageHandler : Higher-level message handling (sending and receiving).
-
-- DumpAddresses : Dumps IP addresses of nodes to peers.dat.
+- ThreadTopUpKeyPool : replenishes the keystore's keypool.
+ 
+- ThreadCleanWalletPassphrase : re-locks an encrypted wallet after user has unlocked it for a period of time. 
+ 
+- SendingDialogStartTransfer : used by pay-via-ip-address code (obsolete)
+ 
+- ThreadDelayedRepaint : repaint the gui 
 
 - ThreadFlushWalletDB : Close the wallet.dat file if it hasn't been used in 500ms.
-
+ 
 - ThreadRPCServer : Remote procedure call handler, listens on port 8332 for connections and services them.
-
-- BitcoinMiner : Generates bitcoins (if wallet is enabled).
-
-- Shutdown : Does an orderly shutdown of everything.
+ 
+- ThreadBitcoinMiner : Generates bitcoins
+  
+- ThreadMapPort : Universal plug-and-play startup/shutdown
+ 
+- Shutdown : Does an orderly shutdown of everything
+ 
+- ExitTimeout : Windows-only, sleeps 5 seconds then exits application

doc/files.txt

@@ -1,5 +1,4 @@
-Used in 0.8.0
----------------------
+Used in 0.8.0:
 * wallet.dat: personal wallet (BDB) with keys and transactions
 * peers.dat: peer IP address database (custom format); since 0.7.0
 * blocks/blk000??.dat: block data (custom, 128 MiB per file); since 0.8.0
@@ -8,16 +7,13 @@ Used in 0.8.0
 * chainstate/*; block chain state database (LevelDB); since 0.8.0
 * database/*: BDB database environment; only used for wallet since 0.8.0
 
-Only used in pre-0.8.0
----------------------
+Only used in pre-0.8.0:
 * blktree/*; block chain index (LevelDB); since pre-0.8, replaced by blocks/index/* in 0.8.0
 * coins/*; unspent transaction output database (LevelDB); since pre-0.8, replaced by chainstate/* in 0.8.0
 
-Only used before 0.8.0
----------------------
+Only used before 0.8.0:
 * blkindex.dat: block chain index database (BDB); replaced by {chainstate/*,blocks/index/*,blocks/rev000??.dat} in 0.8.0
 * blk000?.dat: block data (custom, 2 GiB per file); replaced by blocks/blk000??.dat in 0.8.0
 
-Only used before 0.7.0
----------------------
+Only used before 0.7.0:
 * addr.dat: peer IP address database (BDB); replaced by peers.dat in 0.7.0

doc/gitian-building.md

@@ -1,410 +0,0 @@
-Gitian building
-================
-
-*Setup instructions for a gitian build of Bitcoin using a Debian VM or physical system.*
-
-Gitian is the deterministic build process that is used to build the Bitcoin
-Core executables [1]. It provides a way to be reasonably sure that the
-executables are really built from source on github. It also makes sure that
-the same, tested dependencies are used and statically built into the executable.
-
-Multiple developers build the source code by following a specific descriptor
-("recipe"), cryptographically sign the result, and upload the resulting signature.
-These results are compared and only if they match, the build is accepted and uploaded
-to bitcoin.org.
-
-More independent gitian builders are needed, which is why I wrote this
-guide. It is preferred to follow these steps yourself instead of using someone else's
-VM image to avoid 'contaminating' the build.
-
-[1] For all platforms except for MacOSX, at this point. Work for deterministic
-builds for Mac is under way here: https://github.com/theuni/osx-cross-depends .
-
-Table of Contents
-------------------
-
-- [Create a new VirtualBox VM](#create-a-new-virtualbox-vm)
-- [Connecting to the VM](#connecting-to-the-vm)
-- [Setting up Debian for gitian building](#setting-up-debian-for-gitian-building)
-- [Installing gitian](#installing-gitian)
-- [Setting up gitian images](#setting-up-gitian-images)
-- [Getting and building the inputs](#getting-and-building-the-inputs)
-- [Building Bitcoin](#building-bitcoin)
-- [Building an alternative repository](#building-an-alternative-repository)
-- [Signing externally](#signing-externally)
-- [Uploading signatures](#uploading-signatures)
-
-Create a new VirtualBox VM
----------------------------
-
-The first step is to create a new Virtual Machine, which will be explained in
-this section.  This VM will be used to do the Gitian builds. In this guide it
-will be explained how to set up the environment, and how to get the builds
-started.
-
-Debian Linux was chosen as the host distribution because it has a lightweight install (in
-contrast to Ubuntu) and is readily available. We here show the steps for
-VirtualBox [1], but any kind of virtualization can be used. You can also install
-on actual hardware instead of using a VM, in this case you can skip this section.
-
-In the VirtualBox GUI click "Create" and choose the following parameters in the wizard:
-
-![](gitian-building/create_vm_page1.png)
-
-- Type: Linux, Debian (64 bit)
-
-![](gitian-building/create_vm_memsize.png)
-
-- Memory Size: at least 1024MB, anything lower will really slow the build down
-
-![](gitian-building/create_vm_hard_drive.png)
-
-- Hard Drive: Create a virtual hard drive now
-    
-![](gitian-building/create_vm_hard_drive_file_type.png)
-
-- Hard Drive file type: Use the default, VDI (VirtualBox Disk Image) 
-
-![](gitian-building/create_vm_storage_physical_hard_drive.png)
-    
-- Storage on Physical hard drive: Dynamically Allocated 
-    
-![](gitian-building/create_vm_file_location_size.png)
-
-- Disk size: at least 40GB; as low as 20GB *may* be possible, but better to err on the safe side 
-- Push the `Create` button
-
-Get the [Debian 7.4 net installer](http://cdimage.debian.org/debian-cd/7.4.0/amd64/iso-cd/debian-7.4.0-amd64-netinst.iso).
-This DVD image can be validated using a SHA256 hashing tool, for example on
-Unixy OSes by entering the following in a terminal:
-
-    echo "b712a141bc60269db217d3b3e456179bd6b181645f90e4aac9c42ed63de492e9  /home/orion/Downloads/debian-7.4.0-amd64-netinst.iso" | sha256sum -c
-    # (must return OK)
-
-After creating the VM, we need to configure it. 
-
-- Click the `Settings` button, then go to the `Network` tab. Adapter 1 should be attacked to `NAT`.
-
-![](gitian-building/network_settings.png)
-
-- Click `Advanced`, then `Port Forwarding`. We want to set up a port through where we can reach the VM to get files in and out.
-- Create a new rule by clicking the plus icon.
-
-![](gitian-building/port_forwarding_rules.png)
-
-- Set up the new rule the following way:
-  - Name: `SSH`
-  - Protocol: `TCP`
-  - Leave Host IP empty
-  - Host Port: `22222`
-  - Leave Guest IP empty
-  - Guest Port: `22`
-
-- Click `Ok` twice to save.
-
-Then start the VM. On the first launch you will be asked for a CD or DVD image. Choose the downloaded iso.
-
-![](gitian-building/select_startup_disk.png)
-
-[1] https://www.virtualbox.org/
-
-Installing Debian
-------------------
-
-In this section it will be explained how to install Debian on the newly created VM.
-
-- Choose the non-graphical installer.  We do not need the graphical environment, it will only increase installation time and disk usage.
-
-![](gitian-building/debian_install_1_boot_menu.png)
-
-**Note**: Navigation in the Debian installer: To keep a setting at the default
-and proceed, just press `Enter`. To select a different button, press `Tab`.
-
-- Choose locale and keyboard settings (doesn't matter, you can just go with the defaults or select your own information)
-
-![](gitian-building/debian_install_2_select_a_language.png)
-![](gitian-building/debian_install_3_select_location.png)
-![](gitian-building/debian_install_4_configure_keyboard.png)
-
-- The VM will detect network settings using DHCP, this should all proceed automatically
-- Configure the network: 
-  - System name `debian`.
-  - Leave domain name empty.
-
-![](gitian-building/debian_install_5_configure_the_network.png)
-
-- Choose a root password and enter it twice (and remember it for later) 
-
-![](gitian-building/debian_install_6a_set_up_root_password.png)
-
-- Name the new user `debian` (the full name doesn't matter, you can leave it empty) 
-
-![](gitian-building/debian_install_7_set_up_user_fullname.png)
-![](gitian-building/debian_install_8_set_up_username.png)
-
-- Choose a user password and enter it twice (and remember it for later) 
-
-![](gitian-building/debian_install_9_user_password.png)
-
-- The installer will set up the clock using a time server, this process should be automatic
-- Set up the clock: choose a time zone (depends on the locale settings that you picked earlier; specifics don't matter)  
-
-![](gitian-building/debian_install_10_configure_clock.png)
-
-- Disk setup
-  - Partitioning method: Guided - Use the entire disk 
-  
-![](gitian-building/debian_install_11_partition_disks.png)
-
-  - Select disk to partition: SCSI1 (0,0,0) 
-
-![](gitian-building/debian_install_12_choose_disk.png)
-
-  - Partitioning scheme: All files in one partition 
-  
-![](gitian-building/debian_install_13_partition_scheme.png)
-
-  - Finish partitioning and write changes to disk -> *Yes* (`Tab`, `Enter` to select the `Yes` button)
-
-![](gitian-building/debian_install_14_finish.png) 
-![](gitian-building/debian_install_15_write_changes.png)
-
-- The base system will be installed, this will take a minute or so
-- Choose a mirror (any will do) 
-
-![](gitian-building/debian_install_16_choose_a_mirror.png)
-
-- Enter proxy information (unless you are on an intranet, you can leave this empty)
-
-![](gitian-building/debian_install_18_proxy_settings.png)
-
-- Wait a bit while 'Select and install software' runs
-- Participate in popularity contest -> *No*
-- Choose software to install. We need just the base system. 
-
-![](gitian-building/debian_install_19_software_selection.png)
-
-- Make sure only 'SSH server' and 'Standard System Utilities' are checked
-- Uncheck 'Debian Desktop Environment' and 'Print Server'
-
-![](gitian-building/debian_install_20_install_grub.png)
-
-- Install the GRUB boot loader to the master boot record? -> Yes 
-
-![](gitian-building/debian_install_21_finish_installation.png)
-
-- Installation Complete -> *Continue*
-- After installation, the VM will reboot and you will have a working Debian VM. Congratulations!
-
-Connecting to the VM
-----------------------
-
-After the VM has booted you can connect to it using SSH, and files can be copied from and to the VM using a SFTP utility.
-Connect to `localhost`, port `22222` (or the port configured when installing the VM).
-On Windows you can use putty[1] and WinSCP[2].
-
-For example to connect as `root` from a Linux command prompt use
-
-    $ ssh root@localhost -p 22222
-    The authenticity of host '[localhost]:22222 ([127.0.0.1]:22222)' can't be established.
-    ECDSA key fingerprint is 8e:71:f9:5b:62:46:de:44:01:da:fb:5f:34:b5:f2:18.
-    Are you sure you want to continue connecting (yes/no)? yes
-    Warning: Permanently added '[localhost]:22222' (ECDSA) to the list of known hosts.
-    root@localhost's password: (enter root password configured during install)
-    Linux debian 3.2.0-4-amd64 #1 SMP Debian 3.2.54-2 x86_64
-    root@debian:~#
-
-Replace `root` with `debian` to log in as user.
-
-[1] http://www.chiark.greenend.org.uk/~sgtatham/putty/download.html
-[2] http://winscp.net/eng/index.php
-
-Setting up Debian for gitian building
---------------------------------------
-
-In this section we will be setting up the Debian installation for Gitian building.
-
-First we need to log in as `root` to set up dependencies and make sure that our
-user can use the sudo command. Type/paste the following in the terminal:
-
-```bash
-apt-get install git ruby sudo apt-cacher-ng qemu-utils debootstrap lxc python-cheetah parted kpartx bridge-utils
-adduser debian sudo
-```
-
-When you get a colorful screen with a question about the 'LXC directory', just
-go with the default (`/var/lib/lxc`).
-
-Then set up LXC and the rest with the following is a complex jumble of settings and workarounds:
-
-```bash
-# the version of lxc-start in Debian 7.4 needs to run as root, so make sure
-# that the build script can exectute it without providing a password
-echo "%sudo ALL=NOPASSWD: /usr/bin/lxc-start" > /etc/sudoers.d/gitian-lxc
-# add cgroup for LXC
-echo "cgroup  /sys/fs/cgroup  cgroup  defaults  0   0" >> /etc/fstab
-# make /etc/rc.local script that sets up bridge between guest and host
-echo '#!/bin/sh -e' > /etc/rc.local
-echo 'brctl addbr br0' >> /etc/rc.local
-echo 'ifconfig br0 10.0.3.2/24 up' >> /etc/rc.local
-echo 'exit 0' >> /etc/rc.local
-# make sure that USE_LXC is always set when logging in as debian,
-# and configure LXC IP addresses
-echo 'export USE_LXC=1' >> /home/debian/.profile
-echo 'export GITIAN_HOST_IP=10.0.3.2' >> /home/debian/.profile
-echo 'export LXC_GUEST_IP=10.0.3.5' >> /home/debian/.profile
-reboot
-```
-
-At the end the VM is rebooted to make sure that the changes take effect. The steps in this
-section need only to be performed once.
-
-Installing gitian
-------------------
-
-Re-login as the user `debian` that was created during installation.
-The rest of the steps in this guide will be performed as that user.
-
-There is no `python-vm-builder` package in Debian, so we need to install it from source ourselves,
-
-```bash
-wget http://archive.ubuntu.com/ubuntu/pool/universe/v/vm-builder/vm-builder_0.12.4+bzr489.orig.tar.gz
-echo "ec12e0070a007989561bfee5862c89a32c301992dd2771c4d5078ef1b3014f03  vm-builder_0.12.4+bzr489.orig.tar.gz" | sha256sum -c
-# (verification -- must return OK)
-tar -zxvf vm-builder_0.12.4+bzr489.orig.tar.gz
-cd vm-builder-0.12.4+bzr489
-sudo python setup.py install
-cd ..
-```
-
-**Note**: When sudo asks for a password, enter the password for the user *debian* not for *root*.
-
-Clone the git repositories for bitcoin and gitian,
-
-```bash
-git clone https://github.com/devrandom/gitian-builder.git
-git clone https://github.com/bitcoin/bitcoin
-```
-
-Setting up gitian images
--------------------------
-
-Gitian needs virtual images of the operating system to build in.
-Currently this is Ubuntu Precise for both x86 architectures.
-These images will be copied and used every time that a build is started to
-make sure that the build is deterministic.
-Creating the images will take a while, but only has to be done once.
-
-Execute the following as user `debian`:
-
-```bash
-cd gitian-builder
-bin/make-base-vm --lxc --arch i386 --suite precise
-bin/make-base-vm --lxc --arch amd64 --suite precise
-```
-
-There will be a lot of warnings printed during build of the images. These can be ignored.
-
-**Note**: When sudo asks for a password, enter the password for the user *debian* not for *root*.
-
-Getting and building the inputs
---------------------------------
-
-In [doc/release-process.md](release-process.md) in the bitcoin repository under 'Fetch and build inputs'.
-you will find a list of `wget` commands that can be executed to get the dependencies.
-
-I needed to add `--no-check-certificate` to the OpenSSL wget line to make it work.
-Likely this is because the ca-certificates in Debian 7.4 is fairly old. This does not create a 
-security issue as the gitian descriptors check integrity of the input archives and refuse to work
-if any one is corrupted.
-
-After downloading the archives, execute the `gbuild` commends to build the dependencies.
-This can take a long time, but only has to be done when the dependencies change, for example
-to upgrade the used version.
-
-**Note**: Do not forget to copy the result from `build/out` to `inputs` after every gbuild command! This will save
-you a lot of time.
-
-At any time you can check the package installation and build progress with
-
-```bash
-tail -f var/install.log
-tail -f var/build.log
-```
-
-Building Bitcoin
-----------------
-
-To build Bitcoin (for Linux and/or Windows) just follow the steps under 'perform
-gitian builds' in [doc/release-process.md](release-process.md) in the bitcoin repository.
-
-Output from `gbuild` will look something like
-
-    Initialized empty Git repository in /home/debian/gitian-builder/inputs/bitcoin/.git/
-    remote: Reusing existing pack: 35606, done.
-    remote: Total 35606 (delta 0), reused 0 (delta 0)
-    Receiving objects: 100% (35606/35606), 26.52 MiB | 4.28 MiB/s, done.
-    Resolving deltas: 100% (25724/25724), done.
-    From https://github.com/bitcoin/bitcoin
-    ... (new tags, new branch etc)
-    --- Building for precise i386 ---
-    Stopping target if it is up
-    Making a new image copy
-    stdin: is not a tty
-    Starting target
-    Checking if target is up
-    Preparing build environment
-    Updating apt-get repository (log in var/install.log)
-    Installing additional packages (log in var/install.log)
-    Grabbing package manifest
-    stdin: is not a tty
-    Creating build script (var/build-script)
-    lxc-start: Connection refused - inotify event with no name (mask 32768)
-    Running build script (log in var/build.log)
-
-As when building the dependencies, the progress of package installation and building
-can be inspected in `var/install.log` and `var/build.log`.
-
-Building an alternative repository
------------------------------------
-
-If you want to do a test build of a pull on github it can be useful to point
-the gitian builder at an alternative repository, using the same descriptors
-and inputs.
-
-For example:
-```bash
-URL=https://github.com/laanwj/bitcoin.git
-COMMIT=2014_03_windows_unicode_path
-./bin/gbuild --commit bitcoin=${COMMIT} --url bitcoin=${URL} ../bitcoin/contrib/gitian-descriptors/gitian-linux.yml
-./bin/gbuild --commit bitcoin=${COMMIT} --url bitcoin=${URL} ../bitcoin/contrib/gitian-descriptors/gitian-win.yml
-```
-
-Signing externally
--------------------
-
-If you want to do the PGP signing on another device that's possible too; just define `SIGNER` as mentioned
-and follow the steps in the build process as normally.
-
-    gpg: skipped "laanwj": secret key not available
-
-When you execute `gsign` you will get an error from GPG, which can be ignored. Copy the resulting `.assert` files
-in `gitian.sigs` to your signing machine and do
-
-```bash
-    gpg --detach-sign ${VERSION}/${SIGNER}/bitcoin-build.assert
-    gpg --detach-sign ${VERSION}-win/${SIGNER}/bitcoin-build.assert
-```
-
-This will create the `.sig` files that can be committed together with the `.assert` files to assert your
-gitian build.
-
-Uploading signatures
----------------------
-
-After building and signing you can push your signatures (both the `.assert` and
-`.assert.sig` files) to the
-[bitcoin/gitian.sigs](https://github.com/bitcoin/gitian.sigs/) repository, or
-if not possible create a pull request. You can also mail the files to me
-(laanwj@gmail.com) and I'll commit them.
-