Version bump for bug #536228

(Portage version: 2.2.14/cvs/Linux x86_64, signed Manifest commit with key 0xF52D4BBA)

6 files changed, 85 insertions, 120 deletions

diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index f684ca1bcc18..b0ec784c7b74 100644
--- a/net-p2p/bitcoind/ChangeLog
+++ b/net-p2p/bitcoind/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for net-p2p/bitcoind
-# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.93 2014/11/21 12:14:47 blueness Exp $
+# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.94 2015/01/10 17:02:08 blueness Exp $
+
+*bitcoind-0.8.6-r2 (10 Jan 2015)
+*bitcoind-0.9.3-r1 (10 Jan 2015)
+
+  10 Jan 2015; Anthony G. Basile <blueness@gentoo.org>
+  +bitcoind-0.8.6-r2.ebuild, +bitcoind-0.9.3-r1.ebuild,
+  +files/0.8-openssl-101k.patch, +files/0.9-openssl-101k.patch,
+  -bitcoind-0.8.6-r1.ebuild, -bitcoind-0.9.2.1.ebuild, -bitcoind-0.9.3.ebuild:
+  Version bump for bug #536228
 
   21 Nov 2014; Anthony G. Basile <blueness@gentoo.org>
   +files/9999-sys_libsecp256k1.patch, bitcoind-9999.ebuild:
diff --git a/net-p2p/bitcoind/bitcoind-0.8.6-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.8.6-r2.ebuild
index f74c25f5e2fb..9df9333f6443 100644
--- a/net-p2p/bitcoind/bitcoind-0.8.6-r1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.8.6-r2.ebuild
@@ -1,8 +1,8 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.8.6-r1.ebuild,v 1.1 2014/02/21 14:22:42 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.8.6-r2.ebuild,v 1.1 2015/01/10 17:02:08 blueness Exp $
 
-EAPI="4"
+EAPI=4
 
 DB_VER="4.8"
 
@@ -20,7 +20,7 @@ SRC_URI="https://github.com/${MyPN}/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyPN}-v
 LICENSE="MIT ISC GPL-2"
 SLOT="0"
 KEYWORDS="~amd64 ~arm ~x86"
-IUSE="bash-completion examples ipv6 logrotate upnp"
+IUSE="examples ipv6 logrotate upnp"
 
 RDEPEND="
 	>=dev-libs/boost-1.41.0[threads(+)]
@@ -32,7 +32,7 @@ RDEPEND="
 		net-libs/miniupnpc
 	)
 	sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	<=dev-libs/leveldb-1.12.0[-snappy]
+	virtual/bitcoin-leveldb
 "
 DEPEND="${RDEPEND}
 	>=app-shells/bash-4.1
@@ -48,6 +48,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/0.8-openssl-101k.patch"
 	epatch "${FILESDIR}/0.8.2-sys_leveldb.patch"
 	rm -r src/leveldb
 
