From 27f59f8e16510831cc751de1406f71afbf464653 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Tue, 24 Oct 2023 14:40:32 +0100 Subject: gentoo auto-resync : 24:10:2023 - 14:40:32 --- dev-util/bitcoin-tx/Manifest | 15 +- dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r2.ebuild | 105 -------- dev-util/bitcoin-tx/bitcoin-tx-22.0-r2.ebuild | 113 --------- dev-util/bitcoin-tx/bitcoin-tx-24.0.1-r1.ebuild | 83 ------ dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild | 2 +- .../files/22.0-fix_build_without_leveldb.patch | 23 -- dev-util/bitcoin-tx/files/24.0.1-gcc13.patch | 39 --- dev-util/bitcoin-tx/files/24.0.1-syslibs.patch | 281 --------------------- dev-util/bitcoin-tx/metadata.xml | 3 - 9 files changed, 3 insertions(+), 661 deletions(-) delete mode 100644 dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r2.ebuild delete mode 100644 dev-util/bitcoin-tx/bitcoin-tx-22.0-r2.ebuild delete mode 100644 dev-util/bitcoin-tx/bitcoin-tx-24.0.1-r1.ebuild delete mode 100644 dev-util/bitcoin-tx/files/22.0-fix_build_without_leveldb.patch delete mode 100644 dev-util/bitcoin-tx/files/24.0.1-gcc13.patch delete mode 100644 dev-util/bitcoin-tx/files/24.0.1-syslibs.patch (limited to 'dev-util/bitcoin-tx') diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest index 70a7f7050ceb..55e4fd26264b 100644 --- a/dev-util/bitcoin-tx/Manifest +++ b/dev-util/bitcoin-tx/Manifest @@ -1,13 +1,2 @@ -AUX 22.0-fix_build_without_leveldb.patch 683 BLAKE2B 471da86970257cc9082c57504e4a571af9ca70a869aeefd2c59ceaf25680cca75c209cb14658bcb3323c372619cf008ba0a019e89bbd0785886aaf47bf8a48f3 SHA512 1c5aa6a181b404d2b6ae5f820f074c5f27845102900457d88857a2a4bfcb21830ff970cc3cde91623a6b6e18a339f9823170312d91e126649e0d0f4ce71d0200 -AUX 24.0.1-gcc13.patch 989 BLAKE2B f1af15f550a0d43fb0a80f585bcc507a505e2351062c347cd334276d87b4cae48235ca643291b6473e89aaabdac920927f2d654589ca029141a833882e041bfc SHA512 07cfc8cea84f716d0844010b8f09a3dc700e8b89c9ea98da133a34a8820841cec20c426f53a3dacde4d406a2f34409018bce879b34c0def30770025834b60929 -AUX 24.0.1-syslibs.patch 9037 BLAKE2B fa634a8f18d1f1c32d1c3cb18bdfcafc89838a7f5b3a075a40ad3354d1253f1d637351d2661475eb86110db470a7b29c9cfb6266a7f61623c0865939c9e74453 SHA512 fcf8114174e69c5385058b190fa2c0b0ef105869d5d6a40a3cc6bb8e8ef1518cb8bc1fb7cc3a7ec28f361d91f66e4253420c2b50a0004a2dc0978910254cae3d -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 -EBUILD bitcoin-tx-0.21.0-r2.ebuild 2477 BLAKE2B 29c4ac0ef985767c0c3d22013777ceb5edb29a53f4436ea0141da679c5dd6eea82dd019d7ad73891e0ebde862f60bfe291d337a2da2111724b28edc07b13b295 SHA512 6a501c4705757736422ebffb264c8cdf09b6e17c2327e113c85ba330067ffdebd990725dda191cbce7dcb80840567ef4e7c095f55a5a5e4033e3c65f51e63cca -EBUILD bitcoin-tx-22.0-r2.ebuild 2741 BLAKE2B 56742837a3b542f1760d0f6122ace4762aeb85ff44dc8d321afce019d7e705aefd73d1c9c3a44a3410339192a2f99653d925673ce1a62fff1b1dae3fa302466f SHA512 bcb0f588aa503aca0ffe1ff6072703a859180cde9748bf15e4a8975ffd55a3fe4484995e07213f2d322790aea51785e3b9321511d21133aec7c26b1b4fc2489f -EBUILD bitcoin-tx-24.0.1-r1.ebuild 1637 BLAKE2B b72b107f9814d4d5be527e94068c490c143df5f343aed66f981b8847b2beacce24908ae8c2201e1f336a21efe242539ab36f82cfa78074843869c8cce2b32543 SHA512 e7ec21e145117c6c0b2836f9df134474627f8589b54af70279c93ef2227dbce06c1d3e4a7c04305ea3396edbca3b754f04a10cb2c55c210fa2677dd6159e601a -EBUILD bitcoin-tx-25.1.ebuild 349 BLAKE2B dc3f1ab18af1e61a7104ce680648835d0030ebfc32f38621085faeccf69aa776d3b4ae0ad9f0b4f07a350e11a7cc724c4b65c044b29093083c5dde38e90034df SHA512 75072bcb7ce659d52ccb4d67a5bead816921be63a14c36445844b56693f133328a4f3dc406053d13bee4162370c032a45a3c7cad1f4631e5d19cb2e83c0bcd6c -MISC metadata.xml 651 BLAKE2B 33a308d2af3a2418cfed88e8a50b1a7f160c3f9ccb7d65acef717cad7bbad0dd8fe0577a6fbe606a354f6458074ed3471ac7672737c8892ac5c67f41ef47ed2f SHA512 303af395b2ef63071c84925ccd94a79f441fa2d32efb78b218c2846be6ae8777949823d205f8073c48ff73746adbec8cf05f76ec90a7f26601cd427335f1fff7 +EBUILD bitcoin-tx-25.1.ebuild 347 BLAKE2B c1ac9bed84d535c738d2565a9a5d25b0930c112b898480ad0bbea48c678097cb64f3bd8994af07c7b9683e99605c90e25daa23062aceeb5fcc7eaf76e172a0ea SHA512 cea7206ec0295c54fc5102df3f6def43bfc7958596f3374e359a6a059d0559f02071ff91ef8d7dd0cbe982abbf21e95a83d30c3b92ec7514936a6e1fa9508f9b +MISC metadata.xml 545 BLAKE2B 1edf1e74fcee6b62d4814c592f1024243f0f0dcfed513748997423e0235c46814ce28a6bb2bf4ecd669699dc552785b27b75cff2f23e2e344601814477baa780 SHA512 e836dcf394ce09821e47025f118286c1f92aed62167133bf8e7ffcf99c8d369584ae941097f7ff2f01c18d1b79e9a38b25558f16774b60320d4b1d41a969b907 diff --git a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r2.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r2.ebuild deleted file mode 100644 index 865fc9b4f6ab..000000000000 --- a/dev-util/bitcoin-tx/bitcoin-tx-0.21.0-r2.ebuild +++ /dev/null @@ -1,105 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 - -BITCOINCORE_COMMITHASH="95ea54ba089610019a74c1176a2c7c0dba144b1c" -KNOTS_PV="${PV}.knots20210130" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Command-line Bitcoin transaction tool" -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/$(ver_cut 1-2).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="knots" - -DEPEND=" - dev-libs/boost:= - >dev-libs/libsecp256k1-0.1_pre20200911:0/0[recovery,schnorr] - !>=dev-libs/libsecp256k1-0.1_pre20210628 - >=dev-libs/univalue-1.0.4:= -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=sys-devel/autoconf-2.69 - >=sys-devel/automake-1.13 -" - -DOCS=( - doc/bips.md - doc/release-notes.md -) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/0.21.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2021/01/14/release-${PV}/" - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}.syslibs.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}.f.patch" - eapply "${knots_patchdir}/${KNOTS_P}.branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}.ts.patch" - fi - - eapply_user - - echo '#!/bin/true' >share/genbuild.sh || die - mkdir -p src/obj || die - echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - --disable-asm - --without-qtdbus - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --enable-util-tx - --disable-util-cli - --disable-util-wallet - --disable-bench - --without-libs - --without-daemon - --without-gui - --disable-fuzz - --disable-ccache - --disable-static - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - newbashcomp contrib/${PN}.bash-completion ${PN} -} diff --git a/dev-util/bitcoin-tx/bitcoin-tx-22.0-r2.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-22.0-r2.ebuild deleted file mode 100644 index cbf1068adebf..000000000000 --- a/dev-util/bitcoin-tx/bitcoin-tx-22.0-r2.ebuild +++ /dev/null @@ -1,113 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -inherit autotools bash-completion-r1 flag-o-matic - -BITCOINCORE_COMMITHASH="a0988140b71485ad12c3c3a4a9573f7c21b1eff8" -KNOTS_PV="${PV}.knots20211108" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Command-line Bitcoin transaction tool" -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/$(ver_cut 1).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="knots" - -RDEPEND=" - dev-libs/boost:= - >dev-libs/libsecp256k1-0.1_pre20200911:0/0[recovery,schnorr] - !>=dev-libs/libsecp256k1-0.1_pre20210628 - >=dev-libs/univalue-1.0.4:= -" -DEPEND="${RDEPEND}" -BDEPEND=" - >=sys-devel/automake-1.13 - || ( >=sys-devel/gcc-7[cxx] >=sys-devel/clang-5 ) -" - -DOCS=( - doc/bips.md - doc/release-notes.md -) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -pkg_pretend() { - if use knots; then - elog "You are building ${PN} from Bitcoin Knots." - elog "For more information, see:" - elog "https://bitcoinknots.org/files/22.x/${KNOTS_PV}/${KNOTS_P}.desc.html" - else - elog "You are building ${PN} from Bitcoin Core." - elog "For more information, see:" - elog "https://bitcoincore.org/en/2021/09/13/release-${PV}/" - fi - - if [[ ${MERGE_TYPE} != "binary" ]] ; then - if ! test-flag-CXX -std=c++17 ; then - die "Building ${CATEGORY}/${P} requires at least GCC 7 or Clang 5" - fi - fi -} - -src_prepare() { - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.patch" - eapply "${FILESDIR}/${PV}-fix_build_without_leveldb.patch" - - if use knots; then - eapply "${knots_patchdir}/${KNOTS_P}_p2-fixes.patch" - eapply "${knots_patchdir}/${KNOTS_P}_p3-features.patch" - eapply "${knots_patchdir}/${KNOTS_P}_p4-branding.patch" - eapply "${knots_patchdir}/${KNOTS_P}_p5-ts.patch" - fi - - default - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local my_econf=( - --disable-asm - --without-qtdbus - --disable-ebpf - --without-natpmp - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --enable-util-tx - --disable-util-util - --disable-util-cli - --disable-util-wallet - --disable-bench - --without-libs - --without-daemon - --without-gui - --disable-fuzz - --disable-fuzz-binary - --disable-ccache - --disable-static - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - newbashcomp contrib/${PN}.bash-completion ${PN} -} diff --git a/dev-util/bitcoin-tx/bitcoin-tx-24.0.1-r1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-24.0.1-r1.ebuild deleted file mode 100644 index fd1d577bd081..000000000000 --- a/dev-util/bitcoin-tx/bitcoin-tx-24.0.1-r1.ebuild +++ /dev/null @@ -1,83 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -inherit autotools bash-completion-r1 - -DESCRIPTION="Command-line Bitcoin transaction tool" -HOMEPAGE="https://bitcoincore.org/" -SRC_URI=" - https://bitcoincore.org/bin/bitcoin-core-${PV}/${P/-tx}.tar.gz -" -S="${WORKDIR}"/${P/-tx} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" - -# TODO: Can we drop virtual/bitcoin-leveldb from some bitcoin-*? -# (only bitcoin-qt, bitcoind should need it?) -RDEPEND=" - >=dev-libs/boost-1.64.0:= - >=dev-libs/libsecp256k1-0.2:=[recovery,schnorr] - virtual/bitcoin-leveldb -" -DEPEND="${RDEPEND}" - -DOCS=( - doc/bips.md - doc/release-notes.md -) - -PATCHES=( - "${FILESDIR}"/24.0.1-syslibs.patch - "${FILESDIR}"/24.0.1-gcc13.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() { - default - - eautoreconf - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local myeconfargs=( - --disable-asm - --without-qtdbus - --disable-ebpf - --without-natpmp - --without-qrencode - --without-miniupnpc - --disable-tests - --disable-wallet - --disable-zmq - --enable-util-tx - --disable-util-util - --disable-util-cli - --disable-util-wallet - --disable-bench - --without-libs - --without-daemon - --without-gui - --disable-fuzz - --disable-fuzz-binary - --disable-ccache - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${myeconfargs[@]}" -} - -src_install() { - default - - newbashcomp contrib/${PN}.bash-completion ${PN} -} diff --git a/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild index 7593d8a0097f..2b266a5f9f35 100644 --- a/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild +++ b/dev-util/bitcoin-tx/bitcoin-tx-25.1.ebuild @@ -8,6 +8,6 @@ HOMEPAGE="https://bitcoincore.org/" LICENSE="MIT" SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 x86 ~amd64-linux ~x86-linux" RDEPEND="~net-p2p/bitcoin-core-${PV}" diff --git a/dev-util/bitcoin-tx/files/22.0-fix_build_without_leveldb.patch b/dev-util/bitcoin-tx/files/22.0-fix_build_without_leveldb.patch deleted file mode 100644 index e9dec14b9d43..000000000000 --- a/dev-util/bitcoin-tx/files/22.0-fix_build_without_leveldb.patch +++ /dev/null @@ -1,23 +0,0 @@ -diff --git a/src/init/common.cpp b/src/init/common.cpp -index b5b74cda78b..d01e0e73b4a 100644 ---- a/src/init/common.cpp -+++ b/src/init/common.cpp -@@ -9,7 +9,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -41,10 +40,6 @@ void UnsetGlobals() - - bool SanityChecks() - { -- if (!dbwrapper_SanityCheck()) { -- return InitError(Untranslated("Database sanity check failure. Aborting.")); -- } -- - if (!ECC_InitSanityCheck()) { - return InitError(Untranslated("Elliptic curve cryptography sanity check failure. Aborting.")); - } diff --git a/dev-util/bitcoin-tx/files/24.0.1-gcc13.patch b/dev-util/bitcoin-tx/files/24.0.1-gcc13.patch deleted file mode 100644 index 39cf81b14953..000000000000 --- a/dev-util/bitcoin-tx/files/24.0.1-gcc13.patch +++ /dev/null @@ -1,39 +0,0 @@ -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 - - /** diff --git a/dev-util/bitcoin-tx/files/24.0.1-syslibs.patch b/dev-util/bitcoin-tx/files/24.0.1-syslibs.patch deleted file mode 100644 index 00404a2ff021..000000000000 --- a/dev-util/bitcoin-tx/files/24.0.1-syslibs.patch +++ /dev/null @@ -1,281 +0,0 @@ -Originally based on 22.0-fix_build_without_leveldb.patch. - -- Allow system libsecp256k1 -- Allow system leveldb -- Abort if runtime leveldb != compiled-against leveldb -- Handle berkdb support being disabled better ---- a/configure.ac -+++ b/configure.ac -@@ -1362,6 +1362,23 @@ if test "$enable_fuzz_binary" = "yes"; then - CHECK_RUNTIME_LIB - fi - -+dnl Check for libsecp256k1, only if explicitly requested -+AC_ARG_WITH([system-libsecp256k1], -+ [AS_HELP_STRING([--with-system-libsecp256k1], -+ [Build with system libsecp256k1 (default is no; DANGEROUS; NOT SUPPORTED)])], -+ [system_libsecp256k1=$withval], -+ [system_libsecp256k1=no] -+) -+if test x$system_libsecp256k1 != xno; then -+ PKG_CHECK_MODULES([libsecp256k1],[libsecp256k1],,[true]) -+else -+ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include' -+ libsecp256k1_LIBS='secp256k1/libsecp256k1.la' -+fi -+AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test x$system_libsecp256k1 = xno]) -+AC_SUBST(libsecp256k1_CFLAGS) -+AC_SUBST(libsecp256k1_LIBS) -+ - if test "$enable_wallet" != "no"; then - dnl Check for libdb_cxx only if wallet enabled - if test "$use_bdb" != "no"; then -@@ -1413,11 +1430,76 @@ if test "$use_usdt" != "no"; then - fi - AM_CONDITIONAL([ENABLE_USDT_TRACEPOINTS], [test "$use_usdt" = "yes"]) - -+build_leveldb=yes - if test "$build_bitcoin_cli$build_bitcoin_tx$build_bitcoin_util$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nonononononono"; then - use_upnp=no - use_natpmp=no - use_zmq=no -+ build_leveldb=no -+fi -+ -+if test x$build_leveldb = xno; then -+ system_leveldb=no -+fi -+dnl Check for leveldb, only if explicitly requested -+if test x$system_leveldb != xno; then -+ build_leveldb=no -+ LEVELDB_CPPFLAGS= -+ AC_CHECK_LIB([leveldb],[main],[ -+ LIBLEVELDB=-lleveldb -+ ],[ -+ 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_CHECKING([for memenv.h path]) -+ BITCOIN_SUBDIR_TO_INCLUDE([LEVELDB_CPPFLAGS],[leveldb/helpers/],[memenv]) -+ ],[ -+ AC_CHECK_HEADER([memenv.h],[],[ -+ AC_MSG_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway]) -+ ]) -+ ]) -+ -+ AC_MSG_CHECKING([library containing leveldb::NewMemEnv]) -+ TEMP_LIBS="$LIBS" -+ TEMP_CPPFLAGS="$CPPFLAGS" -+ CPPFLAGS="$CPPFLAGS $LEVELDB_CPPFLAGS" -+ 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 -+ searchlib="$searchlib $LIBLEVELDB" -+ LIBS="$searchlib $TEMP_LIBS" -+ AC_LINK_IFELSE([AC_LANG_SOURCE([ -+ #include -+ #include -+ -+ int main() { -+ leveldb::Env *myenv = leveldb::NewMemEnv(leveldb::Env::Default()); -+ delete myenv; -+ } -+ ])],[ -+ AC_MSG_RESULT([$searchlib]) -+ LIBMEMENV="$searchlib" -+ break -+ ]) -+ done -+ LIBS="$TEMP_LIBS" -+ CPPFLAGS="$TEMP_CPPFLAGS" - fi -+AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$build_leveldb = xyes]) -+AC_SUBST(LEVELDB_CPPFLAGS) -+AC_SUBST(LIBLEVELDB) -+AC_SUBST(LIBMEMENV) -+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] -+) - - dnl Check for libminiupnpc (optional) - if test "$use_upnp" != "no"; then ---- a/src/Makefile.am -+++ b/src/Makefile.am -@@ -23,7 +23,7 @@ noinst_PROGRAMS = - TESTS = - BENCHMARKS = - --BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(LEVELDB_CPPFLAGS) -+BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) $(libsecp256k1_CFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) $(BOOST_CPPFLAGS) $(LEVELDB_CPPFLAGS) - - LIBBITCOIN_NODE=libbitcoin_node.a - LIBBITCOIN_COMMON=libbitcoin_common.a -@@ -32,7 +32,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 -@@ -67,8 +71,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: -@@ -1080,7 +1086,9 @@ endif - include Makefile.minisketch.include - - include Makefile.crc32c.include -+if EMBEDDED_LEVELDB - include Makefile.leveldb.include -+endif - - include Makefile.test_util.include - include Makefile.test_fuzz.include ---- a/src/Makefile.test.include -+++ b/src/Makefile.test.include -@@ -377,8 +377,9 @@ if ENABLE_BENCH - $(BENCH_BINARY) --sanity-check > /dev/null - 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 - noinst_PROGRAMS += $(UNIVALUE_TESTS) ---- a/src/dbwrapper.cpp -+++ b/src/dbwrapper.cpp -@@ -7,26 +7,45 @@ - #include - #include - #include -+#include - #include - #include - #include -+#include - - #include - #include - #include - #include - #include -+#include - #include - #include - #include - #include --#include -+#include - #include - #include - #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; -+} -+ - class CBitcoinLevelDBLogger : public leveldb::Logger { - public: - // This code is adapted from posix_logger.h, which is why it is using vsprintf. ---- a/src/dbwrapper.h -+++ b/src/dbwrapper.h -@@ -31,6 +31,8 @@ class Env; - static const size_t DBWRAPPER_PREALLOC_KEY_SIZE = 64; - static const size_t DBWRAPPER_PREALLOC_VALUE_SIZE = 1024; - -+bool dbwrapper_SanityCheck(); -+ - class dbwrapper_error : public std::runtime_error - { - public: ---- a/src/kernel/checks.cpp -+++ b/src/kernel/checks.cpp -@@ -3,9 +3,10 @@ - // file COPYING or http://www.opensource.org/licenses/mit-license.php. - - #include -- -+#include - #include - #include -+#include - #include - #include - -@@ -15,6 +16,10 @@ namespace kernel { - - std::optional SanityChecks(const Context&) - { -+ if (!dbwrapper_SanityCheck()) { -+ return Untranslated("Database sanity check failure. Aborting."); -+ } -+ - if (!ECC_InitSanityCheck()) { - return Untranslated("Elliptic curve cryptography sanity check failure. Aborting."); - } ---- a/src/qt/createwalletdialog.cpp -+++ b/src/qt/createwalletdialog.cpp -@@ -12,6 +12,7 @@ - - #include - -+#include - #include - - CreateWalletDialog::CreateWalletDialog(QWidget* parent) : -@@ -94,9 +95,16 @@ CreateWalletDialog::CreateWalletDialog(QWidget* parent) : - ui->external_signer_checkbox->setChecked(false); - #endif - --#ifndef USE_BDB -- ui->descriptor_checkbox->setEnabled(false); -- ui->descriptor_checkbox->setChecked(true); -+#ifdef USE_BDB -+ connect(ui->buttonBox, &QDialogButtonBox::accepted, this, &QDialog::accept); -+#else -+ connect(ui->buttonBox, &QDialogButtonBox::accepted, [this]() { -+ if (!this->isDescriptorWalletChecked()) { -+ QMessageBox::critical(this, tr("Cannot create wallet"), tr("This build was compiled without BDB support, so only experimental descriptor wallets are supported.")); -+ return; -+ } -+ this->accept(); -+ }); - #endif - - #ifndef ENABLE_EXTERNAL_SIGNER diff --git a/dev-util/bitcoin-tx/metadata.xml b/dev-util/bitcoin-tx/metadata.xml index 90d16ca8cd0d..9eab793a582a 100644 --- a/dev-util/bitcoin-tx/metadata.xml +++ b/dev-util/bitcoin-tx/metadata.xml @@ -9,9 +9,6 @@ proxy-maint@gentoo.org Proxy Maintainers - - Build enhanced Bitcoin Knots version, rather than Bitcoin Core - bitcoin/bitcoin bitcoinknots/bitcoin -- cgit v1.2.3