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 --- net-p2p/bitcoind/Manifest | 18 +- net-p2p/bitcoind/bitcoind-0.21.0-r1.ebuild | 176 ------------- net-p2p/bitcoind/bitcoind-22.0-r1.ebuild | 206 --------------- net-p2p/bitcoind/bitcoind-24.0.1.ebuild | 163 ------------ net-p2p/bitcoind/bitcoind-25.1.ebuild | 2 +- net-p2p/bitcoind/files/24.0.1-gcc13.patch | 39 --- net-p2p/bitcoind/files/24.0.1-syslibs.patch | 281 --------------------- net-p2p/bitcoind/files/bitcoin.conf | 8 - net-p2p/bitcoind/files/bitcoin.conf.5 | 19 -- .../files/bitcoind-0.20.1-boost-1.77-compat.patch | 56 ---- net-p2p/bitcoind/files/bitcoind.logrotate-r1 | 8 - net-p2p/bitcoind/metadata.xml | 2 - 12 files changed, 3 insertions(+), 975 deletions(-) delete mode 100644 net-p2p/bitcoind/bitcoind-0.21.0-r1.ebuild delete mode 100644 net-p2p/bitcoind/bitcoind-22.0-r1.ebuild delete mode 100644 net-p2p/bitcoind/bitcoind-24.0.1.ebuild delete mode 100644 net-p2p/bitcoind/files/24.0.1-gcc13.patch delete mode 100644 net-p2p/bitcoind/files/24.0.1-syslibs.patch delete mode 100644 net-p2p/bitcoind/files/bitcoin.conf delete mode 100644 net-p2p/bitcoind/files/bitcoin.conf.5 delete mode 100644 net-p2p/bitcoind/files/bitcoind-0.20.1-boost-1.77-compat.patch delete mode 100644 net-p2p/bitcoind/files/bitcoind.logrotate-r1 (limited to 'net-p2p/bitcoind') diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index ab9e8e732cc3..3a1a9da6c329 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -1,16 +1,2 @@ -AUX 24.0.1-gcc13.patch 989 BLAKE2B f1af15f550a0d43fb0a80f585bcc507a505e2351062c347cd334276d87b4cae48235ca643291b6473e89aaabdac920927f2d654589ca029141a833882e041bfc SHA512 07cfc8cea84f716d0844010b8f09a3dc700e8b89c9ea98da133a34a8820841cec20c426f53a3dacde4d406a2f34409018bce879b34c0def30770025834b60929 -AUX 24.0.1-syslibs.patch 9037 BLAKE2B fa634a8f18d1f1c32d1c3cb18bdfcafc89838a7f5b3a075a40ad3354d1253f1d637351d2661475eb86110db470a7b29c9cfb6266a7f61623c0865939c9e74453 SHA512 fcf8114174e69c5385058b190fa2c0b0ef105869d5d6a40a3cc6bb8e8ef1518cb8bc1fb7cc3a7ec28f361d91f66e4253420c2b50a0004a2dc0978910254cae3d -AUX bitcoin.conf 80 BLAKE2B be9f776453fce1081dfa95fd844089d51e8212731d7bb460256a3b258b5369fe14b0bd19af15d9c360fbc07232e8718056acd829e03138a326faba32ac42e4da SHA512 43bef890505a1fac88887bb39e9fdd4ec673ae8838a40279b33711e970551f5a75ac25171c41f8c83de2c953b157f7a3f57171e868fd9f626007d9909331a19f -AUX bitcoin.conf.5 1438 BLAKE2B 8664545f78ee9e48a9c9ea2d11f54d7320d205182f6b81f705262826f470e0bf9c86fa3a93aab81ccb1dd139bd01cb399a7b2c6a37109cc21aba5606ca9bc593 SHA512 1dd9dfdfb530d1bfb20bc84590034ab6902f25714b3c5bfa2418ad27515bc895fa16968880ec326641f0e58f9364e666764972b5a8782acb2e7494207d629888 -AUX bitcoind-0.20.1-boost-1.77-compat.patch 2255 BLAKE2B 9a65c1640fd4090840070865265b7529324e850a7f34cc13c6e6a940f0a706cf5b3849497044233f3cf5b3fde177afb4d160ded2ed3a8adfc0ae8d488724539f SHA512 f1326a67749949efee07e01175b227ff16fda8f88e0a956598013399ad3b0ae652bb3206a0ce08edfbf4a712d523f2018de684d4c747c9d234d1fab6088e42ad -AUX bitcoind.logrotate-r1 121 BLAKE2B 815316d97eaf71f1fe94673a58a91eaee3020fac39d5d6b84cc72afe5c22d48cb80ed561f9c6b43b6f85bd6f269f37fdd4fc1e4e96688f7a8ae25023ac560cea SHA512 a4783a310ea6b77f607bcc45d86d25ffd72794983bd1854b77eb057e86377e067f666ca38073c8efcb06256e1202918c77c8e09382cd8462832dee769017dde1 -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 bitcoind-0.21.0-r1.ebuild 4890 BLAKE2B aeafd089052e3339e78258042454893e37b0fbf867453a99acd688019b58e2be5e3c7a256a0cab9bdacc72d09c985c6afad7d0d7628fa439c80154363e28a4c4 SHA512 2291bdb99d0747ca35dcd53dfea9007100e9c6a666d6a8b1b9193fdae47178c7d8e9715c445ed2e0c873b45ac66fa736169ed43dd3a7a37b3515d3dac2891498 -EBUILD bitcoind-22.0-r1.ebuild 6173 BLAKE2B 212e5f1f4c6f06f4adc25f88df4bedf93e61bd123ce0b4648a7ddcfe30c1cd6ebd3554d56ee784a47d29e7314d1ae6cc84f1b7b71c7fe2f9d0ecf7e78f405961 SHA512 2551d976eaec4ccc48431f91b5854bf858794421a6f74f12e9a578065b3eb381ea2b7952f5a159d9280ed299f15edf7a373fecfb9825db7c222350fcdcc7b22d -EBUILD bitcoind-24.0.1.ebuild 4078 BLAKE2B 5bed8c28092d9acada04ff5d543738cff11360c27e732c94dd5b3b4ecc664ad526c4ce43ac28191cef34208cc653404639ca4776512e30aa3f51ca2e26ced268 SHA512 bb8f5f00b88c7d7dff051b32ac16aaaef0bede28fe262dd8b62f88dd546df6bb74e2f8f80ce09ddea1d97c1af4caafcffd5b9ff31cfe5ad5bf1046fc28e353eb -EBUILD bitcoind-25.1.ebuild 672 BLAKE2B 3f576d9b537462ba60b763a0c51694185e450fa8859b8a28a230e133717ded34d2ccbe376811170dd8aad7af70114f04839508a2bd0dabec3a8c8615146e98c3 SHA512 591fc5368ffe6c84652d070ed2a14170cfa6f734ecdc6a02865323ff18c98490b4f58cca73cc3cb8fa650e259a266a40539e8e6a9aed3155858f117d6220e4c2 -MISC metadata.xml 1352 BLAKE2B a924424d5811e88d1dbc6cff68289695e270854d8afb811c4d5d682fc893d2434d166f26c229e5f8ab62e4161944940ee6eb55aa3149b93d69f288a023aa6d3d SHA512 a024d33e339da9e75e10137568503187f186fc717d6bc1f170e478f06fb577340b36a7f13fea070ef98faa97c8bc52e4f60698df4a09b28050656ddd06d842fc +EBUILD bitcoind-25.1.ebuild 670 BLAKE2B 13bafd9fbf062a458ac335ec83111e37866ddf1c3e120b0aa51335421abc98b0ebae97710d7442eca6c9e0cf01dc64f60ab3e965fb33673b7d186fcca2b03f0a SHA512 5931a45e5d366b34a2be6286599401d3e1dd70e3f8ae1d49496dd48cc6ba397d628f47391dd5f25053cecb8e6b000fefb1c1b432eff8ca9c5430d5173a32d5d1 +MISC metadata.xml 1157 BLAKE2B 6468568ff3d317aefd1a59b735c48bcf46c5e651fceea6b079ef449934b9807fbf28d21159296a426ebb75358eb0dd826c45b12622267858066593d8ea41b792 SHA512 197c97b856058aebc8a91fdfd7bd79f24a7ff56f7a6750222a3e76e0b2383934aa37ff11ff813e13070ac3fd220e422f1ee1851274f45a06761c1732ab703945 diff --git a/net-p2p/bitcoind/bitcoind-0.21.0-r1.ebuild b/net-p2p/bitcoind/bitcoind-0.21.0-r1.ebuild deleted file mode 100644 index ee53cd8ba772..000000000000 --- a/net-p2p/bitcoind/bitcoind-0.21.0-r1.ebuild +++ /dev/null @@ -1,176 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DB_VER="4.8" -inherit autotools bash-completion-r1 db-use systemd - -BITCOINCORE_COMMITHASH="95ea54ba089610019a74c1176a2c7c0dba144b1c" -KNOTS_PV="${PV}.knots20210130" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/$(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="+asm examples knots +sqlite system-leveldb test upnp +wallet zeromq" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-group/bitcoin - acct-user/bitcoin - dev-libs/boost:= - dev-libs/libevent:= - >dev-libs/libsecp256k1-0.1_pre20200911:0/0[recovery,schnorr] - !>=dev-libs/libsecp256k1-0.1_pre20210628 - >=dev-libs/univalue-1.0.4:= - system-leveldb? ( virtual/bitcoin-leveldb ) - sqlite? ( >=dev-db/sqlite-3.7.17:= ) - upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) - wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] ) - zeromq? ( net-libs/zeromq:= ) -" -RDEPEND="${DEPEND}" -BDEPEND=" - >=sys-devel/autoconf-2.69 - >=sys-devel/automake-1.13 -" - -DOCS=( - doc/bips.md - doc/bitcoin-conf.md - doc/descriptors.md - doc/files.md - doc/JSON-RPC-interface.md - doc/psbt.md - doc/reduce-traffic.md - doc/release-notes.md - doc/REST-interface.md - doc/tor.md -) - -S="${WORKDIR}/bitcoin-${BITCOINCORE_COMMITHASH}" - -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 - elog "Replace By Fee policy is now always enabled by default: Your node will" - elog "preferentially mine and relay transactions paying the highest fee, regardless" - elog "of receive order. To disable RBF, set mempoolreplacement=never in bitcoin.conf" -} - -src_prepare() { - sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die - - 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 "${FILESDIR}/${PN}-0.20.1-boost-1.77-compat.patch" - - default - - 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/secp256k1 || die - if use system-leveldb; then - rm -r src/leveldb || die - fi -} - -src_configure() { - local my_econf=( - $(use_enable asm) - --without-qtdbus - --without-qrencode - $(use_with upnp miniupnpc) - $(use_enable upnp upnp-default) - $(use_enable test tests) - $(use_enable wallet) - $(use_enable zeromq zmq) - --with-daemon - --disable-util-cli - --disable-util-tx - --disable-util-wallet - --disable-bench - --without-libs - --without-gui - --disable-fuzz - --disable-ccache - --disable-static - $(use_with sqlite) - $(use_with system-leveldb) - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - if use test; then - rm -f "${ED}/usr/bin/test_bitcoin" || die - fi - - insinto /etc/bitcoin - newins "${FILESDIR}/bitcoin.conf" bitcoin.conf - fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf - fperms 600 /etc/bitcoin/bitcoin.conf - - newconfd "contrib/init/bitcoind.openrcconf" ${PN} - newinitd "contrib/init/bitcoind.openrc" ${PN} - systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service" - - keepdir /var/lib/bitcoin/.bitcoin - fperms 700 /var/lib/bitcoin - fowners bitcoin:bitcoin /var/lib/bitcoin/ - fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin - dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf - - doman "${FILESDIR}/bitcoin.conf.5" - - use zeromq && dodoc doc/zmq.md - - newbashcomp contrib/${PN}.bash-completion ${PN} - - if use examples; then - docinto examples - dodoc -r contrib/{linearize,qos} - use zeromq && dodoc -r contrib/zmq - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind -} - -pkg_postinst() { - elog "To have ${PN} automatically use Tor when it's running, be sure your" - elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup" - elog "correctly, and:" - elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group." - elog "- Running bitcoind directly: add that user to the 'tor' user group." -} diff --git a/net-p2p/bitcoind/bitcoind-22.0-r1.ebuild b/net-p2p/bitcoind/bitcoind-22.0-r1.ebuild deleted file mode 100644 index 1fdd799bd9a7..000000000000 --- a/net-p2p/bitcoind/bitcoind-22.0-r1.ebuild +++ /dev/null @@ -1,206 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=7 - -DB_VER="4.8" -inherit autotools bash-completion-r1 db-use systemd flag-o-matic - -BITCOINCORE_COMMITHASH="a0988140b71485ad12c3c3a4a9573f7c21b1eff8" -KNOTS_PV="${PV}.knots20211108" -KNOTS_P="bitcoin-${KNOTS_PV}" - -DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services" -HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/" -SRC_URI=" - https://github.com/bitcoin/bitcoin/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> bitcoin-v${PV}.tar.gz - https://bitcoinknots.org/files/$(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="+asm +berkdb examples +external-signer knots nat-pmp sqlite systemtap test upnp +wallet zeromq" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - sqlite? ( wallet ) - berkdb? ( wallet ) - wallet? ( || ( berkdb sqlite ) ) -" -RDEPEND=" - acct-group/bitcoin - acct-user/bitcoin - dev-libs/boost:= - dev-libs/libevent:= - >dev-libs/libsecp256k1-0.1_pre20200911:0/0[recovery,schnorr] - !>=dev-libs/libsecp256k1-0.1_pre20210628 - >=dev-libs/univalue-1.0.4:= - nat-pmp? ( net-libs/libnatpmp ) - virtual/bitcoin-leveldb - sqlite? ( >=dev-db/sqlite-3.7.17:= ) - upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) - berkdb? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] ) - zeromq? ( net-libs/zeromq:= ) -" -DEPEND="${RDEPEND} - systemtap? ( dev-util/systemtap ) -" -BDEPEND=" - >=sys-devel/automake-1.13 - || ( >=sys-devel/gcc-7[cxx] >=sys-devel/clang-5 ) -" - -DOCS=( - doc/bips.md - doc/bitcoin-conf.md - doc/descriptors.md - doc/files.md - doc/JSON-RPC-interface.md - doc/psbt.md - doc/reduce-memory.md - doc/reduce-traffic.md - doc/release-notes.md - doc/REST-interface.md - doc/tor.md -) - -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 - elog - elog "Replace By Fee policy is now always enabled by default: Your node will" - elog "preferentially mine and relay transactions paying the highest fee, regardless" - if use knots; then - elog "of receive order. To disable RBF, set mempoolreplacement=never in bitcoin.conf" - else # Bitcoin Core doesn't support disabling RBF anymore - elog "of receive order. To disable RBF, rebuild with USE=knots to get ${PN}" - elog "from Bitcoin Knots, and set mempoolreplacement=never in bitcoin.conf" - fi - if has_version "<${CATEGORY}/${PN}-0.21.1" ; then - ewarn "CAUTION: BITCOIN PROTOCOL CHANGE INCLUDED" - ewarn "This release adds enforcement of the Taproot protocol change to the Bitcoin" - ewarn "rules, beginning in November. Protocol changes require user consent to be" - ewarn "effective, and if enforced inconsistently within the community may compromise" - ewarn "your security or others! If you do not know what you are doing, learn more" - ewarn "before November. (You must make a decision either way - simply not upgrading" - ewarn "is insecure in all scenarios.)" - ewarn "To learn more, see https://bitcointaproot.cc" - 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() { - sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die - - local knots_patchdir="${WORKDIR}/${KNOTS_P}.patches/" - - eapply "${knots_patchdir}/${KNOTS_P}_p1-syslibs.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=( - $(use_enable asm) - --without-qtdbus - $(use_enable systemtap ebpf) - $(use_enable external-signer) - $(use_with nat-pmp natpmp) - $(use_with nat-pmp natpmp-default) - --without-qrencode - $(use_with upnp miniupnpc) - $(use_enable upnp upnp-default) - $(use_enable test tests) - $(use_enable wallet) - $(use_enable zeromq zmq) - --with-daemon - --disable-util-cli - --disable-util-tx - --disable-util-util - --disable-util-wallet - --disable-bench - --without-libs - --without-gui - --disable-fuzz - --disable-fuzz-binary - --disable-ccache - --disable-static - $(use_with berkdb bdb) - $(use_with sqlite) - --with-system-leveldb - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - if use test; then - rm -f "${ED}/usr/bin/test_bitcoin" || die - fi - - insinto /etc/bitcoin - newins "${FILESDIR}/bitcoin.conf" bitcoin.conf - fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf - fperms 600 /etc/bitcoin/bitcoin.conf - - newconfd "contrib/init/bitcoind.openrcconf" ${PN} - newinitd "contrib/init/bitcoind.openrc" ${PN} - systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service" - - keepdir /var/lib/bitcoin/.bitcoin - fperms 700 /var/lib/bitcoin - fowners bitcoin:bitcoin /var/lib/bitcoin/ - fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin - dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf - - doman "${FILESDIR}/bitcoin.conf.5" - - use zeromq && dodoc doc/zmq.md - - newbashcomp contrib/${PN}.bash-completion ${PN} - - if use examples; then - docinto examples - dodoc -r contrib/{linearize,qos} - use zeromq && dodoc -r contrib/zmq - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind -} - -pkg_postinst() { - elog "To have ${PN} automatically use Tor when it's running, be sure your" - elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup" - elog "correctly, and:" - elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group." - elog "- Running bitcoind directly: add that user to the 'tor' user group." -} diff --git a/net-p2p/bitcoind/bitcoind-24.0.1.ebuild b/net-p2p/bitcoind/bitcoind-24.0.1.ebuild deleted file mode 100644 index 6eec37f477fe..000000000000 --- a/net-p2p/bitcoind/bitcoind-24.0.1.ebuild +++ /dev/null @@ -1,163 +0,0 @@ -# Copyright 1999-2023 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI=8 - -DB_VER="4.8" -inherit autotools bash-completion-r1 db-use systemd - -DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services" -HOMEPAGE="https://bitcoincore.org/" -SRC_URI=" - https://bitcoincore.org/bin/bitcoin-core-${PV}/${P/d}.tar.gz -" -S="${WORKDIR}"/${P/d} - -LICENSE="MIT" -SLOT="0" -KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" -IUSE="+asm +berkdb examples +external-signer nat-pmp sqlite systemtap test upnp +wallet zeromq" -RESTRICT="!test? ( test )" - -REQUIRED_USE=" - sqlite? ( wallet ) - berkdb? ( wallet ) - wallet? ( || ( berkdb sqlite ) ) -" -# 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=" - acct-group/bitcoin - acct-user/bitcoin - dev-libs/boost:= - dev-libs/libevent:= - >=dev-libs/libsecp256k1-0.2.0:=[recovery,schnorr] - >=dev-libs/univalue-1.0.4:= - virtual/bitcoin-leveldb - nat-pmp? ( net-libs/libnatpmp ) - sqlite? ( >=dev-db/sqlite-3.7.17:= ) - upnp? ( >=net-libs/miniupnpc-1.9.20150916:= ) - berkdb? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] ) - zeromq? ( net-libs/zeromq:= ) -" -DEPEND=" - ${RDEPEND} - systemtap? ( dev-util/systemtap ) -" - -DOCS=( - doc/bips.md - doc/bitcoin-conf.md - doc/descriptors.md - doc/files.md - doc/JSON-RPC-interface.md - doc/psbt.md - doc/reduce-memory.md - doc/reduce-traffic.md - doc/release-notes.md - doc/REST-interface.md - doc/tor.md -) - -PATCHES=( - "${FILESDIR}"/24.0.1-syslibs.patch - "${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() { - sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die - - default - - eautoreconf - - rm -r src/leveldb src/secp256k1 || die -} - -src_configure() { - local myeconfargs=( - $(use_enable asm) - --without-qtdbus - $(use_enable systemtap ebpf) - $(use_enable external-signer) - $(use_with nat-pmp natpmp) - $(use_with nat-pmp natpmp-default) - --without-qrencode - $(use_with upnp miniupnpc) - $(use_enable upnp upnp-default) - $(use_enable test tests) - $(use_enable wallet) - $(use_enable zeromq zmq) - --with-daemon - --disable-util-cli - --disable-util-tx - --disable-util-util - --disable-util-wallet - --disable-bench - --without-libs - --without-gui - --disable-fuzz - --disable-fuzz-binary - --disable-ccache - --disable-static - $(use_with berkdb bdb) - $(use_with sqlite) - --with-system-leveldb - --with-system-libsecp256k1 - ) - - econf "${myeconfargs[@]}" -} - -src_install() { - default - - if use test; then - rm -f "${ED}/usr/bin/test_bitcoin" || die - fi - - insinto /etc/bitcoin - newins "${FILESDIR}/bitcoin.conf" bitcoin.conf - fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf - fperms 600 /etc/bitcoin/bitcoin.conf - - newconfd "contrib/init/bitcoind.openrcconf" ${PN} - newinitd "contrib/init/bitcoind.openrc" ${PN} - systemd_newunit "contrib/init/bitcoind.service" "bitcoind.service" - - keepdir /var/lib/bitcoin/.bitcoin - fperms 700 /var/lib/bitcoin - fowners bitcoin:bitcoin /var/lib/bitcoin/ - fowners bitcoin:bitcoin /var/lib/bitcoin/.bitcoin - dosym ../../../../etc/bitcoin/bitcoin.conf /var/lib/bitcoin/.bitcoin/bitcoin.conf - - doman "${FILESDIR}/bitcoin.conf.5" - - use zeromq && dodoc doc/zmq.md - - newbashcomp contrib/${PN}.bash-completion ${PN} - - if use examples; then - docinto examples - dodoc -r contrib/{linearize,qos} - use zeromq && dodoc -r contrib/zmq - fi - - insinto /etc/logrotate.d - newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind -} - -pkg_postinst() { - elog "To have ${PN} automatically use Tor when it's running, be sure your" - elog "'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup" - elog "correctly, and:" - elog "- Using an init script: add the 'bitcoin' user to the 'tor' user group." - elog "- Running bitcoind directly: add that user to the 'tor' user group." -} diff --git a/net-p2p/bitcoind/bitcoind-25.1.ebuild b/net-p2p/bitcoind/bitcoind-25.1.ebuild index b0f60caef63e..7808d912fce7 100644 --- a/net-p2p/bitcoind/bitcoind-25.1.ebuild +++ b/net-p2p/bitcoind/bitcoind-25.1.ebuild @@ -8,7 +8,7 @@ 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" IUSE="+asm +berkdb examples +external-signer nat-pmp +sqlite systemtap test upnp +wallet zeromq" RESTRICT="!test? ( test )" diff --git a/net-p2p/bitcoind/files/24.0.1-gcc13.patch b/net-p2p/bitcoind/files/24.0.1-gcc13.patch deleted file mode 100644 index 39cf81b14953..000000000000 --- a/net-p2p/bitcoind/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/net-p2p/bitcoind/files/24.0.1-syslibs.patch b/net-p2p/bitcoind/files/24.0.1-syslibs.patch deleted file mode 100644 index 00404a2ff021..000000000000 --- a/net-p2p/bitcoind/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/net-p2p/bitcoind/files/bitcoin.conf b/net-p2p/bitcoind/files/bitcoin.conf deleted file mode 100644 index c6a55f3d9133..000000000000 --- a/net-p2p/bitcoind/files/bitcoin.conf +++ /dev/null @@ -1,8 +0,0 @@ -# http://www.bitcoin.org/smf/index.php?topic=644.0 -#rpcuser= -#rpcpassword= - - - - - diff --git a/net-p2p/bitcoind/files/bitcoin.conf.5 b/net-p2p/bitcoind/files/bitcoin.conf.5 deleted file mode 100644 index 839dc26c1aa5..000000000000 --- a/net-p2p/bitcoind/files/bitcoin.conf.5 +++ /dev/null @@ -1,19 +0,0 @@ -.TH BITCOIN.CONF "5" "February 2016" "bitcoin.conf 0.12" -.SH NAME -bitcoin.conf \- bitcoin configuration file -.SH SYNOPSIS -All command-line options (except for '\-conf') may be specified in a configuration file, and all configuration file options may also be specified on the command line. Command-line options override values set in the configuration file. -.TP -The configuration file is a list of 'setting=value' pairs, one per line, with optional comments starting with the '#' character. Please refer to bitcoind(1) for a up to date list of valid options. -.TP -The configuration file is not automatically created; you can create it using your favorite plain-text editor. By default, bitcoind(1) will look for a file named bitcoin.conf(5) in the bitcoin data directory, but both the data directory and the configuration file path may be changed using the '\-datadir' and '\-conf' command-line arguments. -.SH LOCATION -bitcoin.conf should be located in $HOME/.bitcoin - -.SH "SEE ALSO" -bitcoind(1) -.SH AUTHOR -This manual page was written by Micah Anderson for the Debian system (but may be used by others). Permission is granted to copy, distribute and/or modify this document under the terms of the GNU General Public License, Version 3 or any later version published by the Free Software Foundation. - -On Debian systems, the complete text of the GNU General Public License can be found in /usr/share/common-licenses/GPL. - diff --git a/net-p2p/bitcoind/files/bitcoind-0.20.1-boost-1.77-compat.patch b/net-p2p/bitcoind/files/bitcoind-0.20.1-boost-1.77-compat.patch deleted file mode 100644 index 53b5563cb662..000000000000 --- a/net-p2p/bitcoind/files/bitcoind-0.20.1-boost-1.77-compat.patch +++ /dev/null @@ -1,56 +0,0 @@ -commit acb7aad27ec8a184808aa7905887e3b2c5d54e9c -Author: Rafael Sadowski -Date: Mon Aug 16 06:34:02 2021 +0200 - - Fix build with Boost 1.77.0 - - BOOST_FILESYSTEM_C_STR changed to accept the path as an argument - -diff --git a/src/fs.cpp b/src/fs.cpp -index 4f20ca4d28f..89c7ad27dc4 100644 ---- a/src/fs.cpp -+++ b/src/fs.cpp -@@ -242,7 +242,11 @@ void ofstream::close() - } - #else // __GLIBCXX__ - -+#if BOOST_VERSION >= 107700 -+static_assert(sizeof(*BOOST_FILESYSTEM_C_STR(fs::path())) == sizeof(wchar_t), -+#else - static_assert(sizeof(*fs::path().BOOST_FILESYSTEM_C_STR) == sizeof(wchar_t), -+#endif // BOOST_VERSION >= 107700 - "Warning: This build is using boost::filesystem ofstream and ifstream " - "implementations which will fail to open paths containing multibyte " - "characters. You should delete this static_assert to ignore this warning, " -diff --git a/src/wallet/test/db_tests.cpp b/src/wallet/test/db_tests.cpp -index 17f5264b459..16cb7e0baf0 100644 ---- a/src/wallet/test/db_tests.cpp -+++ b/src/wallet/test/db_tests.cpp -@@ -25,7 +25,11 @@ BOOST_AUTO_TEST_CASE(getwalletenv_file) - std::string test_name = "test_name.dat"; - const fs::path datadir = gArgs.GetDataDirNet(); - fs::path file_path = datadir / test_name; -+#if BOOST_VERSION >= 107700 -+ std::ofstream f(BOOST_FILESYSTEM_C_STR(file_path)); -+#else - std::ofstream f(file_path.BOOST_FILESYSTEM_C_STR); -+#endif // BOOST_VERSION >= 107700 - f.close(); - - std::string filename; -diff --git a/src/wallet/test/init_test_fixture.cpp b/src/wallet/test/init_test_fixture.cpp -index dd9354848d7..53c972c46d3 100644 ---- a/src/wallet/test/init_test_fixture.cpp -+++ b/src/wallet/test/init_test_fixture.cpp -@@ -32,7 +32,11 @@ InitWalletDirTestingSetup::InitWalletDirTestingSetup(const std::string& chainNam - fs::create_directories(m_walletdir_path_cases["default"]); - fs::create_directories(m_walletdir_path_cases["custom"]); - fs::create_directories(m_walletdir_path_cases["relative"]); -+#if BOOST_VERSION >= 107700 -+ std::ofstream f(BOOST_FILESYSTEM_C_STR(m_walletdir_path_cases["file"])); -+#else - std::ofstream f(m_walletdir_path_cases["file"].BOOST_FILESYSTEM_C_STR); -+#endif // BOOST_VERSION >= 107700 - f.close(); - } - diff --git a/net-p2p/bitcoind/files/bitcoind.logrotate-r1 b/net-p2p/bitcoind/files/bitcoind.logrotate-r1 deleted file mode 100644 index f9a4702720ab..000000000000 --- a/net-p2p/bitcoind/files/bitcoind.logrotate-r1 +++ /dev/null @@ -1,8 +0,0 @@ -/var/lib/bitcoin/.bitcoin/debug.log { - missingok - weekly - sharedscripts - postrotate - killall -HUP bitcoind - endscript -} diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml index 651c8b9cb191..722f2a18a376 100644 --- a/net-p2p/bitcoind/metadata.xml +++ b/net-p2p/bitcoind/metadata.xml @@ -12,9 +12,7 @@ Enable assembly for optimization Include support for external wallet signer programs - Build enhanced Bitcoin Knots version, rather than Bitcoin Core Enable NAT-PMP port forwarding - Use the system-wide dev-libs/leveldb instead of bundled Enable SystemTAP/DTrace tracing Enable Universal Plug and Play Enable wallet support -- cgit v1.2.3