Version bump for bug #536228

Package-Manager: portage-2.2.14/cvs/Linux x86_64
Manifest-Sign-Key: 0xF52D4BBA

diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog
index f684ca1bcc1875be5d5a1f5996b9223bc7ab44f4..b0ec784c7b74fb92b0412d9e032d15aff58dcdf8 100644 (file)
--- 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/Manifest b/net-p2p/bitcoind/Manifest
index 843efb12b49f181d37ceb58a8c1904e28f4e2f38..782630ec608d7db4d0cf4810341384b5144f9d63 100644 (file)
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,7 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
+AUX 0.8-openssl-101k.patch 1185 SHA256 b983630d22847ea2aa41674ab2317363e48788b01a4157818a2a9cb78e671a2f SHA512 e54a742467d922892a332f786f2a29b1901fc2c8c0e316a69bdc6492977d649c4d57d09ae51f43ba01e2bfc2f4bb19db3f1cddfbe0ee093b3daed4493385d836 WHIRLPOOL 30876d679e4ebb38b6db6524fa3a22be42a2cbe0f2b50458ac7dfbebd74e1d16be6a19f4e369c30ad65c528dcbcff9d79077aad5b8d971a15dceb0339de18c21
 AUX 0.8.2-sys_leveldb.patch 6726 SHA256 11322fc7715b9b552075babf60c8261e0343e5ec834188013fb7d77cacf3b4d9 SHA512 e371b6da685c916c5941cfc094d01237f18502597e778b35e1c31cbf93cda1118a97272b56605f7c6da1f2873190415974ebdb4e7ce08a5d04e94dac675a4112 WHIRLPOOL 8579c73d18281b3910c260ef0708842380f8c5001982c94ea51e6b8f99111b11959ffb04fc7812e0c90ba8a919071b13e975ed95ec207017e34bef5844f65068
+AUX 0.9-openssl-101k.patch 1192 SHA256 198318943cd1eaff2ce5e94b5b9aea40a2c99c46c459f2f2049eb15c52721566 SHA512 471dd9a581a07f859bb5f7b8d9489995c6e137bec0e3afcf91903135f4dd259f7f56d734749fd5acba0d744d6b8b23688570371656be5af9e960d63bbe3659f0 WHIRLPOOL abc6596e349acb34c2fb657c302b20fa74c545f2c2fbb4062bc1041f4944285ab3a5ff63dfc7ef7a724abb95a1742ac1e9ee05c9e9dbabcba4a5cbf500d4e368
 AUX 0.9.0-sys_leveldb.patch 1040 SHA256 1355674ba82966b31fd001b12e7bd1bffbfd7f1c6d8dc1679cedba032e6df642 SHA512 26b1b6f8c4fdc228c08982a3172de57e09d963745726c99e1e274f381e242467f84d23c718f8e07675c2fc938f2d6db6b50a05dbb944702238d7b0eb6205cff7 WHIRLPOOL 7d39d39f846f03ffbf3e4c9655c42f298c8196dde8ee621862483a49f386c13cfdd13221ff265745f504a33422aaafac3657b72552f55784c9296daffc248f31
 AUX 0.9.x-ljr_noblacklist.patch 330 SHA256 b20c934540748cd42405bfca305a61bf05a76cd9b54f20e57e5fba84bb742f6a SHA512 13e727d6e1324542f7097c310e2f2a869d39acf6288593661b81715858ee95d1ca0566aa9892e5a8e34e4c45edc28faff6938728f1b97e9561460ea99838834a WHIRLPOOL 851fe606c02da5d8f778d56aea83d5a55a427c7a83610755cdd35fdc67a02a4628c1c480bea5d8d862968416ff3cb3e78d56ece498055f86e4d138e5997db674
 AUX 9999-sys_libsecp256k1.patch 2804 SHA256 ddeb293959184d82beed8bf9117916a28d49c0d0a324287ea026bdcaa7505871 SHA512 970a851f564cddf5ca2ad453ce6ba767b3815be9bcc4dd09c5fba6f42e1b70a9de7438d31e8dcf15875cb4c06ff2f04b0a2361b6b413b2146b2c2c78b908ea17 WHIRLPOOL 634cb832458551b61caf8d852335260ce4f2253a516dddc8b723ce89be05fd4254f4f6b49f8c6697da4120e723a068308d0cdfb57c16c199329cceb83a9be2b1
