aboutsummaryrefslogtreecommitdiffstats
path: root/testing
diff options
context:
space:
mode:
authorStuart Cardall <developer@it-offshore.co.uk>2015-05-06 21:59:30 +0000
committerNatanael Copa <ncopa@alpinelinux.org>2015-05-07 05:57:19 +0000
commit943e5152ac05f6e580fe52e56e6ceeba4ff683b8 (patch)
tree072fc66ac74488290dec4804f1fa62013235313e /testing
parent084b9372103354999bffda490f597fca0740a91d (diff)
downloadaports-943e5152ac05f6e580fe52e56e6ceeba4ff683b8.tar.bz2
aports-943e5152ac05f6e580fe52e56e6ceeba4ff683b8.tar.xz
testing/bitcoin: update to 0.10.1 + fix boost error
Diffstat (limited to 'testing')
-rw-r--r--testing/bitcoin/APKBUILD30
-rw-r--r--testing/bitcoin/bitcoin.initd2
-rw-r--r--testing/bitcoin/boost-STATIC_ASSERTION_FAILURE.patch11
3 files changed, 27 insertions, 16 deletions
diff --git a/testing/bitcoin/APKBUILD b/testing/bitcoin/APKBUILD
index 33738e714d..b4d8f745d5 100644
--- a/testing/bitcoin/APKBUILD
+++ b/testing/bitcoin/APKBUILD
@@ -1,9 +1,9 @@
# Contributor: Natanael Copa <ncopa@alpinelinux.org>
# Maintainer: Stuart Cardall <developer@it-offshore.co.uk>
pkgname=bitcoin
-pkgver=0.10.0
+pkgver=0.10.1
_ver=${pkgver/_/}
-pkgrel=1
+pkgrel=0
pkgdesc="decentralized P2P electronic cash system"
url="http://www.bitcoin.org/"
arch="all"
@@ -19,6 +19,7 @@ source="$pkgname-$_ver.tar.gz::https://github.com/bitcoin/bitcoin/archive/v${_ve
ssize_t.patch
$pkgname.initd
$pkgname.conf
+ boost-STATIC_ASSERTION_FAILURE.patch
"
_builddir="$srcdir"/bitcoin-$_ver
@@ -35,10 +36,6 @@ prepare() {
build() {
cd "$_builddir"
- # we need to set BOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT after
- # boost 1.58.0
- # http://www.boost.org/doc/libs/1_58_0/doc/html/boost/get_idp295310448.html
- CXXFLAGS="$CXXFLAGS -DBOOST_VARIANT_USE_RELAXED_GET_BY_DEFAULT=1" \
./configure \
--build=$CBUILD \
--host=$CHOST \
@@ -73,15 +70,18 @@ cli() {
mv "$pkgdir"/usr/bin/bitcoin-cli "$subpkgdir"/usr/bin/ || return 1
}
-md5sums="69fb3ebe5fc89f5fb55ca7c46818c3e8 bitcoin-0.10.0.tar.gz
+md5sums="210667b037b2b2c7ed13a499ceb93945 bitcoin-0.10.1.tar.gz
716a88e668729e89d3eb929da86f7f04 ssize_t.patch
-56edf10681b0cd7cc33de1fd24155108 bitcoin.initd
-3e9b4a37bb46e6cd83b6824870c58484 bitcoin.conf"
-sha256sums="be57f3b0d64a797873189e45851f3b3510832e14ff18b5f563e1ba8911d145ac bitcoin-0.10.0.tar.gz
+70a29202a5fa77e50e92083b014909c9 bitcoin.initd
+3e9b4a37bb46e6cd83b6824870c58484 bitcoin.conf
+999b641737df8691e472d170e48137a3 boost-STATIC_ASSERTION_FAILURE.patch"
+sha256sums="d83e2872de37a17c60b7f5d86a5d9cfe2e7e706bf270ea59d7cd846d2fbf8102 bitcoin-0.10.1.tar.gz
f0a094c7b374338ad153ee06b7dd2369dad6b97b1f1bb0252da12c9aaace5321 ssize_t.patch
-df060fcee7227a2c7c4a435e24dea25b6388a6d6a98f01975c466a2c770e976a bitcoin.initd
-b7a31bf251f1011ab6584b610acac8494612c2012e9771985228c36c08a315ac bitcoin.conf"
-sha512sums="68b0575cd6b2d8ca3237adfe86460114bdb45a77ea75655ddb38412fa8952907471dd05fb368125effd5b6fa07d9203447ebf1fff7a2bd2aedb673d424f18825 bitcoin-0.10.0.tar.gz
+432b769f9e7cc2e728d72dd38c20ef54132da4a36134988e3401c8451f31bc42 bitcoin.initd
+b7a31bf251f1011ab6584b610acac8494612c2012e9771985228c36c08a315ac bitcoin.conf
+5bdab73812d88824e7644d853288b674f995f38a4c57578d27a8b38dc52cf394 boost-STATIC_ASSERTION_FAILURE.patch"
+sha512sums="3aaa2fc33a21023484074584e02d01a5ae686d4326c5a1de5e3a578e14059d60d44631f42ec54322bea6a12a6b119276b45bade590e54d6d5d51a38b0eed006c bitcoin-0.10.1.tar.gz
98aa5ad81bdb4ae961b791bc978c39117cdf2d83c2181f92bebbb0db107d9b6e86eda265fb3f93ff8a5ca8a7754d7148818b98095d57201dff9363d60b97e7dd ssize_t.patch
-9bab044e3ddc229f8e2b2eb170361f92d234c78e21c6f1c24a5fe1d0b480db5b6728dda990752eb0820085ecdc41538e735d631ff5886c270475a5b634e3729f bitcoin.initd
-48abce0f0a5b088c957aa5cb2bcf9bb520593caa7a20019bdf785e43f7d2459968240d4529dfa30be2fca92891bf50c1253a513530511e99d8ee471d9ff6bd95 bitcoin.conf"
+cb2454c353014213bd25fbb938affe79639aa82542c560eaa910e4d9fc01d1cbfec6d8ff004aab9a123ca62e26ed2ebeb264b052a36d3d7154758061065664ab bitcoin.initd
+48abce0f0a5b088c957aa5cb2bcf9bb520593caa7a20019bdf785e43f7d2459968240d4529dfa30be2fca92891bf50c1253a513530511e99d8ee471d9ff6bd95 bitcoin.conf
+de0ee15ca5f74b53dd9d6bc912c65f269063d27ff28682fbd20334e7e232163afd8454cdbcb8b0ae3a088e1dbf5d898a4725e17e050b5f4071412c151431f795 boost-STATIC_ASSERTION_FAILURE.patch"
diff --git a/testing/bitcoin/bitcoin.initd b/testing/bitcoin/bitcoin.initd
index 5f0ef76015..393ea45374 100644
--- a/testing/bitcoin/bitcoin.initd
+++ b/testing/bitcoin/bitcoin.initd
@@ -1,4 +1,4 @@
-#!/sbin/runscript
+#!/sbin/openrc-run
# Bitcoin init.d file for Alpine Linux.
diff --git a/testing/bitcoin/boost-STATIC_ASSERTION_FAILURE.patch b/testing/bitcoin/boost-STATIC_ASSERTION_FAILURE.patch
new file mode 100644
index 0000000000..07589c74f1
--- /dev/null
+++ b/testing/bitcoin/boost-STATIC_ASSERTION_FAILURE.patch
@@ -0,0 +1,11 @@
+--- bitcoin-0.10.1/src/rpcrawtransaction.cpp
++++ bitcoin-0.10.1/src/rpcrawtransaction.cpp.new
+@@ -287,7 +287,7 @@
+ if (pk.IsPayToScriptHash()) {
+ CTxDestination address;
+ if (ExtractDestination(pk, address)) {
+- const CScriptID& hash = boost::get<const CScriptID&>(address);
++ const CScriptID& hash = boost::get<CScriptID>(address);
+ CScript redeemScript;
+ if (pwalletMain->GetCScript(hash, redeemScript))
+ entry.push_back(Pair("redeemScript", HexStr(redeemScript.begin(), redeemScript.end())));