@@ -106,9 +107,7 @@ src_install() {
 	dodoc doc/README.md doc/release-notes.md
 	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
 
-	if use bash-completion; then
-		newbashcomp contrib/${PN}.bash-completion ${PN}
-	fi
+	newbashcomp contrib/${PN}.bash-completion ${PN}
 
 	if use examples; then
 		docinto examples
diff --git a/net-p2p/bitcoind/bitcoind-0.9.2.1.ebuild b/net-p2p/bitcoind/bitcoind-0.9.2.1.ebuild
deleted file mode 100644
index b7e7e8349b71..000000000000
--- a/net-p2p/bitcoind/bitcoind-0.9.2.1.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 2010-2014 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.9.2.1.ebuild,v 1.5 2014/11/13 18:41:27 blueness Exp $
-
-EAPI=4
-
-DB_VER="4.8"
-
-inherit autotools bash-completion-r1 db-use eutils user versionator systemd
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-HOMEPAGE="http://bitcoin.org/"
-SRC_URI="https://github.com/${MyPN}/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyPN}-v${PV}.tgz
-"
-
-LICENSE="MIT ISC GPL-2"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~x86"
-IUSE="examples logrotate test upnp +wallet"
-
-RDEPEND="
-	>=dev-libs/boost-1.41.0[threads(+)]
-	dev-libs/openssl:0[-bindist]
-	logrotate? (
-		app-admin/logrotate
-	)
-	upnp? (
-		net-libs/miniupnpc
-	)
-	wallet? (
-		sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx]
-	)
-	virtual/bitcoin-leveldb
-"
-DEPEND="${RDEPEND}
-	>=app-shells/bash-4.1
-	sys-apps/sed
-"
-
-S="${WORKDIR}/${MyP}"
-
-pkg_setup() {
-	local UG='bitcoin'
-	enewgroup "${UG}"
-	enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
-	epatch "${FILESDIR}/0.9.0-sys_leveldb.patch"
-	rm -r src/leveldb
-	eautoreconf
-}
-
-src_configure() {
-	econf \
-		--disable-ccache \
-		$(use_with upnp miniupnpc) $(use_enable upnp upnp-default) \
-		$(use_enable test tests)  \
-		$(use_enable wallet)  \
-		--with-system-leveldb  \
-		--without-cli  \
-		--without-gui
-}
-
-src_test() {
-	emake check
-}
-
-src_install() {
-	emake DESTDIR="${D}" install
-
-	insinto /etc/bitcoin
-	newins "${FILESDIR}/bitcoin.conf" bitcoin.conf
-	fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf
-	fperms 600 /etc/bitcoin/bitcoin.conf
-
-	newconfd "${FILESDIR}/bitcoin.confd" ${PN}
-	newinitd "${FILESDIR}/bitcoin.initd-r1" ${PN}
-	systemd_dounit "${FILESDIR}/bitcoind.service"
-
-	keepdir /var/lib/bitcoin/.bitcoin
-	fperms 700 /var/lib/bitcoin
-	fowners bitcoin:bitcoin /var/lib/bitcoin/
-	fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin
-	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
-
-	dodoc doc/README.md doc/release-notes.md
-	dodoc doc/assets-attribution.md doc/tor.md
-	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
-	newbashcomp contrib/${PN}.bash-completion ${PN}
-
-	if use examples; then
-		docinto examples
-		dodoc -r contrib/{bitrpc,pyminer,qos,spendfrom,tidy_datadir.sh}
-	fi
-
-	if use logrotate; then
-		insinto /etc/logrotate.d
-		newins "${FILESDIR}/bitcoind.logrotate" bitcoind
-	fi
-}
diff --git a/net-p2p/bitcoind/bitcoind-0.9.3.ebuild b/net-p2p/bitcoind/bitcoind-0.9.3-r1.ebuild
index 0d9cc09b0d1f..eb9d0b1bd5fa 100644
--- a/net-p2p/bitcoind/bitcoind-0.9.3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.9.3-r1.ebuild
@@ -1,6 +1,6 @@
-# Copyright 2010-2014 Gentoo Foundation
+# Copyright 2010-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.9.3.ebuild,v 1.3 2014/11/13 18:41:27 blueness Exp $
+# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-0.9.3-r1.ebuild,v 1.1 2015/01/10 17:02:08 blueness Exp $
 
 EAPI=4
 
@@ -29,7 +29,7 @@ REQUIRED_USE="
 	ljr-antispam? ( ljr )
 "
 RDEPEND="