@@ -14,29 +16,27 @@ AUX bitcoind.service 869 SHA256 c24332570f8ac155847372a4f9019a47a2e3c8c15435584d
 DIST bitcoin-0.9.3.ljr20141002.patch.xz 23320 SHA256 d0a480e11159d597a36e300398c858b5713de78d4f00295b46aa6612ed4b28cc SHA512 b6f225c1e6fc4b1b0b53084d62ff6a57af3b45ea48064fb790b51a081bd1a2333ad5ebffdd443da47babac76ca7394d3ccb645fb3e5e532252409de32a3cb768 WHIRLPOOL 2cdb0a3e3b8407ef11a9f6a56c47ca51c38eb7adbf1b0ceaf1b7fec00118a75892782f66a4c85e54f43e3a3107d1b4e3c799eb1171dff8eb9db69d162cde650a
 DIST bitcoin-v0.8.5.tgz 3181865 SHA256 39f170aa29292d530371d287f2036aa372d1e255cf46c29588b8c5a3afedcea4 SHA512 ac605f202b4b8c2fc3574517018817d7ac6ac9296040052db67232b0fd136446895986e25f1b4aa6a888a0ec510ad2a69bf09c65b95deba1d9b2ea6ece62d9c7 WHIRLPOOL cfe8839fd5bc6e22cfe485c63e2a7f261c8817c0d090766ae2dac6303612a977ebea87df2df473a5cebaaee9a2712b8a97aa3f6613f88732be06b7a9fa18351b
 DIST bitcoin-v0.8.6.tgz 3194026 SHA256 26fd485823ee15a823ca51a5ac7ed8664079ef15356a030e74a01f1a7a157170 SHA512 88e1d5dece485beaa95571016f41239db616323508038ea59d0fa3608639c03af06c0d782df3bf5a67d45d25c976bc07b977504ca6390e147e3b8605f3d3ce86 WHIRLPOOL 86a5118dda3f68226d30794bc1b363a75479fd55648146e4347017416d730c23ef4168553a5e70d95466157bf89055def81647790fe414d6182c1baf3e397344
-DIST bitcoin-v0.9.2.1.tgz 5242673 SHA256 7cadbadd90485b7302b86ce041db576aad650f6c621d3a552d09e7231d3fcfd8 SHA512 059be086bacfe39c0983dc4ae768349b8d9213b3cd7b60157c7606a25b8b3156e0ffb86e28711550e20b1e6f692bfed021aa1d4ec583496189fa821fc547ad92 WHIRLPOOL ef828956423b8f2170b6a2f2f861d6c2deab59ba312757c52a20cc6c0381129a30b6e927a82f86f6d4c2ee5fd4344c90cb5fbfc4ba2936d03c25fa9e8bfe3a16
 DIST bitcoin-v0.9.3.tgz 4788997 SHA256 3ed92e8323cb4187cae015457c7c5920a5c658438f01c6c45f0ce3aabf9bd428 SHA512 cf6ff5bc586b0614b4e74e1c18b30e8f443f03db348382492e49c70ec31a0ef3a4d1989b34a8fdce289788c894b48b72b94d2562e497220453b668dc28ce0d66 WHIRLPOOL 6ce18de9a2b24cedd88e110088d0747452f8403b6239df9212b673e4a893e059bdea2640b13b6fde659a866d4a6a3b4fa62dde3adbf957b80104d41c0e4aeb18
 EBUILD bitcoind-0.8.5.ebuild 2909 SHA256 f65b9f559428791e0da364bc576377c84f0cf33b6a1b5363f48d6f1cb95cf98b SHA512 98f9e0a1ffb30a25208a5d7d1188bd86f2a9a7f5500017edc86b0ffcd9e512193874feb8821abc83aab8cb77712998adf75d4445af22c3d8fe892c672cb660bc WHIRLPOOL d1390662bbfe3f87b18b316d91269a456b38b6b31f8cf33864313bf2a3e30b4a8ef8bfa44e7b75ff99b1a1662b56df4d6f9de13303ff0ceeac0ca370f53e0e55
