[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
commit: 3418f2ccedbf9e6f0df70d720f38b98ed8a924a6 Author: Sam James gentoo org> AuthorDate: Mon Apr 10 04:03:59 2023 + Commit: Sam James gentoo org> CommitDate: Mon Apr 10 04:03:59 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3418f2cc net-p2p/bitcoind: fix build w/ gcc 13 Closes: https://bugs.gentoo.org/903781 Signed-off-by: Sam James gentoo.org> net-p2p/bitcoind/bitcoind-24.0.1.ebuild | 1 + net-p2p/bitcoind/files/24.0.1-gcc13.patch | 39 +++ 2 files changed, 40 insertions(+) diff --git a/net-p2p/bitcoind/bitcoind-24.0.1.ebuild b/net-p2p/bitcoind/bitcoind-24.0.1.ebuild index 15346a5e3025..6eec37f477fe 100644 --- a/net-p2p/bitcoind/bitcoind-24.0.1.ebuild +++ b/net-p2p/bitcoind/bitcoind-24.0.1.ebuild @@ -62,6 +62,7 @@ DOCS=( PATCHES=( "${FILESDIR}"/24.0.1-syslibs.patch + "${FILESDIR}"/24.0.1-gcc13.patch ) pkg_pretend() { diff --git a/net-p2p/bitcoind/files/24.0.1-gcc13.patch b/net-p2p/bitcoind/files/24.0.1-gcc13.patch new file mode 100644 index ..39cf81b14953 --- /dev/null +++ b/net-p2p/bitcoind/files/24.0.1-gcc13.patch @@ -0,0 +1,39 @@ +https://bugs.gentoo.org/903781 +https://bugs.gentoo.org/900246 +https://bugs.gentoo.org/895814 +https://bugs.gentoo.org/894734 +https://github.com/bitcoin/bitcoin/commit/fadeb6b103cb441e0e91ef506ef29febabb10715 + +From fadeb6b103cb441e0e91ef506ef29febabb10715 Mon Sep 17 00:00:00 2001 +From: MarcoFalke <*~=`'#}+{/-|&$^_...@721217.xyz> +Date: Thu, 19 Jan 2023 19:35:43 +0100 +Subject: [PATCH] Add missing includes to fix gcc-13 compile error + +--- a/src/support/lockedpool.cpp b/src/support/lockedpool.cpp +@@ -19,6 +19,9 @@ + #endif + + #include ++#include ++#include ++#include + #ifdef ARENA_DEBUG + #include + #include +--- a/src/support/lockedpool.h b/src/support/lockedpool.h +@@ -5,11 +5,11 @@ + #ifndef BITCOIN_SUPPORT_LOCKEDPOOL_H + #define BITCOIN_SUPPORT_LOCKEDPOOL_H + +-#include ++#include + #include + #include +-#include + #include ++#include + #include + + /**
[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
commit: 6fe2ee275a20a9a3178a94e3e79bac481197f828 Author: Sam James gentoo org> AuthorDate: Thu Jan 5 03:30:05 2023 + Commit: Sam James gentoo org> CommitDate: Thu Jan 5 04:37:46 2023 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=6fe2ee27 net-p2p/bitcoind: add 24.0.1 Signed-off-by: Sam James gentoo.org> net-p2p/bitcoind/Manifest | 1 + net-p2p/bitcoind/bitcoind-24.0.1.ebuild | 159 net-p2p/bitcoind/files/24.0.1-syslibs.patch | 281 3 files changed, 441 insertions(+) diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index 0408f94aa093..c33fa9abf302 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -1,4 +1,5 @@ DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871 DIST bitcoin-22.0.knots20211108.patches.tar.xz 1318256 BLAKE2B d6e56bc0ca1d706e99e7f42d8f335f016335b6bf3637c733d993696872f0a4c655cc58fc0394dfdf9916e13f0d7fbdcebf25fbdc9a165227e3c59133033644c0 SHA512 daab5860b7c7e137b6bf350cdc153e6e19172e49935640d1f6fe1f1be1e4df805b1db7fd30b0f95a560106956adab70cc6282fe933ae9de153cb971dd280f83d +DIST bitcoin-24.0.1.tar.gz 11412628 BLAKE2B 2a8c83aecd12d8d40305d78ede1f389884ee62cfe4af39a9b416b8887a595f3393d599ebe9ddeb576bba5896923feb7ee45ba32d7d4cb0ce9e6d0ef39ecf83c7 SHA512 de1ddb543429f70b0b55a46500e0bc4807cca1b1655a28f8ab186d6f6e620f8cf82420bbdf412976ffed9bc6d742926b19933429c734edaf7430a4f8c37e1685 DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f DIST bitcoin-v22.0.tar.gz 7977783 BLAKE2B ba212037bc8efcfbbbf6340c48ed886c4a5aa93e4a34097eafea39734a6f4e25fa6b174f894655f63c504380d8761657771795bfcc641018bf1f1661deef9321 SHA512 1b4b17360e97f390ae678adb7a239c359d3a1288799710683e26f09fc53341b6fca3211465fa3e4fdee37324d85ec1a31ffd1a3714e969df13441f755fa4b7ad diff --git a/net-p2p/bitcoind/bitcoind-24.0.1.ebuild b/net-p2p/bitcoind/bitcoind-24.0.1.ebuild new file mode 100644 index ..edae72c7b9f3 --- /dev/null +++ b/net-p2p/bitcoind/bitcoind-24.0.1.ebuild @@ -0,0 +1,159 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +DB_VER="4.8" +inherit autotools bash-completion-r1 db-use systemd + +DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services" +HOMEPAGE="https://bitcoincore.org/; +SRC_URI=" + https://bitcoincore.org/bin/bitcoin-core-${PV}/${P/d}.tar.gz +" +S="${WORKDIR}"/${P/d} + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+asm +berkdb examples +external-signer nat-pmp sqlite systemtap test upnp +wallet zeromq" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + sqlite? ( wallet ) + berkdb? ( wallet ) + wallet? ( || ( berkdb sqlite ) ) +" +RDEPEND=" + acct-group/bitcoin + acct-user/bitcoin + dev-libs/boost:= + dev-libs/libevent:= + >=dev-libs/libsecp256k1-0.2.0:=[recovery,schnorr] + >=dev-libs/univalue-1.0.4:= + virtual/bitcoin-leveldb + nat-pmp? ( net-libs/libnatpmp ) + sqlite? ( >=dev-db/sqlite-3.7.17:= ) + upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) + berkdb? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] ) + zeromq? ( net-libs/zeromq:= ) +" +DEPEND=" + ${RDEPEND} + systemtap? ( dev-util/systemtap ) +" + +DOCS=( + doc/bips.md + doc/bitcoin-conf.md + doc/descriptors.md + doc/files.md + doc/JSON-RPC-interface.md + doc/psbt.md + doc/reduce-memory.md + doc/reduce-traffic.md + doc/release-notes.md + doc/REST-interface.md + doc/tor.md +) + +PATCHES=( + "${FILESDIR}"/24.0.1-syslibs.patch +) + +pkg_pretend() { + elog "You are building ${PN} from Bitcoin Core." + elog "For more information, see:" + elog "https://bitcoincore.org/en/releases/${PV}/; +} + +src_prepare() { + sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die + + default + + eautoreconf + + rm -r src/leveldb src/secp256k1 || die +} + +src_configure() { + local myeconfargs=( + $(use_enable asm) + --without-qtdbus + $(use_enable systemtap ebpf) + $(use_enable external-signer) + $(use_with nat-pmp natpmp) + $(use_with nat-pmp natpmp-default) +
[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
commit: d00a0f0f3e4e07b0a959d4c1e6588358ef3b4a1b Author: John Helmert III posteo net> AuthorDate: Sun Jan 10 22:03:49 2021 + Commit: Sam James gentoo org> CommitDate: Thu Jan 21 23:22:53 2021 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=d00a0f0f net-p2p/bitcoind: security cleanup Bug: https://bugs.gentoo.org/711198 Package-Manager: Portage-3.0.12, Repoman-3.0.2 Signed-off-by: John Helmert III posteo.net> Signed-off-by: Sam James gentoo.org> net-p2p/bitcoind/Manifest | 6 - net-p2p/bitcoind/bitcoind-0.16.3.ebuild| 153 -- net-p2p/bitcoind/bitcoind-0.19.1.ebuild| 168 net-p2p/bitcoind/bitcoind-0.20.0.ebuild| 171 - .../files/bitcoind-0.16.3-missing-include.patch| 10 -- 5 files changed, 508 deletions(-) diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index caa968a9c39..16d898727cf 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -1,8 +1,2 @@ -DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893 -DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5 -DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92 DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58 -DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d -DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d -DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e diff --git a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild deleted file mode 100644 index 74b734ed258..000 --- a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild +++ /dev/null @@ -1,153 +0,0 @@ -# Copyright 2010-2019 Gentoo Authors -# 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 - -BITCOINCORE_COMMITHASH="49e34e288005a5b144a642e197b628396f5a0765" -KNOTS_PV="${PV}.knots20180918" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/; -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/0.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz -" - -LICENSE="MIT" -SLOT="0" -KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" -IUSE="+asm examples knots libressl test upnp +wallet zeromq" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-group/bitcoin - acct-user/bitcoin - >=dev-libs/boost-1.52.0:=[threads(+)] - dev-libs/libevent:= - >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] -
[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
commit: b3cb7b8967205cf814ab9eadc50aa7466814e4c6 Author: Luke Dashjr utopios org> AuthorDate: Mon May 20 03:38:24 2019 + Commit: Craig Andrews gentoo org> CommitDate: Wed Aug 7 16:27:52 2019 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b3cb7b89 net-p2p/bitcoind: Bump to 0.18.0 Closes: https://bugs.gentoo.org/685912 Signed-off-by: Luke Dashjr utopios.org> Signed-off-by: Craig Andrews gentoo.org> net-p2p/bitcoind/Manifest | 2 + net-p2p/bitcoind/bitcoind-0.18.0.ebuild| 173 + net-p2p/bitcoind/files/0.18.0-daemon-fix.patch | 12 ++ .../bitcoind-0.18.0-raii_event_tests-always.patch | 70 + 4 files changed, 257 insertions(+) diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index c3a90d5a2b6..6498fdc5f9f 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -1,4 +1,6 @@ DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893 DIST bitcoin-0.17.1.knots20181229.patches.tar.xz 475988 BLAKE2B ce19ccbbeaac48f24b2833858a186494f84cb54ac380c42104f4d16b0a6acb44bc7a83c1b11311e2c566326d7067530ea5f34404def5f22b4825e2fa15aca22d SHA512 da89f9510ee523c712aa137512dda752ab8d115eb8a45a999aa742555621f557694db34162a1f6979922268a3e22563883ea6d9d9a47e5c7613235c0ff06fda0 +DIST bitcoin-0.18.0.knots20190502.patches.tar.xz 400252 BLAKE2B 0303bba89b3595a115ec8e5e743c362fc5feb0072ae493455cf3bcf1085b7f44d6b10142c05cb7ea59fadc630095de3a5f648007eb28f79551f2415db5c4f560 SHA512 b4c30c63cb6c770e04abd18e626db6e095b0d8b5aaf59e64b55eb8e19d4fdb559a3a2b939ab0e09967b4d3465b560e1379fa21b8efb3f25c22f84a2a1c655d16 DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d DIST bitcoin-v0.17.1.tar.gz 6224852 BLAKE2B efc86768ee2d23db83496ff9e62bc86d10c4d24a7343f4c706a4d336aeb94087b2d496db53e393beb5a9dc228bb9fe957ca89254c2fdaf9980b03029efbac2f8 SHA512 ef911ac6b49075a4f3d8db7f9f4dc59590d49847006fa36d7b8cce1634945d418accd95b12da505df38314fb7768f544863169d4b26b230e88dd627a83947466 +DIST bitcoin-v0.18.0.tar.gz 6533794 BLAKE2B 0eb7830e215757efb024be7aff73108c4a8e2f80a204ca71f1b3b6015933a1ab740ad006e58c473c4b9609b3e47885ba6564472a3514335ab6d7f99d32903822 SHA512 a2e38754d459fac0786eaa43f23c62ee326167f325d98964546217bcdc4f68ab88314bfb674ca4efd4cbc21fc3950bd029e1375ee101e0c72bbae7197fc31cf2 diff --git a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild new file mode 100644 index 000..813f8093491 --- /dev/null +++ b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild @@ -0,0 +1,173 @@ +# Copyright 1999-2019 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +DB_VER="4.8" +inherit autotools bash-completion-r1 db-use systemd user + +BITCOINCORE_COMMITHASH="2472733a24a9364e4c6233ccd04166a26a68cc65" +KNOTS_PV="${PV}.knots20190502" +KNOTS_P="bitcoin-${KNOTS_PV}" + +DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services" +HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/; +SRC_URI=" + https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz + https://bitcoinknots.org/files/0.18.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz +" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +IUSE="+asm +bitcoin_policy_rbf examples knots libressl +system-leveldb test upnp +wallet zeromq" + +DEPEND=" + >=dev-libs/boost-1.52.0:=[threads(+)] + dev-libs/libevent:= + >=dev-libs/libsecp256k1-0.0.0_pre20151118:=[recovery] + >=dev-libs/univalue-1.0.4:= + system-leveldb? ( virtual/bitcoin-leveldb ) + !libressl? ( dev-libs/openssl:0=[-bindist] ) + libressl? ( dev-libs/libressl:0= ) + upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) + wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] ) + zeromq? ( net-libs/zeromq:= ) +" +RDEPEND="${DEPEND}" + +DOCS=( doc/bips.md doc/bitcoin-conf.md doc/descriptors.md doc/files.md doc/JSON-RPC-interface.md doc/psbt.md doc/reduce-traffic.md doc/release-notes.md doc/REST-interface.md doc/tor.md ) + +S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" + +PATCHES=( + "${FILESDIR}/${P}-raii_event_tests-always.patch" +) + +pkg_pretend() { + if use knots; then + elog "You are building ${PN} from Bitcoin Knots." + elog "For more
[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
commit: 4909efc24359126a7d86a755d874979d5b63ced3 Author: Luke DashjrAuthorDate: Tue Jan 23 04:03:32 2018 + Commit: Thomas Deutschmann gentoo org> CommitDate: Tue Jan 23 10:37:02 2018 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4909efc2 net-p2p/bitcoind-0.15.1: Fix tests Closes: https://github.com/gentoo/gentoo/pull/6934 Closes: https://bugs.gentoo.org/645250 net-p2p/bitcoind/bitcoind-0.15.1.ebuild| 4 +++- .../files/bitcoind-0.15.1-test-build-fix.patch | 24 ++ .../files/bitcoind-0.15.1-test-util-fix.patch | 15 ++ 3 files changed, 42 insertions(+), 1 deletion(-) diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild index 3ada285926e..3d8c5eb306c 100644 --- a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild +++ b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild @@ -1,4 +1,4 @@ -# Copyright 2010-2017 Gentoo Foundation +# Copyright 2010-2018 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 EAPI=6 @@ -74,11 +74,13 @@ src_prepare() { 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 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 new file mode 100644 index 000..3d953d9c0a9 --- /dev/null +++ b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch @@ -0,0 +1,24 @@ +commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD) +Author: Luke Dashjr +Date: Tue Jan 23 03:37:10 2018 + + +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 new file mode 100644 index 000..60fc9d84905 --- /dev/null +++ b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch @@ -0,0 +1,15 @@ +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
[gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/, net-p2p/bitcoind/files/
commit: f31189f83957e3a5cbb52b4ec285582b49b5a926 Author: Andreas Sturmlechner gentoo org> AuthorDate: Sun Jan 22 20:51:33 2017 + Commit: Andreas Sturmlechner gentoo org> CommitDate: Tue Jan 24 01:17:22 2017 + URL:https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=f31189f8 net-p2p/bitcoind: Drop old Package-Manager: portage-2.3.0 net-p2p/bitcoind/Manifest | 19 -- net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild| 80 --- net-p2p/bitcoind/bitcoind-0.10.2.ebuild | 78 -- net-p2p/bitcoind/bitcoind-0.11.0.ebuild | 76 - net-p2p/bitcoind/bitcoind-0.11.1.ebuild | 68 --- net-p2p/bitcoind/bitcoind-0.11.2.ebuild | 71 net-p2p/bitcoind/bitcoind-0.12.0.ebuild | 70 net-p2p/bitcoind/bitcoind-0.12.1.ebuild | 70 net-p2p/bitcoind/files/0.10.0-openrc-compat.patch | 24 --- net-p2p/bitcoind/files/bitcoind.logrotate | 7 -- net-p2p/bitcoind/files/miniupnpc-14.patch | 28 net-p2p/bitcoind/metadata.xml | 6 -- 12 files changed, 597 deletions(-) diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index a69baa0..1a8817d 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -1,25 +1,6 @@ -DIST bitcoin-0.10.1.ljr20150428.patches.tar.xz 34980 SHA256 f3770c478bd541fcc75c1f64664ae810aa67da7535f11859034dcc7067546713 SHA512 edf7c8aa81c8890da61224eddde61cec62058514fa76a50ab25cc7db272f6c656f5c46f8b9468f6059eb7c1be624de834867c0a7c1c2559a5231b763e40c13a2 WHIRLPOOL 2b8d878bf3d599393da177403e2199e63bb2634d14438079b5c8821c07441e26fb8b5cd150281c9923534f474763d9f3c2cab9424ab7a319de059c1b3bb49c4e -DIST bitcoin-0.11.0.ljr20150711.patches.tar.xz 79740 SHA256 2f9608ee18f10fccaeda239baf82fd74180a562eb92aec72f7959c7211228bbb SHA512 cafa5cf0b7a56894b07e949bb401016c46456f6043da86f54023f930e9836a420c88ca9e94067edcf2150495cb637b1938478332f7f7669394ea90351f3b4623 WHIRLPOOL 1bab46c50b7bc8709359ea98a9a75f4b476dd81540421f6696b4085f4acf8fd3d040e591230df1f83625ada89d0d178040f747ae02f76d1dd73787c86e73dac4 -DIST bitcoin-0.11.1.ljr20150921.patches.tar.xz 85116 SHA256 b8f7912a90f74dbd710f769e2d5df79ad494caef98a34ddd08496870d8826cd8 SHA512 f428fbd726cba8f82a0afe1dd09bed477896c7186770eb0da53e12f342d5dc260419c2c216d8fdad5038a18d88ca746b9c275d50659fbefc6d2b456ce8e5aade WHIRLPOOL de1a89142bcb2a6df11466cc497ff6d6d599cdca909c14b713dd5579e243fb27fdd0baeb3de4205645fa34bf403cc3b3d50137a45be62955382f038146586c3a -DIST bitcoin-0.11.2.ljr20151118.patches.tar.xz 98552 SHA256 de44c8604de476d282820c2419ccbba3bef3eb054887cdd16b0ab4e7ff450dcb SHA512 283d0b6550fa1c6d2347e146c350b2afb9d7ca0c2e8ad150a8dcb6c0522abd17ca31ba8dcdee7e2d7020561be6e8bdc9bd33f7d21e7901ca675ff990441a97ef WHIRLPOOL 24f25ba32d1c22e1e795aba13e202af661b9e23992b633382cdd62953d744862901494726c36075eb0ae186bd6e60e4c15148e0f46a2401efffa1b419b4d2390 -DIST bitcoin-0.12.0.knots20160226.rc1.patches.tar.xz 145776 SHA256 93431aa2c1d66c41d52bbf8810df27228f5a0823db2416312d6e07a20dc78dea SHA512 042c02dc64591f4edbad1cc421ee90e84d628f93292fd42b190728960a65eb76d0234d821ce2df92a3a66328a5368b5b42670ebf130045d92d74d74287a90990 WHIRLPOOL b4543468936c6e16a8636c2eaed1d6f76a20958c2f2fda6f9c6a389cc79111369d906c08878e3eb7b2d6bad8299e3e16ad38a190dab80996f63adfda8c1c93f2 -DIST bitcoin-0.12.1.knots20160629.rc2.patches.tar.xz 283700 SHA256 9bc8ff0946dfcd10d82b0f9ce3b509b23da244cddc3707013a9a8eebe64df1af SHA512 25860908625d8e501e079e0cbb946432ca086edcacdcb59dc81d49eac309bfb70e4c4701aeb0d45cd51ffbebead4f211590b4870dff22c2886c949fd8e600643 WHIRLPOOL da6c35551e87da57a4d0d67ee12e239638b02b634c4fc2c08912a1b56dd6348f595929af03719238d7bfc8f4e490b39672cc7671ec1c84f8c36b77a8f37fe643 DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 SHA256 be92292d55e624ce8494210a51d6228f20d3f7b5ee2faf4185ba326a5f18fd30 SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2 WHIRLPOOL c41dbadc730f1b8df2244dd294c63a1989ebaf4bc2057435eeb0743555345a6158c36b34589427c22eb717af9358096fb6ab3dd851fffc5cafafa76c812b7fd8 DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 SHA256 b3242fa3bf7959de31aba47b4124e582d0a3d2924a5fe48f91676ef586a5d2f0 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6 WHIRLPOOL 768d3d1fdfe15d5d36d3d724224e3e33da5292764b3264bba89e3186e03d05cf57e957c071850bacc0fb49c7aae6cfd01bb649ffd82acfa4cfe695ef4b7e3b43 DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 SHA256 837dbc5a69a25a844681971e3b5bc22c93655e893fc579094556c10bc038488a SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061 WHIRLPOOL