diff options
author | V3n3RiX <venerix@koprulu.sector> | 2023-01-05 06:08:15 +0000 |
---|---|---|
committer | V3n3RiX <venerix@koprulu.sector> | 2023-01-05 06:08:15 +0000 |
commit | 083bdfbef9bc532b72cf116591025916eebaf676 (patch) | |
tree | 04da8a6f58a6ef6f05ebafc0a86b3a27c00ba283 /dev-util | |
parent | e84469d1a99031578172f7c064945ba5114c5263 (diff) |
gentoo auto-resync : 05:01:2023 - 06:08:15
Diffstat (limited to 'dev-util')
-rw-r--r-- | dev-util/Manifest.gz | bin | 68432 -> 68425 bytes | |||
-rw-r--r-- | dev-util/bcc/Manifest | 2 | ||||
-rw-r--r-- | dev-util/bcc/bcc-0.26.0-r1.ebuild (renamed from dev-util/bcc/bcc-0.26.0.ebuild) | 2 | ||||
-rw-r--r-- | dev-util/bitcoin-tx/Manifest | 3 | ||||
-rw-r--r-- | dev-util/bitcoin-tx/bitcoin-tx-24.0.1.ebuild | 79 | ||||
-rw-r--r-- | dev-util/bitcoin-tx/files/24.0.1-syslibs.patch | 281 | ||||
-rw-r--r-- | dev-util/ropper/Manifest | 2 | ||||
-rw-r--r-- | dev-util/ropper/ropper-1.13.8.ebuild | 4 |
8 files changed, 368 insertions, 5 deletions
diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz Binary files differindex 0f8099c768d3..9a92676968bb 100644 --- a/dev-util/Manifest.gz +++ b/dev-util/Manifest.gz diff --git a/dev-util/bcc/Manifest b/dev-util/bcc/Manifest index eb085eb88ad3..21d82fa381c2 100644 --- a/dev-util/bcc/Manifest +++ b/dev-util/bcc/Manifest @@ -6,5 +6,5 @@ AUX bcc-0.9.0-no-luajit-automagic-dep.patch 463 BLAKE2B 286ed298055cbdb22d9c3f3f DIST bcc-0.25.0.tar.gz 4984989 BLAKE2B 7547e3db293c1eef617b3bb58231f40a4bd3d58f425666dcb58bf77a69d74b468f07d07e01cdf2be89820318c9f3c213047b2d6dd654e08e6a60a3ecc2573252 SHA512 9f71f6c21d1f66054985562168d5848352f5029383e9c65c907a6f044258bc23df842cc65db20bfaaf33789e69c9b8e7b606a32dc882cbdf093b71768c8b521d DIST bcc-0.26.0.tar.gz 5255485 BLAKE2B 934b63148dc1e4f017ab97681c6df69c9d5ab1db44c2bb1608644e1d91b745c25759fb1a6c5c543888e23a4e0c4a2e5738b772e0b02ea9901f8bec1a8b15cdd3 SHA512 394872a5780cc7651c91b584ccc13f18f64585b5843364433c042d9ded70faaf15a2e1125d51498508427b089f5bf826f13004d15a1892aada1a5f228a2a8adb EBUILD bcc-0.25.0.ebuild 3063 BLAKE2B 2d17d42ab8e990464edc581a9b000b5e84e64a435612cc8fd85cd5c1ee6449a90bc3c0a7b4a9fe8effa471ddbdcb4076c2319905a7c03c63997eaa438854fa82 SHA512 b5002cd2ce4e33fe9ccfce8fa4370e8697860f23a776b2a276c5607902176599084afd67a81b8b655ff4d3c343605d91eb0328a23b1a0c7a102af8051b096a85 -EBUILD bcc-0.26.0.ebuild 3063 BLAKE2B 2d17d42ab8e990464edc581a9b000b5e84e64a435612cc8fd85cd5c1ee6449a90bc3c0a7b4a9fe8effa471ddbdcb4076c2319905a7c03c63997eaa438854fa82 SHA512 b5002cd2ce4e33fe9ccfce8fa4370e8697860f23a776b2a276c5607902176599084afd67a81b8b655ff4d3c343605d91eb0328a23b1a0c7a102af8051b096a85 +EBUILD bcc-0.26.0-r1.ebuild 3063 BLAKE2B c999c3d0ff65d7ac877355cfe20769a37fa7b1997df35ee308e791ab7fe8f492ea8dd679bbf3ac416014535b2f52dac2d374abe4deff47255deaba818b604df9 SHA512 82799cdbfa96b9d662882c59049d15ca4cf52c19509bc3e18f55bd08ae5f328265bb223b2f24f056bf5165b17fb977a73928f4470ee02c29be0229bb40816017 MISC metadata.xml 533 BLAKE2B b34e30baea99e82348b7f925ab1b4899ea9e4119d2f24f59e11b48dd8efc61edb3029580af40184acd0dfa180caa7e558ef0303247658cc1b3136940f7a735f6 SHA512 c7d4a450c8fe534fd9ab3aede95ac1192aa62f94858b9e0b1efc1b8982d49b0546e012f2d60c1aefc96155b8641d6ebba059af8fbea798827cc8dfeee15390e9 diff --git a/dev-util/bcc/bcc-0.26.0.ebuild b/dev-util/bcc/bcc-0.26.0-r1.ebuild index f4e7887f0085..edac8187bcbe 100644 --- a/dev-util/bcc/bcc-0.26.0.ebuild +++ b/dev-util/bcc/bcc-0.26.0-r1.ebuild @@ -5,7 +5,7 @@ EAPI=8 LUA_COMPAT=( luajit ) PYTHON_COMPAT=( python3_{8..11} ) -LLVM_MAX_SLOT=14 +LLVM_MAX_SLOT=15 inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs diff --git a/dev-util/bitcoin-tx/Manifest b/dev-util/bitcoin-tx/Manifest index 33be09ecd49a..a703614ffefc 100644 --- a/dev-util/bitcoin-tx/Manifest +++ b/dev-util/bitcoin-tx/Manifest @@ -1,8 +1,11 @@ AUX 22.0-fix_build_without_leveldb.patch 683 BLAKE2B 471da86970257cc9082c57504e4a571af9ca70a869aeefd2c59ceaf25680cca75c209cb14658bcb3323c372619cf008ba0a019e89bbd0785886aaf47bf8a48f3 SHA512 1c5aa6a181b404d2b6ae5f820f074c5f27845102900457d88857a2a4bfcb21830ff970cc3cde91623a6b6e18a339f9823170312d91e126649e0d0f4ce71d0200 +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.ebuild 2433 BLAKE2B ae42a797e2f2c258e0f70fa5bdde4250c14e2f9db658a6df208d4449d71bbf5fb9e5dbf3cd2364a5595b5ead60143df3504413910b2ab5a9f423ff85f916b54e SHA512 e985e69f181f72438e32eecd29bc78e70904cea6d61b053e8405c4205d48b0864fc4e0f1df004b021fbee581f7fac50f23f6d832c5d5e7f8c02ac4972a29eb5e EBUILD bitcoin-tx-22.0.ebuild 2697 BLAKE2B 6dfa8a2c86c01be35c8e0139fead76a742dc638ee30e83b17a8f161321d38607147135c63dce66712854e1b6bcd5bab9a891ffa7b280687631d300ff2673670d SHA512 7af1ba5b32d7b7d58df8c37ddb1dc7ccec66ac79917541493fe193afee722fa2cf77efcdeba10c7930e8f1a92fc28c27793d91607d8f44e545a71339a970007d +EBUILD bitcoin-tx-24.0.1.ebuild 1467 BLAKE2B 7d393aefeca4d1d9073a5db84e0b0ab8533d7ee9faa14645e62e60bf97c968b099342d516fe1e12e04aa8c085197e11260ffc77268e8f228d38cfddc49f382ad SHA512 88011f90c24f5beaec90899acd1ab02d8e4dc89000e7db0d26bc279e1976b1a9e15b8f8edd1b4d81a45c2be70ca58a56abfea8d53c63585a5b06c442ec5c0885 MISC metadata.xml 651 BLAKE2B 33a308d2af3a2418cfed88e8a50b1a7f160c3f9ccb7d65acef717cad7bbad0dd8fe0577a6fbe606a354f6458074ed3471ac7672737c8892ac5c67f41ef47ed2f SHA512 303af395b2ef63071c84925ccd94a79f441fa2d32efb78b218c2846be6ae8777949823d205f8073c48ff73746adbec8cf05f76ec90a7f26601cd427335f1fff7 diff --git a/dev-util/bitcoin-tx/bitcoin-tx-24.0.1.ebuild b/dev-util/bitcoin-tx/bitcoin-tx-24.0.1.ebuild new file mode 100644 index 000000000000..ef71b0141e50 --- /dev/null +++ b/dev-util/bitcoin-tx/bitcoin-tx-24.0.1.ebuild @@ -0,0 +1,79 @@ +# 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" + +RDEPEND=" + >=dev-libs/boost-1.64.0:= + >=dev-libs/libsecp256k1-0.2:=[recovery,schnorr] +" +DEPEND="${RDEPEND}" + +DOCS=( + doc/bips.md + doc/release-notes.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() { + 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/files/24.0.1-syslibs.patch b/dev-util/bitcoin-tx/files/24.0.1-syslibs.patch new file mode 100644 index 000000000000..00404a2ff021 --- /dev/null +++ b/dev-util/bitcoin-tx/files/24.0.1-syslibs.patch @@ -0,0 +1,281 @@ +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 <leveldb/env.h> ++ #include <leveldb/helpers/memenv.h> ++ ++ 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 <fs.h> + #include <logging.h> + #include <random.h> ++#include <node/interface_ui.h> + #include <tinyformat.h> + #include <util/strencodings.h> + #include <util/system.h> ++#include <util/translation.h> + + #include <algorithm> + #include <cassert> + #include <cstdarg> + #include <cstdint> + #include <cstdio> ++#include <leveldb/c.h> + #include <leveldb/cache.h> + #include <leveldb/db.h> + #include <leveldb/env.h> + #include <leveldb/filter_policy.h> +-#include <leveldb/helpers/memenv/memenv.h> ++#include <leveldb/helpers/memenv.h> + #include <leveldb/iterator.h> + #include <leveldb/options.h> + #include <leveldb/status.h> + #include <memory> + #include <optional> + ++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 <kernel/checks.h> +- ++#include <dbwrapper.h> + #include <key.h> + #include <random.h> ++#include <node/interface_ui.h> + #include <util/time.h> + #include <util/translation.h> + +@@ -15,6 +16,10 @@ namespace kernel { + + std::optional<bilingual_str> 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 <qt/guiutil.h> + ++#include <QMessageBox> + #include <QPushButton> + + 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/ropper/Manifest b/dev-util/ropper/Manifest index 060a798c48e7..7834037ac278 100644 --- a/dev-util/ropper/Manifest +++ b/dev-util/ropper/Manifest @@ -1,6 +1,6 @@ DIST ropper-1.13.7.tar.gz 1491228 BLAKE2B 24e3f4d2454cad2b4ba8f365a4da4060f0aadc4e78423388024adbf2b58d33276e68ed92f7b778b9a7d9eda057c6a1675a67c43c93df4d378605c08720d97197 SHA512 1d93c4d58454bbd5cfb6a4a7a69f571294613e10e77cae6a65eaf7b9a5c977a3b82c888bd414d1b3e6a1082ba7cd9f2121253bf849dff2a40cdb34acb1371acf DIST ropper-1.13.8.gh.tar.gz 1491769 BLAKE2B 8601bcd2287763aa208b227c437362b9799ec1775104b659213e69a77f118bce567e95a0b83a4f0556439a82ee853ebc9aabaa4098b2a700572d1b661213eb25 SHA512 eae2279e1c6bc91af76e8e5d37b7d57c5d2e518d027e293dbd52c6c27dcd8826e73673c55fe581cdefda272b657c8eff2b5eb4fdc4996fec1548709b8371b5d4 EBUILD ropper-1.13.7.ebuild 1102 BLAKE2B e52ef8a6bc3a1aa70d72d0b5d1b172312cc943ac029ab53281afe52d72bc2c9666fccdaf06a4475b5811e2114cde8b8d8c800168e137e7757240c26b891f3132 SHA512 e8302bfe62bb3c97bc1260537b4c2561d2d18e21832e81cab4693a1870e614cb74a4bc9a81e3af2eb6010ddfd66690c95a9fd052b278e47c4825cbbb8a8daf04 -EBUILD ropper-1.13.8.ebuild 1105 BLAKE2B 805e2e2c6336104c9215a28a75b0df7564bf3feef8c504056d2fc5a7917be8584083e21accfd53cea07188359aed1ea29beef15475f6cbad3703b5bf9908a10a SHA512 a7618d437ed1022f4b9fd457aa57e26e58f1a4441f6fd916f5589ff071e9e63fa02f8f57365a7992f4f02f1f4395337ccbdc4984232cd973f18b60ef9f2dfdfb +EBUILD ropper-1.13.8.ebuild 1103 BLAKE2B 2fefb477c020fa57de236d090d4dd65aeb96c34890e1ac52cc2f003e4cf608db7f7d7f358f066749f3c52f17a72ef6128020137390b16fa41457d323c6fb4b70 SHA512 dad2d40d83bdcbf88b36ecf7b00287d57f03ece9e8d2e96fcb17953587b90b8dae242ba4d157ce994346e69e42c6a76659daa6d9a43a8d13c11bbb870ea16e47 EBUILD ropper-9999.ebuild 1105 BLAKE2B 805e2e2c6336104c9215a28a75b0df7564bf3feef8c504056d2fc5a7917be8584083e21accfd53cea07188359aed1ea29beef15475f6cbad3703b5bf9908a10a SHA512 a7618d437ed1022f4b9fd457aa57e26e58f1a4441f6fd916f5589ff071e9e63fa02f8f57365a7992f4f02f1f4395337ccbdc4984232cd973f18b60ef9f2dfdfb MISC metadata.xml 786 BLAKE2B 1080932503cd360d0ecac2d9f135bb4e52c5590944adf0f491eac763fef40e4d95361fc81a9144469d86d1c75f6448623662f179030ec7b01634e0edb8202a8e SHA512 4dbd1c561976731b60ad27d9c71128151b2063e4a9c28291e4e53aedfe829110f1bdbc89b0a3ffabc95236dbe30830489f034280c3c0e9bf90a572960654cba3 diff --git a/dev-util/ropper/ropper-1.13.8.ebuild b/dev-util/ropper/ropper-1.13.8.ebuild index 715beb97d20b..f79631b10189 100644 --- a/dev-util/ropper/ropper-1.13.8.ebuild +++ b/dev-util/ropper/ropper-1.13.8.ebuild @@ -1,4 +1,4 @@ -# Copyright 1999-2022 Gentoo Authors +# Copyright 1999-2023 Gentoo Authors # Distributed under the terms of the GNU General Public License v2 EAPI=8 @@ -19,7 +19,7 @@ else SRC_URI="https://github.com/sashs/Ropper/archive/v${PV}.tar.gz -> ${P}.gh.tar.gz" S="${WORKDIR}"/Ropper-${PV} - KEYWORDS="~amd64 ~x86" + KEYWORDS="amd64 x86" fi LICENSE="BSD" |