-EBUILD bitcoind-0.8.6-r1.ebuild 2920 SHA256 6419cc56b3d94e33774ba349babc38f1eeac7bf2f755c1819da910f17a0a27d1 SHA512 704e2dda94fb1f7d66e6f4ec1a1074a3a0d8ef5a1af51a05cc1b8b9020acfb1c8aaf52f1aa4cdb68995fba2cebfe947ab9bccc7451c844c2ff00ea3b7c4dc48d WHIRLPOOL acce69febef02caeb48a0bfbaa5a92a2d32042e7c441c971fac97eb7e9b85426aa927f2db8970856d0197d1f3135c6fd7f7dc617c95c20b392812e7ebf7c87c7
-EBUILD bitcoind-0.9.2.1.ebuild 2463 SHA256 c6ff8ce6cd14e6fdeb38b7393cef2158eccd759ea183c0a559ac74c34bd18f40 SHA512 493462c3775ec69fa19e2bd856e65ec4cef553a262a24323fd8529c6155d262d55102cb2aedda8098e32050d4a39c81463c2de4b1149a612aca9fb03a2ee54a4 WHIRLPOOL 94b794b59bcaf35fcaf7a004181a5aa1af23a1893f40f8de187ef6189f5cb1dce77ce9e3586d802ba19d410f2dc72edd860f9b3e071dc447de08dbfbb89eae3c
-EBUILD bitcoind-0.9.3.ebuild 2821 SHA256 b17711277716a0621ff028879062746d35600268c88b4454e72cf5a50db8a49a SHA512 04b157ed698572508c253c70a5750f3293cdbcd37e69eee84a3db6f2618310937833189b10689cb165a83a0ddd46306ae730513ac6c0163b18d3025d65e8b892 WHIRLPOOL 3a3b5cb85f409988947621f854fb095c5589399359195885aa453bb08f5bb6404270a90b55e1f36a58b32bafb82d814774c16bbe6ddb12ba93c376058debf921
+EBUILD bitcoind-0.8.6-r2.ebuild 2901 SHA256 d8a2f29550c35441c6c8c496671d79cc88f2657f4bace958b86d973156594f03 SHA512 c6f5275f68cd7c3cabd6eb57a10e030194dae79e2378ef7b4a5f4827f9dc7e8037054f265d785a9fbdb18e3bbe0ae5d3787ec72658e962808501b080bccd538d WHIRLPOOL 63c772ce3309d542fa19996985365ccc0f4554ba6e38e5642b54a7cda8d0683e2acb69b2fc1c3562d1046ae3755fc08e473808181f495c2f2d06e73f20e7d33d
+EBUILD bitcoind-0.9.3-r1.ebuild 2843 SHA256 09e92c05b8ba310525a2e8abfb3502c7931e86b328b1842daab316ec66bd8f89 SHA512 d9fb4bfcf828c9c2e1844a21bae41ed677a8dadb3048b4e33bfa62a5d19ffe78d21c0f3fadc80d688cfe9dcbea26cc0a6f009f84569eda72d9bf589688a5b11d WHIRLPOOL 61d28949152cb693affb300777e20b1b5272d887d041fc4b2cf66030f810b58528864acb561ed8ae8b53672db8221ba8ca439f2f62d9c97a1f34ceb3782aec05
 EBUILD bitcoind-9999.ebuild 2604 SHA256 df1c5de3335f7bb489324db5ba95e7c2d590404c04f8dffb703707e5327d1466 SHA512 751a4cfa540dbd03188a094ff22b44ad69a2462f91df61fccd5ac316ed01a80d0b4866b71711c4415b8952590bfaa91b9b7af43a3f24bb20fa3b9590446ae4ea WHIRLPOOL 74b2bdb375770361e0c3f11da3392e37ae667a7eefceafbe66f383c5861dd1af79423bd8e39789393a7d8cc5a9533e3b206421b6024a8e91710580d9e970c27a