-	>=dev-libs/boost-1.52.0[threads(+)]
+	>=dev-libs/boost-1.41.0[threads(+)]
 	dev-libs/openssl:0[-bindist]
 	logrotate? (
 		app-admin/logrotate
@@ -56,6 +56,7 @@ pkg_setup() {
 }
 
 src_prepare() {
+	epatch "${FILESDIR}/0.9-openssl-101k.patch"
 	if use ljr; then
 		epatch "${WORKDIR}/${LJR_PATCH}"
 		use ljr-antispam || epatch "${FILESDIR}/0.9.x-ljr_noblacklist.patch"
@@ -100,7 +101,7 @@ src_install() {
 	dosym /etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf
 
 	dodoc doc/README.md doc/release-notes.md
-	dodoc doc/assets-attribution.md doc/tor.md
+	dodoc doc/tor.md
 	doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
 
 	newbashcomp contrib/${PN}.bash-completion ${PN}
diff --git a/net-p2p/bitcoind/files/0.8-openssl-101k.patch b/net-p2p/bitcoind/files/0.8-openssl-101k.patch
new file mode 100644
index 000000000000..5eaaba9a5788
--- /dev/null
+++ b/net-p2p/bitcoind/files/0.8-openssl-101k.patch
@@ -0,0 +1,31 @@
+diff --git a/src/key.cpp b/src/key.cpp
+index 75114c6..7fcb17d 100644
+--- a/src/key.cpp
++++ b/src/key.cpp
+@@ -376,11 +376,23 @@ bool CKey::SetCompactSignature(uint256 hash, const std::vector<unsigned char>& v
+ 
+ bool CKey::Verify(uint256 hash, const std::vector<unsigned char>& vchSig)
+ {
+-    // -1 = error, 0 = bad sig, 1 = good
+-    if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1)
++    if (vchSig.empty())
+         return false;
+ 
+-    return true;
++    // New versions of OpenSSL will reject non-canonical DER signatures. de/re-serialize first.
++    unsigned char *norm_der = NULL;
++    ECDSA_SIG *norm_sig = ECDSA_SIG_new();
++    const unsigned char* sigptr = &vchSig[0];
++    d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size());
++    int derlen = i2d_ECDSA_SIG(norm_sig, &norm_der);
++    ECDSA_SIG_free(norm_sig);
++    if (derlen <= 0)
++        return false;
++
++    // -1 = error, 0 = bad sig, 1 = good
++    bool ret = ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), norm_der, derlen, pkey) == 1;
++    OPENSSL_free(norm_der);
++    return ret;
+ }
+ 
+ bool CKey::VerifyCompact(uint256 hash, const std::vector<unsigned char>& vchSig)
diff --git a/net-p2p/bitcoind/files/0.9-openssl-101k.patch b/net-p2p/bitcoind/files/0.9-openssl-101k.patch
new file mode 100644
index 000000000000..80f64887425b
--- /dev/null
+++ b/net-p2p/bitcoind/files/0.9-openssl-101k.patch
@@ -0,0 +1,31 @@
+diff --git a/src/key.cpp b/src/key.cpp
+index 5b261bb..a845ba1 100644
+--- a/src/key.cpp
++++ b/src/key.cpp
+@@ -227,10 +227,23 @@ public:
+     }
+ 
+     bool Verify(const uint256 &hash, const std::vector<unsigned char>& vchSig) {
+-        // -1 = error, 0 = bad sig, 1 = good
+-        if (ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), &vchSig[0], vchSig.size(), pkey) != 1)
++        if (vchSig.empty())
+             return false;
+-        return true;
++
++        // New versions of OpenSSL will reject non-canonical DER signatures. de/re-serialize first.
++        unsigned char *norm_der = NULL;
++        ECDSA_SIG *norm_sig = ECDSA_SIG_new();
++        const unsigned char* sigptr = &vchSig[0];
++        d2i_ECDSA_SIG(&norm_sig, &sigptr, vchSig.size());
++        int derlen = i2d_ECDSA_SIG(norm_sig, &norm_der);
++        ECDSA_SIG_free(norm_sig);
++        if (derlen <= 0)
++            return false;
++
++        // -1 = error, 0 = bad sig, 1 = good
++        bool ret = ECDSA_verify(0, (unsigned char*)&hash, sizeof(hash), norm_der, derlen, pkey) == 1;
++        OPENSSL_free(norm_der);
++        return ret;
+     }
+ 
+     bool SignCompact(const uint256 &hash, unsigned char *p64, int &rec) {