gitian: Version bump for Qt dependency

Bump Qt dependency version after OpenSSL update.
Very important. Thanks @michagogo for noting.

Rebased-From: 178825d

.gitignore

@@ -34,7 +34,6 @@ src/qt/test/moc*.cpp
 *.rej
 *.orig
 *.o
-*.o-*
 *.patch
 .bitcoin
 *.a

.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

Makefile.am

@@ -15,7 +15,6 @@ 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)
 
@@ -25,8 +24,7 @@ WINDOWS_PACKAGING = $(top_srcdir)/share/pixmaps/bitcoin.ico \
   $(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
+  $(top_srcdir)/contrib/macdeploy/background.png
 
 COVERAGE_INFO = baseline_filtered_combined.info baseline.info block_test.info \
   leveldb_baseline.info test_bitcoin_filtered.info total_coverage.info \
@@ -47,9 +45,9 @@ 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
+	$(INSTALL_STRIP_PROGRAM) $(BITCOIND_BIN) $(top_builddir)/release
+	$(INSTALL_STRIP_PROGRAM) $(BITCOIN_QT_BIN) $(top_builddir)/release
+	$(INSTALL_STRIP_PROGRAM) $(BITCOIN_CLI_BIN) $(top_builddir)/release
 	@test -f $(MAKENSIS) && $(MAKENSIS) $(top_builddir)/share/setup.nsi || \
 	  echo error: could not build $@
 
@@ -66,33 +64,23 @@ $(OSX_APP)/Contents/Resources/empty.lproj:
 
 $(OSX_APP)/Contents/Info.plist: $(OSX_PLIST)
 	$(MKDIR_P) $(@D)
-	$(INSTALL_DATA) $< $@
+	$(INSTALL) $< $@
 
 $(OSX_APP)/Contents/Resources/bitcoin.icns: $(OSX_INSTALLER_ICONS)
 	$(MKDIR_P) $(@D)
-	$(INSTALL_DATA) $< $@
+	$(INSTALL) $< $@
 
 $(OSX_APP)/Contents/MacOS/Bitcoin-Qt: $(BITCOIN_QT_BIN)
 	$(MKDIR_P) $(@D)
-	STRIPPROG="$(STRIP)" $(INSTALL_STRIP_PROGRAM)  $< $@
+	$(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
+	$(OSX_DEPLOY_SCRIPT) $(OSX_APP) -add-qt-tr da,de,es,hu,ru,uk,zh_CN,zh_TW -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)
@@ -162,11 +150,11 @@ check-local:
 	@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)
+EXTRA_DIST = $(top_srcdir)/share/genbuild.sh qa/pull-tester/pull-tester.sh $(DIST_DOCS) $(WINDOWS_PACKAGING) $(OSX_PACKAGING)
 
-CLEANFILES = $(OSX_DMG) $(BITCOIN_WIN_INSTALLER)
+CLEANFILES = $(OSX_DMG) $(OSX_APP) $(BITCOIN_WIN_INSTALLER)
 
 .INTERMEDIATE: $(COVERAGE_INFO)
 
 clean-local:
-	rm -rf test_bitcoin.coverage/ total.coverage/ $(OSX_APP)
+	rm -rf test_bitcoin.coverage/ total.coverage/

README.md

@@ -3,7 +3,7 @@ Bitcoin Core integration/staging tree
 
 http://www.bitcoin.org
 
-Copyright (c) 2009-2014 Bitcoin Core Developers
+Copyright (c) 2009-2013 Bitcoin Core Developers
 
 What is Bitcoin?
 ----------------
@@ -69,50 +69,3 @@ 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.

configure.ac

@@ -2,7 +2,7 @@ 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, 2)
+define(_CLIENT_VERSION_REVISION, 1)
 define(_CLIENT_VERSION_BUILD, 0)
 define(_CLIENT_VERSION_IS_RELEASE, true)
 define(_COPYRIGHT_YEAR, 2014)
@@ -62,6 +62,13 @@ AC_ARG_ENABLE([upnp-default],
   [use_upnp_default=$enableval],
   [use_upnp_default=no])
 
+dnl enable ipv6 support
+AC_ARG_ENABLE([ipv6],
+  [AS_HELP_STRING([--enable-ipv6],
+  [enable ipv6 (default is yes)])],
+  [use_ipv6=$enableval],
+  [use_ipv6=yes])
+
 AC_ARG_ENABLE(tests,
     AS_HELP_STRING([--enable-tests],[compile tests (default is yes)]),
     [use_tests=$enableval],
@@ -101,12 +108,6 @@ AC_ARG_ENABLE([lcov],
   [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], [])
 
 
@@ -120,7 +121,6 @@ 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
@@ -222,7 +222,6 @@ case $host in
      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
@@ -239,17 +238,6 @@ case $host in
          CPPFLAGS="$CPPFLAGS -I$bdb_prefix/include"
          LIBS="$LIBS -L$bdb_prefix/lib"
        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"
@@ -303,8 +291,6 @@ INCLUDES="$INCLUDES $PTHREAD_CFLAGS"
 # 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 &&
@@ -320,21 +306,6 @@ 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([#define __USE_FORTIFY_LEVEL 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"])
@@ -555,6 +526,27 @@ 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])
 
+
+if test x$use_ipv6 = xyes; then
+  dnl Check for ipv6 build requirements
+  AC_MSG_CHECKING(for operating system IPv6 support)
+  AC_TRY_LINK([
+  #if defined(_WINDOWS)
+  #include <winsock2.h>
+  #else
+  #include <sys/types.h>
+  #include <sys/socket.h>
+  #include <netinet/in.h>
+  #endif
+  ],[
+  #if !defined(_WINDOWS)
+  struct in6_addr ipv6Addr;
+  struct sockaddr_in6 addr;
+  #endif
+  int temp = socket(AF_INET6, SOCK_STREAM, 0);],
+  [AC_MSG_RESULT(yes); have_ipv6=yes; AC_DEFINE(HAVE_IPV6, 1, [Define this symbol if you have operating system IPv6 support])],
+  [AC_MSG_RESULT(no)]; have_ipv6=no)
+fi
 AC_LANG_POP
 
 if test "x$use_ccache" != "xno"; then
@@ -583,6 +575,22 @@ else
   AC_MSG_RESULT(no)
 fi
 
+dnl enable ipv6 support
+AC_MSG_CHECKING([whether to build with support for IPv6])
+if test x$have_ipv6 = xno; then
+  if test x$use_ipv6 = xyes; then
+     AC_MSG_ERROR([IPv6 requested, but cannot be built. use --disable-ipv6])
+  fi
+  AC_MSG_RESULT(no)
+else
+  if test x$use_ipv6 = xyes; then
+      AC_MSG_RESULT(yes)
+      AC_DEFINE([USE_IPV6],[1],[Define if IPv6 support should be compiled in])
+  else
+      AC_MSG_RESULT(no)
+  fi
+fi
+
 dnl enable upnp support
 AC_MSG_CHECKING([whether to build with support for UPnP])
 if test x$have_miniupnpc = xno; then
@@ -663,14 +671,12 @@ if test "x$use_tests$build_bitcoind$use_qt" = "xnonono"; then
 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])
@@ -688,6 +694,7 @@ AC_SUBST(COPYRIGHT_YEAR, _COPYRIGHT_YEAR)
 
 AC_SUBST(USE_UPNP)
 AC_SUBST(USE_QRCODE)
+AC_SUBST(USE_IPV6)
 AC_SUBST(INCLUDES)
 AC_SUBST(BOOST_LIBS)
 AC_SUBST(TESTDEFS)

contrib/README.md

@@ -1,38 +1,24 @@
-Wallet Tools
+Python Tools
 ---------------------
 
 ### [BitRPC](/contrib/bitrpc) ###
 Allows for sending of all standard Bitcoin commands via RPC rather than as command line args.
 
+### [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.
+
 ### [SpendFrom](/contrib/spendfrom) ###
 
 Use the raw transactions API to send coins received on a particular
 address (or addresses).
 
+### WalletTools
+Removed. Please see [/contrib/bitrpc](/contrib/bitrpc).
+
 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.
@@ -43,11 +29,18 @@ Gavin's notes on getting gitian builds up and running using KVM.
 ### [Gitian-downloader](/contrib/gitian-downloader)
 Various PGP files of core developers. 
 
+### [Linearize](/contrib/linearize) ###
+Construct a linear, no-fork, best version of the blockchain.
+
 ### [MacDeploy](/contrib/macdeploy) ###
 Scripts and notes for Mac builds. 
 
-Test and Verify Tools 
----------------------
+### [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.
 
 ### [TestGen](/contrib/testgen) ###
 Utilities to generate test vectors for the data-driven Bitcoin tests.
@@ -58,3 +51,8 @@ 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.
+
+### [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.
+

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/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,16 +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.

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,7 +34,7 @@ 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 bitcoind, a combined daemon and CLI tool to
  interact with the daemon.
@@ -52,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/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

@@ -3,7 +3,7 @@ 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.
 
@@ -36,8 +36,7 @@ Configuring the github-merge tool for the bitcoin repository is done in the foll
     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
