diff options
Diffstat (limited to 'net-p2p/bitcoin-qt')
18 files changed, 0 insertions, 1003 deletions
diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest deleted file mode 100644 index 099715c..0000000 --- a/net-p2p/bitcoin-qt/Manifest +++ /dev/null @@ -1,19 +0,0 @@ -AUX 0.10.0-openrc-compat.patch 949 SHA256 5cbea89dd672b5fd6c56431d3ba5a792c9ffa37676d759eae03bb98db1536336 SHA512 3af1c031cbfa6d27e1128f864ef51ad34ce241360481a69217abb04774552b06a0a8e1c07cf187c39bf09c0e9ecfc51d9a9a45e23c4bee4b7233e67cfcad4eeb WHIRLPOOL ba476a679cfb5e88aced3bed1f0f59e5aa4402f84440b4225ad2e326666bc2b54095abb304db28e073eaa6f9210648b862afdac9e88467b2931c78f711e24684 -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.5-sys_leveldb.patch 2562 SHA256 35f29e9849846cdf716036337e00138b5ee56202a22e689163b9ec0ef2f85c88 SHA512 5da00d33d29fb5d0bd0f7f7d3dc379b625f6db9d5c9b2eba6b750e259909a495d33603ee4022b12359838d4e66a5cc2c91ce914d8f823cf2f47c160dec5b04f7 WHIRLPOOL 112511ac7a16d40650d7222799f53cdc09785385084a233826d4c1c20284c35a4091f49990d21a21cc0a0734baf5952a7457579515fd5365f888af4db409e9c8 -AUX 0.9.x-ljr_noblacklist.patch 330 SHA256 b20c934540748cd42405bfca305a61bf05a76cd9b54f20e57e5fba84bb742f6a SHA512 13e727d6e1324542f7097c310e2f2a869d39acf6288593661b81715858ee95d1ca0566aa9892e5a8e34e4c45edc28faff6938728f1b97e9561460ea99838834a WHIRLPOOL 851fe606c02da5d8f778d56aea83d5a55a427c7a83610755cdd35fdc67a02a4628c1c480bea5d8d862968416ff3cb3e78d56ece498055f86e4d138e5997db674 -AUX 9999-syslibs.patch 9143 SHA256 a91cb64a820e2e0eaa573fc3c7e408d68f344f9f0d25a4ba110d0443cb622bc6 SHA512 595717f059b6ad11dc790a7c2f343ca66fcf237311cbf5f60cd9569624755295d5efb57127cc82bf3e0bb972ee432e0d2211155b26c71546808faa68c78d55df WHIRLPOOL 805ebe3de20d9a417ead593274297d2b074af55cccf63bc73b4a8884f5c27bd0c27d0f8c92636769bce88637677924149ef8b8520e907c64486f7c666f2e1a04 -AUX bitcoin.conf 80 SHA256 541ae10cc2246b620de3e7efa97eee59efacf83d28ea5f1297a121d0708226d2 SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f WHIRLPOOL 728e38b62da2c7c3a1149ac511b92d156f7b3c51dacfadd7ce74d9e6f915a6547c4cc8d34159243f50eee333c63b35949b311ea5a7f48a6c3bf17a5d4d47c123 -AUX bitcoin.confd 238 SHA256 72300b41d57325de5a5f2ddea449d5f414f278549fb665d60746707ee5de2549 SHA512 2b010d8c773a76868a11626ba0552f122cd51293cb39e06b7ed7e17be47f9e3790cc090f8311b32d441d3ff1eb4db266a4b2cd08693f7edbe2dde178254838d1 WHIRLPOOL f51d97b828b4b096d1ca924cb7256f648b94ae098a4f10dcfbac7d6045cf84da0c203b1e2d5569f3b304ba193501c9b9239c5ee1a1c11fbdb62bb9909c384358 -AUX bitcoin.initd-r1 2478 SHA256 0dd08d606683195ba638311bf50036d64fc91446c7963e48833aca391da10db4 SHA512 df5a9b30426f4fb3a12b2e0b21c3f865df8229e7583f0dba34860bd40f2cb35aff061e5940febf6f9382b6d23e729024a28ca55897fed9c9b4ce337f32fb4814 WHIRLPOOL 8aca6b746ed6a73a4ab79892f1b5c9ea533039ebb0d0e06d5134217b5d5b876b82d92ad16382c0144d0fa3f5f01f00bbdd2d86385dc6675abdac4e7af7230efb -AUX bitcoind.logrotate 110 SHA256 9b469c67e7af914199d699ac76279f194010f154be91f8136eddeeddf623a475 SHA512 b0e0634fc33979695fc0f37057f76b264ff3eb2655a8828d505a38621a5bba9fd4eafe47b012e5cb3863d607146b5a2d1a995787ed55cb6d5e6147ab795e1949 WHIRLPOOL 5ebd73178d3228b9477b5eae51ee783857d3a88a765c6802923f2a1d682c00cd4cefbf39e1f2d5192704ff2c72e8b91a38755cece6e139371ea2e75cab461e32 -AUX bitcoind.logrotate-r1 121 SHA256 71b195013cd2fe3091eb03a3b8c18d1f021fa91a2e2c02cc3d50384545580b84 SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1 WHIRLPOOL c2879092a8a60d5e485d0540426c1b2bed0d2d4c230540f7716c193393d68792e75ba39f261ac94e24ccfb9f35a806a8b301c131059f32fce3c55d579d840318 -AUX bitcoind.service 869 SHA256 c24332570f8ac155847372a4f9019a47a2e3c8c15435584dac4153b8eb300bc7 SHA512 d0e23b98bc9109e7e4d8a6459f73d1f9a06a3da71593613e22c5d0f31a8ad7473242b07690c6f22f35358ed869ffa7160d0daa65937462442bfc9028794321ea WHIRLPOOL 7992f776ac36277ce83898920ed5a8abc6b031f1d88214150c362c6f5befc869eb9901bd346da74da9fb56bda500fe9d3d9ff8dd46f1b3f257691cb106754a93 -AUX miniupnpc-14.patch 882 SHA256 fe4c62c1848a841e546f67db4017dca85e09c31763e6287374a881725e3e155f SHA512 80d09d74e4efe16e1d8467f1b8e4cc454bf6b1228e024cc6f6ab890db71eb6f259765662ecd3ac7441beb6496c3cb411ec0d5ee02193e2d998a28ccca202873e WHIRLPOOL 732f1c9d7c4255ad5ca912ac73b77a9ce23778c260c4ca6878b5dc7cef0dfc7b774aa4935768f99ee4e7404d94285e15f352731273b542badc5b1699b7697c7b -DIST bitcoin-0.12.0.knots20160226.rc1.patches.tar.xz 145776 SHA256 93431aa2c1d66c41d52bbf8810df27228f5a0823db2416312d6e07a20dc78dea SHA512 042c02dc64591f4edbad1cc421ee90e84d628f93292fd42b190728960a65eb76d0234d821ce2df92a3a66328a5368b5b42670ebf130045d92d74d74287a90990 WHIRLPOOL b4543468936c6e16a8636c2eaed1d6f76a20958c2f2fda6f9c6a389cc79111369d906c08878e3eb7b2d6bad8299e3e16ad38a190dab80996f63adfda8c1c93f2 -DIST bitcoin-v0.12.0.tgz 6708553 SHA256 a5bac23b087c183821f06c19947cba2399ced09ee2b02c751ecbda9f808d8e33 SHA512 2c6bec18eed7b8145ee711ae143b425e08ed3243454083a1a91eb2a1f16abcac2a5e053f83c9ae840cbbdea3960856b613ba17d269d8b60706379744a4cf9f4b WHIRLPOOL bd159d52567a84a577c0581cdd8df02030c25b32ee44df26e1081b588cbddde0d951226c1c46e69077d2e2887c98874455f340bb3fe01bede85d044ef1bb02e8 -EBUILD bitcoin-qt-0.12.0.ebuild 3336 SHA256 5d22ce02d96996ddb7ebf5b71e8db2101f8b54c385daed70334ea78067bb4d88 SHA512 78d292f88da6d2b42c5634100d58f5fa5c9c296cf0d816275fed11d6515d916e80f02412d75562fcde247d9866db7f9562c81f266a384376c7f1db3c79ac630b WHIRLPOOL a6ec5bfcf48e82888d9d2eb8f989ca3f56f8b900b7dd9b4a68addb49bda644ac3d707e1e4f1d5a380bc526cc2f16e9935a6850c683c2c42e6d8a12c374297ef6 -MISC metadata.xml 1756 SHA256 99fd159ad0cb70d24c00d25cfc329a5dd83fdd82e44ca6dfb9591b57f7cbfee5 SHA512 d8fc739e9ce0d095b55b31b2a0e022b9f99737b4e15f18fcf66c4bfa9ac4421d6979a55da9c432d6a4c994bc35e5a90ddc6cbf51680f6b15e91d5673dd56a9d9 WHIRLPOOL 27d4f50d19fe9f425883761cd7f0fb15de10750ccc012133496f19ddfd1b333de9b35da3f85a3fdd2c2c0d98233e73de0f01fa8f3c1e8be0a156d8cdb7da475c diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.12.0.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.12.0.ebuild deleted file mode 100644 index b3ebf49..0000000 --- a/net-p2p/bitcoin-qt/bitcoin-qt-0.12.0.ebuild +++ /dev/null @@ -1,136 +0,0 @@ -# Copyright 2010-2015 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=5 - -BITCOINCORE_COMMITHASH="188ca9c305d3dd0fb462b9d6a44048b1d99a05f3" -BITCOINCORE_LJR_DATE="20160226" -BITCOINCORE_LJR_PREV="rc1" -BITCOINCORE_IUSE="dbus kde +libevent +ljr +qrcode qt4 qt5 +rpc test +tor upnp +wallet zeromq" -BITCOINCORE_POLICY_PATCHES="+rbf spamfilter" -LANGS="af_ZA ar be_BY bg bg_BG bs ca ca@valencia ca_ES cs cs_CZ cy da de el el_GR en en_GB eo es es_AR es_CL es_CO es_DO es_ES es_MX es_UY es_VE et eu_ES fa fa_IR fi fr fr_CA fr_FR gl he hi_IN hr hu id_ID it ja ka kk_KZ ko_KR ky la lt lv_LV mk_MK mn ms_MY nb nl pam pl pt_BR pt_PT ro_RO ru ru_RU sk sl_SI sq sr sv ta th_TH tr tr_TR uk ur_PK uz@Cyrl vi vi_VN zh zh_CN zh_TW" -KNOTS_LANGS="es_AR es_CO ta" -BITCOINCORE_NEED_LEVELDB=1 -BITCOINCORE_NEED_LIBSECP256K1=1 -inherit bitcoincore eutils fdo-mime gnome2-utils kde4-functions qt4-r2 - -DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency" -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux" - -RDEPEND=" - dev-libs/protobuf - qrcode? ( - media-gfx/qrencode - ) - qt4? ( dev-qt/qtgui:4 ) - qt5? ( dev-qt/qtgui:5 dev-qt/qtnetwork:5 dev-qt/qtwidgets:5 ) - dbus? ( - qt4? ( dev-qt/qtdbus:4 ) - qt5? ( dev-qt/qtdbus:5 ) - ) -" -DEPEND="${RDEPEND} - qt5? ( dev-qt/linguist-tools:5 ) - ljr? ( - gnome-base/librsvg - media-gfx/imagemagick - ) -" -REQUIRED_USE="^^ ( qt4 qt5 ) - rpc? ( libevent ) tor? ( libevent ) libevent? ( rpc tor ) - !libevent? ( ljr ) -" - -for lang in ${KNOTS_LANGS}; do - REQUIRED_USE="${REQUIRED_USE} linguas_${lang}? ( ljr )" -done - -src_prepare() { - bitcoincore_prepare - - local filt= yeslang= nolang= lan ts x - - for lan in $LANGS; do - if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then - if has $lan $KNOTS_LANGS && ! use ljr; then - # Expected - continue - fi - die "Language '$lan' no longer supported. Ebuild needs update." - fi - done - - for ts in src/qt/locale/*.ts - do - x="${ts/*bitcoin_/}" - x="${x/.ts/}" - if ! use "linguas_$x"; then - nolang="$nolang $x" - rm "$ts" || die - filt="$filt\\|$x" - else - yeslang="$yeslang $x" - fi - done - filt="bitcoin_\\(${filt:2}\\)\\.\(qm\|ts\)" - sed "/${filt}/d" -i 'src/qt/bitcoin_locale.qrc' || die - sed "s/locale\/${filt}/bitcoin.qrc/" -i 'src/Makefile.qt.include' || die - einfo "Languages -- Enabled:$yeslang -- Disabled:$nolang" - - bitcoincore_autoreconf -} - -src_configure() { - unset DISPLAY - bitcoincore_conf \ - $(use_with dbus qtdbus) \ - $(use_with qrcode qrencode) \ - --with-gui=$(usex qt5 qt5 qt4) -} - -src_compile() { - unset DISPLAY - emake -} - -src_install() { - bitcoincore_src_install - - insinto /usr/share/pixmaps - if use ljr; then - newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico" - else - newins "share/pixmaps/bitcoin.ico" "${PN}.ico" - fi - 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/assets-attribution.md doc/bips.md doc/tor.md - doman contrib/debian/manpages/bitcoin-qt.1 - - use zeromq && dodoc doc/zmq.md - - if use kde; then - insinto /usr/share/kde4/services - doins contrib/debian/bitcoin-qt.protocol - fi -} - -pkg_preinst() { - gnome2_icon_savelist -} - -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/files/0.10.0-openrc-compat.patch b/net-p2p/bitcoin-qt/files/0.10.0-openrc-compat.patch deleted file mode 100644 index a7c31d6..0000000 --- a/net-p2p/bitcoin-qt/files/0.10.0-openrc-compat.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- contrib/init/bitcoind.openrc 2015-03-03 09:37:59.919728713 +0000 -+++ contrib/init/bitcoind.openrc 2015-03-03 09:38:08.109757531 +0000 -@@ -12,9 +12,11 @@ - BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/bitcoind} - BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/bitcoind.pid} - BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} --BITCOIND_USER=${BITCOIND_USER:-bitcoin} -+BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-bitcoin}} - BITCOIND_GROUP=${BITCOIND_GROUP:-bitcoin} - BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/bitcoind} -+BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} -+BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" - - name="Bitcoin Core Daemon" - description="Bitcoin crypto-currency p2p network daemon" -@@ -28,7 +30,7 @@ - - required_files="${BITCOIND_CONFIGFILE}" - start_stop_daemon_args="-u ${BITCOIND_USER} \ -- -N ${BITCOIND_NICE:-0} -w 2000" -+ -N ${BITCOIND_NICE} -w 2000" - pidfile="${BITCOIND_PIDFILE}" - retry=60 - diff --git a/net-p2p/bitcoin-qt/files/0.8-openssl-101k.patch b/net-p2p/bitcoin-qt/files/0.8-openssl-101k.patch deleted file mode 100644 index 5eaaba9..0000000 --- a/net-p2p/bitcoin-qt/files/0.8-openssl-101k.patch +++ /dev/null @@ -1,31 +0,0 @@ -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/bitcoin-qt/files/0.8.2-sys_leveldb.patch b/net-p2p/bitcoin-qt/files/0.8.2-sys_leveldb.patch deleted file mode 100644 index 2b9ab1a..0000000 --- a/net-p2p/bitcoin-qt/files/0.8.2-sys_leveldb.patch +++ /dev/null @@ -1,185 +0,0 @@ -diff --git a/bitcoin-qt.pro b/bitcoin-qt.pro -index cf80986..520b5df 100644 ---- a/bitcoin-qt.pro -+++ b/bitcoin-qt.pro -@@ -4,7 +4,7 @@ macx:TARGET = "Bitcoin-Qt" - VERSION = 0.8.0 - INCLUDEPATH += src src/json src/qt - QT += network --DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE -+DEFINES += QT_GUI BOOST_THREAD_USE_LIB BOOST_SPIRIT_THREADSAFE LEVELDB_WITHOUT_MEMENV - CONFIG += no_include_pwd - CONFIG += thread - -@@ -98,25 +98,29 @@ contains(BITCOIN_NEED_QT_PLUGINS, 1) { - QTPLUGIN += qcncodecs qjpcodecs qtwcodecs qkrcodecs qtaccessiblewidgets - } - -+contains(USE_SYSTEM_LEVELDB, 1) { -+ LIBS += -lleveldb -+} else { - INCLUDEPATH += src/leveldb/include src/leveldb/helpers --LIBS += $$PWD/src/leveldb/libleveldb.a $$PWD/src/leveldb/libmemenv.a -+LIBS += $$PWD/src/leveldb/libleveldb.a - !win32 { - # we use QMAKE_CXXFLAGS_RELEASE even without RELEASE=1 because we use RELEASE to indicate linking preferences not -O preferences -- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a -+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a - } else { - # make an educated guess about what the ranlib command is called - isEmpty(QMAKE_RANLIB) { - QMAKE_RANLIB = $$replace(QMAKE_STRIP, strip, ranlib) - } - LIBS += -lshlwapi -- genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a libmemenv.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libmemenv.a -+ genleveldb.commands = cd $$PWD/src/leveldb && CC=$$QMAKE_CC CXX=$$QMAKE_CXX TARGET_OS=OS_WINDOWS_CROSSCOMPILE $(MAKE) OPT=\"$$QMAKE_CXXFLAGS $$QMAKE_CXXFLAGS_RELEASE\" libleveldb.a && $$QMAKE_RANLIB $$PWD/src/leveldb/libleveldb.a - } - genleveldb.target = $$PWD/src/leveldb/libleveldb.a - genleveldb.depends = FORCE - PRE_TARGETDEPS += $$PWD/src/leveldb/libleveldb.a - QMAKE_EXTRA_TARGETS += genleveldb -+} - # Gross ugly hack that depends on qmake internals, unfortunately there is no other way to do it. --QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb ; $(MAKE) clean -+QMAKE_CLEAN += $$PWD/src/leveldb/libleveldb.a; cd $$PWD/src/leveldb && $(MAKE) clean || true - - # regenerate src/build.h - !win32|contains(USE_BUILD_INFO, 1) { -diff --git a/src/leveldb.cpp b/src/leveldb.cpp -index b41764f..30c524d 100644 ---- a/src/leveldb.cpp -+++ b/src/leveldb.cpp -@@ -8,7 +8,9 @@ - #include <leveldb/env.h> - #include <leveldb/cache.h> - #include <leveldb/filter_policy.h> --#include <memenv/memenv.h> -+#ifndef LEVELDB_WITHOUT_MEMENV -+#include <memenv.h> -+#endif - - #include <boost/filesystem.hpp> - -@@ -42,8 +44,12 @@ CLevelDB::CLevelDB(const boost::filesystem::path &path, size_t nCacheSize, bool - options = GetOptions(nCacheSize); - options.create_if_missing = true; - if (fMemory) { -+#ifndef LEVELDB_WITHOUT_MEMENV - penv = leveldb::NewMemEnv(leveldb::Env::Default()); - options.env = penv; -+#else -+ throw std::runtime_error("CLevelDB(): compiled without memenv support"); -+#endif - } else { - if (fWipe) { - printf("Wiping LevelDB in %s\n", path.string().c_str()); -diff --git a/src/makefile.unix b/src/makefile.unix -index 081edaf..27f2199 100644 ---- a/src/makefile.unix -+++ b/src/makefile.unix -@@ -104,8 +104,7 @@ xCXXFLAGS=-O2 -pthread -Wall -Wextra -Wformat -Wformat-security -Wno-unused-para - # adds some defaults in front. Unfortunately, LDFLAGS=... $(LDFLAGS) does not work. - xLDFLAGS=$(LDHARDENING) $(LDFLAGS) - --OBJS= \ -- leveldb/libleveldb.a \ -+BASEOBJS := \ - obj/alert.o \ - obj/version.o \ - obj/checkpoints.o \ -@@ -114,7 +113,6 @@ OBJS= \ - obj/crypter.o \ - obj/key.o \ - obj/db.o \ -- obj/init.o \ - obj/keystore.o \ - obj/main.o \ - obj/net.o \ -@@ -134,24 +132,43 @@ OBJS= \ - obj/hash.o \ - obj/bloom.o \ - obj/noui.o \ -- obj/leveldb.o \ - obj/txdb.o - -+OBJS := \ -+ obj/leveldb.o \ -+ obj/init.o \ -+ $(BASEOBJS) -+ -+TESTOBJS := \ -+ obj-test/leveldb.o \ -+ $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) \ -+ $(BASEOBJS) -+ - - all: bitcoind - - test check: test_bitcoin FORCE - ./test_bitcoin - -+ifdef USE_SYSTEM_LEVELDB -+ LIBS += -lleveldb -+ TESTLIBS += -lmemenv -+else - # - # LevelDB support - # - MAKEOVERRIDES = --LIBS += $(CURDIR)/leveldb/libleveldb.a $(CURDIR)/leveldb/libmemenv.a -+LIBS += $(CURDIR)/leveldb/libleveldb.a -+TESTLIBS += $(CURDIR)/leveldb/libmemenv.a - DEFS += $(addprefix -I,$(CURDIR)/leveldb/include) --DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers) -+DEFS += $(addprefix -I,$(CURDIR)/leveldb/helpers/memenv) - leveldb/libleveldb.a: -- @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a libmemenv.a && cd .. -+ @echo "Building LevelDB ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libleveldb.a && cd .. -+leveldb/libmemenv.a: -+ @echo "Building LevelDB memenv ..." && cd leveldb && $(MAKE) CC=$(CC) CXX=$(CXX) OPT="$(xCXXFLAGS)" libmemenv.a && cd .. -+OBJS += leveldb/libleveldb.a -+TESTOBJS += leveldb/libmemenv.a -+endif - - # auto-generated dependencies: - -include obj/*.P -@@ -162,26 +179,28 @@ obj/build.h: FORCE - version.cpp: obj/build.h - DEFS += -DHAVE_BUILD_INFO - --obj/%.o: %.cpp -- $(CXX) -c $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< -+P_TO_D = \ - @cp $(@:%.o=%.d) $(@:%.o=%.P); \ -- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -+ sed -e 's/\#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ - -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ - rm -f $(@:%.o=%.d) - --bitcoind: $(OBJS:obj/%=obj/%) -- $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) -+obj/%.o: %.cpp -+ $(CXX) -c $(xCXXFLAGS) -DLEVELDB_WITHOUT_MEMENV -MMD -MF $(@:%.o=%.d) -o $@ $< -+ $(P_TO_D) - --TESTOBJS := $(patsubst test/%.cpp,obj-test/%.o,$(wildcard test/*.cpp)) -+bitcoind: $(OBJS) -+ $(LINK) $(xCXXFLAGS) -o $@ $^ $(xLDFLAGS) $(LIBS) - - obj-test/%.o: test/%.cpp - $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< -- @cp $(@:%.o=%.d) $(@:%.o=%.P); \ -- sed -e 's/#.*//' -e 's/^[^:]*: *//' -e 's/ *\\$$//' \ -- -e '/^$$/ d' -e 's/$$/ :/' < $(@:%.o=%.d) >> $(@:%.o=%.P); \ -- rm -f $(@:%.o=%.d) -+ $(P_TO_D) -+ -+obj-test/leveldb.o: leveldb.cpp -+ $(CXX) -c $(TESTDEFS) $(xCXXFLAGS) -MMD -MF $(@:%.o=%.d) -o $@ $< -+ $(P_TO_D) - --test_bitcoin: $(TESTOBJS) $(filter-out obj/init.o,$(OBJS:obj/%=obj/%)) -+test_bitcoin: $(TESTOBJS) - $(LINK) $(xCXXFLAGS) -o $@ $(LIBPATHS) $^ $(TESTLIBS) $(xLDFLAGS) $(LIBS) - - clean: diff --git a/net-p2p/bitcoin-qt/files/0.9-openssl-101k.patch b/net-p2p/bitcoin-qt/files/0.9-openssl-101k.patch deleted file mode 100644 index 80f6488..0000000 --- a/net-p2p/bitcoin-qt/files/0.9-openssl-101k.patch +++ /dev/null @@ -1,31 +0,0 @@ -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) { diff --git a/net-p2p/bitcoin-qt/files/0.9.0-sys_leveldb.patch b/net-p2p/bitcoin-qt/files/0.9.0-sys_leveldb.patch deleted file mode 100644 index 60e9f2b..0000000 --- a/net-p2p/bitcoin-qt/files/0.9.0-sys_leveldb.patch +++ /dev/null @@ -1,34 +0,0 @@ -commit c38e0af3e021eb0b2aba846c77b06ca71de06b11 (personal-github/sys_leveldb, sys_leveldb) -Author: Luke Dashjr <luke-jr+git@utopios.org> -Date: Mon Sep 9 03:06:17 2013 +0000 - - configure: Add unsupported --with-system-leveldb configure flag - -diff --git a/configure.ac b/configure.ac -index 3ed4549..5a5852d 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -332,10 +332,22 @@ AC_TRY_COMPILE([#include <sys/socket.h>], - [ AC_MSG_RESULT(no)] - ) - -+dnl Check for leveldb, only if explicitly requested - LEVELDB_CPPFLAGS= - LIBLEVELDB= - LIBMEMENV= --AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) -+AC_ARG_WITH([system-leveldb], -+ [AS_HELP_STRING([--with-system-leveldb], -+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_leveldb=$withval], -+ [system_leveldb=no] -+) -+if test x$system_leveldb != xno; then -+ LEVELDB_CPPFLAGS= -+ LIBLEVELDB=-lleveldb -+ LIBMEMENV=-lmemenv -+fi -+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) - AC_SUBST(LEVELDB_CPPFLAGS) - AC_SUBST(LIBLEVELDB) - AC_SUBST(LIBMEMENV) diff --git a/net-p2p/bitcoin-qt/files/0.9.5-sys_leveldb.patch b/net-p2p/bitcoin-qt/files/0.9.5-sys_leveldb.patch deleted file mode 100644 index 0987adb..0000000 --- a/net-p2p/bitcoin-qt/files/0.9.5-sys_leveldb.patch +++ /dev/null @@ -1,63 +0,0 @@ -diff --git a/configure.ac b/configure.ac -index 7924105..a899b3c 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -394,10 +394,44 @@ AC_TRY_COMPILE([#include <sys/socket.h>], - [ AC_MSG_RESULT(no)] - ) - -+dnl Check for leveldb, only if explicitly requested - LEVELDB_CPPFLAGS= - LIBLEVELDB= - LIBMEMENV= --AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) -+AC_ARG_WITH([system-leveldb], -+ [AS_HELP_STRING([--with-system-leveldb], -+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_leveldb=$withval], -+ [system_leveldb=no] -+) -+if test x$system_leveldb != xno; then -+ LEVELDB_CPPFLAGS= -+ AC_CHECK_LIB([leveldb],[main],[ -+ LIBLEVELDB=-lleveldb -+ ],[ -+ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ TEMP_LIBS="$LIBS" -+ LIBS="$LIBS $LIBLEVELDB" -+ AC_CHECK_LIB([memenv],[main],[ -+ LIBMEMENV=-lmemenv -+ ],[ -+ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ LIBS="$TEMP_LIBS" -+ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[ -+ AC_MSG_CHECKING([for memenv.h path]) -+ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv]) -+ ],[ -+ AC_CHECK_HEADER([memenv.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ ]) -+fi -+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) - AC_SUBST(LEVELDB_CPPFLAGS) - AC_SUBST(LIBLEVELDB) - AC_SUBST(LIBMEMENV) -diff --git a/src/m4/bitcoin_subdir_to_include.m4 b/src/m4/bitcoin_subdir_to_include.m4 -index 66f106c..5f0a3b1 100644 ---- a/src/m4/bitcoin_subdir_to_include.m4 -+++ b/src/m4/bitcoin_subdir_to_include.m4 -@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ - AC_MSG_RESULT([default]) - else - echo "#include <$2$3.h>" >conftest.cpp -- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`] -+ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d]) - AC_MSG_RESULT([${newinclpath}]) - if test "x${newinclpath}" != "x"; then - eval "$1=\"\$$1\"' -I${newinclpath}'" diff --git a/net-p2p/bitcoin-qt/files/0.9.x-ljr_noblacklist.patch b/net-p2p/bitcoin-qt/files/0.9.x-ljr_noblacklist.patch deleted file mode 100644 index 3519466..0000000 --- a/net-p2p/bitcoin-qt/files/0.9.x-ljr_noblacklist.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff --git a/src/script.cpp b/src/script.cpp -index 24bbbad..a60d8b6 100644 ---- a/src/script.cpp -+++ b/src/script.cpp -@@ -1870,6 +1870,7 @@ bool fIsBareMultisigStd = false; - - const char *CScript::IsBlacklisted() const - { -+ return false; - if (this->size() >= 7 && this->at(0) == OP_DUP) - { - // pay-to-pubkeyhash diff --git a/net-p2p/bitcoin-qt/files/9999-syslibs.patch b/net-p2p/bitcoin-qt/files/9999-syslibs.patch deleted file mode 100644 index 2cdf2ab..0000000 --- a/net-p2p/bitcoin-qt/files/9999-syslibs.patch +++ /dev/null @@ -1,243 +0,0 @@ -diff --git a/build-aux/m4/bitcoin_subdir_to_include.m4 b/build-aux/m4/bitcoin_subdir_to_include.m4 -index 66f106c..5f0a3b1 100644 ---- a/build-aux/m4/bitcoin_subdir_to_include.m4 -+++ b/build-aux/m4/bitcoin_subdir_to_include.m4 -@@ -5,7 +5,7 @@ AC_DEFUN([BITCOIN_SUBDIR_TO_INCLUDE],[ - AC_MSG_RESULT([default]) - else - echo "#include <$2$3.h>" >conftest.cpp -- newinclpath=`${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | [ tr -d '\\n\\r\\\\' | sed -e 's/^.*[[:space:]:]\(\/[^[:space:]]*\)]$3[\.h[[:space:]].*$/\1/' -e t -e d`] -+ newinclpath=$(${CXXCPP} ${CPPFLAGS} -M conftest.cpp 2>/dev/null | sed [-E -e ':a' -e '/\\$/!b b' -e N -e 's/\\\n/ /' -e 't a' -e ':b' -e 's/^[^:]*:[[:space:]]*(([^[:space:]\]|\\.)*[[:space:]])*(([^[:space:]\]|\\.)*)]$3\.h[([[:space:]].*)?$/\3/' -e 't' -e d]) - AC_MSG_RESULT([${newinclpath}]) - if test "x${newinclpath}" != "x"; then - eval "$1=\"\$$1\"' -I${newinclpath}'" -diff --git a/configure.ac b/configure.ac -index 37fe47e..14e5c34 100644 ---- a/configure.ac -+++ b/configure.ac -@@ -170,6 +170,18 @@ AC_ARG_WITH([utils], - [build_bitcoin_utils=$withval], - [build_bitcoin_utils=yes]) - -+AC_ARG_ENABLE([util-cli], -+ [AS_HELP_STRING([--enable-util-cli], -+ [build bitcoin-cli])], -+ [build_bitcoin_cli=$enableval], -+ [build_bitcoin_cli=$build_bitcoin_utils]) -+ -+AC_ARG_ENABLE([util-tx], -+ [AS_HELP_STRING([--enable-util-tx], -+ [build bitcoin-tx])], -+ [build_bitcoin_tx=$enableval], -+ [build_bitcoin_tx=$build_bitcoin_utils]) -+ - AC_ARG_WITH([libs], - [AS_HELP_STRING([--with-libs], - [build libraries (default=yes)])], -@@ -488,14 +500,65 @@ if test x$use_reduce_exports = xyes; then - [AC_MSG_ERROR([Cannot set default symbol visibility. Use --disable-reduce-exports.])]) - fi - -+dnl Check for leveldb, only if explicitly requested - LEVELDB_CPPFLAGS= - LIBLEVELDB= - LIBMEMENV= --AM_CONDITIONAL([EMBEDDED_LEVELDB],[true]) -+AC_ARG_WITH([system-leveldb], -+ [AS_HELP_STRING([--with-system-leveldb], -+ [Build with system LevelDB (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_leveldb=$withval], -+ [system_leveldb=no] -+) -+if test x$system_leveldb != xno; then -+ LEVELDB_CPPFLAGS= -+ AC_CHECK_LIB([leveldb],[main],[ -+ LIBLEVELDB=-lleveldb -+ ],[ -+ AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ TEMP_LIBS="$LIBS" -+ LIBS="$LIBS $LIBLEVELDB" -+ AC_CHECK_LIB([memenv],[main],[ -+ LIBMEMENV=-lmemenv -+ ],[ -+ AC_MSG_ERROR([LevelDB's memenv library not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ LIBS="$TEMP_LIBS" -+ AC_CHECK_HEADER([leveldb/filter_policy.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ AC_CHECK_HEADER([leveldb/helpers/memenv.h],[ -+ AC_MSG_CHECKING([for memenv.h path]) -+ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv]) -+ ],[ -+ AC_CHECK_HEADER([memenv.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ ]) -+fi -+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) - AC_SUBST(LEVELDB_CPPFLAGS) - AC_SUBST(LIBLEVELDB) - AC_SUBST(LIBMEMENV) - -+dnl Check for libsecp256k1, only if explicitly requested -+AC_ARG_WITH([system-libsecp256k1], -+ [AS_HELP_STRING([--with-system-libsecp256k1], -+ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_libsecp256k1=$withval], -+ [system_libsecp256k1=no] -+) -+if test x$system_libsecp256k1 != xno; then -+ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true]) -+else -+ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include' -+ libsecp256k1_LIBS='secp256k1/libsecp256k1.la' -+fi -+AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno]) -+AC_SUBST(libsecp256k1_CFLAGS) -+AC_SUBST(libsecp256k1_LIBS) -+ - if test x$enable_wallet != xno; then - dnl Check for libdb_cxx only if wallet enabled - BITCOIN_FIND_BDB48 -@@ -515,7 +578,7 @@ BITCOIN_QT_INIT - dnl sets $bitcoin_enable_qt, $bitcoin_enable_qt_test, $bitcoin_enable_qt_dbus - BITCOIN_QT_CONFIGURE([$use_pkgconfig], [qt4]) - --if test x$build_bitcoin_utils$build_bitcoind$bitcoin_enable_qt$use_tests = xnononono; then -+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then - use_boost=no - else - use_boost=yes -@@ -701,9 +764,13 @@ AC_MSG_CHECKING([whether to build bitcoind]) - AM_CONDITIONAL([BUILD_BITCOIND], [test x$build_bitcoind = xyes]) - AC_MSG_RESULT($build_bitcoind) - --AC_MSG_CHECKING([whether to build utils (bitcoin-cli bitcoin-tx)]) --AM_CONDITIONAL([BUILD_BITCOIN_UTILS], [test x$build_bitcoin_utils = xyes]) --AC_MSG_RESULT($build_bitcoin_utils) -+AC_MSG_CHECKING([whether to build bitcoin-cli]) -+AM_CONDITIONAL([BUILD_BITCOIN_CLI], [test x$build_bitcoin_cli = xyes]) -+AC_MSG_RESULT($build_bitcoin_cli) -+ -+AC_MSG_CHECKING([whether to build bitcoin-tx]) -+AM_CONDITIONAL([BUILD_BITCOIN_TX], [test x$build_bitcoin_tx = xyes]) -+AC_MSG_RESULT($build_bitcoin_tx) - - AC_MSG_CHECKING([whether to build libraries]) - AM_CONDITIONAL([BUILD_BITCOIN_LIBS], [test x$build_bitcoin_libs = xyes]) -@@ -826,7 +893,7 @@ else - AC_MSG_RESULT([no]) - fi - --if test x$build_bitcoin_utils$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnonononono; then -+if test x$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_libs$build_bitcoind$bitcoin_enable_qt$use_tests = xnononononono; then - AC_MSG_ERROR([No targets! Please specify at least one of: --with-utils --with-libs --with-daemon --with-gui or --enable-tests]) - fi - -@@ -895,8 +962,10 @@ PKGCONFIG_LIBDIR_TEMP="$PKG_CONFIG_LIBDIR" - unset PKG_CONFIG_LIBDIR - PKG_CONFIG_LIBDIR="$PKGCONFIG_LIBDIR_TEMP" - -+if test x$system_libsecp256k1 = xno; then - ac_configure_args="${ac_configure_args} --disable-shared --with-pic --with-bignum=no" - AC_CONFIG_SUBDIRS([src/secp256k1]) -+fi - - AC_OUTPUT - -diff --git a/qa/pull-tester/rpc-tests.sh b/qa/pull-tester/rpc-tests.sh -index 9b31865..5bb187c 100755 ---- a/qa/pull-tester/rpc-tests.sh -+++ b/qa/pull-tester/rpc-tests.sh -@@ -57,7 +57,7 @@ testScriptsExt=( - extArg="-extended" - passOn=${@#$extArg} - --if [ "x${ENABLE_BITCOIND}${ENABLE_UTILS}${ENABLE_WALLET}" = "x111" ]; then -+if [ "x${ENABLE_BITCOIND}${ENABLE_CLI}${ENABLE_WALLET}" = "x111" ]; then - for (( i = 0; i < ${#testScripts[@]}; i++ )) - do - if [ -z "$1" ] || [ "${1:0:1}" == "-" ] || [ "$1" == "${testScripts[$i]}" ] || [ "$1.py" == "${testScripts[$i]}" ] -diff --git a/qa/pull-tester/tests-config.sh.in b/qa/pull-tester/tests-config.sh.in -index 10f4d33..e0e407d 100755 ---- a/qa/pull-tester/tests-config.sh.in -+++ b/qa/pull-tester/tests-config.sh.in -@@ -8,7 +8,7 @@ EXEEXT="@EXEEXT@" - - # These will turn into comments if they were disabled when configuring. - @ENABLE_WALLET_TRUE@ENABLE_WALLET=1 --@BUILD_BITCOIN_UTILS_TRUE@ENABLE_UTILS=1 -+@BUILD_BITCOIN_CLI_TRUE@ENABLE_CLI=1 - @BUILD_BITCOIND_TRUE@ENABLE_BITCOIND=1 - - REAL_BITCOIND="$BUILDDIR/src/bitcoind${EXEEXT}" -diff --git a/src/Makefile.am b/src/Makefile.am -index 1c2f770..4d60ddf 100644 ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -1,4 +1,6 @@ -+if EMBEDDED_LIBSECP256K1 - DIST_SUBDIRS = secp256k1 -+endif - AM_LDFLAGS = $(PTHREAD_CFLAGS) $(LIBTOOL_LDFLAGS) - - -@@ -20,7 +22,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 +32,16 @@ LIBBITCOIN_UTIL=libbitcoin_util.a - LIBBITCOIN_CRYPTO=crypto/libbitcoin_crypto.a - LIBBITCOIN_UNIVALUE=univalue/libbitcoin_univalue.a - LIBBITCOINQT=qt/libbitcoinqt.a -+if EMBEDDED_LIBSECP256K1 - LIBSECP256K1=secp256k1/libsecp256k1.la -+else -+LIBSECP256K1=$(libsecp256k1_LIBS) -+endif - -+if EMBEDDED_LIBSECP256K1 - $(LIBSECP256K1): $(wildcard secp256k1/src/*) $(wildcard secp256k1/include/*) - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C $(@D) $(@F) -+endif - - # 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: -@@ -63,8 +71,11 @@ if BUILD_BITCOIND - bin_PROGRAMS += bitcoind - endif - --if BUILD_BITCOIN_UTILS -- bin_PROGRAMS += bitcoin-cli bitcoin-tx -+if BUILD_BITCOIN_CLI -+ bin_PROGRAMS += bitcoin-cli -+endif -+if BUILD_BITCOIN_TX -+ bin_PROGRAMS += bitcoin-tx - endif - - .PHONY: FORCE -diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 0997148..14b4deb 100644 ---- a/src/Makefile.test.include -+++ b/src/Makefile.test.include -@@ -111,10 +111,12 @@ bitcoin_test_check: $(TEST_BINARY) FORCE - bitcoin_test_clean : FORCE - rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) - -+if EMBEDDED_LIBSECP256K1 - check-local: - @echo "Running test/bitcoin-util-test.py..." - $(AM_V_at)srcdir=$(srcdir) PYTHONPATH=$(builddir)/test $(srcdir)/test/bitcoin-util-test.py - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check -+endif - - %.json.h: %.json - @$(MKDIR_P) $(@D) diff --git a/net-p2p/bitcoin-qt/files/bitcoin.conf b/net-p2p/bitcoin-qt/files/bitcoin.conf deleted file mode 100644 index c6a55f3..0000000 --- a/net-p2p/bitcoin-qt/files/bitcoin.conf +++ /dev/null @@ -1,8 +0,0 @@ -# http://www.bitcoin.org/smf/index.php?topic=644.0 -#rpcuser= -#rpcpassword= - - - - - diff --git a/net-p2p/bitcoin-qt/files/bitcoin.confd b/net-p2p/bitcoin-qt/files/bitcoin.confd deleted file mode 100644 index 7c0868c..0000000 --- a/net-p2p/bitcoin-qt/files/bitcoin.confd +++ /dev/null @@ -1,10 +0,0 @@ -# Config file for /etc/init.d/bitcoin - -# owner of bitcoind process (don't change, must be existing) -BITCOIN_USER="bitcoin" - -# See http://www.bitcoin.org/smf/index.php?topic=1063 -BITCOIN_OPTS="${BITCOIN_OPTS}" - -# nice level -NICELEVEL="19" diff --git a/net-p2p/bitcoin-qt/files/bitcoin.initd-r1 b/net-p2p/bitcoin-qt/files/bitcoin.initd-r1 deleted file mode 100644 index 02a159c..0000000 --- a/net-p2p/bitcoin-qt/files/bitcoin.initd-r1 +++ /dev/null @@ -1,104 +0,0 @@ -#!/sbin/runscript -# Distributed under the terms of the GNU General Public License, v2 or later - -VARDIR="/var/lib/bitcoin" -CONFFILE="${VARDIR}/.bitcoin/bitcoin.conf" - -depend() { - need net -} - -checkconfig() { - if [ "${BITCOIN_USER}" = "" ] ; then - eerror "Please edit /etc/conf.d/bitcoind" - eerror "A user must be specified to run bitcoind as that user." - eerror "Modify USER to your needs (you may also add a group after a colon)" - return 1 - fi - if ! `getent passwd | cut -d ':' -f 1 | grep $( echo "${BITCOIN_USER}" | cut -d ':' -f 1 ) -sq` ; then - eerror "Please edit /etc/conf.d/bitcoind" - eerror "Specified user must exist!" - return 1 - fi - if `echo "${BITCOIN_USER}" | grep ':' -sq` ; then - if ! `cut -d ':' -f 1 /etc/group | grep $( echo "${BITCOIN_USER}" | cut -d ':' -f 2 ) -sq` ; then - eerror "Please edit /etc/conf.d/bitcoind" - eerror "Specified group must exist!" - return 1 - fi - fi - if ! grep -q '^rpcpassword=' "${CONFFILE}"; then - eerror "Please edit `readlink -f ${CONFFILE}`" - eerror "There must be at least a line assigning rpcpassword=something-secure" - return 1 - fi - if ! stat -Lc '%a' "${CONFFILE}" | grep -q '^[4567]00$'; then - eerror "`readlink -f ${CONFFILE}` should not be readable by other users" - return 1 - fi - return 0 -} - -start() { - checkconfig || return 1 - ebegin "Starting Bitcoind daemon" - - pkg-config openrc - if [ $? = 0 ]; then - start_openrc - else - start_baselayout - fi -} - -stop() { - ebegin "Stopping Bitcoin daemon" - - pkg-config openrc - if [ $? = 0 ]; then - stop_openrc - else - stop_baselayout - fi -} - -start_openrc() { - start-stop-daemon \ - --start --user "${BITCOIN_USER}" --name bitcoind \ - --pidfile /var/run/bitcoind.pid --make-pidfile \ - --env HOME="${VARDIR}" --exec /usr/bin/bitcoind \ - --nicelevel "${NICELEVEL}" \ - --background \ - --wait 2000 \ - -- ${BITCOIN_OPTS} - eend $? -} - -stop_openrc() { - start-stop-daemon --stop --user "${BITCOIN_USER}" \ - --name bitcoind --pidfile /var/run/bitcoind.pid \ - --wait 30000 \ - --progress - eend $? -} - -start_baselayout() { - start-stop-daemon \ - --start --user "${BITCOIN_USER}" --name bitcoind \ - --pidfile /var/run/bitcoind.pid --make-pidfile \ - --env HOME="${VARDIR}" --exec /usr/bin/bitcoind \ - --chuid "${BITCOIN_USER}" \ - --nicelevel "${NICELEVEL}" \ - --background \ - -- ${BITCOIN_OPTS} - eend $? -} - -stop_baselayout() { - start-stop-daemon \ - --stop \ - --user "${BITCOIN_USER}" \ - --name bitcoind \ - --pidfile /var/run/bitcoind.pid - eend $? -} diff --git a/net-p2p/bitcoin-qt/files/bitcoind.logrotate b/net-p2p/bitcoin-qt/files/bitcoind.logrotate deleted file mode 100644 index 36d8dc2..0000000 --- a/net-p2p/bitcoin-qt/files/bitcoind.logrotate +++ /dev/null @@ -1,7 +0,0 @@ -/var/lib/bitcoin/.bitcoin/debug.log { - weekly - sharedscripts - postrotate - killall -HUP bitcoind - endscript -} diff --git a/net-p2p/bitcoin-qt/files/bitcoind.logrotate-r1 b/net-p2p/bitcoin-qt/files/bitcoind.logrotate-r1 deleted file mode 100644 index f9a4702..0000000 --- a/net-p2p/bitcoin-qt/files/bitcoind.logrotate-r1 +++ /dev/null @@ -1,8 +0,0 @@ -/var/lib/bitcoin/.bitcoin/debug.log { - missingok - weekly - sharedscripts - postrotate - killall -HUP bitcoind - endscript -} diff --git a/net-p2p/bitcoin-qt/files/bitcoind.service b/net-p2p/bitcoin-qt/files/bitcoind.service deleted file mode 100644 index 9774700..0000000 --- a/net-p2p/bitcoin-qt/files/bitcoind.service +++ /dev/null @@ -1,30 +0,0 @@ -# It's not recommended to modify this file in-place, because it will be -# overwritten during package upgrades. If you want to customize, the -# best way is to create file -# "/etc/systemd/system/bitcoind.service.d/*.conf" -# containing your changes - -# For example, if you want to change some daemon and/or unit options, -# create a file named -# "/etc/systemd/system/bitcoind.service.d/myopts.conf" -# containing: -# [Service] -# Environment="BITCOIN_OPTS=-debug -logtimestamps" -# Nice=10 -# This will override the setting appearing below. - -# Note that almost all daemon options could be specified in -# /etc/bitcoin/bitcoin.conf - -[Unit] -Description=Bitcoin Daemon -After=network.target - -[Service] -User=bitcoin -Environment=BITCOIN_OPTS= -ExecStart=/usr/bin/bitcoind -daemon=0 $BITCOIN_OPTS -ExecReload=/bin/kill -HUP $MAINPID - -[Install] -WantedBy=multi-user.target diff --git a/net-p2p/bitcoin-qt/files/miniupnpc-14.patch b/net-p2p/bitcoin-qt/files/miniupnpc-14.patch deleted file mode 100644 index aa8e32f..0000000 --- a/net-p2p/bitcoin-qt/files/miniupnpc-14.patch +++ /dev/null @@ -1,28 +0,0 @@ -commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 (origin-pull/6583/head) -Author: Pavel Vasin <pavel@vasin.nl> -Date: Sun Aug 23 23:53:49 2015 +0300 - - add support for miniupnpc api version 14 - - The value of new arg ttl is set to 2 as it's recommended default. - -diff --git a/src/net.cpp b/src/net.cpp -index fb5726a..4c6331f 100644 ---- a/src/net.cpp -+++ b/src/net.cpp -@@ -1120,10 +1120,14 @@ void ThreadMapPort() - #ifndef UPNPDISCOVER_SUCCESS - /* miniupnpc 1.5 */ - devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0); --#else -+#elif MINIUPNPC_API_VERSION < 14 - /* miniupnpc 1.6 */ - int error = 0; - devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error); -+#else -+ /* miniupnpc 1.9.20150730 */ -+ int error = 0; -+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error); - #endif - - struct UPNPUrls urls; diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml deleted file mode 100644 index c6d65e4..0000000 --- a/net-p2p/bitcoin-qt/metadata.xml +++ /dev/null @@ -1,30 +0,0 @@ -<?xml version='1.0' encoding='UTF-8'?> -<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd"> -<pkgmetadata> - <maintainer> - <email>blueness@gentoo.org</email> - <name>Anthony G. Basile</name> - </maintainer> - <maintainer> - <email>luke-jr+gentoobugs@utopios.org</email> - <name>Luke Dashjr</name> - </maintainer> - <use> - <flag name="1stclassmsg">Enable first-class Bitcoin message tools</flag> - <flag name="bitcoin_policy_cltv">Check LockTime Verify policy: Your node will recognise and assist OP_CHECKLOCKTIMEVERIFY (BIP65) transactions</flag> - <flag name="bitcoin_policy_cpfp">Child-Pays-For-Parent policy: If you mine, you will give consideration to child transaction fees to pay for their parents</flag> - <flag name="bitcoin_policy_dcmp">Data Carrier Multi-Push policy: Your node will assist transactions with multiple pushes in their data carrier (if any)</flag> - <flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag> - <flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag> - <flag name="ljr">Enable Luke Dashjr's patches</flag> - <flag name="ljr-antispam">Enable Luke Dashjr's address-based spam filter</flag> - <flag name="qrcode">Enable generation of QR Codes for receiving payments</flag> - <flag name="upnp">Enable Universal Plug and Play</flag> - <flag name="wallet">Enable wallet support</flag> - <flag name="xt">Enable Mike Hearn's Bitcoin XT patches</flag> - <flag name="zeromq">Report blocks and transactions via zeromq</flag> - </use> - <upstream> - <remote-id type="github">bitcoin/bitcoin</remote-id> - </upstream> -</pkgmetadata> |