From bc5dfb0671fb08c7da579b38b0e6abdd19da103f Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Fri, 15 Mar 2024 06:47:25 +0000 Subject: gentoo auto-resync : 15:03:2024 - 06:47:25 --- net-p2p/Manifest.gz | Bin 6914 -> 6916 bytes net-p2p/bitcoin-core/Manifest | 7 +- net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild | 424 ---------------------- net-p2p/bitcoin-core/bitcoin-core-26.1_rc2.ebuild | 424 ++++++++++++++++++++++ net-p2p/bitcoin-core/bitcoin-core-27.0_rc1.ebuild | 424 ++++++++++++++++++++++ net-p2p/bitcoin-core/files/27.0-syslibs.patch | 296 +++++++++++++++ 6 files changed, 1149 insertions(+), 426 deletions(-) delete mode 100644 net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild create mode 100644 net-p2p/bitcoin-core/bitcoin-core-26.1_rc2.ebuild create mode 100644 net-p2p/bitcoin-core/bitcoin-core-27.0_rc1.ebuild create mode 100644 net-p2p/bitcoin-core/files/27.0-syslibs.patch (limited to 'net-p2p') diff --git a/net-p2p/Manifest.gz b/net-p2p/Manifest.gz index cc848bfd4a10..ceb80f54ef1b 100644 Binary files a/net-p2p/Manifest.gz and b/net-p2p/Manifest.gz differ diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest index 82e8cc705076..db9f4284d281 100644 --- a/net-p2p/bitcoin-core/Manifest +++ b/net-p2p/bitcoin-core/Manifest @@ -1,6 +1,7 @@ AUX 25.0-syslibs.patch 9154 BLAKE2B 6056ffa707c26dab36bdd885ff87fadda4ee5b3a0cb022fa22bd456636f2f8a6bcc2a660664d9debe95bc53b2636aa3418076f97f46bb7801d50a7a40357206e SHA512 5e593e8c18e281dccb40a303d832481d43553d086f7b7a3fcc1c9a823cda88889e7fe51473c049d57a3a2b2c49b7107febafcc60de12b1d91acc1134cb0377d9 AUX 26.0-init.patch 6487 BLAKE2B 22e7934a4eebc7cefa1ad0db7273f95a74e4e2605d9cc816267a74e030a531177ceec0bf1ffcdb1d31481073aa03474b83b7eb36e2d0ca50bc417f9f1ccdf1a5 SHA512 53994b0f1ad315e5dc490b3d3f1e0cfc692b2cb0ac1be10feb25395083f57a5c5a28df3035808ee83cd7c1769d5fb3e6c7ae9281dbee55bd5d12fac30f18b2fa AUX 26.0-syslibs.patch 10109 BLAKE2B 0273b5c0a65fed9321b6af0196f4c5f80048eb5ff992cdd373999d0c29654f507b13556225c8b6ad1a71f512b4835ff133f55c5478755a1c2c567a2fb8e58e57 SHA512 42f071d8040cf68231a11ab296ea09b1f5cd658f4103aa1e07848ed63a6963e004570a121564da43079fb1830cd3f6c5ed865e1f8102a7050cb7c2aeca8b256d +AUX 27.0-syslibs.patch 10150 BLAKE2B 4a6d15467f3893ee95a6fb33ec1e9f7725934e711033eff15fe41fc421724e6ff190bee854caf03edfd0d07e974ec363ba4c9ee6f3dc873a9acca1780ac13009 SHA512 25546325c758a812ac018ee14021ff2605ff904af5f4c0f6fe6c9694191c5127cf8957080309ecfcee9f4173a6ee8dabba9f88a0b2f6592e7a7e2c45c706e29b AUX bitcoin-qt.protocol 150 BLAKE2B b18645f52a6884fc0e475a85809d5b79e207adc346307623c5f1edececcb4564ac17bdb9a0deeb5c12c41409a34f83c1f22ab89f32852c58d948affa1de57edb SHA512 6b71d9d3fc9e05e6c6595aaaa307be9b5007c25f4b11162c5d873e200576d35156c2c660f229799400a3fba6dc8a9663ff8824371d83242d52ee6472687118ab AUX bitcoind.logrotate-r1 113 BLAKE2B ad27bb7f4f136c17117ca1f149b504da13f7a4ed1f7dce04f1ada2723a8900e94a0e2611aaa0f6d7545fc11d5ca3ecd6925e41875a2c3ed8a4f3e778bfcfb2a4 SHA512 51c77cddd6ff1c852112669b0c4180b04a6a91d8bfdce9d1df6560ac5ef5ebdfcc3998d81a0a47f24834b7314fe132fd9e90386c7eb8933b9c14d59bcc95d876 AUX bitcoind.openrc 2690 BLAKE2B ef44f88f5d03e488ba4793954ff22949fdb293fac64c4264041a7ccd3e261e98ee0d8037f1b4f851a0753295a44168f9ed352a3d09b423d52ffa289fdf7fd1e1 SHA512 827f049acdfff90b3d7dc211a199e86c66c59780a0590d586b1cedf164bfdfc73223b3881001b75d3bc9e5350e41f08a867f3d8fb8b154b284e4ddb90f9c2dd9 @@ -9,9 +10,11 @@ AUX org.bitcoin.bitcoin-qt.desktop 465 BLAKE2B 7ce8818cd967e478e6d41106b7111616b DIST bitcoin-25.1.tar.gz 12498596 BLAKE2B e8e4ea99cb40db420033c4df75e985af93cbb64f9862376e2de1a0731b4aeafbf43a95b33770e882ad77b73e454d48dbd5744902c78ade2b965e3d2d4e4b4656 SHA512 310e5d976a062496d2b99d0e64c4d5d2b536a747901e887f85b75151d94237f0de800163b534c812d390eb5e93b3f7284cd7f71843ec35e891f34634b6b142ab DIST bitcoin-26.0.tar.gz 12753904 BLAKE2B 35b5d40390dc5eab18a12b0f120619d40d9d0eaf4a59f5ed943a59189c0ede5d78207b7606f1c3490b90f14c17e87882242d6637fdc348005a6f60a1d8202d13 SHA512 31b7bc66b43d073611ccf19adc80a4dd3ce3a4b5cf4c8b814f4be9e771e88721d20ae0aa83d89cd8d55ffaf0853444479932b425e82081fd66bb037c6b53e4a8 DIST bitcoin-core-25.2_rc1.tar.gz 12499745 BLAKE2B db05eb84f80aebfcbb269367ac95f8e9f710210ddb99ea44755344260be3000e0c41cf9e458fb66288f8e206a376f63b2e486ff430daee4719d201b2c18f435e SHA512 40c1b13f887d7229742155d48946e42adedf1431d92acc322426a4df38625f7acabff226a70d2a864ea12d34a16b67d657db3274891c313534c46f64e7b07a3a -DIST bitcoin-core-26.1_rc1.tar.gz 12816436 BLAKE2B 05a3c774901f75368a42f4f81b2dcf181efc1db4f82b230bca1c5f78ee9a310e00654960fdab368eb169bbc283628f9c5a020d1e7c7abcad6fe15ca4feba01c5 SHA512 5f93bc3061e93c57d65c00c458c39ede19e1908a25804b2191ed4866a7cf92438b068de15e8685a37d38608d750be3ce64d3e7cc22418e27b47ed65d9bcb7557 +DIST bitcoin-core-26.1_rc2.tar.gz 12823146 BLAKE2B 92d193936475fd2bf8f4cb2e823546a5b51722dd80e035fbbdd1e501b9d65cfcc25f2ff60afd0702030c57e572af92bc16eae1a9a27aad7d588b5f4e77697b8c SHA512 4d77fd5fa05b53be0a0b67f6c999fedfec28c7264ed65e6173a7ab9fe1586bfc4d7947fca2a7466dbd23ebb771da5cfb6383f072f15120b2645ad8430647a5bf +DIST bitcoin-core-27.0_rc1.tar.gz 13084690 BLAKE2B c4fe8de0ae8e46a5ce9f00ef0274a1ddb7bc6c448b467224375fe5f317e3af0a12a53b704b56ed4f77cfd3efd043349905e72ada1cc12db82e72be5e07374d17 SHA512 515fb0ad1dfce7d1a3b580a0200cebe6a51a267210c1218e6c601048c3ce64be52e20aa662f97183deb9d0e4e36ac23fe989f8189458c9755000c02c825353fc EBUILD bitcoin-core-25.1-r2.ebuild 12629 BLAKE2B ca23ce3077968fd5be33f331ca0ca56414a7cbedc8be85dd495f5a4da7d15317dcae5fbc3ba493e43cd77e43208650ba8d8a7c5185e4f04bb897594ca70e1396 SHA512 8dd9d7a39fa36ed915577f52e08cf9af1c2bf4acc04cf8a0f84f1409ebd88e24cb7252ab68aff7c307e9a979742890d61919551f78390852f77735a703602088 EBUILD bitcoin-core-25.2_rc1.ebuild 12845 BLAKE2B 85749f2ad79af48347c65ef114d4a2406538fc7c7faa704b610e8cb3abcf96df7961ee2b97eaec59745258f6ed782d5109417ac478fd4d832ad124b4981435dd SHA512 8cdd2c497a25bf47cdf78c0ec2cc82f2092c1a8fd331d631f44b92d9cda246ec8c9607b609ff7e00d8eee1cf82087644bda55fddf95c42e537d25468c7916301 EBUILD bitcoin-core-26.0-r1.ebuild 13052 BLAKE2B 6f4863f10ac953c7b9520463cafc139f5b4cfa3fc0f36e0ac8bc4c8a761e3bc40d1742d5ba28169f94412cf4163b29e89319b511f19e9cdcb5b1df28f4e95401 SHA512 2a7abe6b9916a42165578e45e72be33f3a408224e400d45a47bb825be3cac0494829daf512f241d92ab2983db5f646222cfe429da4e1012d56641f4315e99f67 -EBUILD bitcoin-core-26.1_rc1.ebuild 13104 BLAKE2B efd0c9acecb52a1ee8a5de0ee21b21301cb1f55681c749516e93f78e7008841cad502f1e89fd2a9cdca057608b3b4680a86c81e5acfa0a906a370d3b61f3d2c2 SHA512 198dac6e37f5ebca036a4c99109561979d22cd28101fa5978b6b79733e9c564ab6c8a2d1cde6e3974dd8a2f237dee95d6ffed3674d6637065e01b697bdb1a46c +EBUILD bitcoin-core-26.1_rc2.ebuild 13104 BLAKE2B efd0c9acecb52a1ee8a5de0ee21b21301cb1f55681c749516e93f78e7008841cad502f1e89fd2a9cdca057608b3b4680a86c81e5acfa0a906a370d3b61f3d2c2 SHA512 198dac6e37f5ebca036a4c99109561979d22cd28101fa5978b6b79733e9c564ab6c8a2d1cde6e3974dd8a2f237dee95d6ffed3674d6637065e01b697bdb1a46c +EBUILD bitcoin-core-27.0_rc1.ebuild 13104 BLAKE2B e5365f234a05d3941beb0698205927d524ea4092f2afc8d325a15c8c76f0576ba92524c0b8fbc0fd1978128273c2db9fe3ba24e708648e4e3b6dce89c8a4062e SHA512 6a889701455cf67ee9f049bf5d533bccb681a38d2c6dfe85481f812113cd5c644ceaeca1296fbd71684c35dac3a1e99658525d7fdf6e6ccf13e771c45be13c1a MISC metadata.xml 1652 BLAKE2B 7d0646991b669df16ef19516b3fdc177379cae6388fdb67e365abe6db7f79888d934ef55f6e03cb8943b30d4f0cd29d4f2a0c03db7702a5167648a18c3218732 SHA512 1f4c73c07f874c322a99f8c929fceacb52fb2fc7be3475ec49512edd7f29e2fb8f58a04760f4b43e483181039ece66779b87f5dc77cdd14c465ce0ffb5d5bd8a diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild deleted file mode 100644 index cf31b6360f4b..000000000000 --- a/net-p2p/bitcoin-core/bitcoin-core-26.1_rc1.ebuild +++ /dev/null @@ -1,424 +0,0 @@ -# Copyright 1999-2024 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -PYTHON_COMPAT=( python3_{10..12} ) - -inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd toolchain-funcs xdg-utils - -DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency" -HOMEPAGE="https://bitcoincore.org/" -SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz" -S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}" - -LICENSE="MIT" -SLOT="0" -if [[ "${PV}" != *_rc* ]] ; then - KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -fi -# IUSE="+cli" doesn't work due to https://bugs.gentoo.org/831045#c3 -IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer gui kde libs +man nat-pmp +qrcode +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - dbus? ( gui ) - kde? ( gui ) - qrcode? ( gui ) - system-leveldb? ( || ( daemon gui ) ) -" -# dev-libs/univalue is now bundled, as upstream dropped support for system copy -# and their version in the Bitcoin repo has deviated a fair bit from upstream. -# Upstream also seems very inactive. -RDEPEND=" - !dev-util/bitcoin-tx - >=dev-libs/boost-1.81.0:= - >=dev-libs/libevent-2.1.12:= - berkdb? ( >=sys-libs/db-4.8.30:$(db_ver_to_slot 4.8)=[cxx] ) - bitcoin-cli? ( !net-p2p/bitcoin-cli ) - daemon? ( - !net-p2p/bitcoind - acct-group/bitcoin - acct-user/bitcoin - ) - gui? ( - !net-p2p/bitcoin-qt - >=dev-qt/qtcore-5.15.10:5 - >=dev-qt/qtgui-5.15.10:5 - >=dev-qt/qtnetwork-5.15.10:5 - >=dev-qt/qtwidgets-5.15.10:5 - dbus? ( >=dev-qt/qtdbus-5.15.10:5 ) - ) - libs? ( !net-libs/libbitcoinconsensus ) - nat-pmp? ( >=net-libs/libnatpmp-20220705:= ) - qrcode? ( >=media-gfx/qrencode-4.1.1:= ) - sqlite? ( >=dev-db/sqlite-3.38.5:= ) - system-leveldb? ( virtual/bitcoin-leveldb ) - system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.4.0:=[ellswift,extrakeys,recovery,schnorr] ) - upnp? ( >=net-libs/miniupnpc-2.2.2:= ) - zeromq? ( >=net-libs/zeromq-4.3.4:= ) -" -DEPEND=" - ${RDEPEND} - systemtap? ( >=dev-debug/systemtap-4.8 ) -" -BDEPEND=" - virtual/pkgconfig - daemon? ( - acct-group/bitcoin - acct-user/bitcoin - ) - gui? ( >=dev-qt/linguist-tools-5.15.10:5 ) - test? ( ${PYTHON_DEPS} ) -" -IDEPEND=" - gui? ( dev-util/desktop-file-utils ) -" - -DOCS=( - doc/bips.md - doc/bitcoin-conf.md - doc/descriptors.md - doc/files.md - doc/i2p.md - doc/JSON-RPC-interface.md - doc/multisig-tutorial.md - doc/p2p-bad-ports.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}/26.0-syslibs.patch" - "${FILESDIR}/26.0-init.patch" -) - -efmt() { - : ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}") -} - -pkg_pretend() { - if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then - efmt ewarn <<-EOF - You are enabling neither USE="daemon" nor USE="gui". This is a valid - configuration, but you will be unable to run a Bitcoin node using this - installation. - EOF - fi - if use daemon && ! use bitcoin-cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli]" ; then - efmt ewarn <<-EOF - You are enabling USE="daemon" but not USE="bitcoin-cli". This is a valid - configuration, but you will be unable to interact with your bitcoind node - via the command line using this installation. - EOF - fi - if ! use berkdb && ! use sqlite && - { { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } || - { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; } - then - efmt ewarn <<-EOF - You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid - configuration, but your Bitcoin node will be unable to open any wallets. - EOF - fi - - # test/functional/feature_pruning.py requires 4 GB disk space - # test/functional/wallet_pruning.py requires 1.3 GB disk space - use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend -} - -pkg_setup() { - if use test ; then - CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup - python-any-r1_pkg_setup - fi -} - -src_prepare() { - default - ! use system-leveldb || rm -r src/leveldb || die - if use system-libsecp256k1 ; then - rm -r src/secp256k1 || die - sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die - else - pushd src/secp256k1 >/dev/null || die - AT_NOELIBTOOLIZE=yes eautoreconf - popd >/dev/null || die - fi - eautoreconf - - # we say --disable-util-util, so we can't test bitcoin-util - sed -ne '/^ {/{h;:0;n;H;/^ }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \ - -i test/util/data/bitcoin-util-test.json || die - - sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \ - -i contrib/completions/bash/bitcoind.bash || die -} - -src_configure() { - local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi - local myeconfargs=( - --disable-static - --${wallet}-wallet - $(use_with sqlite) - $(use_with berkdb bdb) - $(use_enable systemtap usdt) - $(use_with upnp miniupnpc) - $(use_with nat-pmp natpmp) - $(use_enable test tests) - --disable-bench - --disable-fuzz{,-binary} - $(use_with qrcode qrencode) - --disable-ccache - $(use_enable asm) - $(use_enable zeromq zmq) - $(use_enable man) - $(use_enable external-signer) - --with-utils - $(use_enable {bitcoin,util}-cli) - --enable-util-tx - --${wallet}-util-wallet - --disable-util-util - $(use_with libs) - $(use_with daemon) - $(use_with gui gui qt5) - $(use_with dbus qtdbus) - $(use_with system-leveldb) - $(use_with system-libsecp256k1) - ) - econf "${myeconfargs[@]}" -} - -src_compile() { - default - - if use daemon && ! tc-is-cross-compiler ; then - TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die - fi - sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \ - -ni share/examples/bitcoin.conf || die -} - -src_test() { - emake check - - use daemon && edo "${PYTHON}" test/functional/test_runner.py \ - --ansi --extended --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}" -} - -src_install() { - use external-signer && DOCS+=( doc/external-signer.md ) - use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md ) - use libs && DOCS+=( doc/shared-libraries.md ) - use systemtap && DOCS+=( doc/tracing.md ) - use zeromq && DOCS+=( doc/zmq.md ) - - if use daemon ; then - # https://bugs.gentoo.org/757102 - DOCS+=( share/rpcauth/rpcauth.py ) - docompress -x "/usr/share/doc/${PF}/rpcauth.py" - fi - - default - - find "${ED}" -type f -name '*.la' -delete || die - ! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die - - newbashcomp contrib/completions/bash/bitcoin-tx.bash bitcoin-tx - use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash bitcoin-cli - if use daemon ; then - newbashcomp contrib/completions/bash/bitcoind.bash bitcoind - use gui && bashcomp_alias bitcoind bitcoin-qt - elif use gui ; then - newbashcomp contrib/completions/bash/bitcoind.bash bitcoin-qt - fi - - if use daemon ; then - insinto /etc/bitcoin - doins share/examples/bitcoin.conf - fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf - fperms 0660 /etc/bitcoin/bitcoin.conf - - newconfd contrib/init/bitcoind.openrcconf bitcoind - newinitd "${FILESDIR}/bitcoind.openrc" bitcoind - systemd_newunit contrib/init/bitcoind.service bitcoind.service - - keepdir /var/lib/bitcoind - fperms 0750 /var/lib/bitcoind - fowners bitcoin:bitcoin /var/lib/bitcoind - dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf - - insinto /etc/logrotate.d - newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind - fi - - if use gui ; then - insinto /usr/share/icons/hicolor/scalable/apps - newins src/qt/res/src/bitcoin.svg bitcoin128.svg - - domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop" - - if use kde ; then - insinto /usr/share/kservices5 - doins "${FILESDIR}/bitcoin-qt.protocol" - fi - fi - - if use examples ; then - docinto examples - dodoc -r contrib/{linearize,qos} - use zeromq && dodoc -r contrib/zmq - fi -} - -pkg_preinst() { - if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then - if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then - dosym -r /var/lib/bitcoin{d,/.bitcoin} - elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then - efmt ewarn <<-EOF - Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin, - a deprecated location. To perform an automated migration to - ${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances - that may be using the deprecated path, and then run: - - # emerge --config ${CATEGORY}/${PN} - EOF - insinto /var/lib/bitcoin - mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die - dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf - dosym -r /var/lib/bitcoin{/.bitcoin,d} - fi - fi - - if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then - dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol - fi -} - -pkg_postinst() { - # we don't use xdg.eclass because it adds unconditional IDEPENDs - if use gui ; then - xdg_desktop_database_update - xdg_icon_cache_update - fi - - if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then - efmt -su elog <<-EOF - To have ${PN} automatically use Tor when it's running, be sure your \ - 'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \ - correctly, and: - - Using an init script: add the 'bitcoin' user to the 'tor' user group. - - Running bitcoind directly: add that user to the 'tor' user group. - EOF - fi - - if use bitcoin-cli && use daemon ; then - efmt -su elog <<-EOF - To use bitcoin-cli with the /etc/init.d/bitcoind service: - - Add your user(s) to the 'bitcoin' group. - - Symlink ~/.bitcoin to /var/lib/bitcoind. - EOF - fi - - if use berkdb ; then - # https://github.com/bitcoin/bitcoin/pull/28597 - # https://bitcoincore.org/en/releases/26.0/#wallet - efmt ewarn <<-EOF - Creation of legacy (Berkeley DB) wallets is refused starting with Bitcoin - Core 26.0, pending the deprecation and eventual removal of support for - legacy wallets altogether in future releases. At present you can still - force support for the creation of legacy wallets by adding the following - line to your bitcoin.conf: - - deprecatedrpc=create_bdb - EOF - fi -} - -pkg_postrm() { - if use gui ; then - xdg_desktop_database_update - xdg_icon_cache_update - fi -} - -pkg_config() { - if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] && - [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] - then - in_use() { - : ${1:?} ; local each - if command -v fuser >/dev/null ; then - fuser "${@}" >/dev/null 2>&1 - elif command -v lsof >/dev/null ; then - for each ; do - lsof -- "${each}" && return - done >/dev/null 2>&1 - elif mountpoint -q /proc ; then - { find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} + - awk '{ print $6 }' /proc/[0-9]*/maps - } 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}") - else - return 13 - fi - } - ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use" - in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock} - case $? in - 0) - eend 1 - efmt eerror <<-EOF - ${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any - running bitcoind instances that may be using this data directory, and then - retry this migration. - EOF - die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" - ;; - 13) - eend 1 - if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then - efmt eerror <<-EOF - Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use. - Do you have /proc mounted? To force the migration without checking, re-run - this command with BITCOIND_IS_NOT_RUNNING=1. - EOF - die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" - fi - ;; - *) - eend 0 - ;; - esac - - # find all relative symlinks that point outside the data dir - local -A symlinks - cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die - local each ; while read -r -d '' each ; do - local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] && - target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] && - symlinks["${each}"]="${target}" - done < <(find -type l -print0) - - einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." - rm -f -- "${EROOT}/var/lib/bitcoind" || die - mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} || - die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." - - # fix up the relative symlinks - cd -- "${EROOT}/var/lib/bitcoind" || die - for each in "${!symlinks[@]}" ; do - ln -fnrs -- "${symlinks[${each}]}" "${each}" # keep going even if this fails - done - - einfo 'Creating a transitional symlink for your convenience.' - ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin} - einfo 'You may remove this link when you no longer need it.' - else - einfo 'Nothing to do.' - fi -} diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.1_rc2.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.1_rc2.ebuild new file mode 100644 index 000000000000..cf31b6360f4b --- /dev/null +++ b/net-p2p/bitcoin-core/bitcoin-core-26.1_rc2.ebuild @@ -0,0 +1,424 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd toolchain-funcs xdg-utils + +DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency" +HOMEPAGE="https://bitcoincore.org/" +SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}" + +LICENSE="MIT" +SLOT="0" +if [[ "${PV}" != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +fi +# IUSE="+cli" doesn't work due to https://bugs.gentoo.org/831045#c3 +IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer gui kde libs +man nat-pmp +qrcode +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + dbus? ( gui ) + kde? ( gui ) + qrcode? ( gui ) + system-leveldb? ( || ( daemon gui ) ) +" +# dev-libs/univalue is now bundled, as upstream dropped support for system copy +# and their version in the Bitcoin repo has deviated a fair bit from upstream. +# Upstream also seems very inactive. +RDEPEND=" + !dev-util/bitcoin-tx + >=dev-libs/boost-1.81.0:= + >=dev-libs/libevent-2.1.12:= + berkdb? ( >=sys-libs/db-4.8.30:$(db_ver_to_slot 4.8)=[cxx] ) + bitcoin-cli? ( !net-p2p/bitcoin-cli ) + daemon? ( + !net-p2p/bitcoind + acct-group/bitcoin + acct-user/bitcoin + ) + gui? ( + !net-p2p/bitcoin-qt + >=dev-qt/qtcore-5.15.10:5 + >=dev-qt/qtgui-5.15.10:5 + >=dev-qt/qtnetwork-5.15.10:5 + >=dev-qt/qtwidgets-5.15.10:5 + dbus? ( >=dev-qt/qtdbus-5.15.10:5 ) + ) + libs? ( !net-libs/libbitcoinconsensus ) + nat-pmp? ( >=net-libs/libnatpmp-20220705:= ) + qrcode? ( >=media-gfx/qrencode-4.1.1:= ) + sqlite? ( >=dev-db/sqlite-3.38.5:= ) + system-leveldb? ( virtual/bitcoin-leveldb ) + system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.4.0:=[ellswift,extrakeys,recovery,schnorr] ) + upnp? ( >=net-libs/miniupnpc-2.2.2:= ) + zeromq? ( >=net-libs/zeromq-4.3.4:= ) +" +DEPEND=" + ${RDEPEND} + systemtap? ( >=dev-debug/systemtap-4.8 ) +" +BDEPEND=" + virtual/pkgconfig + daemon? ( + acct-group/bitcoin + acct-user/bitcoin + ) + gui? ( >=dev-qt/linguist-tools-5.15.10:5 ) + test? ( ${PYTHON_DEPS} ) +" +IDEPEND=" + gui? ( dev-util/desktop-file-utils ) +" + +DOCS=( + doc/bips.md + doc/bitcoin-conf.md + doc/descriptors.md + doc/files.md + doc/i2p.md + doc/JSON-RPC-interface.md + doc/multisig-tutorial.md + doc/p2p-bad-ports.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}/26.0-syslibs.patch" + "${FILESDIR}/26.0-init.patch" +) + +efmt() { + : ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}") +} + +pkg_pretend() { + if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then + efmt ewarn <<-EOF + You are enabling neither USE="daemon" nor USE="gui". This is a valid + configuration, but you will be unable to run a Bitcoin node using this + installation. + EOF + fi + if use daemon && ! use bitcoin-cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli]" ; then + efmt ewarn <<-EOF + You are enabling USE="daemon" but not USE="bitcoin-cli". This is a valid + configuration, but you will be unable to interact with your bitcoind node + via the command line using this installation. + EOF + fi + if ! use berkdb && ! use sqlite && + { { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } || + { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; } + then + efmt ewarn <<-EOF + You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid + configuration, but your Bitcoin node will be unable to open any wallets. + EOF + fi + + # test/functional/feature_pruning.py requires 4 GB disk space + # test/functional/wallet_pruning.py requires 1.3 GB disk space + use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend +} + +pkg_setup() { + if use test ; then + CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup + python-any-r1_pkg_setup + fi +} + +src_prepare() { + default + ! use system-leveldb || rm -r src/leveldb || die + if use system-libsecp256k1 ; then + rm -r src/secp256k1 || die + sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die + else + pushd src/secp256k1 >/dev/null || die + AT_NOELIBTOOLIZE=yes eautoreconf + popd >/dev/null || die + fi + eautoreconf + + # we say --disable-util-util, so we can't test bitcoin-util + sed -ne '/^ {/{h;:0;n;H;/^ }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \ + -i test/util/data/bitcoin-util-test.json || die + + sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \ + -i contrib/completions/bash/bitcoind.bash || die +} + +src_configure() { + local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi + local myeconfargs=( + --disable-static + --${wallet}-wallet + $(use_with sqlite) + $(use_with berkdb bdb) + $(use_enable systemtap usdt) + $(use_with upnp miniupnpc) + $(use_with nat-pmp natpmp) + $(use_enable test tests) + --disable-bench + --disable-fuzz{,-binary} + $(use_with qrcode qrencode) + --disable-ccache + $(use_enable asm) + $(use_enable zeromq zmq) + $(use_enable man) + $(use_enable external-signer) + --with-utils + $(use_enable {bitcoin,util}-cli) + --enable-util-tx + --${wallet}-util-wallet + --disable-util-util + $(use_with libs) + $(use_with daemon) + $(use_with gui gui qt5) + $(use_with dbus qtdbus) + $(use_with system-leveldb) + $(use_with system-libsecp256k1) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use daemon && ! tc-is-cross-compiler ; then + TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die + fi + sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \ + -ni share/examples/bitcoin.conf || die +} + +src_test() { + emake check + + use daemon && edo "${PYTHON}" test/functional/test_runner.py \ + --ansi --extended --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}" +} + +src_install() { + use external-signer && DOCS+=( doc/external-signer.md ) + use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md ) + use libs && DOCS+=( doc/shared-libraries.md ) + use systemtap && DOCS+=( doc/tracing.md ) + use zeromq && DOCS+=( doc/zmq.md ) + + if use daemon ; then + # https://bugs.gentoo.org/757102 + DOCS+=( share/rpcauth/rpcauth.py ) + docompress -x "/usr/share/doc/${PF}/rpcauth.py" + fi + + default + + find "${ED}" -type f -name '*.la' -delete || die + ! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die + + newbashcomp contrib/completions/bash/bitcoin-tx.bash bitcoin-tx + use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash bitcoin-cli + if use daemon ; then + newbashcomp contrib/completions/bash/bitcoind.bash bitcoind + use gui && bashcomp_alias bitcoind bitcoin-qt + elif use gui ; then + newbashcomp contrib/completions/bash/bitcoind.bash bitcoin-qt + fi + + if use daemon ; then + insinto /etc/bitcoin + doins share/examples/bitcoin.conf + fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf + fperms 0660 /etc/bitcoin/bitcoin.conf + + newconfd contrib/init/bitcoind.openrcconf bitcoind + newinitd "${FILESDIR}/bitcoind.openrc" bitcoind + systemd_newunit contrib/init/bitcoind.service bitcoind.service + + keepdir /var/lib/bitcoind + fperms 0750 /var/lib/bitcoind + fowners bitcoin:bitcoin /var/lib/bitcoind + dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind + fi + + if use gui ; then + insinto /usr/share/icons/hicolor/scalable/apps + newins src/qt/res/src/bitcoin.svg bitcoin128.svg + + domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop" + + if use kde ; then + insinto /usr/share/kservices5 + doins "${FILESDIR}/bitcoin-qt.protocol" + fi + fi + + if use examples ; then + docinto examples + dodoc -r contrib/{linearize,qos} + use zeromq && dodoc -r contrib/zmq + fi +} + +pkg_preinst() { + if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then + if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then + dosym -r /var/lib/bitcoin{d,/.bitcoin} + elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then + efmt ewarn <<-EOF + Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin, + a deprecated location. To perform an automated migration to + ${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances + that may be using the deprecated path, and then run: + + # emerge --config ${CATEGORY}/${PN} + EOF + insinto /var/lib/bitcoin + mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die + dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf + dosym -r /var/lib/bitcoin{/.bitcoin,d} + fi + fi + + if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then + dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol + fi +} + +pkg_postinst() { + # we don't use xdg.eclass because it adds unconditional IDEPENDs + if use gui ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi + + if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then + efmt -su elog <<-EOF + To have ${PN} automatically use Tor when it's running, be sure your \ + 'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \ + correctly, and: + - Using an init script: add the 'bitcoin' user to the 'tor' user group. + - Running bitcoind directly: add that user to the 'tor' user group. + EOF + fi + + if use bitcoin-cli && use daemon ; then + efmt -su elog <<-EOF + To use bitcoin-cli with the /etc/init.d/bitcoind service: + - Add your user(s) to the 'bitcoin' group. + - Symlink ~/.bitcoin to /var/lib/bitcoind. + EOF + fi + + if use berkdb ; then + # https://github.com/bitcoin/bitcoin/pull/28597 + # https://bitcoincore.org/en/releases/26.0/#wallet + efmt ewarn <<-EOF + Creation of legacy (Berkeley DB) wallets is refused starting with Bitcoin + Core 26.0, pending the deprecation and eventual removal of support for + legacy wallets altogether in future releases. At present you can still + force support for the creation of legacy wallets by adding the following + line to your bitcoin.conf: + + deprecatedrpc=create_bdb + EOF + fi +} + +pkg_postrm() { + if use gui ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} + +pkg_config() { + if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] && + [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] + then + in_use() { + : ${1:?} ; local each + if command -v fuser >/dev/null ; then + fuser "${@}" >/dev/null 2>&1 + elif command -v lsof >/dev/null ; then + for each ; do + lsof -- "${each}" && return + done >/dev/null 2>&1 + elif mountpoint -q /proc ; then + { find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} + + awk '{ print $6 }' /proc/[0-9]*/maps + } 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}") + else + return 13 + fi + } + ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use" + in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock} + case $? in + 0) + eend 1 + efmt eerror <<-EOF + ${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any + running bitcoind instances that may be using this data directory, and then + retry this migration. + EOF + die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" + ;; + 13) + eend 1 + if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then + efmt eerror <<-EOF + Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use. + Do you have /proc mounted? To force the migration without checking, re-run + this command with BITCOIND_IS_NOT_RUNNING=1. + EOF + die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" + fi + ;; + *) + eend 0 + ;; + esac + + # find all relative symlinks that point outside the data dir + local -A symlinks + cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die + local each ; while read -r -d '' each ; do + local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] && + target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] && + symlinks["${each}"]="${target}" + done < <(find -type l -print0) + + einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." + rm -f -- "${EROOT}/var/lib/bitcoind" || die + mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} || + die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." + + # fix up the relative symlinks + cd -- "${EROOT}/var/lib/bitcoind" || die + for each in "${!symlinks[@]}" ; do + ln -fnrs -- "${symlinks[${each}]}" "${each}" # keep going even if this fails + done + + einfo 'Creating a transitional symlink for your convenience.' + ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin} + einfo 'You may remove this link when you no longer need it.' + else + einfo 'Nothing to do.' + fi +} diff --git a/net-p2p/bitcoin-core/bitcoin-core-27.0_rc1.ebuild b/net-p2p/bitcoin-core/bitcoin-core-27.0_rc1.ebuild new file mode 100644 index 000000000000..71f4e9421dd1 --- /dev/null +++ b/net-p2p/bitcoin-core/bitcoin-core-27.0_rc1.ebuild @@ -0,0 +1,424 @@ +# Copyright 1999-2024 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd toolchain-funcs xdg-utils + +DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency" +HOMEPAGE="https://bitcoincore.org/" +SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV/_rc/rc}.tar.gz -> ${P}.tar.gz" +S="${WORKDIR}/${PN/-core}-${PV/_rc/rc}" + +LICENSE="MIT" +SLOT="0" +if [[ "${PV}" != *_rc* ]] ; then + KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +fi +# IUSE="+cli" doesn't work due to https://bugs.gentoo.org/831045#c3 +IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer gui kde libs +man nat-pmp +qrcode +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + dbus? ( gui ) + kde? ( gui ) + qrcode? ( gui ) + system-leveldb? ( || ( daemon gui ) ) +" +# dev-libs/univalue is now bundled, as upstream dropped support for system copy +# and their version in the Bitcoin repo has deviated a fair bit from upstream. +# Upstream also seems very inactive. +RDEPEND=" + !dev-util/bitcoin-tx + >=dev-libs/boost-1.81.0:= + >=dev-libs/libevent-2.1.12:= + berkdb? ( >=sys-libs/db-4.8.30:$(db_ver_to_slot 4.8)=[cxx] ) + bitcoin-cli? ( !net-p2p/bitcoin-cli ) + daemon? ( + !net-p2p/bitcoind + acct-group/bitcoin + acct-user/bitcoin + ) + gui? ( + !net-p2p/bitcoin-qt + >=dev-qt/qtcore-5.15.11:5 + >=dev-qt/qtgui-5.15.11:5 + >=dev-qt/qtnetwork-5.15.11:5 + >=dev-qt/qtwidgets-5.15.11:5 + dbus? ( >=dev-qt/qtdbus-5.15.11:5 ) + ) + libs? ( !net-libs/libbitcoinconsensus ) + nat-pmp? ( >=net-libs/libnatpmp-20220705:= ) + qrcode? ( >=media-gfx/qrencode-4.1.1:= ) + sqlite? ( >=dev-db/sqlite-3.38.5:= ) + system-leveldb? ( virtual/bitcoin-leveldb ) + system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.4.0:=[ellswift,extrakeys,recovery,schnorr] ) + upnp? ( >=net-libs/miniupnpc-2.2.2:= ) + zeromq? ( >=net-libs/zeromq-4.3.4:= ) +" +DEPEND=" + ${RDEPEND} + systemtap? ( >=dev-debug/systemtap-4.8 ) +" +BDEPEND=" + virtual/pkgconfig + daemon? ( + acct-group/bitcoin + acct-user/bitcoin + ) + gui? ( >=dev-qt/linguist-tools-5.15.11:5 ) + test? ( ${PYTHON_DEPS} ) +" +IDEPEND=" + gui? ( dev-util/desktop-file-utils ) +" + +DOCS=( + doc/bips.md + doc/bitcoin-conf.md + doc/descriptors.md + doc/files.md + doc/i2p.md + doc/JSON-RPC-interface.md + doc/multisig-tutorial.md + doc/p2p-bad-ports.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}/27.0-syslibs.patch" + "${FILESDIR}/26.0-init.patch" +) + +efmt() { + : ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}") +} + +pkg_pretend() { + if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then + efmt ewarn <<-EOF + You are enabling neither USE="daemon" nor USE="gui". This is a valid + configuration, but you will be unable to run a Bitcoin node using this + installation. + EOF + fi + if use daemon && ! use bitcoin-cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli]" ; then + efmt ewarn <<-EOF + You are enabling USE="daemon" but not USE="bitcoin-cli". This is a valid + configuration, but you will be unable to interact with your bitcoind node + via the command line using this installation. + EOF + fi + if ! use berkdb && ! use sqlite && + { { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } || + { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; } + then + efmt ewarn <<-EOF + You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid + configuration, but your Bitcoin node will be unable to open any wallets. + EOF + fi + + # test/functional/feature_pruning.py requires 4 GB disk space + # test/functional/wallet_pruning.py requires 1.3 GB disk space + use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend +} + +pkg_setup() { + if use test ; then + CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup + python-any-r1_pkg_setup + fi +} + +src_prepare() { + default + ! use system-leveldb || rm -r src/leveldb || die + if use system-libsecp256k1 ; then + rm -r src/secp256k1 || die + sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die + else + pushd src/secp256k1 >/dev/null || die + AT_NOELIBTOOLIZE=yes eautoreconf + popd >/dev/null || die + fi + eautoreconf + + # we say --disable-util-util, so we can't test bitcoin-util + sed -ne '/^ {/{h;:0;n;H;/^ }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \ + -i test/util/data/bitcoin-util-test.json || die + + sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \ + -i contrib/completions/bash/bitcoind.bash || die +} + +src_configure() { + local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi + local myeconfargs=( + --disable-static + --${wallet}-wallet + $(use_with sqlite) + $(use_with berkdb bdb) + $(use_enable systemtap usdt) + $(use_with upnp miniupnpc) + $(use_with nat-pmp natpmp) + $(use_enable test tests) + --disable-bench + --disable-fuzz{,-binary} + $(use_with qrcode qrencode) + --disable-ccache + $(use_enable asm) + $(use_enable zeromq zmq) + $(use_enable man) + $(use_enable external-signer) + --with-utils + $(use_enable {bitcoin,util}-cli) + --enable-util-tx + --${wallet}-util-wallet + --disable-util-util + $(use_with libs) + $(use_with daemon) + $(use_with gui gui qt5) + $(use_with dbus qtdbus) + $(use_with system-leveldb) + $(use_with system-libsecp256k1) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + if use daemon && ! tc-is-cross-compiler ; then + TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die + fi + sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \ + -ni share/examples/bitcoin.conf || die +} + +src_test() { + emake check + + use daemon && edo "${PYTHON}" test/functional/test_runner.py \ + --ansi --extended --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}" +} + +src_install() { + use external-signer && DOCS+=( doc/external-signer.md ) + use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md ) + use libs && DOCS+=( doc/shared-libraries.md ) + use systemtap && DOCS+=( doc/tracing.md ) + use zeromq && DOCS+=( doc/zmq.md ) + + if use daemon ; then + # https://bugs.gentoo.org/757102 + DOCS+=( share/rpcauth/rpcauth.py ) + docompress -x "/usr/share/doc/${PF}/rpcauth.py" + fi + + default + + find "${ED}" -type f -name '*.la' -delete || die + ! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die + + newbashcomp contrib/completions/bash/bitcoin-tx.bash bitcoin-tx + use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash bitcoin-cli + if use daemon ; then + newbashcomp contrib/completions/bash/bitcoind.bash bitcoind + use gui && bashcomp_alias bitcoind bitcoin-qt + elif use gui ; then + newbashcomp contrib/completions/bash/bitcoind.bash bitcoin-qt + fi + + if use daemon ; then + insinto /etc/bitcoin + doins share/examples/bitcoin.conf + fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf + fperms 0660 /etc/bitcoin/bitcoin.conf + + newconfd contrib/init/bitcoind.openrcconf bitcoind + newinitd "${FILESDIR}/bitcoind.openrc" bitcoind + systemd_newunit contrib/init/bitcoind.service bitcoind.service + + keepdir /var/lib/bitcoind + fperms 0750 /var/lib/bitcoind + fowners bitcoin:bitcoin /var/lib/bitcoind + dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind + fi + + if use gui ; then + insinto /usr/share/icons/hicolor/scalable/apps + newins src/qt/res/src/bitcoin.svg bitcoin128.svg + + domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop" + + if use kde ; then + insinto /usr/share/kservices5 + doins "${FILESDIR}/bitcoin-qt.protocol" + fi + fi + + if use examples ; then + docinto examples + dodoc -r contrib/{linearize,qos} + use zeromq && dodoc -r contrib/zmq + fi +} + +pkg_preinst() { + if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then + if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then + dosym -r /var/lib/bitcoin{d,/.bitcoin} + elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then + efmt ewarn <<-EOF + Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin, + a deprecated location. To perform an automated migration to + ${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances + that may be using the deprecated path, and then run: + + # emerge --config ${CATEGORY}/${PN} + EOF + insinto /var/lib/bitcoin + mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die + dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf + dosym -r /var/lib/bitcoin{/.bitcoin,d} + fi + fi + + if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then + dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol + fi +} + +pkg_postinst() { + # we don't use xdg.eclass because it adds unconditional IDEPENDs + if use gui ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi + + if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then + efmt -su elog <<-EOF + To have ${PN} automatically use Tor when it's running, be sure your \ + 'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \ + correctly, and: + - Using an init script: add the 'bitcoin' user to the 'tor' user group. + - Running bitcoind directly: add that user to the 'tor' user group. + EOF + fi + + if use bitcoin-cli && use daemon ; then + efmt -su elog <<-EOF + To use bitcoin-cli with the /etc/init.d/bitcoind service: + - Add your user(s) to the 'bitcoin' group. + - Symlink ~/.bitcoin to /var/lib/bitcoind. + EOF + fi + + if use berkdb ; then + # https://github.com/bitcoin/bitcoin/pull/28597 + # https://bitcoincore.org/en/releases/26.0/#wallet + efmt ewarn <<-EOF + Creation of legacy (Berkeley DB) wallets is refused starting with Bitcoin + Core 26.0, pending the deprecation and eventual removal of support for + legacy wallets altogether in future releases. At present you can still + force support for the creation of legacy wallets by adding the following + line to your bitcoin.conf: + + deprecatedrpc=create_bdb + EOF + fi +} + +pkg_postrm() { + if use gui ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} + +pkg_config() { + if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] && + [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] + then + in_use() { + : ${1:?} ; local each + if command -v fuser >/dev/null ; then + fuser "${@}" >/dev/null 2>&1 + elif command -v lsof >/dev/null ; then + for each ; do + lsof -- "${each}" && return + done >/dev/null 2>&1 + elif mountpoint -q /proc ; then + { find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} + + awk '{ print $6 }' /proc/[0-9]*/maps + } 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}") + else + return 13 + fi + } + ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use" + in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock} + case $? in + 0) + eend 1 + efmt eerror <<-EOF + ${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any + running bitcoind instances that may be using this data directory, and then + retry this migration. + EOF + die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" + ;; + 13) + eend 1 + if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then + efmt eerror <<-EOF + Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use. + Do you have /proc mounted? To force the migration without checking, re-run + this command with BITCOIND_IS_NOT_RUNNING=1. + EOF + die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" + fi + ;; + *) + eend 0 + ;; + esac + + # find all relative symlinks that point outside the data dir + local -A symlinks + cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die + local each ; while read -r -d '' each ; do + local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] && + target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] && + symlinks["${each}"]="${target}" + done < <(find -type l -print0) + + einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." + rm -f -- "${EROOT}/var/lib/bitcoind" || die + mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} || + die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." + + # fix up the relative symlinks + cd -- "${EROOT}/var/lib/bitcoind" || die + for each in "${!symlinks[@]}" ; do + ln -fnrs -- "${symlinks[${each}]}" "${each}" # keep going even if this fails + done + + einfo 'Creating a transitional symlink for your convenience.' + ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin} + einfo 'You may remove this link when you no longer need it.' + else + einfo 'Nothing to do.' + fi +} diff --git a/net-p2p/bitcoin-core/files/27.0-syslibs.patch b/net-p2p/bitcoin-core/files/27.0-syslibs.patch new file mode 100644 index 000000000000..984e9b5181fb --- /dev/null +++ b/net-p2p/bitcoin-core/files/27.0-syslibs.patch @@ -0,0 +1,296 @@ +From d7d37c944809f8f957e7ad043b540feb4f25503c Mon Sep 17 00:00:00 2001 +From: Matt Whitlock +Date: Sun, 17 Sep 2023 10:29:27 -0400 +Subject: [PATCH] support linking against system-installed leveldb and + libsecp256k1 + +- Abort if runtime leveldb != compiled-against leveldb. + +Originally based on 22.0-fix_build_without_leveldb.patch. +--- + configure.ac | 90 ++++++++++++++++++++++++++++++++++++++- + src/Makefile.am | 13 +++++- + src/Makefile.test.include | 2 + + src/dbwrapper.cpp | 27 +++++++++++- + src/dbwrapper.h | 8 ++++ + src/kernel/checks.cpp | 7 +++ + 6 files changed, 143 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index d39006be33..ee7b092131 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1291,6 +1291,41 @@ if test "$enable_fuzz_binary" = "yes"; then + ]])]) + fi + ++dnl Check for libsecp256k1, only if explicitly requested ++AC_ARG_WITH([system-libsecp256k1], ++ [AS_HELP_STRING([[--with-system-libsecp256k1[=PKG]]], ++ [build using system-installed libsecp256k1 instead of bundled, passing PKG (default: libsecp256k1) to pkg-config (default is no; DANGEROUS; NOT SUPPORTED)])], ++ [AS_IF([test "x$withval" = xyes], [with_system_libsecp256k1=libsecp256k1])], ++ [with_system_libsecp256k1=no]) ++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test "x$with_system_libsecp256k1" = xno]) ++AM_COND_IF([EMBEDDED_LIBSECP256K1], [ ++ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include' ++ libsecp256k1_LIBS='secp256k1/libsecp256k1.la' ++], [ ++ saved_CPPFLAGS=$CPPFLAGS ++ saved_LIBS=$LIBS ++ PKG_CHECK_MODULES([libsecp256k1], [$with_system_libsecp256k1]) ++ CPPFLAGS="$libsecp256k1_CFLAGS $CPPFLAGS" ++ LIBS="$libsecp256k1_LIBS $LIBS" ++ missing_modules= ++ AC_DEFUN([CHECK_MODULE], [ ++ AC_CHECK_HEADER([secp256k1_$1.h], ++ [AC_CHECK_FUNCS([$2], [], [missing_modules="${missing_modules} $1"])], ++ [missing_modules="${missing_modules} $1"]) ++ ]) ++ CHECK_MODULE([ellswift], [secp256k1_ellswift_encode]) ++ CHECK_MODULE([extrakeys], [secp256k1_xonly_pubkey_parse]) ++ CHECK_MODULE([recovery], [secp256k1_ecdsa_recover]) ++ CHECK_MODULE([schnorrsig], [secp256k1_schnorrsig_verify]) ++ AS_IF([test -n "${missing_modules}"], [ ++ AC_MSG_ERROR([system-installed libsecp256k1 does not support these required modules:${missing_modules}]) ++ ]) ++ CPPFLAGS=$saved_CPPFLAGS ++ LIBS=$saved_LIBS ++]) ++AC_SUBST(libsecp256k1_CFLAGS) ++AC_SUBST(libsecp256k1_LIBS) ++ + if test "$enable_wallet" != "no"; then + dnl Check for libdb_cxx only if wallet enabled + if test "$use_bdb" != "no"; then +@@ -1350,6 +1385,55 @@ if test "$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nononono"; th + use_zmq=no + fi + ++dnl Check for leveldb, only if explicitly requested ++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]) ++AC_ARG_VAR([leveldb_CFLAGS],[C compiler flags for system-leveldb]) ++AC_ARG_VAR([leveldb_LIBS],[linker flags for system-leveldb]) ++AS_IF([test x$system_leveldb != xno],[ ++ TEMP_CPPFLAGS="$CPPFLAGS" ++ TEMP_LIBS="$LIBS" ++ CPPFLAGS="$leveldb_CFLAGS" ++ LIBS="$leveldb_LIBS" ++ AC_SEARCH_LIBS([leveldb_open],[leveldb],[leveldb_LIBS="$LIBS"], ++ [AC_MSG_ERROR([leveldb library not found; using --with-system-leveldb is not supported anyway])]) ++ 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_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])]) ++ ++ AC_MSG_CHECKING([for library containing leveldb::NewMemEnv]) ++ for searchlib in "" "-lmemenv" ERR; do ++ if test "x$searchlib" = "xERR"; then ++ AC_MSG_RESULT([no]) ++ AC_MSG_ERROR([LevelDB's memenv helper not found; using --with-system-leveldb is not supported anyway]) ++ fi ++ LIBS="$searchlib $leveldb_LIBS" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([ ++ #include ++ #include ++ ],[ ++ leveldb::Env *myenv = leveldb::NewMemEnv(leveldb::Env::Default()); ++ delete myenv; ++ ]) ++ ],[ ++ AC_MSG_RESULT([$searchlib]) ++ break ++ ]) ++ done ++ leveldb_LIBS="$LIBS" ++ LIBS="$TEMP_LIBS" ++ CPPFLAGS="$TEMP_CPPFLAGS" ++],[ ++ AC_DEFINE([EMBEDDED_LEVELDB],[1],[Define to use the bundled LevelDB sources]) ++]) ++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) ++AC_SUBST(leveldb_CFLAGS) ++AC_SUBST(leveldb_LIBS) ++ + dnl Check for libminiupnpc (optional) + if test "$use_upnp" != "no"; then + TEMP_CPPFLAGS="$CPPFLAGS" +@@ -1897,8 +1981,10 @@ CPPFLAGS="$CPPFLAGS_TEMP" + if test -n "$use_sanitizers"; then + export SECP_CFLAGS="$SECP_CFLAGS $SANITIZER_CFLAGS" + fi +-ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --disable-module-ecdh" +-AC_CONFIG_SUBDIRS([src/secp256k1]) ++AM_COND_IF([EMBEDDED_LIBSECP256K1],[ ++ ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --disable-module-ecdh" ++ AC_CONFIG_SUBDIRS([src/secp256k1]) ++]) + + AC_OUTPUT + +diff --git a/src/Makefile.am b/src/Makefile.am +index b5d5c4652a..91dec582e2 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -24,7 +24,7 @@ check_PROGRAMS = + TESTS = + BENCHMARKS = + +-BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) ++BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) $(libsecp256k1_CFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) + + LIBBITCOIN_NODE=libbitcoin_node.a + LIBBITCOIN_COMMON=libbitcoin_common.a +@@ -33,7 +33,11 @@ LIBBITCOIN_CLI=libbitcoin_cli.a + LIBBITCOIN_UTIL=libbitcoin_util.a + LIBBITCOIN_CRYPTO_BASE=crypto/libbitcoin_crypto_base.la + LIBBITCOINQT=qt/libbitcoinqt.a ++if EMBEDDED_LIBSECP256K1 + LIBSECP256K1=secp256k1/libsecp256k1.la ++else ++LIBSECP256K1=$(libsecp256k1_LIBS) ++endif + + if ENABLE_ZMQ + LIBBITCOIN_ZMQ=libbitcoin_zmq.a +@@ -68,8 +72,10 @@ LIBBITCOIN_CRYPTO += $(LIBBITCOIN_CRYPTO_ARM_SHANI) + endif + noinst_LTLIBRARIES += $(LIBBITCOIN_CRYPTO) + ++if EMBEDDED_LIBSECP256K1 + $(LIBSECP256K1): $(wildcard secp256k1/src/*.h) $(wildcard secp256k1/src/*.c) $(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: +@@ -1132,8 +1138,13 @@ endif + + include Makefile.minisketch.include + ++if EMBEDDED_LEVELDB + include Makefile.crc32c.include + include Makefile.leveldb.include ++else ++LEVELDB_CPPFLAGS = $(leveldb_CFLAGS) ++LIBLEVELDB = $(leveldb_LIBS) ++endif + + include Makefile.test_util.include + include Makefile.test_fuzz.include +diff --git a/src/Makefile.test.include b/src/Makefile.test.include +index 9f9bdbbd0c..3585e16bbe 100644 +--- a/src/Makefile.test.include ++++ b/src/Makefile.test.include +@@ -435,7 +435,9 @@ if ENABLE_BENCH + $(BENCH_BINARY) -sanity-check -priority-level=high + endif + endif ++if EMBEDDED_LIBSECP256K1 + $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check ++endif + + if ENABLE_TESTS + UNIVALUE_TESTS = univalue/test/object univalue/test/unitester +diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp +index 775496e21b..1304b2a2b3 100644 +--- a/src/dbwrapper.cpp ++++ b/src/dbwrapper.cpp +@@ -22,7 +22,11 @@ + #include + #include + #include +-#include ++#if EMBEDDED_LEVELDB ++# include ++#else ++# include ++#endif + #include + #include + #include +@@ -51,6 +55,27 @@ static void HandleError(const leveldb::Status& status) + throw dbwrapper_error(errmsg); + } + ++#if !EMBEDDED_LEVELDB ++#include ++#include ++#include ++bool dbwrapper_SanityCheck() ++{ ++ unsigned long header_version = (leveldb::kMajorVersion << 16) | leveldb::kMinorVersion; ++ unsigned long library_version = (leveldb_major_version() << 16) | leveldb_minor_version(); ++ ++ if (header_version != library_version) { ++ InitError(Untranslated(strprintf("Compiled with LevelDB %d.%d, but linked with LevelDB %d.%d (incompatible).", ++ leveldb::kMajorVersion, leveldb::kMinorVersion, ++ leveldb_major_version(), leveldb_minor_version() ++ ))); ++ return false; ++ } ++ ++ return true; ++} ++#endif ++ + class CBitcoinLevelDBLogger : public leveldb::Logger { + public: + // This code is adapted from posix_logger.h, which is why it is using vsprintf. +diff --git a/src/dbwrapper.h b/src/dbwrapper.h +index 63c2f99d2a..406d03f1ea 100644 +--- a/src/dbwrapper.h ++++ b/src/dbwrapper.h +@@ -5,6 +5,10 @@ + #ifndef BITCOIN_DBWRAPPER_H + #define BITCOIN_DBWRAPPER_H + ++#if defined(HAVE_CONFIG_H) ++#include ++#endif ++ + #include + #include + #include +@@ -46,6 +50,10 @@ struct DBParams { + DBOptions options{}; + }; + ++#if !EMBEDDED_LEVELDB ++bool dbwrapper_SanityCheck(); ++#endif ++ + class dbwrapper_error : public std::runtime_error + { + public: +diff --git a/src/kernel/checks.cpp b/src/kernel/checks.cpp +index bf8a2ec74c..640deb2415 100644 +--- a/src/kernel/checks.cpp ++++ b/src/kernel/checks.cpp +@@ -4,6 +4,7 @@ + + #include + ++#include + #include + #include + #include +@@ -15,6 +16,12 @@ namespace kernel { + + util::Result SanityChecks(const Context&) + { ++#if !EMBEDDED_LEVELDB ++ if (!dbwrapper_SanityCheck()) { ++ return util::Error{Untranslated("Database sanity check failure. Aborting.")}; ++ } ++#endif ++ + if (!ECC_InitSanityCheck()) { + return util::Error{Untranslated("Elliptic curve cryptography sanity check failure. Aborting.")}; + } +-- +2.44.0 + -- cgit v1.2.3