-===========================
+## 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
@@ -47,37 +46,4 @@ 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.
-
+```// Copyright (c) 2009-2014 The Bitcoin developers```

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,66 +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
-- remove 'unfinished' translation items
-'''
-from __future__ import division, print_function
-import subprocess
-import re
-import sys
-import os
-
-# 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 postprocess_translations():
-    print('Postprocessing...')
-    for filename in os.listdir(LOCALE_DIR):
-        # process only language files, and do not process source language
-        if not filename.endswith('.ts') or filename == SOURCE_LANG: 
-            continue
-        filepath = os.path.join(LOCALE_DIR, filename)
-        with open(filepath, 'rb') as f:
-            data = f.read()
-        # remove non-allowed control characters
-        data = re.sub('[\x00-\x09\x0b\x0c\x0e-\x1f]', '', data)
-        data = data.split('\n')
-        # strip locations from non-origin translation
-        # location tags are used to guide translators, they are not necessary for compilation
-        # TODO: actually process XML instead of relying on Transifex's one-tag-per-line output format
-        data = [line for line in data if not '<location' in line]
-        with open(filepath, 'wb') as f:
-            f.write('\n'.join(data))
-
-if __name__ == '__main__':
-    check_at_repository_root()
-    fetch_all_translations()
-    postprocess_translations()
-

contrib/gitian-descriptors/README.md

@@ -25,17 +25,30 @@ Once you've got the right hardware and software:
     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)
     ...
+    cd ../..
 
-    # For further build instructions see doc/release-notes.md
-    ...
+    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-linux.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
+    ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/protobuf-win32.yml
+
+    # Build Win32 release:
+    ./bin/gbuild --commit bitcoin=HEAD ../bitcoin/contrib/gitian-descriptors/gitian-win32.yml
 
 ---------------------
 

contrib/gitian-descriptors/deps-linux.yml

@@ -16,8 +16,8 @@ packages:
 reference_datetime: "2013-06-01 00:00:00"
 remotes: []
 files:
-- "openssl-1.0.1h.tar.gz"
-- "miniupnpc-1.9.tar.gz"
+- "openssl-1.0.1g.tar.gz"
+- "miniupnpc-1.8.tar.gz"
 - "qrencode-3.4.3.tar.bz2"
 - "protobuf-2.5.0.tar.bz2"
 - "db-4.8.30.NC.tar.gz"
@@ -30,15 +30,15 @@ script: |
   export TZ=UTC
   export LIBRARY_PATH="$STAGING/lib"
   # Integrity Check
-  echo "9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093  openssl-1.0.1h.tar.gz"  | sha256sum -c
-  echo "2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464  miniupnpc-1.9.tar.gz"   | sha256sum -c
+  echo "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028  openssl-1.0.1g.tar.gz"  | sha256sum -c
+  echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c  miniupnpc-1.8.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.1h.tar.gz
-  cd openssl-1.0.1h
+  tar xzf openssl-1.0.1g.tar.gz
+  cd openssl-1.0.1g
   #   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
@@ -46,8 +46,8 @@ script: |
   make install_sw
   cd ..
   #
-  tar xzfm miniupnpc-1.9.tar.gz
-  cd miniupnpc-1.9
+  tar xzfm miniupnpc-1.8.tar.gz
+  cd miniupnpc-1.8
   #   miniupnpc is always built with -fPIC
   INSTALLPREFIX=$STAGING make $MAKEOPTS install
   rm -f $STAGING/lib/libminiupnpc.so* # no way to skip shared lib build
@@ -95,4 +95,4 @@ script: |
   done
   #
   cd $STAGING
-  find include lib bin host | sort | zip -X@ $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r6.zip
+  find include lib bin host | sort | zip -X@ $OUTDIR/bitcoin-deps-linux${GBUILD_BITS}-gitian-r4.zip

contrib/gitian-descriptors/deps-win.yml

@@ -14,9 +14,9 @@ packages:
 reference_datetime: "2011-01-30 00:00:00"
 remotes: []
 files:
-- "openssl-1.0.1h.tar.gz"
+- "openssl-1.0.1g.tar.gz"
 - "db-4.8.30.NC.tar.gz"
-- "miniupnpc-1.9.tar.gz"
+- "miniupnpc-1.8.tar.gz"
 - "zlib-1.2.8.tar.gz"
 - "libpng-1.6.8.tar.gz"
 - "qrencode-3.4.3.tar.bz2"
@@ -28,9 +28,9 @@ script: |
   INDIR=$HOME/build
   TEMPDIR=$HOME/tmp
   # Input Integrity Check
-  echo "9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093  openssl-1.0.1h.tar.gz"  | sha256sum -c
+  echo "53cb818c3b90e507a8348f4f5eaedb05d8bfe5358aabb508b7263cc670c3e028  openssl-1.0.1g.tar.gz"  | sha256sum -c
   echo "12edc0df75bf9abd7f82f821795bcee50f42cb2e5f76a6a281b85732798364ef  db-4.8.30.NC.tar.gz"    | sha256sum -c
-  echo "2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464  miniupnpc-1.9.tar.gz"   | sha256sum -c
+  echo "bc5f73c7b0056252c1888a80e6075787a1e1e9112b808f863a245483ff79859c  miniupnpc-1.8.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
@@ -48,8 +48,8 @@ script: |
     mkdir -p $INSTALLPREFIX $BUILDDIR
     cd $BUILDDIR
     #
-    tar xzf $INDIR/openssl-1.0.1h.tar.gz
-    cd openssl-1.0.1h
+    tar xzf $INDIR/openssl-1.0.1g.tar.gz
+    cd openssl-1.0.1g
     if [ "$BITS" == "32" ]; then
       OPENSSL_TGT=mingw
     else
@@ -67,11 +67,11 @@ script: |
     make install_lib install_include
     cd ../..
     #
-    tar xzf $INDIR/miniupnpc-1.9.tar.gz
-    cd miniupnpc-1.9
+    tar xzf $INDIR/miniupnpc-1.8.tar.gz
+    cd miniupnpc-1.8
     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
+  --- miniupnpc-1.8/Makefile.mingw.orig   2013-09-29 18:52:51.014087958 -1000
+  +++ miniupnpc-1.8/Makefile.mingw        2013-09-29 19:09:29.663318691 -1000
   @@ -67,8 +67,8 @@
    
    wingenminiupnpcstrings.o:	wingenminiupnpcstrings.c
@@ -124,5 +124,5 @@ script: |
     done
     #
     cd $INSTALLPREFIX
-    find include lib | sort | zip -X@ $OUTDIR/bitcoin-deps-win$BITS-gitian-r13.zip
+    find include lib | sort | zip -X@ $OUTDIR/bitcoin-deps-win$BITS-gitian-r11.zip
   done # for BITS in

contrib/gitian-descriptors/gitian-linux.yml

@@ -7,6 +7,7 @@ architectures:
 - "amd64"
 packages: 
 - "g++"
+- "libqt4-dev"
 - "git-core"
 - "unzip"
 - "pkg-config"
@@ -15,22 +16,15 @@ packages:
 - "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-r6.zip"
-- "bitcoin-deps-linux64-gitian-r6.zip"
+- "bitcoin-deps-linux32-gitian-r4.zip"
+- "bitcoin-deps-linux64-gitian-r4.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'
@@ -38,28 +32,16 @@ script: |
   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-r6.zip
+  unzip ../build/bitcoin-deps-linux${GBUILD_BITS}-gitian-r4.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 "$@" --enable-upnp-default --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
+    ./configure "$@" --enable-upnp-default --prefix=$STAGING --with-protoc-bindir=$STAGING/host/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 ${OPTFLAGS}" CXXFLAGS="-frandom-seed=bitcoin ${OPTFLAGS}" BOOST_CHRONO_EXTRALIBS="-lrt"
   }
   #
   cd bitcoin
@@ -78,6 +60,19 @@ script: |
   make $MAKEOPTS install-strip
   make $MAKEOPTS clean
 
+  # Build fully static versions of bitcoind and bitcoin-cli for older Linux distros
+  STATIC_BINDIR="$HOME/bindir.static"
+  mkdir -p $STATIC_BINDIR
+  # For 32-bit, -pie cannot be used with -static, as invalid executables are generated
+  # For 64-bit, -pie with -static causes a link error
+  # Disable hardening in configure and manually pass 'static-safe' hardening flags
+  OPTFLAGS='-O2 -static -Wstack-protector -fstack-protector-all -U_FORTIFY_SOURCE -D_FORTIFY_SOURCE=2 -Wl,-z,relro -Wl,-z,now'
+  do_configure --bindir=$STATIC_BINDIR --disable-tests --enable-upnp-default --without-gui --disable-hardening
+  make $MAKEOPTS
+  make $MAKEOPTS install-strip
+  cp $STATIC_BINDIR/bitcoind $BINDIR/bitcoind.static
+  cp $STATIC_BINDIR/bitcoin-cli $BINDIR/bitcoin-cli.static
+  
   # sort distribution tar file and normalize user/group/mtime information for deterministic output
   mkdir -p $OUTDIR/src
   rm -rf $TEMPDIR

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-r4.tar.gz"
-- "osx-depends-qt-5.2.1-r4.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-r4.tar.gz
-  tar -C osx-cross-depends -xf osx-depends-qt-5.2.1-r4.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.tar.gz"
-- "openssl-1.0.1h.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 "2923e453e880bb949e3d4da9f83dd3cb6f08946d35de0b864d0339cf70934464  miniupnpc-1.9.tar.gz" | sha256sum -c
-  echo "9d1c8a9836aa63e2c6adb684186cbd4371c9e9dcc01d6e3bb447abf2d4d3d093  openssl-1.0.1h.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=r4
-  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.1h.tar.gz
-  BUILD_DIR=${BUILD_BASE}/openssl-1.0.1h
-
-  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
-  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}
-  sed -i "s|engines apps test|engines|" ${BUILD_DIR}/Makefile
-  sed -i "/define DATE/d" ${BUILD_DIR}/crypto/Makefile
-  make -j1 build_libs libcrypto.pc libssl.pc openssl.pc
-  make -j1 install_sw
-  popd
-
-  #libminiupnpc
-  SOURCE_FILE=${SOURCES_PATH}/miniupnpc-1.9.tar.gz
-  BUILD_DIR=${BUILD_BASE}/miniupnpc-1.9
-
-  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-r4.tar.gz"
-- "MacOSX10.7.sdk.tar.gz"
-
-script: |
-
-  echo "84e924181d4ad6db00239d87250cc89868484a14841f77fb85ab1f1dbdcd7da1  qt-everywhere-opensource-src-5.2.1.tar.gz" | sha256sum -c
-
-  REVISION=r4
-  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-r4.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

@@ -26,8 +26,8 @@ files:
 - "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-r13.zip"
-- "bitcoin-deps-win64-gitian-r13.zip"
+- "bitcoin-deps-win32-gitian-r11.zip"
+- "bitcoin-deps-win64-gitian-r11.zip"
 - "protobuf-win32-2.5.0-gitian-r4.zip"
 - "protobuf-win64-2.5.0-gitian-r4.zip"
 script: |
@@ -61,7 +61,7 @@ script: |
     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-r13.zip
+    unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r11.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

contrib/gitian-descriptors/qt-linux.yml

@@ -1,263 +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)
-
-  # 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

@@ -15,8 +15,8 @@ reference_datetime: "2011-01-30 00:00:00"
 remotes: []
 files:
 - "qt-everywhere-opensource-src-5.2.0.tar.gz"
-- "bitcoin-deps-win32-gitian-r13.zip"
-- "bitcoin-deps-win64-gitian-r13.zip"
+- "bitcoin-deps-win32-gitian-r11.zip"
+- "bitcoin-deps-win64-gitian-r11.zip"
 script: |
   # Defines
   export TZ=UTC
@@ -48,7 +48,7 @@ script: |
     #
     # Need mingw-compiled openssl from bitcoin-deps:
     cd $DEPSDIR
-    unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r13.zip
+    unzip $INDIR/bitcoin-deps-win${BITS}-gitian-r11.zip
     #
     cd $BUILDDIR
     #

contrib/gitian-downloader/linux-download-config

@@ -8,32 +8,39 @@ 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:
+    weight: 1
     name: michagogo
     key: michagogo
-  E944AE667CF960B1004BC32FCA662BE18B877A60:
-    name: "Andreas Schildbach"
-    key: aschildbach
+minimum_weight: 120

contrib/gitian-downloader/win32-download-config

@@ -8,32 +8,39 @@ 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:
+    weight: 1
     name: michagogo
     key: michagogo
-  E944AE667CF960B1004BC32FCA662BE18B877A60:
-    name: "Andreas Schildbach"
-    key: aschildbach
+minimum_weight: 120

contrib/macdeploy/macdeployqtplus

@@ -196,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:
@@ -222,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:
@@ -241,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"):
@@ -350,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":
@@ -426,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.

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.9.1/SHA256SUMS.asc"
 
 SIGNATUREFILENAME="SHA256SUMS.asc"
 RCSUBDIR="test/"

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.2
+PROJECT_NUMBER         = 0.9.1
 
 # 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,4 +1,4 @@
-Bitcoin 0.9.2 BETA
+Bitcoin 0.9.1 BETA
 =====================
 
 Copyright (c) 2009-2014 Bitcoin Developers
@@ -6,7 +6,7 @@ Copyright (c) 2009-2014 Bitcoin Developers
 
 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).
+[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](https://bitcointalk.org/index.php?topic=145386.0).
 
 Running
 ---------------------

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,4 +1,4 @@
-Bitcoin 0.9.2 BETA
+Bitcoin 0.9.1 BETA
 
 Copyright (c) 2009-2014 Bitcoin Core Developers
 

doc/assets-attribution.md

@@ -78,13 +78,13 @@ Everaldo (Everaldo Coelho)
 ### Assets Used
 	scripts/img/reload.xcf (modified), src/qt/res/movies/*.png
 
-[Vignoni David](http://techbase.kde.org/Projects/Oxygen)
+[Vignoni David](http://www.oxygen-icons.org)
 -----------------------
 
 ### 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)
+* Site: [http://www.oxygen-icons.org](http://www.oxygen-icons.org)
 
 ### Assets Used
 	src/qt/res/icons/debugwindow.png

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-osx.md

@@ -86,9 +86,7 @@ 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. 
+Rerunning "openssl version" should now return the correct version.
 
 ### Building `bitcoind`
 

doc/build-unix.md

@@ -32,20 +32,25 @@ turned off by default.  See the configure options for upnp behavior desired:
 	--disable-upnp-default   (the default) UPnP support turned off by default at runtime
 	--enable-upnp-default    UPnP support turned on by default at runtime
 
+IPv6 support may be disabled by setting:
+
+	--disable-ipv6           Disable IPv6 support
+
 Licenses of statically linked libraries:
  Berkeley DB   New BSD license with additional requirement that linked
                software must be free open source
  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.55
+-  miniupnpc     1.6
+-  qt            4.8.3
+-  protobuf      2.5.0
+-  libqrencode   3.2.0
 
 Dependency Build Instructions: Ubuntu & Debian
 ----------------------------------------------
@@ -87,6 +92,7 @@ for other Ubuntu & Debian:
 
 	sudo apt-get install libdb4.8-dev
 	sudo apt-get install libdb4.8++-dev
+	sudo apt-get install libboost1.55-all-dev
 
 Optional:
 
@@ -102,15 +108,15 @@ To build without GUI pass `--without-gui`.
 
 To build with Qt 4 you need the following:
 
-    sudo apt-get install libqt4-dev libprotobuf-dev protobuf-compiler
+    apt-get install libqt4-dev libprotobuf-dev protobuf-compiler
 
 For Qt 5 you need the following:
 
-    sudo apt-get install libqt5gui5 libqt5core5 libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev
+    apt-get install libqt5gui5 libqt5core5 libqt5dbus5 qttools5-dev qttools5-dev-tools libprotobuf-dev
 
 libqrencode (optional) can be installed with:
 
-    sudo apt-get install libqrencode-dev
+    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.
@@ -132,33 +138,13 @@ 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)
+	cd build_unix/
+	../dist/configure --enable-cxx
+	make
+	sudo make install
 
-# 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
 -----

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,8 +60,8 @@ 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
 -------
+Threads
 
 - ThreadScriptCheck : Verifies block scripts.
 

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.
-

doc/release-notes.md

@@ -1,18 +1,18 @@
-Bitcoin Core version 0.9.2 is now available from:
+Bitcoin Core version 0.9.1 is now available from:
 
-  https://bitcoin.org/bin/0.9.2/
+  https://bitcoin.org/bin/0.9.1/test/
 
-This is a new minor version release, bringing mostly bug fixes and some minor
-improvements. OpenSSL has been updated because of a security issue (CVE-2014-0224).
-Upgrading to this release is recommended.
+This is a security update. It is recommended to upgrade to this release
+as soon as possible.
+
+It is especially important to upgrade if you currently have version 0.9.0
+installed and are using the graphical interface OR you are using bitcoind from
+any pre-0.9.1 version, and have enabled SSL for RPC.
 
 Please report bugs using the issue tracker at github:
 
   https://github.com/bitcoin/bitcoin/issues
 
-Upgrading and downgrading
-==========================
-
 How to Upgrade
 --------------
 
@@ -22,183 +22,31 @@ installer (on Windows) or just copy over /Applications/Bitcoin-Qt (on Mac) or
 bitcoind/bitcoin-qt (on Linux).
 
 If you are upgrading from version 0.7.2 or earlier, the first time you run
-0.9.0 your blockchain files will be re-indexed, which will take anywhere from 
+0.9.1 your blockchain files will be re-indexed, which will take anywhere from 
 30 minutes to several hours, depending on the speed of your machine.
 
-Downgrading warnings
---------------------
-
-The 'chainstate' for this release is not always compatible with previous
-releases, so if you run 0.9.x and then decide to switch back to a
-0.8.x release you might get a blockchain validation error when starting the
-old release (due to 'pruned outputs' being omitted from the index of
-unspent transaction outputs).
-
-Running the old release with the -reindex option will rebuild the chainstate
-data structures and correct the problem.
-
-Also, the first time you run a 0.8.x release on a 0.9 wallet it will rescan
-the blockchain for missing spent coins, which will take a long time (tens
-of minutes on a typical machine).
-
-Important changes
-==================
-
-Gitian OSX build
------------------
-
-The deterministic build system that was already used for Windows and Linux
-builds is now used for OSX as well. Although the resulting executables have
-been tested quite a bit, there could be possible regressions. Be sure to report
-these on the Github bug tracker mentioned above.
-
-Compatibility of Linux build
------------------------------
-
-For Linux we now build against Qt 4.6, and filter the symbols for libstdc++ and glibc.
-This brings back compatibility with
-
-- Debian 6+ / Tails
-- Ubuntu 10.04
-- CentOS 6.5
-
-0.9.2 Release notes
+0.9.1 Release notes
 =======================
 
-The OpenSSL dependency in the gitian builds has been upgraded to 1.0.1h because of CVE-2014-0224.
+No code changes were made between 0.9.0 and 0.9.1. Only the dependencies were changed.
 
-RPC:
-- Add `getwalletinfo`, `getblockchaininfo` and `getnetworkinfo` calls (will replace hodge-podge `getinfo` at some point)
-- Add a `relayfee` field to `getnetworkinfo`
-- Fix RPC related shutdown hangs and leaks
-- Always show syncnode in `getpeerinfo`
-- `sendrawtransaction`: report the reject code and reason, and make it possible to re-send transactions that are already in the mempool
-- `getmininginfo` show right genproclimit
+- Upgrade OpenSSL to 1.0.1g. This release fixes the following vulnerabilities which can
+  affect the Bitcoin Core software:
 
-Command-line options:
-- Fix `-printblocktree` output
-- Show error message if ReadConfigFile fails
+  - CVE-2014-0160 ("heartbleed")
+    A missing bounds check in the handling of the TLS heartbeat extension can
+    be used to reveal up to 64k of memory to a connected client or server.
 
-Block-chain handling and storage:
-- Fix for GetBlockValue() after block 13,440,000 (BIP42)
-- Upgrade leveldb to 1.17
+  - CVE-2014-0076
+    The Montgomery ladder implementation in OpenSSL does not ensure that
+    certain swap operations have a constant-time behavior, which makes it
+    easier for local users to obtain ECDSA nonces via a FLUSH+RELOAD cache
+    side-channel attack.
 
-Protocol and network code:
-- Per-peer block download tracking and stalled download detection
-- Add new DNS seed from bitnodes.io
-- Prevent socket leak in ThreadSocketHandler and correct some proxy related socket leaks
-- Use pnode->nLastRecv as sync score (was the wrong way around)
-
-Wallet:
-- Make GetAvailableCredit run GetHash() only once per transaction (performance improvement)
-- Lower paytxfee warning threshold from 0.25 BTC to 0.01 BTC
-- Fix importwallet nTimeFirstKey (trigger necessary rescans)
-- Log BerkeleyDB version at startup
-- CWallet init fix
-
-Build system:
-- Add OSX build descriptors to gitian
-- Fix explicit --disable-qt-dbus
-- Don't require db_cxx.h when compiling with wallet disabled and GUI enabled
-- Improve missing boost error reporting
-- Upgrade miniupnpc version to 1.9
-- gitian-linux: --enable-glibc-back-compat for binary compatibility with old distributions
-- gitian: don't export any symbols from executable
-- gitian: build against Qt 4.6
-- devtools: add script to check symbols from Linux gitian executables
-- Remove build-time no-IPv6 setting
-
-GUI:
-- Fix various coin control visual issues
-- Show number of in/out connections in debug console
-- Show weeks as well as years behind for long timespans behind
-- Enable and disable the Show and Remove buttons for requested payments history based on whether any entry is selected.
-- Show also value for options overridden on command line in options dialog
-- Fill in label from address book also for URIs
-- Fixes feel when resizing the last column on tables (issue #2862)
-- Fix ESC in disablewallet mode
-- Add expert section to wallet tab in optionsdialog
-- Do proper boost::path conversion (fixes unicode in datadir)
-- Only override -datadir if different from the default (fixes -datadir in config file)
-- Show rescan progress at start-up
-- Show importwallet progress
-- Get required locks upfront in polling functions (avoids hanging on locks)
-- Catch Windows shutdown events while client is running
-- Optionally add third party links to transaction context menu
-- Check for !pixmap() before trying to export QR code (avoids crashes when no QR code could be generated)
-- Fix "Start bitcoin on system login"
-
-Miscellaneous:
-
-- Replace non-threadsafe C functions (gmtime, strerror and setlocale)
-- Add missing cs_main and wallet locks
-- Avoid exception at startup when system locale not recognized
-- Changed bitrpc.py's raw_input to getpass for passwords to conceal characters during command line input
-- devtools: add a script to fetch and postprocess translations
+- Add statically built executables to Linux build
 
 Credits
 --------
 
-Thanks to everyone who contributed to this release:
-
-- Addy Yeow
-- Altoidnerd
-- Andrea D'Amore
-- Andreas Schildbach
-- Bardi Harborow
-- Brandon Dahler
-- Bryan Bishop
-- Chris Beams
-- Christian von Roques
-- Cory Fields
-- Cozz Lovan
-- daniel
-- Daniel Newton
-- David A. Harding
-- ditto-b
-- duanemoody
-- Eric S. Bullington
-- Fabian Raetz
-- Gavin Andresen
-- Gregory Maxwell
-- gubatron
-- Haakon Nilsen
-- harry
-- Hector Jusforgues
-- Isidoro Ghezzi
-- Jeff Garzik
-- Johnathan Corgan
-- jtimon
-- Kamil Domanski
-- langerhans
-- Luke Dashjr
-- Manuel Araoz
-- Mark Friedenbach
-- Matt Corallo
-- Matthew Bogosian
-- Meeh
-- Michael Ford
-- Michagogo
-- Mikael Wikman
-- Mike Hearn
-- olalonde
-- paveljanik
-- peryaudo
-- Philip Kaufmann
-- philsong
-- Pieter Wuille
-- R E Broadley
-- richierichrawr
-- Rune K. Svendsen
-- rxl
-- shshshsh
-- Simon de la Rouviere
-- Stuart Cardall
-- super3
-- Telepatheic
-- Thomas Zander
-- Torstein Husebø
-- Warren Togami
-- Wladimir J. van der Laan
-- Yoichi Hirai
+Credits go to the OpenSSL team for fixing the vulnerabilities quickly.
 

doc/release-notes/release-notes-0.9.0.md

@@ -1,411 +0,0 @@
-Bitcoin Core version 0.9.0 is now available from:
-
-  https://bitcoin.org/bin/0.9.0/
-
-This is a new major version release, bringing both new features and
-bug fixes.
-
-Please report bugs using the issue tracker at github:
-
-  https://github.com/bitcoin/bitcoin/issues
-
-How to Upgrade
---------------
-
-If you are running an older version, shut it down. Wait until it has completely
-shut down (which might take a few minutes for older versions), uninstall all
-earlier versions of Bitcoin, then run the installer (on Windows) or just copy
-over /Applications/Bitcoin-Qt (on Mac) or bitcoind/bitcoin-qt (on Linux).
-
-If you are upgrading from version 0.7.2 or earlier, the first time you run
-0.9.0 your blockchain files will be re-indexed, which will take anywhere from 
-30 minutes to several hours, depending on the speed of your machine.
-
-On Windows, do not forget to uninstall all earlier versions of the Bitcoin
-client first, especially if you are switching to the 64-bit version.
-
-Windows 64-bit installer
--------------------------
-
-New in 0.9.0 is the Windows 64-bit version of the client. There have been
-frequent reports of users running out of virtual memory on 32-bit systems
-during the initial sync. Because of this it is recommended to install the
-64-bit version if your system supports it.
-
-NOTE: Release candidate 2 Windows binaries are not code-signed; use PGP
-and the SHA256SUMS.asc file to make sure your binaries are correct.
-In the final 0.9.0 release, Windows setup.exe binaries will be code-signed.
-
-OSX 10.5 / 32-bit no longer supported
--------------------------------------
-
-0.9.0 drops support for older Macs. The minimum requirements are now:
-* A 64-bit-capable CPU (see http://support.apple.com/kb/ht3696);
-* Mac OS 10.6 or later (see https://support.apple.com/kb/ht1633).
-
-Downgrading warnings
---------------------
-
-The 'chainstate' for this release is not always compatible with previous
-releases, so if you run 0.9 and then decide to switch back to a
-0.8.x release you might get a blockchain validation error when starting the
-old release (due to 'pruned outputs' being omitted from the index of
-unspent transaction outputs).
-
-Running the old release with the -reindex option will rebuild the chainstate
-data structures and correct the problem.
-
-Also, the first time you run a 0.8.x release on a 0.9 wallet it will rescan
-the blockchain for missing spent coins, which will take a long time (tens
-of minutes on a typical machine).
-
-Rebranding to Bitcoin Core
----------------------------
-
-To reduce confusion between Bitcoin-the-network and Bitcoin-the-software we
-have renamed the reference client to Bitcoin Core.
-
-
-OP_RETURN and data in the block chain
--------------------------------------
-On OP_RETURN:  There was been some confusion and misunderstanding in
-the community, regarding the OP_RETURN feature in 0.9 and data in the
-blockchain.  This change is not an endorsement of storing data in the
-blockchain.  The OP_RETURN change creates a provably-prunable output,
-to avoid data storage schemes -- some of which were already deployed --
-that were storing arbitrary data such as images as forever-unspendable
-TX outputs, bloating bitcoin's UTXO database.
-
-Storing arbitrary data in the blockchain is still a bad idea; it is less
-costly and far more efficient to store non-currency data elsewhere.
-
-Autotools build system
------------------------
-
-For 0.9.0 we switched to an autotools-based build system instead of individual
-(q)makefiles.
-
-Using the standard "./autogen.sh; ./configure; make" to build Bitcoin-Qt and
-bitcoind makes it easier for experienced open source developers to contribute 
-to the project.
-
-Be sure to check doc/build-*.md for your platform before building from source.
-
-Bitcoin-cli
--------------
-
-Another change in the 0.9 release is moving away from the bitcoind executable
-functioning both as a server and as a RPC client. The RPC client functionality
-("tell the running bitcoin daemon to do THIS") was split into a separate
-executable, 'bitcoin-cli'. The RPC client code will eventually be removed from
-bitcoind, but will be kept for backwards compatibility for a release or two.
-
-`walletpassphrase` RPC
------------------------
-
-The behavior of the `walletpassphrase` RPC when the wallet is already unlocked
-has changed between 0.8 and 0.9.
-
-The 0.8 behavior of `walletpassphrase` is to fail when the wallet is already unlocked:
-
-    > walletpassphrase 1000
-    walletunlocktime = now + 1000
-    > walletpassphrase 10
-    Error: Wallet is already unlocked (old unlock time stays)
-
-The new behavior of `walletpassphrase` is to set a new unlock time overriding
-the old one:
-
-    > walletpassphrase 1000
-    walletunlocktime = now + 1000
-    > walletpassphrase 10
-    walletunlocktime = now + 10 (overriding the old unlock time)
-
-Transaction malleability-related fixes
---------------------------------------
-
-This release contains a few fixes for transaction ID (TXID) malleability 
-issues:
-
-- -nospendzeroconfchange command-line option, to avoid spending
-  zero-confirmation change
-- IsStandard() transaction rules tightened to prevent relaying and mining of
-  mutated transactions
-- Additional information in listtransactions/gettransaction output to
-  report wallet transactions that conflict with each other because
-  they spend the same outputs.
-- Bug fixes to the getbalance/listaccounts RPC commands, which would report
-  incorrect balances for double-spent (or mutated) transactions.
-- New option: -zapwallettxes to rebuild the wallet's transaction information
-
-Transaction Fees
-----------------
-
-This release drops the default fee required to relay transactions across the
-network and for miners to consider the transaction in their blocks to
-0.01mBTC per kilobyte.
-
-Note that getting a transaction relayed across the network does NOT guarantee
-that the transaction will be accepted by a miner; by default, miners fill
-their blocks with 50 kilobytes of high-priority transactions, and then with
-700 kilobytes of the highest-fee-per-kilobyte transactions.
-
-The minimum relay/mining fee-per-kilobyte may be changed with the
-minrelaytxfee option. Note that previous releases incorrectly used
-the mintxfee setting to determine which low-priority transactions should
-be considered for inclusion in blocks.
-
-The wallet code still uses a default fee for low-priority transactions of
-0.1mBTC per kilobyte. During periods of heavy transaction volume, even this
-fee may not be enough to get transactions confirmed quickly; the mintxfee
-option may be used to override the default.
-
-0.9.0 Release notes
-=======================
-
-RPC:
-
-- New notion of 'conflicted' transactions, reported as confirmations: -1
-- 'listreceivedbyaddress' now provides tx ids
-- Add raw transaction hex to 'gettransaction' output
-- Updated help and tests for 'getreceivedby(account|address)'
-- In 'getblock', accept 2nd 'verbose' parameter, similar to getrawtransaction,
-  but defaulting to 1 for backward compatibility
-- Add 'verifychain', to verify chain database at runtime
-- Add 'dumpwallet' and 'importwallet' RPCs
-- 'keypoolrefill' gains optional size parameter
-- Add 'getbestblockhash', to return tip of best chain
-- Add 'chainwork' (the total work done by all blocks since the genesis block)
-  to 'getblock' output
-- Make RPC password resistant to timing attacks
-- Clarify help messages and add examples
-- Add 'getrawchangeaddress' call for raw transaction change destinations
-- Reject insanely high fees by default in 'sendrawtransaction'
-- Add RPC call 'decodescript' to decode a hex-encoded transaction script
-- Make 'validateaddress' provide redeemScript
-- Add 'getnetworkhashps' to get the calculated network hashrate
-- New RPC 'ping' command to request ping, new 'pingtime' and 'pingwait' fields
-  in 'getpeerinfo' output
-- Adding new 'addrlocal' field to 'getpeerinfo' output
-- Add verbose boolean to 'getrawmempool'
-- Add rpc command 'getunconfirmedbalance' to obtain total unconfirmed balance
-- Explicitly ensure that wallet is unlocked in `importprivkey`
-- Add check for valid keys in `importprivkey`
-
-Command-line options:
-
-- New option: -nospendzeroconfchange to never spend unconfirmed change outputs
-- New option: -zapwallettxes to rebuild the wallet's transaction information
-- Rename option '-tor' to '-onion' to better reflect what it does
-- Add '-disablewallet' mode to let bitcoind run entirely without wallet (when
-  built with wallet)
-- Update default '-rpcsslciphers' to include TLSv1.2
-- make '-logtimestamps' default on and rework help-message
-- RPC client option: '-rpcwait', to wait for server start
-- Remove '-logtodebugger'
-- Allow `-noserver` with bitcoind
-
-Block-chain handling and storage:
-
-- Update leveldb to 1.15
-- Check for correct genesis (prevent cases where a datadir from the wrong
-  network is accidentally loaded)
-- Allow txindex to be removed and add a reindex dialog
-- Log aborted block database rebuilds
-- Store orphan blocks in serialized form, to save memory
-- Limit the number of orphan blocks in memory to 750
-- Fix non-standard disconnected transactions causing mempool orphans
-- Add a new checkpoint at block 279,000
-
-Wallet:
-
-- Bug fixes and new regression tests to correctly compute
-  the balance of wallets containing double-spent (or mutated) transactions
-- Store key creation time. Calculate whole-wallet birthday.
-- Optimize rescan to skip blocks prior to birthday
-- Let user select wallet file with -wallet=foo.dat
-- Consider generated coins mature at 101 instead of 120 blocks
-- Improve wallet load time
-- Don't count txins for priority to encourage sweeping
-- Don't create empty transactions when reading a corrupted wallet
-- Fix rescan to start from beginning after importprivkey
-- Only create signatures with low S values
-
-Mining:
-
-- Increase default -blockmaxsize/prioritysize to 750K/50K
-- 'getblocktemplate' does not require a key to create a block template
-- Mining code fee policy now matches relay fee policy
-
-Protocol and network:
-
-- Drop the fee required to relay a transaction to 0.01mBTC per kilobyte
-- Send tx relay flag with version
-- New 'reject' P2P message (BIP 0061, see
-  https://gist.github.com/gavinandresen/7079034 for draft)
-- Dump addresses every 15 minutes instead of 10 seconds
-- Relay OP_RETURN data TxOut as standard transaction type
-- Remove CENT-output free transaction rule when relaying
-- Lower maximum size for free transaction creation
-- Send multiple inv messages if mempool.size > MAX_INV_SZ
-- Split MIN_PROTO_VERSION into INIT_PROTO_VERSION and MIN_PEER_PROTO_VERSION
-- Do not treat fFromMe transaction differently when broadcasting
-- Process received messages one at a time without sleeping between messages
-- Improve logging of failed connections
-- Bump protocol version to 70002
-- Add some additional logging to give extra network insight
-- Added new DNS seed from bitcoinstats.com
-
-Validation:
-
-- Log reason for non-standard transaction rejection
-- Prune provably-unspendable outputs, and adapt consistency check for it.
-- Detect any sufficiently long fork and add a warning
-- Call the -alertnotify script when we see a long or invalid fork
-- Fix multi-block reorg transaction resurrection
-- Reject non-canonically-encoded serialization sizes
-- Reject dust amounts during validation
-- Accept nLockTime transactions that finalize in the next block
-
-Build system:
-
-- Switch to autotools-based build system
-- Build without wallet by passing `--disable-wallet` to configure, this 
-  removes the BerkeleyDB dependency
-- Upgrade gitian dependencies (libpng, libz, libupnpc, boost, openssl) to more
-  recent versions
-- Windows 64-bit build support
-- Solaris compatibility fixes
-- Check integrity of gitian input source tarballs
-- Enable full GCC Stack-smashing protection for all OSes
-
-GUI:
-
-- Switch to Qt 5.2.0 for Windows build
-- Add payment request (BIP 0070) support
-- Improve options dialog
-- Show transaction fee in new send confirmation dialog
-- Add total balance in overview page
-- Allow user to choose data directory on first start, when data directory is
-  missing, or when the -choosedatadir option is passed
-- Save and restore window positions
-- Add vout index to transaction id in transactions details dialog
-- Add network traffic graph in debug window
-- Add open URI dialog
-- Add Coin Control Features
-- Improve receive coins workflow: make the 'Receive' tab into a form to request
-  payments, and move historical address list functionality to File menu.
-- Rebrand to `Bitcoin Core`
-- Move initialization/shutdown to a thread. This prevents "Not responding"
-  messages during startup. Also show a window during shutdown.
-- Don't regenerate autostart link on every client startup
-- Show and store message of normal bitcoin:URI
-- Fix richtext detection hang issue on very old Qt versions
-- OS X: Make use of the 10.8+ user notification center to display Growl-like 
-  notifications
-- OS X: Added NSHighResolutionCapable flag to Info.plist for better font
-  rendering on Retina displays.
-- OS X: Fix bitcoin-qt startup crash when clicking dock icon
-- Linux: Fix Gnome bitcoin: URI handler
-
-Miscellaneous:
-
-- Add Linux script (contrib/qos/tc.sh) to limit outgoing bandwidth
-- Add '-regtest' mode, similar to testnet but private with instant block
-  generation with 'setgenerate' RPC.
-- Add 'linearize.py' script to contrib, for creating bootstrap.dat
-- Add separate bitcoin-cli client
-
-Credits
---------
-
-Thanks to everyone who contributed to this release:
-
-- Andrey
-- Ashley Holman
-- b6393ce9-d324-4fe1-996b-acf82dbc3d53
-- bitsofproof
-- Brandon Dahler
-- Calvin Tam
-- Christian Decker
-- Christian von Roques
-- Christopher Latham
-- Chuck
-- coblee
-- constantined
-- Cory Fields
-- Cozz Lovan
-- daniel
-- Daniel Larimer
-- David Hill
-- Dmitry Smirnov
-- Drak
-- Eric Lombrozo
-- fanquake
-- fcicq
-- Florin
-- frewil
-- Gavin Andresen
-- Gregory Maxwell
-- gubatron
-- Guillermo Céspedes Tabárez
-- Haakon Nilsen
-- HaltingState
-- Han Lin Yap
-- harry
-- Ian Kelling
-- Jeff Garzik
-- Johnathan Corgan
-- Jonas Schnelli
-- Josh Lehan
-- Josh Triplett
-- Julian Langschaedel
-- Kangmo
-- Lake Denman
-- Luke Dashjr
-- Mark Friedenbach
-- Matt Corallo
-- Michael Bauer
-- Michael Ford
-- Michagogo
-- Midnight Magic
-- Mike Hearn
-- Nils Schneider
-- Noel Tiernan
-- Olivier Langlois
-- patrick s
-- Patrick Strateman
-- paveljanik
-- Peter Todd
-- phantomcircuit
-- phelixbtc
-- Philip Kaufmann
-- Pieter Wuille
-- Rav3nPL
-- R E Broadley
-- regergregregerrge
-- Robert Backhaus
-- Roman Mindalev
-- Rune K. Svendsen
-- Ryan Niebur
-- Scott Ellis
-- Scott Willeke
-- Sergey Kazenyuk
-- Shawn Wilkinson
-- Sined
-- sje
-- Subo1978
-- super3
-- Tamas Blummer
-- theuni
-- Thomas Holenstein
-- Timon Rapp
-- Timothy Stranex
-- Tom Geller
-- Torstein Husebø
-- Vaclav Vobornik
-- vhf / victor felder
-- Vinnie Falco
-- Warren Togami
-- Wil Bown
-- Wladimir J. van der Laan

doc/release-process.md

@@ -8,6 +8,8 @@ Release Process
 
 ###update (commit) version in sources
 
+
+	bitcoin-qt.pro
 	contrib/verifysfbinaries/verify.sh
 	doc/README*
 	share/setup.nsi
@@ -33,18 +35,12 @@ Release Process
 	git checkout v${VERSION}
 	popd
 	pushd ./gitian-builder
-        mkdir -p inputs; cd inputs/
-
- Register and download the Apple SDK (see OSX Readme for details)
-	visit https://developer.apple.com/downloads/download.action?path=Developer_Tools/xcode_4.6.3/xcode4630916281a.dmg
- 
- Using a Mac, create a tarball for the 10.7 SDK
-	tar -C /Volumes/Xcode/Xcode.app/Contents/Developer/Platforms/MacOSX.platform/Developer/SDKs/ -czf MacOSX10.7.sdk.tar.gz MacOSX10.7.sdk
 
  Fetch and build inputs: (first time, or when dependency versions change)
 
-	wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.9.tar.gz' -O miniupnpc-1.9.tar.gz
-	wget 'https://www.openssl.org/source/openssl-1.0.1h.tar.gz'
+	mkdir -p inputs; cd inputs/
+	wget 'http://miniupnp.free.fr/files/download.php?file=miniupnpc-1.8.tar.gz' -O miniupnpc-1.8.tar.gz
+	wget 'https://www.openssl.org/source/openssl-1.0.1g.tar.gz'
 	wget 'http://download.oracle.com/berkeley-db/db-4.8.30.NC.tar.gz'
 	wget 'http://zlib.net/zlib-1.2.8.tar.gz'
 	wget 'ftp://ftp.simplesystems.org/pub/png/src/history/libpng16/libpng-1.6.8.tar.gz'
@@ -53,25 +49,12 @@ Release Process
 	wget 'https://svn.boost.org/trac/boost/raw-attachment/ticket/7262/boost-mingw.patch' -O \ 
 	     boost-mingw-gas-cross-compile-2013-03-03.patch
 	wget 'https://download.qt-project.org/official_releases/qt/5.2/5.2.0/single/qt-everywhere-opensource-src-5.2.0.tar.gz'
-	wget 'https://download.qt-project.org/archive/qt/4.6/qt-everywhere-opensource-src-4.6.4.tar.gz'
 	wget 'https://protobuf.googlecode.com/files/protobuf-2.5.0.tar.bz2'
-	wget 'https://github.com/mingwandroid/toolchain4/archive/10cc648683617cca8bcbeae507888099b41b530c.tar.gz'
-	wget 'http://www.opensource.apple.com/tarballs/cctools/cctools-809.tar.gz'
-	wget 'http://www.opensource.apple.com/tarballs/dyld/dyld-195.5.tar.gz'
-	wget 'http://www.opensource.apple.com/tarballs/ld64/ld64-127.2.tar.gz'
-	wget 'http://cdrkit.org/releases/cdrkit-1.1.11.tar.gz'
-	wget 'https://github.com/theuni/libdmg-hfsplus/archive/libdmg-hfsplus-v0.1.tar.gz'
-	wget 'http://llvm.org/releases/3.2/clang+llvm-3.2-x86-linux-ubuntu-12.04.tar.gz' -O \
-	     clang-llvm-3.2-x86-linux-ubuntu-12.04.tar.gz
-        wget 'https://raw.githubusercontent.com/theuni/osx-cross-depends/master/patches/cdrtools/genisoimage.diff' -O \
-	     cdrkit-deterministic.patch
 	cd ..
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-linux.yml
 	mv build/out/boost-*.zip inputs/
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-linux.yml
 	mv build/out/bitcoin-deps-*.zip inputs/
-	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/qt-linux.yml
-	mv build/out/qt-*.tar.gz inputs/
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/boost-win.yml
 	mv build/out/boost-*.zip inputs/
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/deps-win.yml
@@ -80,29 +63,6 @@ Release Process
 	mv build/out/qt-*.zip inputs/
 	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/protobuf-win.yml
 	mv build/out/protobuf-*.zip inputs/
-	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/gitian-osx-native.yml
-	mv build/out/osx-*.tar.gz inputs/
-	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/gitian-osx-depends.yml
-	mv build/out/osx-*.tar.gz inputs/
-	./bin/gbuild ../bitcoin/contrib/gitian-descriptors/gitian-osx-qt.yml
-	mv build/out/osx-*.tar.gz inputs/
-
- The expected SHA256 hashes of the intermediate inputs are:
-
-    46710f673467e367738d8806e45b4cb5931aaeea61f4b6b55a68eea56d5006c5  bitcoin-deps-linux32-gitian-r6.zip
-    f03be39fb26670243d3a659e64d18e19d03dec5c11e9912011107768390b5268  bitcoin-deps-linux64-gitian-r6.zip
-    f29b7d9577417333fb56e023c2977f5726a7c297f320b175a4108cf7cd4c2d29  boost-linux32-1.55.0-gitian-r1.zip
-    88232451c4104f7eb16e469ac6474fd1231bd485687253f7b2bdf46c0781d535  boost-linux64-1.55.0-gitian-r1.zip
-    74ec2d301cf1a9d03b194153f545102ba45dad02b390485212fe6717de486361  qt-linux32-4.6.4-gitian-r1.tar.gz
-    01d0477e299467f09280f15424781154e2b1ea4072c5edb16e044c234954fd9a  qt-linux64-4.6.4-gitian-r1.tar.gz
-    60dc2d3b61e9c7d5dbe2f90d5955772ad748a47918ff2d8b74e8db9b1b91c909  boost-win32-1.55.0-gitian-r6.zip
-    f65fcaf346bc7b73bc8db3a8614f4f6bee2f61fcbe495e9881133a7c2612a167  boost-win64-1.55.0-gitian-r6.zip
-    70de248cd0dd7e7476194129e818402e974ca9c5751cbf591644dc9f332d3b59  bitcoin-deps-win32-gitian-r13.zip
-    9eace4c76f639f4f3580a478eee4f50246e1bbb5ccdcf37a158261a5a3fa3e65  bitcoin-deps-win64-gitian-r13.zip
-    963e3e5e85879010a91143c90a711a5d1d5aba992e38672cdf7b54e42c56b2f1  qt-win32-5.2.0-gitian-r3.zip
-    751c579830d173ef3e6f194e83d18b92ebef6df03289db13ab77a52b6bc86ef0  qt-win64-5.2.0-gitian-r3.zip
-    e2e403e1a08869c7eed4d4293bce13d51ec6a63592918b90ae215a0eceb44cb4  protobuf-win32-2.5.0-gitian-r4.zip
-    a0999037e8b0ef9ade13efd88fee261ba401f5ca910068b7e0cd3262ba667db0  protobuf-win64-2.5.0-gitian-r4.zip
 
  Build bitcoind and bitcoin-qt on Linux32, Linux64, and Win32:
   
@@ -118,19 +78,13 @@ Release Process
 	zip -r bitcoin-${VERSION}-win-gitian.zip *
 	mv bitcoin-${VERSION}-win-gitian.zip ../../../
 	popd
-        ./bin/gbuild --commit bitcoin=v${VERSION} ../bitcoin/contrib/gitian-descriptors/gitian-osx-bitcoin.yml
-        ./bin/gsign --signer $SIGNER --release ${VERSION}-osx --destination ../gitian.sigs/ ../bitcoin/contrib/gitian-descriptors/gitian-osx-bitcoin.yml
-	pushd build/out
-	mv Bitcoin-Qt.dmg ../../../
-	popd
 	popd
 
   Build output expected:
 
   1. linux 32-bit and 64-bit binaries + source (bitcoin-${VERSION}-linux-gitian.zip)
   2. windows 32-bit and 64-bit binaries + installer + source (bitcoin-${VERSION}-win-gitian.zip)
-  3. OSX installer (Bitcoin-Qt.dmg)
-  4. Gitian signatures (in gitian.sigs/${VERSION}[-win|-osx]/(your gitian key)/
+  3. Gitian signatures (in gitian.sigs/${VERSION}[-win]/(your gitian key)/
 
 repackage gitian builds for release as stand-alone zip/tar/installer exe
 
@@ -147,6 +101,21 @@ repackage gitian builds for release as stand-alone zip/tar/installer exe
 	zip -r bitcoin-${VERSION}-win.zip bitcoin-${VERSION}-win
 	rm -rf bitcoin-${VERSION}-win
 
+**Perform Mac build:**
+
+  OSX binaries are created by Gavin Andresen on a 64-bit, OSX 10.6 machine.
+
+	./autogen.sh
+        SDK=$(xcode-select --print-path)/Platforms/MacOSX.platform/Developer/SDKs/MacOSX10.6.sdk
+        CXXFLAGS="-mmacosx-version-min=10.6 -isysroot $SDK" ./configure --enable-upnp-default
+	make
+	export QTDIR=/opt/local/share/qt4  # needed to find translations/qt_*.qm files
+	T=$(contrib/qt_translations.py $QTDIR/translations src/qt/locale)
+        export CODESIGNARGS='--keychain ...path_to_keychain --sign "Developer ID Application: BITCOIN FOUNDATION, INC., THE"'
+	python2.7 contrib/macdeploy/macdeployqtplus Bitcoin-Qt.app -sign -add-qt-tr $T -dmg -fancy contrib/macdeploy/fancy.plist
+
+ Build output expected: Bitcoin-Qt.dmg
+
 ###Next steps:
 
 * Code-sign Windows -setup.exe (in a Windows virtual machine using signtool)

doc/translation_process.md

@@ -70,16 +70,35 @@ We are using https://transifex.com as a frontend for translating the client.
 
 https://www.transifex.com/projects/p/bitcoin/resource/tx/
 
-The "Transifex client" (see: http://support.transifex.com/customer/portal/topics/440187-transifex-client/articles)
-is used to fetch new translations from Transifex. The configuration for this client (`.tx/config`)
-is part of the repository.
+The "Transifex client" (see: http://help.transifex.com/features/client/)
+will help with fetching new translations from Transifex. Use the following
+config to be able to connect with the client:
 
-Do not directly download translations one by one from the Transifex website, as we do a few
-postprocessing steps before committing the translations.
+### .tx/config
+
+    [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
+    
+### .tx/config (for Windows)
+
+    [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
+
+It is also possible to directly download new translations one by one from the Transifex website.
 
 ### Fetching new translations
 
-1. `python contrib/devtools/update-translations.py`
+1. `tx pull -a`
 2. update `src/qt/bitcoin.qrc` manually or via
    `ls src/qt/locale/*ts|xargs -n1 basename|sed 's/\(bitcoin_\(.*\)\).ts/<file alias="\2">locale\/\1.qm<\/file>/'`
 3. update `src/qt/Makefile.am` manually or via

qa/pull-tester/build-tests.sh.in

@@ -1,8 +1,4 @@
 #!/bin/bash
-# Copyright (c) 2013 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 # Param1: The prefix to mingw staging
 # Param2: Path to java comparison tool
 # Param3: Number of make jobs. Defaults to 1.
@@ -74,9 +70,6 @@ make check
 
 # Run RPC integration test on Linux:
 @abs_top_srcdir@/qa/rpc-tests/wallet.sh @abs_top_srcdir@/linux-build/src
-@abs_top_srcdir@/qa/rpc-tests/listtransactions.py --srcdir @abs_top_srcdir@/linux-build/src
-# Clean up cache/ directory that the python regression tests create
-rm -rf cache
 
 if [ $RUN_EXPENSIVE_TESTS = 1 ]; then
   # Run unit tests and blockchain-tester on Windows:

qa/pull-tester/pull-tester.py

@@ -1,8 +1,4 @@
 #!/usr/bin/python
-# Copyright (c) 2013 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 import json
 from urllib import urlopen
 import requests

qa/pull-tester/pull-tester.sh

@@ -1,8 +1,4 @@
 #!/bin/sh
-# Copyright (c) 2013 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 # Helper script for pull-tester.
 #Param 1: path to bitcoin srcroot
 #Param ...: arguments for build-test.sh
@@ -11,9 +7,6 @@ if [ $# -lt 1 ]; then
   echo "usage: $0 [bitcoin srcroot] build-test arguments..."
 fi
 
-killall -q bitcoin-cli
-killall -q bitcoind
-
 cd $1
 shift
 

qa/pull-tester/run-bitcoind-for-test.sh.in

@@ -1,8 +1,4 @@
 #!/bin/bash
-# Copyright (c) 2013 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
-#
 DATADIR="@abs_top_builddir@/.bitcoin"
 rm -rf "$DATADIR"
 mkdir -p "$DATADIR"/regtest

qa/rpc-tests/README.md

@@ -1,26 +1,22 @@
 Regression tests of RPC interface
 =================================
 
-### [python-bitcoinrpc](https://github.com/jgarzik/python-bitcoinrpc)
-Git subtree of [https://github.com/jgarzik/python-bitcoinrpc](https://github.com/jgarzik/python-bitcoinrpc).
+python-bitcoinrpc: git subtree of https://github.com/jgarzik/python-bitcoinrpc
 Changes to python-bitcoinrpc should be made upstream, and then
-pulled here using git subtree.
+pulled here using git subtree
 
-### [skeleton.py](skeleton.py)
-Copy this to create new regression tests.
+skeleton.py : Copy this to create new regression tests.
 
-### [listtransactions.py](listtransactions.py)
-Tests for the listtransactions RPC call.
+listtransactions.py : Tests for the listtransactions RPC call
 
-### [util.py](util.sh)
-Generally useful functions.
+util.py : generally useful functions
 
 Bash-based tests, to be ported to Python:
 -----------------------------------------
-- wallet.sh : Exercise wallet send/receive code.
-- walletbackup.sh : Exercise wallet backup / dump / import
-- txnmall.sh : Test proper accounting of malleable transactions
-- conflictedbalance.sh : More testing of malleable transaction handling
+wallet.sh : Exercise wallet send/receive code.
+walletbackup.sh : Exercise wallet backup / dump / import
+txnmall.sh : Test proper accounting of malleable transactions
+conflictedbalance.sh : More testing of malleable transaction handling
 
 Notes
 =====
@@ -36,8 +32,5 @@ test state.
 
 If you get into a bad state, you should be able
 to recover with:
-
-```bash
-rm -rf cache
-killall bitcoind
-```
+  rm -rf cache
+  killall bitcoind

qa/rpc-tests/conflictedbalance.sh

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 # Test marking of spent outputs
 

qa/rpc-tests/listtransactions.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-# Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 # Exercise the listtransactions API
 
@@ -118,7 +115,6 @@ def main():
     check_json_precision()
 
     success = False
-    nodes = []
     try:
         print("Initializing test directory "+options.tmpdir)
         if not os.path.isdir(options.tmpdir):
@@ -128,7 +124,6 @@ def main():
         nodes = start_nodes(2, options.tmpdir)
         connect_nodes(nodes[1], 0)
         sync_blocks(nodes)
-
         run_test(nodes)
 
         success = True
@@ -137,12 +132,12 @@ def main():
         print("Assertion failed: "+e.message)
     except Exception as e:
         print("Unexpected exception caught during testing: "+str(e))
-        traceback.print_tb(sys.exc_info()[2])
+        stack = traceback.extract_tb(sys.exc_info()[2])
+        print(stack[-1])
 
     if not options.nocleanup:
         print("Cleaning up")
-        stop_nodes(nodes)
-        wait_bitcoinds()
+        stop_nodes()
         shutil.rmtree(options.tmpdir)
 
     if success:

qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/.gitignore

@@ -1 +0,0 @@
-*.pyc

qa/rpc-tests/python-bitcoinrpc/bitcoinrpc/authproxy.py

@@ -1,140 +0,0 @@
-
-"""
-  Copyright 2011 Jeff Garzik
-
-  AuthServiceProxy has the following improvements over python-jsonrpc's
-  ServiceProxy class:
-
-  - HTTP connections persist for the life of the AuthServiceProxy object
-    (if server supports HTTP/1.1)
-  - sends protocol 'version', per JSON-RPC 1.1
-  - sends proper, incrementing 'id'
-  - sends Basic HTTP authentication headers
-  - parses all JSON numbers that look like floats as Decimal
-  - uses standard Python json lib
-
-  Previous copyright, from python-jsonrpc/jsonrpc/proxy.py:
-
-  Copyright (c) 2007 Jan-Klaas Kollhof
-
-  This file is part of jsonrpc.
-
-  jsonrpc is free software; you can redistribute it and/or modify
-  it under the terms of the GNU Lesser General Public License as published by
-  the Free Software Foundation; either version 2.1 of the License, or
-  (at your option) any later version.
-
-  This software is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU Lesser General Public License for more details.
-
-  You should have received a copy of the GNU Lesser General Public License
-  along with this software; if not, write to the Free Software
-  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
-"""
-
-try:
-    import http.client as httplib
-except ImportError:
-    import httplib
-import base64
-import json
-import decimal
-try:
-    import urllib.parse as urlparse
-except ImportError:
-    import urlparse
-
-USER_AGENT = "AuthServiceProxy/0.1"
-
-HTTP_TIMEOUT = 30
-
-
-class JSONRPCException(Exception):
-    def __init__(self, rpc_error):
-        Exception.__init__(self)
-        self.error = rpc_error
-
-
-class AuthServiceProxy(object):
-    def __init__(self, service_url, service_name=None, timeout=HTTP_TIMEOUT, connection=None):
-        self.__service_url = service_url
-        self.__service_name = service_name
-        self.__url = urlparse.urlparse(service_url)
-        if self.__url.port is None:
-            port = 80
-        else:
-            port = self.__url.port
-        self.__id_count = 0
-        (user, passwd) = (self.__url.username, self.__url.password)
-        try:
-            user = user.encode('utf8')
-        except AttributeError:
-            pass
-        try:
-            passwd = passwd.encode('utf8')
-        except AttributeError:
-            pass
-        authpair = user + b':' + passwd
-        self.__auth_header = b'Basic ' + base64.b64encode(authpair)
-
-        if connection:
-            # Callables re-use the connection of the original proxy
-            self.__conn = connection
-        elif self.__url.scheme == 'https':
-            self.__conn = httplib.HTTPSConnection(self.__url.hostname, port,
-                                                  None, None, False,
-                                                  timeout)
-        else:
-            self.__conn = httplib.HTTPConnection(self.__url.hostname, port,
-                                                 False, timeout)
-
-    def __getattr__(self, name):
-        if name.startswith('__') and name.endswith('__'):
-            # Python internal stuff
-            raise AttributeError
-        if self.__service_name is not None:
-            name = "%s.%s" % (self.__service_name, name)
-        return AuthServiceProxy(self.__service_url, name, connection=self.__conn)
-
-    def __call__(self, *args):
-        self.__id_count += 1
-
-        postdata = json.dumps({'version': '1.1',
-                               'method': self.__service_name,
-                               'params': args,
-                               'id': self.__id_count})
-        self.__conn.request('POST', self.__url.path, postdata,
-                            {'Host': self.__url.hostname,
-                             'User-Agent': USER_AGENT,
-                             'Authorization': self.__auth_header,
-                             'Content-type': 'application/json'})
-
-        response = self._get_response()
-        if response['error'] is not None:
-            raise JSONRPCException(response['error'])
-        elif 'result' not in response:
-            raise JSONRPCException({
-                'code': -343, 'message': 'missing JSON-RPC result'})
-        else:
-            return response['result']
-
-    def _batch(self, rpc_call_list):
-        postdata = json.dumps(list(rpc_call_list))
-        self.__conn.request('POST', self.__url.path, postdata,
-                            {'Host': self.__url.hostname,
-                             'User-Agent': USER_AGENT,
-                             'Authorization': self.__auth_header,
-                             'Content-type': 'application/json'})
-
-        return self._get_response()
-
-    def _get_response(self):
-        http_response = self.__conn.getresponse()
-        if http_response is None:
-            raise JSONRPCException({
-                'code': -342, 'message': 'missing HTTP response from server'})
-
-        return json.loads(http_response.read().decode('utf8'),
-                          parse_float=decimal.Decimal)

qa/rpc-tests/python-bitcoinrpc/setup.py

@@ -1,15 +0,0 @@
-#!/usr/bin/env python
-
-from distutils.core import setup
-
-setup(name='python-bitcoinrpc',
-      version='0.1',
-      description='Enhanced version of python-jsonrpc for use with Bitcoin',
-      long_description=open('README').read(),
-      author='Jeff Garzik',
-      author_email='<jgarzik@exmulti.com>',
-      maintainer='Jeff Garzik',
-      maintainer_email='<jgarzik@exmulti.com>',
-      url='http://www.github.com/jgarzik/python-bitcoinrpc',
-      packages=['bitcoinrpc'],
-      classifiers=['License :: OSI Approved :: GNU Library or Lesser General Public License (LGPL)', 'Operating System :: OS Independent'])

qa/rpc-tests/send.sh

@@ -1,7 +1,4 @@
 #!/bin/bash
-# Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 TIMEOUT=10
 SIGNAL=HUP
 PIDFILE=.send.pid

qa/rpc-tests/skeleton.py

@@ -1,7 +1,4 @@
 #!/usr/bin/env python
-# Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 # Skeleton for python-based regression tests using
 # JSON-RPC
@@ -45,7 +42,6 @@ def main():
     check_json_precision()
 
     success = False
-    nodes = []
     try:
         print("Initializing test directory "+options.tmpdir)
         if not os.path.isdir(options.tmpdir):
@@ -64,12 +60,12 @@ def main():
         print("Assertion failed: "+e.message)
     except Exception as e:
         print("Unexpected exception caught during testing: "+str(e))
-        traceback.print_tb(sys.exc_info()[2])
+        stack = traceback.extract_tb(sys.exc_info()[2])
+        print(stack[-1])
 
     if not options.nocleanup:
         print("Cleaning up")
-        stop_nodes(nodes)
-        wait_bitcoinds()
+        stop_nodes()
         shutil.rmtree(options.tmpdir)
 
     if success:

qa/rpc-tests/txnmall.sh

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 # Test proper accounting with malleable transactions
 

qa/rpc-tests/util.py

@@ -1,6 +1,3 @@
-# Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 #
 # Helpful routines for regression testing
 #
@@ -55,8 +52,6 @@ def sync_mempools(rpc_connections):
         time.sleep(1)
         
 
-bitcoind_processes = []
-
 def initialize_chain(test_dir):
     """
     Create (or copy from cache) a 200-block-long chain and
@@ -65,8 +60,8 @@ def initialize_chain(test_dir):
     """
 
     if not os.path.isdir(os.path.join("cache", "node0")):
-        devnull = open("/dev/null", "w+")
         # Create cache directories, run bitcoinds:
+        bitcoinds = []
         for i in range(4):
             datadir = os.path.join("cache", "node"+str(i))
             os.makedirs(datadir)
@@ -79,10 +74,10 @@ def initialize_chain(test_dir):
             args = [ "bitcoind", "-keypool=1", "-datadir="+datadir ]
             if i > 0:
                 args.append("-connect=127.0.0.1:"+str(START_P2P_PORT))
-            bitcoind_processes.append(subprocess.Popen(args))
-            subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir,
-                                    "-rpcwait", "getblockcount"], stdout=devnull)
-        devnull.close()
+            bitcoinds.append(subprocess.Popen(args))
+            subprocess.check_output([ "bitcoin-cli", "-datadir="+datadir,
+                                      "-rpcwait", "getblockcount"])
+
         rpcs = []
         for i in range(4):
             try:
@@ -92,6 +87,8 @@ def initialize_chain(test_dir):
                 sys.stderr.write("Error connecting to "+url+"\n")
                 sys.exit(1)
 
+        import pdb; pdb.set_trace()
+
         # Create a 200-block-long chain; each of the 4 nodes
         # gets 25 mature blocks and 25 immature.
         for i in range(4):
@@ -100,28 +97,25 @@ def initialize_chain(test_dir):
         for i in range(4):
             rpcs[i].setgenerate(True, 25)
             sync_blocks(rpcs)
-
-        # Shut them down, and remove debug.logs:
-        stop_nodes(rpcs)
-        wait_bitcoinds()
+        # Shut them down
         for i in range(4):
-            os.remove(debug_log("cache", i))
+            rpcs[i].stop()
 
     for i in range(4):
         from_dir = os.path.join("cache", "node"+str(i))
         to_dir = os.path.join(test_dir,  "node"+str(i))
         shutil.copytree(from_dir, to_dir)
 
+bitcoind_processes = []
+
 def start_nodes(num_nodes, dir):
     # Start bitcoinds, and wait for RPC interface to be up and running:
-    devnull = open("/dev/null", "w+")
     for i in range(num_nodes):
         datadir = os.path.join(dir, "node"+str(i))
         args = [ "bitcoind", "-datadir="+datadir ]
         bitcoind_processes.append(subprocess.Popen(args))
-        subprocess.check_call([ "bitcoin-cli", "-datadir="+datadir,
-                                  "-rpcwait", "getblockcount"], stdout=devnull)
-    devnull.close()
+        subprocess.check_output([ "bitcoin-cli", "-datadir="+datadir,
+                                  "-rpcwait", "getblockcount"])
     # Create&return JSON-RPC connections
     rpc_connections = []
     for i in range(num_nodes):
@@ -129,19 +123,9 @@ def start_nodes(num_nodes, dir):
         rpc_connections.append(AuthServiceProxy(url))
     return rpc_connections
 
-def debug_log(dir, n_node):
-    return os.path.join(dir, "node"+str(n_node), "regtest", "debug.log")
-
-def stop_nodes(nodes):
-    for i in range(len(nodes)):
-        nodes[i].stop()
-    del nodes[:] # Emptying array closes connections as a side effect
-
-def wait_bitcoinds():
-    # Wait for all bitcoinds to cleanly exit
-    for bitcoind in bitcoind_processes:
-        bitcoind.wait()
-    del bitcoind_processes[:]
+def stop_nodes():
+    for process in bitcoind_processes:
+        process.kill()
 
 def connect_nodes(from_connection, node_num):
     ip_port = "127.0.0.1:"+str(START_P2P_PORT+node_num)

qa/rpc-tests/util.sh

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) 2014 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 # Functions used by more than one test
 

qa/rpc-tests/wallet.sh

@@ -1,7 +1,4 @@
 #!/usr/bin/env bash
-# Copyright (c) 2013-2014 The Bitcoin Core developers
-# Distributed under the MIT/X11 software license, see the accompanying
-# file COPYING or http://www.opensource.org/licenses/mit-license.php.
 
 # Test block generation and basic wallet sending