From 083bdfbef9bc532b72cf116591025916eebaf676 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Thu, 5 Jan 2023 06:08:15 +0000 Subject: gentoo auto-resync : 05:01:2023 - 06:08:15 --- dev-util/Manifest.gz | Bin 68432 -> 68425 bytes dev-util/bcc/Manifest | 2 +- dev-util/bcc/bcc-0.26.0-r1.ebuild | 137 ++++++++++++ dev-util/bcc/bcc-0.26.0.ebuild | 137 ------------ dev-util/bitcoin-tx/Manifest | 3 + dev-util/bitcoin-tx/bitcoin-tx-24.0.1.ebuild | 79 +++++++ dev-util/bitcoin-tx/files/24.0.1-syslibs.patch | 281 +++++++++++++++++++++++++ dev-util/ropper/Manifest | 2 +- dev-util/ropper/ropper-1.13.8.ebuild | 4 +- 9 files changed, 504 insertions(+), 141 deletions(-) create mode 100644 dev-util/bcc/bcc-0.26.0-r1.ebuild delete mode 100644 dev-util/bcc/bcc-0.26.0.ebuild create mode 100644 dev-util/bitcoin-tx/bitcoin-tx-24.0.1.ebuild create mode 100644 dev-util/bitcoin-tx/files/24.0.1-syslibs.patch (limited to 'dev-util') diff --git a/dev-util/Manifest.gz b/dev-util/Manifest.gz index 0f8099c768d3..9a92676968bb 100644 Binary files a/dev-util/Manifest.gz and b/dev-util/Manifest.gz differ 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-r1.ebuild b/dev-util/bcc/bcc-0.26.0-r1.ebuild new file mode 100644 index 000000000000..edac8187bcbe --- /dev/null +++ b/dev-util/bcc/bcc-0.26.0-r1.ebuild @@ -0,0 +1,137 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +LUA_COMPAT=( luajit ) +PYTHON_COMPAT=( python3_{8..11} ) +LLVM_MAX_SLOT=15 + +inherit cmake linux-info llvm lua-single python-r1 toolchain-funcs + +DESCRIPTION="Tools for BPF-based Linux IO analysis, networking, monitoring, and more" +HOMEPAGE="https://iovisor.github.io/bcc/" +SRC_URI="https://github.com/iovisor/bcc/archive/v${PV}.tar.gz -> ${P}.tar.gz" + +LICENSE="Apache-2.0" +SLOT="0" +KEYWORDS="~amd64 ~arm64 ~riscv ~x86" +IUSE="+lua test" + +REQUIRED_USE=" + ${PYTHON_REQUIRED_USE} + lua? ( ${LUA_REQUIRED_USE} ) +" + +# tests need root access +RESTRICT="test" + +RDEPEND=" + >=dev-libs/elfutils-0.166:= + >=dev-libs/libbpf-0.7.0:=[static-libs(-)] + sys-kernel/linux-headers + ++ #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/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" -- cgit v1.2.3