-MISC ChangeLog 21159 SHA256 e5ed8323a5e9e8d3f397a8d4f67923583ebafff6b0edbd38cc68ac7d939a7fc9 SHA512 fa2374cac1b31398f1651e20a5e70637390eeea9e07ab32148e266e64fcab34e0caaf9ac3a784e82dccde57e7151fd487e3f8bf16a96211ac2317838697756e6 WHIRLPOOL 20c49b43aafc34e977a71abe943bbef1a2e5b85297c7668de061a37e08b648114aeeb86e66b2a54f7ee714794ee104c7c872cb93bd6b1e992b99c2f746ac9cf1
+MISC ChangeLog 21512 SHA256 fe94def326d5a6f72b6f18d4c9d41f86621fcf09477e5a51a4f77f929b2dabfe SHA512 d4f6ea350da201a7295ef8e088f1a2e74eaac1bf67dd6645864c8f82eb2a4a9348a6244d7a85224cb4ab14b010f1f8983f1a993083a9881d422c9b08335fe5a6 WHIRLPOOL 1698480a3a12828231067867d34aa957839393fb43e1996bc7ef9ecf282cda83d43b67cc4982206a712445732657541400bc5b5a2e89324315e80dec1d027b87
 MISC metadata.xml 709 SHA256 ed87f13da36e397366e78990d77271e30be2954acf6753615045ea6c829ece26 SHA512 1a75418c3e930a1a39b6291e980821077e38411fa05812ced0293b157901e356efd5013406c530ea2a6481171a505ea7c48a34d54e7dfd25b2cfd15f6069bf0c WHIRLPOOL 9c156b463d09290d7c58a372892c28b644f277cfe87f985416fa16e67fc9cb05a2e3ffc189cddb3d51eaeffc78490626369c8b1f71e91efb6d9ff6ee9c248890
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJUby1ZAAoJEJOE+m71LUu6XuEQALYSdnaBwa+JHOm/j8M8h402
-IOjydOLE+Gp1dKfcz+lbGEG8uVMlJHCsB8hTL/s0L+QHCZrl00cYMYv/y6pTwP5l
-u2mRfR+jPMMNHeZh95qgRBYdEz9mUQx13EGDUxWAOb6AHdOYXJlshX04uql6wWj+
-89Gz5r2qCJcQ39dqT3xVLTdHFK8XPOd+x0W32U+7TCUjlkbsuoRS4b2FMgSzX+8O
-an/dR+5PKi3TDNZ4BF1bGpqO/CyF1g59lGzt/JUg0sXqqmWqHQgpJyD6Pc0/NIhB
-59H1uvi/Wois2Qrhpxab+3UewBbWdY/piz2DehEIHKoEdU+9H/m2hoWew9TD5HIG
-H8DNUzPr0RuEfn8xuQvKmJP4hqLzQ8t0N58Sk6rL/ub4fJ2bQbaDzWxkeDedKgK5
-ne/752OGm11EcMoJcOL7ct2Mgx4ZLucgjG6SOUdzKr3vFZOFKLQTNKrhmtcLON1c
-tHw49UI8/UxJGExuo1s2+FAkQxeQ1KfBU8aetXiClxO/egscAYHG/uw+s0bqSRPh
-VtnDX+FIGawrPjK13mAw1RW+JIZ42bZAhaxkgfkXJij5wNApXiTVP8yHvlb/M1wC
-8psHtsGg3L8XTReU6RG8W2FkYrr4ZSSH4AoJdCSW60BebAGdMOyrl59yMlqbnq8r
-FlWsJLWz6g3rCemNctyW
-=y8dK
+iQIcBAEBCAAGBQJUsVtpAAoJEJOE+m71LUu663sQAIJu2QrFBBT+UaFriCk6Ksyr
+3Jzv+bQo77MwQ0JDW9EGNz8qEb9xh//SChQpAesn5Wja/CW5TLoCq4BEzXw51hWq
+PSJLCMboVGk/54J60HN0kuEzdt5xshY67kQ/9UtBlK1s4+Vbm1Cf+yq5fvM7VQxg
+FB2HhVUxM/vePQfb2MoL7/dnKGeUrGOONGvyXTzbQsbcxOOyS9r3Cshw3KM4PGzx
+OiE830JXx/xeOMbA/RmrlcoVcSXFxwx5Asz3zzMmdu9RTviGVL62GqfyYms+6NUP
+lgflG8nyOncI3Z8zIUTp1UsukumVNcmuBkTYsaigK5V9jMlRnEjSNNyM4hYZJJuX
+rv8tX7aGG0V5dwG4igWa49Kim7LIitJaP9iSRcIMoZwvrrFS4HaeBs3EaTJNndfj
+MGz0gQPOdbwP+hpjxwvd3gO+n4welDQT+Y9umTwDVvNEE5TSp6xWaqN0UPFps99Q
+i6kNnFYzEzKmJKAoADTy+wg2qZNCCudDpjzgqaBnIlDLNIadGzxEqQ6GV/uPRnXC
+H+AH4Q17uhVEk8QNvbr80hfkTdvOYZ5D4bohU2ahvmrW+hFvlis7e5JnMPmxHtU2
+b9KBBfm4jKimgNHpPBXbHyrlFaLhGxpeZkzyi8Gg7ZJtYbYEvSwCkBVpjaLeEG25
+3OerKPRITOYF5TrEYjQ9
+=ZkcO
 -----END PGP SIGNATURE-----

diff --git a/net-p2p/bitcoind/bitcoind-0.8.6-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.8.6-r2.ebuild
similarity index 90%
rename from net-p2p/bitcoind/bitcoind-0.8.6-r1.ebuild
rename to net-p2p/bitcoind/bitcoind-0.8.6-r2.ebuild
index f74c25f5e2fbc42b39681ebc4d4f824da686d7fe..9df9333f6443c809546997a5ec24fef1c0e9aeb4 100644 (file)
--- 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 (file)
index b7e7e83..0000000
--- 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
similarity index 93%
rename from net-p2p/bitcoind/bitcoind-0.9.3.ebuild
rename to net-p2p/bitcoind/bitcoind-0.9.3-r1.ebuild
index 0d9cc09b0d1fa7165eef21d70037e4cd176be767..eb9d0b1bd5facfcb66fba12237903a394accaf60 100644 (file)
--- 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 (file)
index 0000000..5eaaba9
--- /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 (file)
index 0000000..80f6488
--- /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) {