commit: 3c847a77d54b0910d52d4852859651fa49510eb3 Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org> AuthorDate: Tue Oct 23 20:35:00 2018 +0000 Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org> CommitDate: Tue Oct 23 20:38:27 2018 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c847a77
net-p2p/bitcoind: remove old and vulnerable Bug: https://bugs.gentoo.org/666669 Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org> Package-Manager: Portage-2.3.51, Repoman-2.3.11 net-p2p/bitcoind/Manifest | 2 - net-p2p/bitcoind/bitcoind-0.15.1.ebuild | 167 --------------------- .../files/bitcoind-0.15.1-test-build-fix.patch | 24 --- .../files/bitcoind-0.15.1-test-util-fix.patch | 15 -- 4 files changed, 208 deletions(-) diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index 8c6c2a5d72d..443491598dd 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -1,4 +1,2 @@ -DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890 DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893 -DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild deleted file mode 100644 index c4ed72826f0..00000000000 --- a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild +++ /dev/null @@ -1,167 +0,0 @@ -# Copyright 2010-2018 Gentoo Foundation -# Distributed under the terms of the GNU General Public License v2 - -EAPI=6 - -DB_VER="4.8" -inherit autotools bash-completion-r1 db-use systemd user - -MyPV="${PV/_/}" -MyPN="bitcoin" -MyP="${MyPN}-${MyPV}" -BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58" -KNOTS_PV="${PV}.knots20171111" -KNOTS_P="${MyPN}-${KNOTS_PV}" - -IUSE="+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq" - -DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"; -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux" - -SRC_URI=" - https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz - https://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" -CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"; -KNOTS_DESC="https://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"; - -RDEPEND=" - !libressl? ( dev-libs/openssl:0=[-bindist] ) - libressl? ( dev-libs/libressl:0= ) - dev-libs/libevent - >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery] - dev-libs/univalue - >=dev-libs/boost-1.52.0:=[threads(+)] - upnp? ( >=net-libs/miniupnpc-1.9.20150916 ) - wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] ) - zeromq? ( net-libs/zeromq ) - virtual/bitcoin-leveldb -" -DEPEND="${RDEPEND}" - -DOCS=( doc/bips.md doc/files.md doc/reduce-traffic.md doc/release-notes.md ) - -S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - einfo "You are building ${PN} from Bitcoin Knots." - einfo "For more information, see ${KNOTS_DESC}" - else - einfo "You are building ${PN} from Bitcoin Core." - einfo "For more information, see ${CORE_DESC}" - fi - if use bitcoin_policy_rbf; then - einfo "Replace By Fee policy is enabled: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order." - else - einfo "Replace By Fee policy is disabled: Your node will only accept the first transaction seen consuming a conflicting input, regardless of fee offered by later ones." - fi -} - -pkg_setup() { - enewgroup bitcoin - enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin -} - -KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}[email protected]"; } - -src_prepare() { - sed -i 's/runscript/openrc-run/' contrib/init/${PN}.openrc || die - - sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die - - eapply "$(KNOTS_PATCH syslibs)" - eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch" - - if use knots; then - eapply "$(KNOTS_PATCH f)" - eapply "$(KNOTS_PATCH branding)" - eapply "$(KNOTS_PATCH ts)" - eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch" - fi - - eapply_user - - if ! use bitcoin_policy_rbf; then - sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die - fi - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - $(use_enable asm experimental-asm) - --without-qtdbus - --with-libevent - --without-qrencode - $(use_with upnp miniupnpc) - $(use_enable upnp upnp-default) - $(use_enable test tests) - $(use_enable wallet) - $(use_enable zeromq zmq) - --with-daemon - --disable-util-cli - --disable-util-tx - --disable-bench - --without-libs - --without-gui - --disable-ccache - --disable-static - --with-system-leveldb - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - rm -f "${ED%/}/usr/bin/test_bitcoin" || die - - insinto /etc/bitcoin - newins "${FILESDIR}/bitcoin.conf" bitcoin.conf - fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf - fperms 600 /etc/bitcoin/bitcoin.conf - - newconfd "contrib/init/bitcoind.openrcconf" ${PN} - newinitd "contrib/init/bitcoind.openrc" ${PN} - systemd_newunit "${FILESDIR}/bitcoind.service-r1" "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/REST-interface.md doc/tor.md - doman "${FILESDIR}/bitcoin.conf.5" - - use zeromq && dodoc doc/zmq.md - - newbashcomp contrib/${PN}.bash-completion ${PN} - - if use examples; then - docinto examples - dodoc -r contrib/{linearize,qos,tidy_datadir.sh} - use zeromq && dodoc -r contrib/zmq - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind -} - -pkg_postinst() { - einfo "To have ${PN} automatically use Tor when it's running, be sure your 'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup correctly, and:" - einfo "- if using the init script: add the 'bitcoin' user to the 'tor' user group" - einfo" - if running bitcoind directly: add that user to the 'tor' user group" -} diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch deleted file mode 100644 index 3d953d9c0a9..00000000000 --- a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch +++ /dev/null @@ -1,24 +0,0 @@ -commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD) -Author: Luke Dashjr <[email protected]> -Date: Tue Jan 23 03:37:10 2018 +0000 - - Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB - -diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp -index 7826cdc1b3..013846811b 100644 ---- a/src/test/script_tests.cpp -+++ b/src/test/script_tests.cpp -@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen - ++data->eof; - } - -+#if defined(HAVE_CONSENSUS_LIB) - static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = { - .ScriptBegin = script_tests_debugger_ScriptBegin, - .ScriptPreStep = script_tests_debugger_ScriptPreStep, - .ScriptEOF = script_tests_debugger_ScriptEOF, - }; -+#endif - - void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0) - { diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch deleted file mode 100644 index 60fc9d84905..00000000000 --- a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch +++ /dev/null @@ -1,15 +0,0 @@ -diff --git a/src/Makefile.test.include b/src/Makefile.test.include -index 147add3eb5..308b1c88c0 100644 ---- a/src/Makefile.test.include -+++ b/src/Makefile.test.include -@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE - rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY) - - check-local: -+if BUILD_BITCOIN_TX - @echo "Running test/util/bitcoin-util-test.py..." - $(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py -+endif - if EMBEDDED_LIBSECP256K1 - $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check - endif
