From: Anthony G. Basile Date: Sat, 10 Jan 2015 17:20:07 +0000 (+0000) Subject: Version bump for bug #536228 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=37bfb9e3bff6c5d3c9c5ce0668853ee46c2dd05f;p=gentoo.git Version bump for bug #536228 Package-Manager: portage-2.2.14/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA --- diff --git a/net-p2p/bitcoin-qt/ChangeLog b/net-p2p/bitcoin-qt/ChangeLog index 5cc307511c7d..4f044a23edf2 100644 --- a/net-p2p/bitcoin-qt/ChangeLog +++ b/net-p2p/bitcoin-qt/ChangeLog @@ -1,6 +1,16 @@ # ChangeLog for net-p2p/bitcoin-qt -# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.89 2014/11/21 23:44:07 blueness Exp $ +# Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2 +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/ChangeLog,v 1.90 2015/01/10 17:19:55 blueness Exp $ + +*bitcoin-qt-0.8.6-r1 (10 Jan 2015) +*bitcoin-qt-0.9.3-r1 (10 Jan 2015) + + 10 Jan 2015; Anthony G. Basile + +bitcoin-qt-0.8.6-r1.ebuild, +bitcoin-qt-0.9.3-r1.ebuild, + +files/0.8-openssl-101k.patch, +files/0.9-openssl-101k.patch, + -bitcoin-qt-0.8.6.ebuild, -bitcoin-qt-0.9.2.1.ebuild, + -bitcoin-qt-0.9.3.ebuild: + Version bump for bug #536228 21 Nov 2014; Anthony G. Basile +files/9999-sys_libsecp256k1.patch, bitcoin-qt-9999.ebuild: diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest index 724fa6821bde..0501f1080bec 100644 --- a/net-p2p/bitcoin-qt/Manifest +++ b/net-p2p/bitcoin-qt/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 6647 SHA256 45ac78376c1983babf0e001b18196b777cd4bfca1c6b92fad62302d70ec9aabf SHA512 0aaa00584bc56984133f388523b2084d94a620987367e0eff39cc6debc39738586fb991e7cb84f54eb56f27992929d562261bb867e1091679a51839185626edf WHIRLPOOL c027065cedb40a946dc7fa1f5dea6908d35290147f53df178d7ff416c2a5d5bd9f7e6802779d8a0a04044e04bfc4dd76433ad2dcb48b65869d3fbfe8c7bb3748 +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 @@ -9,29 +11,27 @@ DIST 0.8.2-1stclassmsg.patch.xz 1788 SHA256 ae871cbd949abb6c6c57eade016b2945ea95 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 bitcoin-qt-0.8.5.ebuild 3380 SHA256 599f1eeac12ee41b67c8f6a6f7f18966651e21b48f23d5bbc2489201b4305f87 SHA512 7a0113d9c969d59d203a21913b56132abe4f9cf66815152dab495e82cd0550d0ac32ce1cabe780d5d310d597894c8031f1bed324eed2a6add9563b3d75b193d5 WHIRLPOOL c94165c5f9993e21bb84863a886cf023acb3dde11d919b4d21abfaec993006b13af1984d841d96e1e30adf919a1b8d3e270849ed4e221df6c33c340624f3f675 -EBUILD bitcoin-qt-0.8.6.ebuild 3383 SHA256 96392e278dcd2491834215e3dc12ffdba7647db9d9175526123b984f2dafc7a1 SHA512 84a86f6a33a3631765263ed47ec06b644b2ee1669778a89e451955a61b699603a2cf2fd76dc2df2b778ecb6123bc5f6def7f17bc0c2b127b42d978bea4ac606b WHIRLPOOL d7d40e5e15ab243bc9a0432fb18e24fe5c0a6cdf9d9c3f32c277b2b2afeaf99d867340ff7f88efbc6aa56594d66f7e54ed793442defb0ee70afba9e431e598e5 -EBUILD bitcoin-qt-0.9.2.1.ebuild 3109 SHA256 fd706d51a8c9fc2a1707850dc022b4ed326861dc56541348a0fd7c1ccb455e05 SHA512 061af2155cad7deedf585db3db1116f07c52a3dd6b88814f32af4cf7f922aec0a43b55a123e551fd0d99281dda51791283aa6c08a60ffd50b7b0a68282a09d42 WHIRLPOOL ab50bc1fc2752c36bff3ec058da9da309d541d8cbe2ecd2467a519391a9381b58fd5c63ebd91c47a16a7bd5fdb4292260365042e9e41f4242ac35a89bc725789 -EBUILD bitcoin-qt-0.9.3.ebuild 3566 SHA256 6a4bcb925637a012828746382b79eafb83f680620f00ea7c0081f0937ef00cfb SHA512 d4fd6cd3d3b480d7dffe9ac74a99366060f4cea64c22aba5766a6b2f1f6b71abfddd06e4abedf422dd76b091a6ab63c72d9b01a702c87b362ae6649d81f5387c WHIRLPOOL a427e125b7508d8235c3cad5a5d7bb2494b7a59c341a75afe4006229e9bd1fbe04bc358f39011c8bb2a8e0c58f77725a466edb2a3158a3d62d15ceeecdd977e5 +EBUILD bitcoin-qt-0.8.6-r1.ebuild 3496 SHA256 135dfdb715f51bf3a715d3140dfe01a859d062ebfdf7cb4f214419c02d9a2af2 SHA512 e4f06f8672aa7ae78ceff75c1d7f2c69ba2d751295f2dfd8a3cfb44077e5cd96601330d5cf6540163c998afef7ce5bb9db82c5d9fb172e6298072efef72d5b38 WHIRLPOOL 7fa446e70b40197f1a5002936bcc6719e16b5de02a6a66cacdd1600f9919864a3df4b7317d4d39b04fbe567e93e52dfcb6c4ed0928bb31c29e11d442d4e005f8 +EBUILD bitcoin-qt-0.9.3-r1.ebuild 3614 SHA256 d255de5b22a475db2d1acc9b9d5cf379a23164fa23f3b83c03a6cc8ce00a51fe SHA512 f9635abb1d3322009aef59a22953a91b361d939d366d91d35c37b17495ba83ebeab50a93180d3cb9c7061664b1ed7484b79ad6eeb2c127ddd0cb28b60858555b WHIRLPOOL 04effc94fbe52c3278749ec6ac02298b20c64f0425d4a309bb712f2cb5f20f83863fe980061d97de8cf15c82cc60780d6cf0d9d654dbc1c7240548710e5b8aca EBUILD bitcoin-qt-9999.ebuild 3262 SHA256 6ad27258aba3246ca29bc5721211771463e239d4762eb8ec39f78fed49f59be5 SHA512 b7b2618c153cbf15a2c09046f7d5c99e8f33d417a0ae28d3788120eb037829ba8ce04cb62b345700a68657fd3e392aa4ecaff08547147424489940547f37e2b8 WHIRLPOOL 1c13231c9e023c5239341c3763d65bd0f8eb81358ea34b811b088913ccaa3c0736e9d068e3106407529fc5f68a29f10c24b1c9770803447907665d4c6cc56204 -MISC ChangeLog 18640 SHA256 65c4269ac5f0e80180252ada001ceb47cff1a3e6366efa80b600888429272bc6 SHA512 c0ba62f85ed2ca81800692642867401a2fb0ac3809512da8b2beda0c3feb8002ec0a3c24d218245ac2585b1f91dea15e101459c096153aae8d8c42778b23c1c1 WHIRLPOOL ebec09fa90667d3093df5fda6d0faae1c71fcbc7e8aa67e7be4044d07f8c437b25cb25d7dc29afe03ddda0e1587053a61e7ce0a25325abc3a249b785c30a798d +MISC ChangeLog 19006 SHA256 2c2e382aa207ce3fe58c381c2d3b7a8ec34466d2852965ac52ac413c2bbdee0b SHA512 ad1bee15148228e48239053b359b925ee4bc4fd1de22a10903efa48701108027c8b93dae9a1486ab0e9a7a32c89c2156cc727cee3fba3a9daade74e8a97c33d2 WHIRLPOOL 0e6a3f6e7c259a55157834249e33362f17948172c72690239145d1a8c8413efa1f8b2423cdc3517e51474f59df00f9c42d74300d62ca536b63aadc3f74c89718 MISC metadata.xml 683 SHA256 7646cc2d572e809bfa417fd1ff3cd6132e242684890cd12839d30c7ccd58093c SHA512 5e5678aea84a43f45994a3d4ccfa82990df66dc6f7d752642090dd70b2e8bea79eb0d08bf2c1e0017827d1515763fbd1365c2a332fbd033c983d143c38f52453 WHIRLPOOL 0f0456674533817da48c3bfafb23e3b2ecb9fe0679ed0d6cad10db38b01474a08134542d743877e3b10b4979b853775eafdf98b1cc16b1cb0f8f89e8d48b496c -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUb87qAAoJEJOE+m71LUu6mz0P/10Z71EPpMsYIAsNwcRv6G62 -Kj1zVPSxCii+4SzJClYJCrOAlRvvyZBOL8xaYv6gev8uNA5Zzis3mWOxMPMJNpRi -ymopaGY5B88o+A9VK7d7dAchPMWjs6etCYxSP3aA9dxHjr1owjQJyZ2D6LgPCC9V -bzZ86WR/7iSxe07dTaH5Fr0/5OJu5/AddJZjaCX6KC+Owf6/Th7rCr9iEb+2w4ne -jxDLipFbx1po5QxHjCNJqFZQqpdUAWYZ2WvvBdR3VeB1jpFCAyKQUdguCg+Velg8 -zsg+SymZqBqubNq5IKzE/eeDqt01A+nXuXdQXG70t3u10KOQ+N+sVjODx3JGvMIQ -3XyJjPoCd4DgeBl1nnrvv0/75U4ISp9HgzJ2F5We1dtzRr81gIsaFhwSksYHsaQD -A6eXmSGp8oB14l5LDdtwVlqb2JoRxif9j2nIrqPIeho9aezujeJnOcyyw6Cd2hCD -o8eKgULxGONflaqLFYICdtYSnVPFxn44fMokxGdGs4/L5CdoOL4r3QoF4/gqOOs6 -09jV1X/eBag2bk1Vs/jpSxTjIQdRKQu5DgbGsqt1IAQ3M0c14q1vgE300jHcplXI -4ymxEOfqBTWokk7myZZ+0LKQlECnXg+HagXzNR+fRBES7CzPSF2AYAOdpIOKwoZW -INDvU+dsV+e2PLu7WcK7 -=JiHw +iQIcBAEBCAAGBQJUsV+RAAoJEJOE+m71LUu6EK4QAJc5pTna+ijBkKU+Dk9dmTHK +GWpBgE5hQlJTa9INOWLGPx3cvZQpqqjz0JEs3A/Jkcf5dgDyuvAhhYaOPJVFlQbi +8mFoalIlXOJ9kNMjqK6iOQcpnXqyYSLv+0UP9/JXDBknVyNLygzHKPOIzMclyZ8f +/WkpWpXTfyRzy2MrMQvmpKwmQwglhvLsUJ6vVg5aemxEX0OTYHQvoazT+zkTUAJD +ZkZE8ITsXI0ty4R914Y+Xcao+vNhtERSBIuEvPzDgI69NZRBm0jqKNEsGEABgxzI +dlGy2uVzxztN43V7Vvnqtgx4EPGLtXHQZxPJu2SOaLxzb+VSkbjSYExmXIClRKRs +t0wBNWLGYjvGhOZQYprbiooi1arbo21ylOzROIff2daSZvIbQ+0PbN9QIgPFyG2Z +uWpATtT1gkQX27PEMTZrWGpG8CDkBwBWn6yArP8zErZu/dLDpDQ6v+sJ0A80ud3S +Y2DPekNfS7D9QNK81G0l8dNrlMJpAHZikQucKUaV5VzgWjJiTfcotDoBw2Ev9Edg +whXThftI2enyr+JkB9/D4s5aMjLrZmFkYme719hdZX/cPnFVcRYOYjVPDohJflCh +iI1FKN1hm71f2lxMlodnR/cOcPlmuBtpJDGcN3zDJchLflqwpPz7ylCqngRrrM1v ++9Zra8YkU0WcVXmqbEpI +=MzQt -----END PGP SIGNATURE----- diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.8.6.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.8.6-r1.ebuild similarity index 93% rename from net-p2p/bitcoin-qt/bitcoin-qt-0.8.6.ebuild rename to net-p2p/bitcoin-qt/bitcoin-qt-0.8.6-r1.ebuild index 75320e5e2196..6ad921cc9ca5 100644 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.8.6.ebuild +++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.8.6-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/bitcoin-qt/bitcoin-qt-0.8.6.ebuild,v 1.3 2014/07/30 14:27:41 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.8.6-r1.ebuild,v 1.1 2015/01/10 17:19:55 blueness Exp $ EAPI=4 @@ -34,7 +34,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 dev-qt/qtgui:4 dbus? ( dev-qt/qtdbus:4 @@ -49,6 +49,7 @@ DOCS="doc/README.md doc/release-notes.md" S="${WORKDIR}/${MyP}" src_prepare() { + epatch "${FILESDIR}/0.8-openssl-101k.patch" use 1stclassmsg && epatch "${WORKDIR}/0.8.2-1stclassmsg.patch" epatch "${FILESDIR}/0.8.2-sys_leveldb.patch" rm -r src/leveldb @@ -118,6 +119,8 @@ src_install() { newins "share/pixmaps/bitcoin.ico" "${PN}.ico" make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false" + dodoc doc/README.md doc/release-notes.md + dodoc doc/assets-attribution.txt doman contrib/debian/manpages/bitcoin-qt.1 if use kde; then diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.9.2.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.9.2.1.ebuild deleted file mode 100644 index 37e6e8a01430..000000000000 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.9.2.1.ebuild +++ /dev/null @@ -1,126 +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/bitcoin-qt/bitcoin-qt-0.9.2.1.ebuild,v 1.7 2014/11/13 18:31:37 blueness Exp $ - -EAPI=4 - -DB_VER="4.8" - -LANGS="ach af_ZA ar be_BY bg bs ca ca@valencia ca_ES cmn cs cy da de el_GR en eo es es_CL es_DO es_MX es_UY et eu_ES fa fa_IR fi fr fr_CA gl gu_IN he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru sah sk sl_SI sq sr sv th_TH tr uk ur_PK uz@Cyrl vi vi_VN zh_HK zh_CN zh_TW" -inherit autotools db-use eutils fdo-mime gnome2-utils kde4-functions qt4-r2 user versionator - -MyPV="${PV/_/}" -MyPN="bitcoin" -MyP="${MyPN}-${MyPV}" - -DESCRIPTION="An end-user Qt4 GUI for the Bitcoin crypto-currency" -HOMEPAGE="http://bitcoin.org/" -SRC_URI="https://github.com/${MyPN}/${MyPN}/archive/v${MyPV}.tar.gz -> ${MyPN}-v${PV}.tgz -" - -LICENSE="MIT ISC GPL-3 LGPL-2.1 public-domain || ( CC-BY-SA-3.0 LGPL-2.1 )" -SLOT="0" -KEYWORDS="~amd64 ~arm ~x86" -IUSE="$IUSE dbus kde +qrcode test upnp" - -RDEPEND=" - >=dev-libs/boost-1.41.0[threads(+)] - dev-libs/openssl:0[-bindist] - dev-libs/protobuf - qrcode? ( - media-gfx/qrencode - ) - upnp? ( - net-libs/miniupnpc - ) - sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] - virtual/bitcoin-leveldb - dev-qt/qtgui:4 - dbus? ( - dev-qt/qtdbus:4 - ) -" -DEPEND="${RDEPEND} - >=app-shells/bash-4.1 -" - -S="${WORKDIR}/${MyP}" - -src_prepare() { - epatch "${FILESDIR}/0.9.0-sys_leveldb.patch" - rm -r src/leveldb - - local filt= yeslang= nolang= - - for lan in $LANGS; do - if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then - ewarn "Language '$lan' no longer supported. Ebuild needs update." - fi - done - - for ts in $(ls src/qt/locale/*.ts) - do - x="${ts/*bitcoin_/}" - x="${x/.ts/}" - if ! use "linguas_$x"; then - nolang="$nolang $x" - rm "$ts" - filt="$filt\\|$x" - else - yeslang="$yeslang $x" - fi - done - filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)" - sed "/${filt}/d" -i 'src/qt/bitcoin.qrc' - sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/qt/Makefile.am' - einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang" - - eautoreconf -} - -src_configure() { - econf \ - --disable-ccache \ - $(use_with dbus qtdbus) \ - $(use_with upnp miniupnpc) $(use_enable upnp upnp-default) \ - $(use_with qrcode qrencode) \ - $(use_enable test tests) \ - --with-system-leveldb \ - --without-cli --without-daemon \ - --with-gui -} - -src_test() { - emake check -} - -src_install() { - emake DESTDIR="${D}" install - - insinto /usr/share/pixmaps - newins "share/pixmaps/bitcoin.ico" "${PN}.ico" - make_desktop_entry "${PN} %u" "Bitcoin-Qt" "/usr/share/pixmaps/${PN}.ico" "Qt;Network;P2P;Office;Finance;" "MimeType=x-scheme-handler/bitcoin;\nTerminal=false" - - dodoc doc/README.md doc/release-notes.md - dodoc doc/assets-attribution.md doc/tor.md - doman contrib/debian/manpages/bitcoin-qt.1 - - if use kde; then - insinto /usr/share/kde4/services - doins contrib/debian/bitcoin-qt.protocol - fi -} - -update_caches() { - gnome2_icon_cache_update - fdo-mime_desktop_database_update - buildsycoca -} - -pkg_postinst() { - update_caches -} - -pkg_postrm() { - update_caches -} diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.9.3.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.9.3-r1.ebuild similarity index 95% rename from net-p2p/bitcoin-qt/bitcoin-qt-0.9.3.ebuild rename to net-p2p/bitcoin-qt/bitcoin-qt-0.9.3-r1.ebuild index 7ed245b9cc65..e2ac19255231 100644 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.9.3.ebuild +++ b/net-p2p/bitcoin-qt/bitcoin-qt-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/bitcoin-qt/bitcoin-qt-0.9.3.ebuild,v 1.3 2014/11/13 18:31:37 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoin-qt/bitcoin-qt-0.9.3-r1.ebuild,v 1.1 2015/01/10 17:19:55 blueness Exp $ EAPI=4 @@ -31,7 +31,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] dev-libs/protobuf qrcode? ( @@ -54,6 +54,7 @@ DEPEND="${RDEPEND} S="${WORKDIR}/${MyP}" 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" diff --git a/net-p2p/bitcoin-qt/files/0.8-openssl-101k.patch b/net-p2p/bitcoin-qt/files/0.8-openssl-101k.patch new file mode 100644 index 000000000000..5eaaba9a5788 --- /dev/null +++ b/net-p2p/bitcoin-qt/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& v + + bool CKey::Verify(uint256 hash, const std::vector& 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& vchSig) diff --git a/net-p2p/bitcoin-qt/files/0.9-openssl-101k.patch b/net-p2p/bitcoin-qt/files/0.9-openssl-101k.patch new file mode 100644 index 000000000000..80f64887425b --- /dev/null +++ b/net-p2p/bitcoin-qt/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& 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) {