From 903a25583604b73e8b139c591b1e4a8a5402cbba Mon Sep 17 00:00:00 2001 From: Luke Dashjr Date: Thu, 6 Oct 2011 12:47:28 -0400 Subject: [PATCH 1/5] Bugfix: "bits" should be a hex-string, not a number (that just doesn't make sense) --- src/bitcoinrpc.cpp | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/src/bitcoinrpc.cpp b/src/bitcoinrpc.cpp index e9d8ca6a0..6e2eac5a7 100644 --- a/src/bitcoinrpc.cpp +++ b/src/bitcoinrpc.cpp @@ -1773,7 +1773,14 @@ Value getmemorypool(const Array& params, bool fHelp) result.push_back(Pair("transactions", transactions)); result.push_back(Pair("coinbasevalue", (int64_t)pblock->vtx[0].vout[0].nValue)); result.push_back(Pair("time", (int64_t)pblock->nTime)); - result.push_back(Pair("bits", (int64_t)pblock->nBits)); + + union { + int32_t nBits; + char cBits[4]; + } uBits; + uBits.nBits = htonl((int32_t)pblock->nBits); + result.push_back(Pair("bits", HexStr(BEGIN(uBits.cBits), END(uBits.cBits)))); + return result; } else From 7b465b663acbf7b402c251e20a9bd32a8611898f Mon Sep 17 00:00:00 2001 From: globalcitizen Date: Sun, 9 Oct 2011 17:04:35 +0800 Subject: [PATCH 2/5] Collate generic dependency information. Segregate distribution-specific (Ubuntu/Debian) information. Add Gentoo information. --- doc/build-unix.txt | 62 ++++++++++++++++++++++++++++++++-------------- 1 file changed, 43 insertions(+), 19 deletions(-) diff --git a/doc/build-unix.txt b/doc/build-unix.txt index b7aa7112b..89afc0db7 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -22,38 +22,62 @@ the graphical bitcoin. Dependencies ------------ + + Library Purpose Description + ------- ------- ----------- + libssl SSL Support Secure communications + libdb4.8 Berkeley DB Blockchain & wallet storage + libboost Boost C++ Library + miinupnpc UPnP Support Optional firewall-jumping support + +miniupnpc may be used for UPnP port mapping. It can be downloaded from +http://miniupnp.tuxfamily.org/files/. UPnP support is compiled in and +turned off by default. Set USE_UPNP to a different value to control this: + USE_UPNP= No UPnP support - miniupnp not required + USE_UPNP=0 (the default) UPnP support turned off by default at runtime + USE_UPNP=1 UPnP support turned on by default at runtime + +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 + +Versions used in this release: + GCC 4.3.3 + OpenSSL 0.9.8g + Berkeley DB 4.8.30.NC + Boost 1.37 + miniupnpc 1.6 + + +Dependency Build Instructions: Ubuntu & Debian +---------------------------------------------- sudo apt-get install build-essential sudo apt-get install libssl-dev sudo apt-get install libdb4.8-dev sudo apt-get install libdb4.8++-dev -Boost 1.40+: sudo apt-get install libboost-all-dev -or Boost 1.37: sudo apt-get install libboost1.37-dev + Boost 1.40+: sudo apt-get install libboost-all-dev + or Boost 1.37: sudo apt-get install libboost1.37-dev If using Boost 1.37, append -mt to the boost libraries in the makefile. -Requires miniupnpc for UPnP port mapping. It can be downloaded from -http://miniupnp.tuxfamily.org/files/. UPnP support is compiled in and -turned off by default. Set USE_UPNP to a different value to control this: -USE_UPNP= no UPnP support, miniupnp not required; -USE_UPNP=0 (the default) UPnP support turned off by default at runtime; -USE_UPNP=1 UPnP support turned on by default at runtime. -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 +Dependency Build Instructions: Gentoo +------------------------------------- +emerge -av net-libs/miniupnpc boost openssl sys-libs/db -Versions used in this release: -GCC 4.3.3 -OpenSSL 0.9.8g -Berkeley DB 4.8.30.NC -Boost 1.37 -miniupnpc 1.6 +Then take the following steps to build: + cd $BITCOIN_DIR/src + sed -i 's///' src/* + sed -i 's/-Bstatic/-Bdynamic/' makefile.unix + make -f makefile.unix + strip bitcoind Notes ----- -The release is built with GCC and then "strip bitcoin" to strip the debug +The release is built with GCC and then "strip bitcoind" to strip the debug symbols, which reduces the executable size by about 90%. From c60aec9c203f1495039abb1c3ad39ea691f128ac Mon Sep 17 00:00:00 2001 From: globalcitizen Date: Sun, 9 Oct 2011 17:10:43 +0800 Subject: [PATCH 3/5] Fix extraneous directory specifier, beautify bash syntax $VAR -> ${VAR} --- doc/build-unix.txt | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/doc/build-unix.txt b/doc/build-unix.txt index 89afc0db7..b424a5007 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -68,8 +68,8 @@ Dependency Build Instructions: Gentoo emerge -av net-libs/miniupnpc boost openssl sys-libs/db Then take the following steps to build: - cd $BITCOIN_DIR/src - sed -i 's///' src/* + cd ${BITCOIN_DIR}/src + sed -i 's///' * sed -i 's/-Bstatic/-Bdynamic/' makefile.unix make -f makefile.unix strip bitcoind From 4adf78bad32f016196bdcc8d6edfc9d9796b04ef Mon Sep 17 00:00:00 2001 From: globalcitizen Date: Sun, 9 Oct 2011 17:16:53 +0800 Subject: [PATCH 4/5] Improved Gentoo instructions. --- doc/build-unix.txt | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/doc/build-unix.txt b/doc/build-unix.txt index b424a5007..61efb1bec 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -69,8 +69,9 @@ emerge -av net-libs/miniupnpc boost openssl sys-libs/db Then take the following steps to build: cd ${BITCOIN_DIR}/src - sed -i 's///' * - sed -i 's/-Bstatic/-Bdynamic/' makefile.unix + sed -i 's///' *.h # path fix + sed -i 's/-Bstatic/-Bdynamic/' makefile.unix # dynamic linking + sed -i 's/^USE_UPNP:=0$/USE_UPNP:=/' makefile.unix # disable UPnP make -f makefile.unix strip bitcoind From bdf2f7e7111eda0d91b4e740797345d54289947f Mon Sep 17 00:00:00 2001 From: globalcitizen Date: Sun, 9 Oct 2011 17:18:34 +0800 Subject: [PATCH 5/5] Fix typo. Improve Gentoo instructions. --- doc/build-unix.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/doc/build-unix.txt b/doc/build-unix.txt index 61efb1bec..e47dbf710 100644 --- a/doc/build-unix.txt +++ b/doc/build-unix.txt @@ -28,7 +28,7 @@ Dependencies libssl SSL Support Secure communications libdb4.8 Berkeley DB Blockchain & wallet storage libboost Boost C++ Library - miinupnpc UPnP Support Optional firewall-jumping support + miniupnpc UPnP Support Optional firewall-jumping support miniupnpc may be used for UPnP port mapping. It can be downloaded from http://miniupnp.tuxfamily.org/files/. UPnP support is compiled in and @@ -65,9 +65,9 @@ If using Boost 1.37, append -mt to the boost libraries in the makefile. Dependency Build Instructions: Gentoo ------------------------------------- -emerge -av net-libs/miniupnpc boost openssl sys-libs/db +emerge -av boost openssl sys-libs/db -Then take the following steps to build: +Take the following steps to build (no UPnP support): cd ${BITCOIN_DIR}/src sed -i 's///' *.h # path fix sed -i 's/-Bstatic/-Bdynamic/' makefile.unix # dynamic linking