[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoin-qt/files/, net-p2p/bitcoin-qt/

[Virgil Dupras]

commit:     1b957e3983c5b664df340102d7311e266244f019
Author:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 23 20:31:22 2018 +0000
Commit:     Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 20:38:26 2018 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=1b957e39

net-p2p/bitcoin-qt: 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/bitcoin-qt/Manifest                        |   2 -
 net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild        | 255 ---------------------
 .../files/bitcoin-qt-0.15.1-test-build-fix.patch   |  24 --
 .../files/bitcoin-qt-0.15.1-test-util-fix.patch    |  15 --
 net-p2p/bitcoin-qt/metadata.xml                    |   2 -
 5 files changed, 298 deletions(-)

diff --git a/net-p2p/bitcoin-qt/Manifest b/net-p2p/bitcoin-qt/Manifest
index 8c6c2a5d72d..443491598dd 100644
--- a/net-p2p/bitcoin-qt/Manifest
+++ b/net-p2p/bitcoin-qt/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/bitcoin-qt/bitcoin-qt-0.15.1.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
deleted file mode 100644
index 3e86deab6af..00000000000
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.15.1.ebuild
+++ /dev/null
@@ -1,255 +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 gnome2-utils xdg-utils
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
-BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
-KNOTS_PV="${PV}.knots20171111"
-KNOTS_P="${MyPN}-${KNOTS_PV}"
-
-IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode +http test +tor upnp +wallet zeromq"
-LANGS="af af:af_ZA am ar be:be_BY bg bg:bg_BG bn bs ca ca@valencia ca:ca_ES cs cy da de de:de_DE el el:el_GR en en_AU en_GB en_US eo es es_419 es_AR es_CL es_CO es_DO es_ES es_MX es_UY es_VE et et:et_EE eu:eu_ES fa fa:fa_IR fi fr fr_CA fr:fr_FR gl he he:he_IL hi:hi_IN hr hu hu:hu_HU id id:id_ID is it it:it_IT ja ja:ja_JP ka kk:kk_KZ ko:ko_KR ku:ku_IQ ky la lt lv:lv_LV mk:mk_MK mn ms ms:ms_MY my nb nb:nb_NO ne nl nl:nl_NL pam pl pl:pl_PL pt pt_BR pt_PT ro ro:ro_RO ru ru:ru_RU si sk sl:sl_SI sn sq sr sr-Latn:sr@latin sv ta te th th:th_TH tr tr:tr_TR uk ur_PK uz@Cyrl vi vi:vi_VN zh zh_CN zh_HK zh_TW"
-KNOTS_LANGS="am hu_HU is ms pl_PL pt sn"
-
-DESCRIPTION="An end-user Qt GUI for the Bitcoin crypto-currency"
-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= )
-	libevent? ( 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
-	bip70? ( dev-libs/protobuf )
-	qrcode? (
-		media-gfx/qrencode
-	)
-	dev-qt/qtcore:5
-	dev-qt/qtgui:5
-	dev-qt/qtnetwork:5
-	dev-qt/qtwidgets:5
-	dbus? (
-		dev-qt/qtdbus:5
-	)
-"
-DEPEND="${RDEPEND}
-	dev-qt/linguist-tools:5
-	knots? (
-		gnome-base/librsvg
-		media-gfx/imagemagick[png]
-	)
-"
-REQUIRED_USE="
-	http? ( libevent ) tor? ( libevent ) libevent? ( http tor )
-"
-
-declare -A LANG2USE USE2LANGS
-bitcoin_langs_prep() {
-	local lang l10n
-	for lang in ${LANGS}; do
-		l10n="${lang/:*/}"
-		l10n="${l10n/[@_]/-}"
-		lang="${lang/*:/}"
-		LANG2USE["${lang}"]="${l10n}"
-		USE2LANGS["${l10n}"]+=" ${lang}"
-	done
-}
-bitcoin_langs_prep
-
-bitcoin_lang2use() {
-	local l
-	for l; do
-		echo l10n_${LANG2USE["${l}"]}
-	done
-}
-
-IUSE+=" $(bitcoin_lang2use ${!LANG2USE[@]})"
-
-bitcoin_lang_requireduse() {
-	local lang l10n knots_exclusive
-	for l10n in ${!USE2LANGS[@]}; do
-		for lang in ${USE2LANGS["${l10n}"]}; do
-			if ! has $lang $KNOTS_LANGS; then
-				continue 2
-			fi
-		done
-		echo "l10n_${l10n}? ( knots )"
-	done
-}
-REQUIRED_USE+=" $(bitcoin_lang_requireduse)"
-
-DOCS=( doc/bips.md doc/files.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
-}
-
-KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
-
-src_prepare() {
-	sed -i 's/^\(complete -F _bitcoind \)bitcoind \(bitcoin-qt\)$/\1\2/' contrib/bitcoind.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
-
-	sed -i 's/^\(Icon=\).*$/\1bitcoin-qt/;s/^\(Categories=.*\)$/\1P2P;Network;Qt;/' contrib/debian/bitcoin-qt.desktop || die
-
-	local filt= yeslang= nolang= lan ts x
-
-	for lan in $LANGS; do
-		lan="${lan/*:/}"
-		if [ ! -e src/qt/locale/bitcoin_$lan.ts ]; then
-			if has $lan $KNOTS_LANGS && ! use knots; 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 "$(bitcoin_lang2use "$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"
-
-	eautoreconf
-	rm -r src/leveldb src/secp256k1 || die
-}
-
-src_configure() {
-	local my_econf=(
-		$(use_enable asm experimental-asm)
-		$(use_enable bip70)
-		$(use_with dbus qtdbus)
-		$(use_with libevent)
-		$(use_with qrcode qrencode)
-		$(use_with upnp miniupnpc)
-		$(use_enable upnp upnp-default)
-		$(use_enable test tests)
-		$(use_enable wallet)
-		$(use_enable zeromq zmq)
-		--with-gui=qt5
-		--disable-util-cli
-		--disable-util-tx
-		--disable-bench
-		--without-libs
-		--without-daemon
-		--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 /usr/share/pixmaps
-	if use knots; then
-		newins "src/qt/res/rendered_icons/bitcoin.ico" "${PN}.ico"
-	else
-		newins "share/pixmaps/bitcoin.ico" "${PN}.ico"
-	fi
-	insinto /usr/share/applications
-	doins "contrib/debian/bitcoin-qt.desktop"
-
-	use libevent && dodoc doc/REST-interface.md doc/tor.md
-
-	use zeromq && dodoc doc/zmq.md
-
-	newbashcomp contrib/bitcoind.bash-completion ${PN}
-
-	if use kde; then
-		insinto /usr/share/kde4/services
-		doins contrib/debian/bitcoin-qt.protocol
-		dosym "../kde4/services/bitcoin-qt.protocol" "/usr/share/kservices5/bitcoin-qt.protocol"
-	fi
-}
-
-pkg_preinst() {
-	gnome2_icon_savelist
-}
-
-update_caches() {
-	gnome2_icon_cache_update
-	xdg_desktop_database_update
-}
-
-pkg_postinst() {
-	update_caches
-
-	if use tor; then
-		einfo "To have ${PN} automatically use Tor when it's running, be sure your 'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup correctly, and add your that user to the 'tor' user group"
-	fi
-}
-
-pkg_postrm() {
-	update_caches
-}

diff --git a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
deleted file mode 100644
index 3d953d9c0a9..00000000000
--- a/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-build-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
-Author: Luke Dashjr <luke-jr+git@×××××××.org>
-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/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch b/net-p2p/bitcoin-qt/files/bitcoin-qt-0.15.1-test-util-fix.patch
deleted file mode 100644
index 60fc9d84905..00000000000
--- a/net-p2p/bitcoin-qt/files/bitcoin-qt-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

diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml
index c3c11c51b20..f88446cdbbe 100644
--- a/net-p2p/bitcoin-qt/metadata.xml
+++ b/net-p2p/bitcoin-qt/metadata.xml
@@ -13,11 +13,9 @@
 		<flag name="asm">Enable assembly for optimization</flag>
 		<flag name="bip70">Enable support for the BIP70 payment protocol</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="http">Enable support for the JSON-RPC and REST HTTP server (builtin net-p2p/bitcoind)</flag>
 		<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
 		<flag name="libevent">Use dev-libs/libevent (needed for JSON-RPC, REST, and Tor auto-configuration</flag>
 		<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag>
-		<flag name="tor">Enable automatic configuration of a Tor hidden service</flag>
 		<flag name="upnp">Enable Universal Plug and Play</flag>
 		<flag name="wallet">Enable wallet support</flag>
 		<flag name="zeromq">Report blocks and transactions via zeromq</flag>