From: Anthony G. Basile Date: Fri, 21 Nov 2014 12:15:00 +0000 (+0000) Subject: Add libsecp256k1 to 9999 X-Git-Url: http://git.tremily.us/?a=commitdiff_plain;h=23400ba78c10d3398f205eec878c865cd5030a1f;p=gentoo.git Add libsecp256k1 to 9999 Package-Manager: portage-2.2.8-r2/cvs/Linux x86_64 Manifest-Sign-Key: 0xF52D4BBA --- diff --git a/net-p2p/bitcoind/ChangeLog b/net-p2p/bitcoind/ChangeLog index 9940cae11058..f684ca1bcc18 100644 --- a/net-p2p/bitcoind/ChangeLog +++ b/net-p2p/bitcoind/ChangeLog @@ -1,6 +1,10 @@ # 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.92 2014/11/13 18:41:27 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/ChangeLog,v 1.93 2014/11/21 12:14:47 blueness Exp $ + + 21 Nov 2014; Anthony G. Basile + +files/9999-sys_libsecp256k1.patch, bitcoind-9999.ebuild: + Add libsecp256k1 to 9999 *bitcoind-9999 (13 Nov 2014) diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index 9aef02bb96a1..843efb12b49f 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -4,6 +4,7 @@ Hash: SHA256 AUX 0.8.2-sys_leveldb.patch 6726 SHA256 11322fc7715b9b552075babf60c8261e0343e5ec834188013fb7d77cacf3b4d9 SHA512 e371b6da685c916c5941cfc094d01237f18502597e778b35e1c31cbf93cda1118a97272b56605f7c6da1f2873190415974ebdb4e7ce08a5d04e94dac675a4112 WHIRLPOOL 8579c73d18281b3910c260ef0708842380f8c5001982c94ea51e6b8f99111b11959ffb04fc7812e0c90ba8a919071b13e975ed95ec207017e34bef5844f65068 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 AUX bitcoin.conf 80 SHA256 541ae10cc2246b620de3e7efa97eee59efacf83d28ea5f1297a121d0708226d2 SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f WHIRLPOOL 728e38b62da2c7c3a1149ac511b92d156f7b3c51dacfadd7ce74d9e6f915a6547c4cc8d34159243f50eee333c63b35949b311ea5a7f48a6c3bf17a5d4d47c123 AUX bitcoin.confd 238 SHA256 72300b41d57325de5a5f2ddea449d5f414f278549fb665d60746707ee5de2549 SHA512 2b010d8c773a76868a11626ba0552f122cd51293cb39e06b7ed7e17be47f9e3790cc090f8311b32d441d3ff1eb4db266a4b2cd08693f7edbe2dde178254838d1 WHIRLPOOL f51d97b828b4b096d1ca924cb7256f648b94ae098a4f10dcfbac7d6045cf84da0c203b1e2d5569f3b304ba193501c9b9239c5ee1a1c11fbdb62bb9909c384358 AUX bitcoin.initd 2481 SHA256 5dace582c4bf05d893166794ce620ca13b794b695376030f7d319bb22a0c956a SHA512 3e360bf8310f7d2acf9189f9baf87068a6764996cbfe1a0e3ca17fbebd0b6b8cb68212401db15c59c94a0e7ad2f933f90a765a2d653eface74e4ae8f495fda06 WHIRLPOOL 321a903dd85743cb23909614d1d1fe248d30374f0ea5d68c4f25d95b55ad2ec3f2164f5255a428ae79cd1e9b5e7efc10b09204b0bd68c5a557313b47124d0f16 @@ -19,23 +20,23 @@ EBUILD bitcoind-0.8.5.ebuild 2909 SHA256 f65b9f559428791e0da364bc576377c84f0cf33 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-9999.ebuild 2464 SHA256 d6e23c66a28f5a0d61f07b1d3489cbfbc53da3a04714529dae29d8451f85b370 SHA512 fd046a193317332fa6418f779f01b550ca3d4d9a705cf61fd97a2d5fb3c0f61dd4b32224a6e5d606a59b42a1514868cb817e5e6e74ab2230844b13b90b31b213 WHIRLPOOL 1568d8394ddb28c2a2f68f93739ba5d946c5d85d608430a76df66360929d411e9ce905731fe8ed19e2239eaacb0e38eadca9e4cb0fc2a278278da9160bfd2869 -MISC ChangeLog 21016 SHA256 736a447fd660cf10c71edb5ca497a35843e620376d254c4f75b6e67e7e9a0fb7 SHA512 f327d5f4e6fe2fbf5aaf4952ea438397995745f249a7acdbbc3b93c98a3a68f04f05e3ae0a057b63f920228277668cf364da01eb5522d56965afd29dde268a41 WHIRLPOOL 0c6a5ae42d6f385f8761b6a5877011edbbce7412ca50f87b31120d1d5ee6e8df1c54286398dca1797539060f55e9d743ac09448bef88ec7cc2ccec9da3494c6e +EBUILD bitcoind-9999.ebuild 2604 SHA256 df1c5de3335f7bb489324db5ba95e7c2d590404c04f8dffb703707e5327d1466 SHA512 751a4cfa540dbd03188a094ff22b44ad69a2462f91df61fccd5ac316ed01a80d0b4866b71711c4415b8952590bfaa91b9b7af43a3f24bb20fa3b9590446ae4ea WHIRLPOOL 74b2bdb375770361e0c3f11da3392e37ae667a7eefceafbe66f383c5861dd1af79423bd8e39789393a7d8cc5a9533e3b206421b6024a8e91710580d9e970c27a +MISC ChangeLog 21159 SHA256 e5ed8323a5e9e8d3f397a8d4f67923583ebafff6b0edbd38cc68ac7d939a7fc9 SHA512 fa2374cac1b31398f1651e20a5e70637390eeea9e07ab32148e266e64fcab34e0caaf9ac3a784e82dccde57e7151fd487e3f8bf16a96211ac2317838697756e6 WHIRLPOOL 20c49b43aafc34e977a71abe943bbef1a2e5b85297c7668de061a37e08b648114aeeb86e66b2a54f7ee714794ee104c7c872cb93bd6b1e992b99c2f746ac9cf1 MISC metadata.xml 709 SHA256 ed87f13da36e397366e78990d77271e30be2954acf6753615045ea6c829ece26 SHA512 1a75418c3e930a1a39b6291e980821077e38411fa05812ced0293b157901e356efd5013406c530ea2a6481171a505ea7c48a34d54e7dfd25b2cfd15f6069bf0c WHIRLPOOL 9c156b463d09290d7c58a372892c28b644f277cfe87f985416fa16e67fc9cb05a2e3ffc189cddb3d51eaeffc78490626369c8b1f71e91efb6d9ff6ee9c248890 -----BEGIN PGP SIGNATURE----- Version: GnuPG v2 -iQIcBAEBCAAGBQJUZPvlAAoJEJOE+m71LUu6i4MP/Rq51bSBAl8A27giefYaGYkV -fmZR+Vzv1e6o2/XqPwELP50c9BTBRJyrSbmPlTpKtdH95UQG5vA/146ZByEDabUm -tRjM3IEJYsBAgvIPa7mBqqn1rHNv/Ny7z7rNdS5YliO486tWjzUI5x2RXGC6Ss51 -VzPXRtJMIt4eK4o0+adEG5DDVT2G4FIjUZtOe0nA81IDMci/isNjVRYBaBByPlZ1 -oBd5KU8Jr7dKYuGM6YVaegTVJmtt3IT+Z6BRXhs7l/FeCqZWWSEfgx1bE6l5IUeL -e/7A+OAjBSqi6+DE1oLJmIU/uYZAYrrZ/7pVjfCh+gz5T1ROPF+ZUc2mQRPTW3BQ -1NdoO0uIYWyXCogSyknOVru3qohx3rCPw5YCBrv/GQI5Lcf0i7iSf0KtoA86Leue -ZTd3xhO7Z/5P6v7jqtwhTdWrEol6bhp8eogTdA60dGIDwEp3hwyXc1GoxVSmr9T+ -ugBoIfSmpN90Jp0VpkWXlJ70+ChUBurGioQ/yVBOAUZBDWkcW7bl54O7ybLD80Od -aUMPwrpzi83fBa+EeYyMKkrCB9OjZWZeO2xrido2qrgXsKbz8rAvlkaDM+u4T84k -OjxvgBdSPmkaIDYlOGaJ2oVraD3Kw2jM7RwAbGuRuXvdkmLAgItf56HjIJ7zcIyH -0twT2nQLbCIOK+mYB3fa -=D8C1 +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 -----END PGP SIGNATURE----- diff --git a/net-p2p/bitcoind/bitcoind-9999.ebuild b/net-p2p/bitcoind/bitcoind-9999.ebuild index 53b1ae32ead7..5ce082d82bdb 100644 --- a/net-p2p/bitcoind/bitcoind-9999.ebuild +++ b/net-p2p/bitcoind/bitcoind-9999.ebuild @@ -1,6 +1,6 @@ # 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-9999.ebuild,v 1.1 2014/11/13 18:41:27 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/net-p2p/bitcoind/bitcoind-9999.ebuild,v 1.2 2014/11/21 12:14:47 blueness Exp $ EAPI=4 @@ -37,6 +37,7 @@ RDEPEND=" sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] ) virtual/bitcoin-leveldb + dev-libs/libsecp256k1 " DEPEND="${RDEPEND} >=app-shells/bash-4.1 @@ -51,7 +52,8 @@ pkg_setup() { src_prepare() { epatch "${FILESDIR}/0.9.0-sys_leveldb.patch" - rm -r src/leveldb + epatch "${FILESDIR}/${PV}-sys_libsecp256k1.patch" + rm -r src/leveldb src/secp256k1 eautoreconf } @@ -62,6 +64,7 @@ src_configure() { $(use_enable test tests) \ $(use_enable wallet) \ --with-system-leveldb \ + --without-libs \ --without-utils \ --without-gui } @@ -73,6 +76,8 @@ src_test() { src_install() { emake DESTDIR="${D}" install + rm "${D}/usr/bin/test_bitcoin" + insinto /etc/bitcoin newins "${FILESDIR}/bitcoin.conf" bitcoin.conf fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf diff --git a/net-p2p/bitcoind/files/9999-sys_libsecp256k1.patch b/net-p2p/bitcoind/files/9999-sys_libsecp256k1.patch new file mode 100644 index 000000000000..77ed10675e30 --- /dev/null +++ b/net-p2p/bitcoind/files/9999-sys_libsecp256k1.patch @@ -0,0 +1,80 @@ +diff --git a/configure.ac b/configure.ac +index 6784521..3598bab 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -634,6 +634,12 @@ AC_ARG_WITH([daemon], + + BITCOIN_QT_INIT + ++PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true]) ++AC_ARG_WITH([libsecp256k1-verify],[],[use_libsecp256k1=$withval],[use_libsecp256k1=yes]) ++if test "x$use_libsecp256k1" = "xyes"; then ++ AC_DEFINE(USE_SECP256K1,1,[USE_SECP256K1]) ++fi ++ + if test x$use_pkgconfig = xyes; then + + if test x"$PKG_CONFIG" = "x"; then +@@ -869,9 +875,6 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" + unset PKG_CONFIG_LIBDIR + PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" + +-ac_configure_args="${ac_configure_args} --disable-shared --with-pic" +-AC_CONFIG_SUBDIRS([src/secp256k1]) +- + AC_OUTPUT + + dnl Taken from https://wiki.debian.org/RpathIssue +diff --git a/src/Makefile.am b/src/Makefile.am +index 0d45203..3a44a16 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -1,4 +1,3 @@ +-DIST_SUBDIRS = secp256k1 + AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) + + +@@ -20,7 +19,7 @@ endif + BITCOIN_CONFIG_INCLUDES=-I$(builddir)/config + BITCOIN_INCLUDES=-I$(builddir) -I$(builddir)/obj $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) $(CRYPTO_CFLAGS) $(SSL_CFLAGS) + +-BITCOIN_INCLUDES += -I$(srcdir)/secp256k1/include ++BITCOIN_INCLUDES += $(libsecp256k1_CFLAGS) + + LIBBITCOIN_SERVER=libbitcoin_server.a + LIBBITCOIN_WALLET=libbitcoin_wallet.a +@@ -30,10 +29,7 @@ LIBBITCOIN_UTIL=libbitcoin_util.a + LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a + LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a + LIBBITCOINQT=qt/libbitcoinqt.a +-LIBSECP256K1=secp256k1/libsecp256k1.la +- +-$(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) +- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) ++LIBSECP256K1=$(libsecp256k1_LIBS) + + # Make is not made aware of per-object dependencies to avoid limiting building parallelization + # But to build the less dependent modules first, we manually select their order here: +@@ -364,7 +360,7 @@ libbitcoinconsensus_la_LDFLAGS = -no-undefined $(RELDFLAGS) + libbitcoinconsensus_la_LIBADD = $(CRYPTO_LIBS) + libbitcoinconsensus_la_CPPFLAGS = $(CRYPTO_CFLAGS) -I$(builddir)/obj -DBUILD_BITCOIN_INTERNAL + if USE_LIBSECP256K1 +-libbitcoinconsensus_la_LIBADD += secp256k1/libsecp256k1.la ++libbitcoinconsensus_la_LIBADD += $(LIBSECP256K1) + endif + endif + +diff --git a/src/Makefile.test.include b/src/Makefile.test.include +index 5fd2afe..014092a 100644 +--- a/src/Makefile.test.include ++++ b/src/Makefile.test.include +@@ -104,9 +104,6 @@ bitcoin_test_check: $(TEST_BINARY) FORCE + bitcoin_test_clean : FORCE + rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) + +-check-local: +- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check +- + %.json.h: %.json + @$(MKDIR_P) $(@D) + @echo "namespace json_tests{" > $@