diff options
Diffstat (limited to 'net-p2p/bitcoind')
-rw-r--r-- | net-p2p/bitcoind/Manifest | 8 | ||||
-rw-r--r-- | net-p2p/bitcoind/bitcoind-0.20.1.ebuild | 169 | ||||
-rw-r--r-- | net-p2p/bitcoind/bitcoind-0.21.0.ebuild | 2 | ||||
-rw-r--r-- | net-p2p/bitcoind/bitcoind-0.21.1.ebuild | 2 | ||||
-rw-r--r-- | net-p2p/bitcoind/files/bitcoind-0.20.1-boost-1.77-compat.patch | 56 |
5 files changed, 63 insertions, 174 deletions
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest index 825ed37934d9..0e2dd218a3ce 100644 --- a/net-p2p/bitcoind/Manifest +++ b/net-p2p/bitcoind/Manifest @@ -1,13 +1,11 @@ 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.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58 DIST bitcoin-0.21.0.knots20210130.patches.tar.xz 505040 BLAKE2B c8999de4158b8781bba6ad014ae14859f1e0bab3080c59a18910cf7447eb56da4b17a0e1843fdd3669d22636df9e4ddcc4526e4293bfd86dc884983a29a5f76c SHA512 7ee27da3d26be0e93ecddff7bb21ef1746bcdb07f9a2b0ea48065367b4c44391e974e04a21e511c05fca8f55971ab8e3c3ac01a3775cc52a537d9e10966d9871 DIST bitcoin-0.21.1.knots20210629.patches.tar.xz 623916 BLAKE2B c6b669270b7f9718c8452a1c28280b6005edee299a3ab8d754dbf722d021576871ddce200342bf157dd5158c058686aa3dde913970779d8c2e560b8df772821c SHA512 ba058554453efc7ad036b8cc945ba403a6bd4e30dae0fbcee7fbe2f0ce90854a867fe49b0522595c081930d406bdf56987982f403fc8299b3c776eea4672abae -DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e DIST bitcoin-v0.21.0.tar.gz 7533957 BLAKE2B 01247cbb9fca2381a8c08ab1c88c479c640963caef22e4207aab46b05813dbf2a5286ac9e98132fb34db0e9ac6c18c79e45a89de166f5c6d480d8ac6e14ecca2 SHA512 c58187996932b0151432a65885b7e8a7b216fb1ab0576fb7d4b5e9620d957594b05e181153e2e0e50bcd5ce764861ec11019ffbb1095d3e704f441e61ac6a04f DIST bitcoin-v0.21.1.tar.gz 7635092 BLAKE2B 83610537c3cf6a11a1f59b92085b7a99fb22013ead1c6dce0c8f3182b69b11be6801f1f3b35bf31d72cfc15c76b6a69f1e6f3b754ff179565c0a687d16a35a48 SHA512 648739df8f360609d7b562e0bbfb3ab852eb6c538aa33ef56f71e7652ee766648ee8782aadeed1def1f2174d3330bbbdf9b1eee5090ca292e8d4a46c1b7f5c46 -EBUILD bitcoind-0.20.1.ebuild 4699 BLAKE2B 6870bbf0e132af9518eb6a998f34fe27bc7c8f8dc1673ac0ea6dcc9d26694dd067cb498101c1b527ee93af0c7da433630b3b576acc8b29565f51d92844c47294 SHA512 c7649c163c182886ede9e889cda42df76263679bed1808eb99907454f5273f8eba1d4ef00336ee02e68512c5ecb4ae911ab7824213b1508c4e3015ef03346736 -EBUILD bitcoind-0.21.0.ebuild 4797 BLAKE2B 21235097d82c974c40e029919c7b1dd1f5abb69f661af7fc8606941ffdd7c2a8eb1a54ebf64330ceb4d12ce081449c3fa21b01dcaed2e8dabcad7af47076410a SHA512 90774e413d59e7e03158c2277c05be93ce2024a3d45b28ea4e009a1e522c462f0ef11c25fb372e72b7b83820c945a876ebc5aef2bf2c0f0811f54f4690005c1e -EBUILD bitcoind-0.21.1.ebuild 5562 BLAKE2B 25744aa5c83743bdf957cad34182c402120ca5ea84bb9ec4345bd97f131cd65fd9213005da8edd7b5f90a6250ea76209d391cf1bf728b6d943547660307583d3 SHA512 088eaeab24883cada159779137fb6e5e89c9a7f2dd0ee5a3ee359d67059732988e3ac6968cfa7e12326aadf1fb14364d1b84c993ed4dd0241f796608f1f7ad16 +EBUILD bitcoind-0.21.0.ebuild 4857 BLAKE2B 51ffdde51af712587838a530939af59fab9000dcbcca1b650ccd160b6b33f3b13d6840c2ceb3407711220370bac8d4570677195b180bb7e0da13e69d1ae799bf SHA512 c5481ccafcd9139fe1cdd78a1c351a0584bf08b9dc5fde2ea8b8dee4507bf632f7ed8320672c10b80d9d0a0cc01029202a303d73a06d1960af9051862c11d3b2 +EBUILD bitcoind-0.21.1.ebuild 5622 BLAKE2B 1e025725f353a6b959918e0e029a0462b238fc053540180909922d6eb0056924b0c295fbf7c72985c6c0319e00549539dbb8e4f53c3dd1c43101e2d3536a54b5 SHA512 7656a4b9eacc1a782996ec49ab2433e8450bf25b180c9a97809d342a2e36f294aba64b6cb66da711640e464aa14053b192b1cd090c9eab2de6242c8f57a9431a MISC metadata.xml 1126 BLAKE2B e8d9d7ebdc0065e577f451dbb5a5a2912ab63add72dd1f968511c9f74b733f60c774d59327ae2bd865580682cd024643586e642427a85d66193cb3cf4c3c4b06 SHA512 fb3c7d9148b0bbc7ab06fc947cf231de8d690832d9fb2506854f1795bc3ce98edfa18cd5cb0d770edf9409e54c877fc8b9872d246ac794581a98a7f6920d55e6 diff --git a/net-p2p/bitcoind/bitcoind-0.20.1.ebuild b/net-p2p/bitcoind/bitcoind-0.20.1.ebuild deleted file mode 100644 index a5b951f9c8b7..000000000000 --- a/net-p2p/bitcoind/bitcoind-0.20.1.ebuild +++ /dev/null @@ -1,169 +0,0 @@ -# Copyright 1999-2020 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="bf0dc356ac4a2bdeda1908af021dea2de0dfb35a" -KNOTS_PV="${PV}.knots20200815" -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/0.20.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 +system-leveldb test upnp +wallet zeromq" -RESTRICT="!test? ( test )" - -DEPEND=" - acct-group/bitcoin - acct-user/bitcoin - >=dev-libs/boost-1.52.0:=[threads(+)] - dev-libs/libevent:= - >dev-libs/libsecp256k1-0.1_pre20170321:=[recovery] - >=dev-libs/univalue-1.0.4:= - system-leveldb? ( virtual/bitcoin-leveldb ) - 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.20.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/2020/08/01/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 - - 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 system-leveldb) - --with-system-libsecp256k1 - --with-system-univalue - ) - econf "${my_econf[@]}" -} - -src_install() { - default - - rm -f "${ED}/usr/bin/test_bitcoin" || die - - 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-0.21.0.ebuild b/net-p2p/bitcoind/bitcoind-0.21.0.ebuild index 4db4a7535311..574db30d89bb 100644 --- a/net-p2p/bitcoind/bitcoind-0.21.0.ebuild +++ b/net-p2p/bitcoind/bitcoind-0.21.0.ebuild @@ -85,6 +85,8 @@ src_prepare() { 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 diff --git a/net-p2p/bitcoind/bitcoind-0.21.1.ebuild b/net-p2p/bitcoind/bitcoind-0.21.1.ebuild index fc4654fa3b96..2c57f6b16617 100644 --- a/net-p2p/bitcoind/bitcoind-0.21.1.ebuild +++ b/net-p2p/bitcoind/bitcoind-0.21.1.ebuild @@ -101,6 +101,8 @@ src_prepare() { 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 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 new file mode 100644 index 000000000000..53b5563cb662 --- /dev/null +++ b/net-p2p/bitcoind/files/bitcoind-0.20.1-boost-1.77-compat.patch @@ -0,0 +1,56 @@ +commit acb7aad27ec8a184808aa7905887e3b2c5d54e9c +Author: Rafael Sadowski <rafael@sizeofvoid.org> +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(); + } + |