commit: 3c5cb2d985a42ada1be3fff8f600a530d1266fce Author: Matt Whitlock <gentoo <AT> mattwhitlock <DOT> name> AuthorDate: Thu Dec 7 11:12:16 2023 +0000 Commit: Florian Schmaus <flow <AT> gentoo <DOT> org> CommitDate: Mon Dec 11 11:14:45 2023 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c5cb2d9
net-p2p/bitcoin-core: bump to 26.0 Differences versus 25.1: * We're now fetching the sources from GitHub since that source would be harder to compromise than bitcoincore.org. See the [rationale][1]. * The Qt dependencies are bumped from 5.15.5 to 5.15.10 per upstream. * The dev-libs/libsecp256k1 dependency when USE="system-libsecp256k1" is bumped from 0.3.1 to 0.4.0 and now requires USE="ellswift extrakeys". * The soft blockers on the obsolete split packages are now unversioned, as there will be no more transitional meta-packages from this release onward. * configure.ac is patched to check that the system-installed libsecp256k1 (if requested) indeed supports the required modules. * Upstream dropped the syscall sandbox, so we no longer need to configure --without-seccomp to disable it. * Upstream renamed the bash-completion scripts. * When we're not cross-compiling, we now regenerate the example bitcoin.conf using contrib/devtools/gen-bitcoin-conf.sh, just in case upstream ever forgets to do it when tagging a release. * If USE="berkdb", ewarn about support for legacy wallets going away soon and the need to set "deprecatedrpc=create_bdb" if one still wants to create legacy wallets with this release. [1]: https://github.com/gentoo/gentoo/pull/33555#discussion_r1375507602 Signed-off-by: Matt Whitlock <gentoo <AT> mattwhitlock.name> Closes: https://github.com/gentoo/gentoo/pull/34161 Signed-off-by: Florian Schmaus <flow <AT> gentoo.org> net-p2p/bitcoin-core/Manifest | 1 + net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild | 415 ++++++++++++++++++++++++++ net-p2p/bitcoin-core/files/26.0-init.patch | 196 ++++++++++++ net-p2p/bitcoin-core/files/26.0-syslibs.patch | 296 ++++++++++++++++++ 4 files changed, 908 insertions(+) diff --git a/net-p2p/bitcoin-core/Manifest b/net-p2p/bitcoin-core/Manifest index bbfc7b44670b..496eef02d287 100644 --- a/net-p2p/bitcoin-core/Manifest +++ b/net-p2p/bitcoin-core/Manifest @@ -1 +1,2 @@ DIST bitcoin-25.1.tar.gz 12498596 BLAKE2B e8e4ea99cb40db420033c4df75e985af93cbb64f9862376e2de1a0731b4aeafbf43a95b33770e882ad77b73e454d48dbd5744902c78ade2b965e3d2d4e4b4656 SHA512 310e5d976a062496d2b99d0e64c4d5d2b536a747901e887f85b75151d94237f0de800163b534c812d390eb5e93b3f7284cd7f71843ec35e891f34634b6b142ab +DIST bitcoin-26.0.tar.gz 12753904 BLAKE2B 35b5d40390dc5eab18a12b0f120619d40d9d0eaf4a59f5ed943a59189c0ede5d78207b7606f1c3490b90f14c17e87882242d6637fdc348005a6f60a1d8202d13 SHA512 31b7bc66b43d073611ccf19adc80a4dd3ce3a4b5cf4c8b814f4be9e771e88721d20ae0aa83d89cd8d55ffaf0853444479932b425e82081fd66bb037c6b53e4a8 diff --git a/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild b/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild new file mode 100644 index 000000000000..6bdeaa1317a6 --- /dev/null +++ b/net-p2p/bitcoin-core/bitcoin-core-26.0.ebuild @@ -0,0 +1,415 @@ +# Copyright 1999-2023 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=8 + +PYTHON_COMPAT=( python3_{10..12} ) + +inherit autotools bash-completion-r1 check-reqs db-use desktop edo multiprocessing python-any-r1 systemd toolchain-funcs xdg-utils + +DESCRIPTION="Reference implementation of the Bitcoin cryptocurrency" +HOMEPAGE="https://bitcoincore.org/"; +SRC_URI="https://github.com/bitcoin/bitcoin/archive/v${PV}.tar.gz -> ${P/-core}.tar.gz" +S="${WORKDIR}/${P/-core}" + +LICENSE="MIT" +SLOT="0" +KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86 ~amd64-linux ~x86-linux" +# IUSE="+cli" doesn't work due to https://bugs.gentoo.org/831045#c3 +IUSE="+asm +berkdb +bitcoin-cli +daemon dbus examples +external-signer gui kde libs +man nat-pmp +qrcode +sqlite system-leveldb +system-libsecp256k1 systemtap test upnp zeromq" +RESTRICT="!test? ( test )" + +REQUIRED_USE=" + dbus? ( gui ) + kde? ( gui ) + qrcode? ( gui ) + system-leveldb? ( || ( daemon gui ) ) +" +# 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=" + !dev-util/bitcoin-tx + >=dev-libs/boost-1.81.0:= + >=dev-libs/libevent-2.1.12:= + berkdb? ( >=sys-libs/db-4.8.30:$(db_ver_to_slot 4.8)=[cxx] ) + bitcoin-cli? ( !net-p2p/bitcoin-cli ) + daemon? ( + !net-p2p/bitcoind + acct-group/bitcoin + acct-user/bitcoin + ) + gui? ( + !net-p2p/bitcoin-qt + >=dev-qt/qtcore-5.15.10:5 + >=dev-qt/qtgui-5.15.10:5 + >=dev-qt/qtnetwork-5.15.10:5 + >=dev-qt/qtwidgets-5.15.10:5 + dbus? ( >=dev-qt/qtdbus-5.15.10:5 ) + ) + libs? ( !net-libs/libbitcoinconsensus ) + nat-pmp? ( >=net-libs/libnatpmp-20220705:= ) + qrcode? ( >=media-gfx/qrencode-4.1.1:= ) + sqlite? ( >=dev-db/sqlite-3.38.5:= ) + system-leveldb? ( virtual/bitcoin-leveldb ) + system-libsecp256k1? ( >=dev-libs/libsecp256k1-0.4.0:=[ellswift,extrakeys,recovery,schnorr] ) + upnp? ( >=net-libs/miniupnpc-2.2.2:= ) + zeromq? ( >=net-libs/zeromq-4.3.4:= ) +" +DEPEND=" + ${RDEPEND} + systemtap? ( >=dev-util/systemtap-4.8 ) +" +BDEPEND=" + virtual/pkgconfig + daemon? ( + acct-group/bitcoin + acct-user/bitcoin + ) + gui? ( >=dev-qt/linguist-tools-5.15.10:5 ) + test? ( ${PYTHON_DEPS} ) +" +IDEPEND=" + gui? ( dev-util/desktop-file-utils ) +" + +DOCS=( + doc/bips.md + doc/bitcoin-conf.md + doc/descriptors.md + doc/files.md + doc/i2p.md + doc/JSON-RPC-interface.md + doc/multisig-tutorial.md + doc/p2p-bad-ports.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}/26.0-syslibs.patch" + "${FILESDIR}/26.0-init.patch" +) + +efmt() { + : ${1:?} ; local l ; while read -r l ; do "${!#}" "${l}" ; done < <(fmt "${@:1:$#-1}") +} + +pkg_pretend() { + if ! use daemon && ! use gui && ! has_version "${CATEGORY}/${PN}[-daemon,-gui(-),-qt5(-)]" ; then + efmt ewarn <<-EOF + You are enabling neither USE="daemon" nor USE="gui". This is a valid + configuration, but you will be unable to run a Bitcoin node using this + installation. + EOF + fi + if use daemon && ! use bitcoin-cli && ! has_version "${CATEGORY}/${PN}[daemon,-bitcoin-cli]" ; then + efmt ewarn <<-EOF + You are enabling USE="daemon" but not USE="bitcoin-cli". This is a valid + configuration, but you will be unable to interact with your bitcoind node + via the command line using this installation. + EOF + fi + if ! use berkdb && ! use sqlite && + { { use daemon && ! has_version "${CATEGORY}/${PN}[daemon,-berkdb,-sqlite]" ; } || + { use gui && ! has_version "${CATEGORY}/${PN}[gui,-berkdb,-sqlite]" ; } ; } + then + efmt ewarn <<-EOF + You are enabling neither USE="berkdb" nor USE="sqlite". This is a valid + configuration, but your Bitcoin node will be unable to open any wallets. + EOF + fi + + # test/functional/feature_pruning.py requires 4 GB disk space + # test/functional/wallet_pruning.py requires 1.3 GB disk space + use test && CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_pretend +} + +pkg_setup() { + if use test ; then + CHECKREQS_DISK_BUILD="6G" check-reqs_pkg_setup + python-any-r1_pkg_setup + fi +} + +src_prepare() { + default + ! use system-leveldb || rm -r src/leveldb || die + if use system-libsecp256k1 ; then + rm -r src/secp256k1 || die + sed -e '/^DIST_SUBDIRS *=/s/\bsecp256k1\b//' -i src/Makefile.am || die + else + pushd src/secp256k1 >/dev/null || die + AT_NOELIBTOOLIZE=yes eautoreconf + popd >/dev/null || die + fi + eautoreconf + + # we say --disable-util-util, so we can't test bitcoin-util + sed -ne '/^ {/{h;:0;n;H;/^ }/!b0;g;\|"exec": *"\./bitcoin-util"|d};p' \ + -i test/util/data/bitcoin-util-test.json || die + + sed -e 's/^\(complete -F _bitcoind\b\).*$/\1'"$(usev daemon ' bitcoind')$(usev gui ' bitcoin-qt')/" \ + -i contrib/completions/bash/bitcoind.bash || die +} + +src_configure() { + local wallet ; if use berkdb || use sqlite ; then wallet=enable ; else wallet=disable ; fi + local myeconfargs=( + --disable-static + --${wallet}-wallet + $(use_with sqlite) + $(use_with berkdb bdb) + $(use_enable systemtap usdt) + $(use_with upnp miniupnpc) + $(use_with nat-pmp natpmp) + $(use_enable test tests) + --disable-bench + --disable-fuzz{,-binary} + $(use_with qrcode qrencode) + --disable-ccache + $(use_enable asm) + $(use_enable zeromq zmq) + $(use_enable man) + $(use_enable external-signer) + --with-utils + $(use_enable {bitcoin,util}-cli) + --enable-util-tx + --${wallet}-util-wallet + --disable-util-util + $(use_with libs) + $(use_with daemon) + $(use_with gui gui qt5) + $(use_with dbus qtdbus) + $(use_with system-leveldb) + $(use_with system-libsecp256k1) + ) + econf "${myeconfargs[@]}" +} + +src_compile() { + default + + tc-is-cross-compiler || TOPDIR="${S}" bash contrib/devtools/gen-bitcoin-conf.sh || die + sed -e 's/ To use, copy this file$//p;Tp;:0;n;/save the file\.$/!b0;d;:p;p' \ + -ni share/examples/bitcoin.conf || die +} + +src_test() { + emake check + + use daemon && edo "${PYTHON}" test/functional/test_runner.py \ + --ansi --extended --jobs="$(get_makeopts_jobs)" --timeout-factor="${TIMEOUT_FACTOR:-15}" +} + +src_install() { + use external-signer && DOCS+=( doc/external-signer.md ) + use berkdb || use sqlite && DOCS+=( doc/managing-wallets.md ) + use libs && DOCS+=( doc/shared-libraries.md ) + use systemtap && DOCS+=( doc/tracing.md ) + use zeromq && DOCS+=( doc/zmq.md ) + + if use daemon ; then + # https://bugs.gentoo.org/757102 + DOCS+=( share/rpcauth/rpcauth.py ) + docompress -x "/usr/share/doc/${PF}/rpcauth.py" + fi + + default + + find "${ED}" -type f -name '*.la' -delete || die + ! use test || rm -f -- "${ED}"/usr/bin/test_bitcoin{,-qt} || die + + newbashcomp contrib/completions/bash/bitcoin-tx.bash bitcoin-tx + use bitcoin-cli && newbashcomp contrib/completions/bash/bitcoin-cli.bash bitcoin-cli + use daemon || use gui && newbashcomp contrib/completions/bash/bitcoind.bash bitcoind + + if use daemon ; then + insinto /etc/bitcoin + doins share/examples/bitcoin.conf + fowners bitcoin:bitcoin /etc/bitcoin/bitcoin.conf + fperms 0660 /etc/bitcoin/bitcoin.conf + + newconfd contrib/init/bitcoind.openrcconf bitcoind + newinitd "${FILESDIR}/bitcoind.openrc" bitcoind + systemd_newunit contrib/init/bitcoind.service bitcoind.service + + keepdir /var/lib/bitcoind + fperms 0750 /var/lib/bitcoind + fowners bitcoin:bitcoin /var/lib/bitcoind + dosym -r {/etc/bitcoin,/var/lib/bitcoind}/bitcoin.conf + + insinto /etc/logrotate.d + newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind + fi + + if use gui ; then + insinto /usr/share/icons/hicolor/scalable/apps + newins src/qt/res/src/bitcoin.svg bitcoin128.svg + + domenu "${FILESDIR}/org.bitcoin.bitcoin-qt.desktop" + + if use kde ; then + insinto /usr/share/kservices5 + doins "${FILESDIR}/bitcoin-qt.protocol" + fi + fi + + if use examples ; then + docinto examples + dodoc -r contrib/{linearize,qos} + use zeromq && dodoc -r contrib/zmq + fi +} + +pkg_preinst() { + if use daemon && [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then + if [[ -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] ; then + dosym -r /var/lib/bitcoin{d,/.bitcoin} + elif [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] ; then + efmt ewarn <<-EOF + Your bitcoind data directory is located at ${EPREFIX}/var/lib/bitcoin/.bitcoin, + a deprecated location. To perform an automated migration to + ${EPREFIX}/var/lib/bitcoind, first shut down any running bitcoind instances + that may be using the deprecated path, and then run: + + # emerge --config ${CATEGORY}/${PN} + EOF + insinto /var/lib/bitcoin + mv -- "${ED}/var/lib/bitcoin"{d,/.bitcoin} || die + dosym -r {/etc/,/var/lib/bitcoin/.}bitcoin/bitcoin.conf + dosym -r /var/lib/bitcoin{/.bitcoin,d} + fi + fi + + if use kde && [[ -d "${EROOT}/usr/share/kde4" ]] ; then + dosym -r /usr/share/{kservices5,kde4/services}/bitcoin-qt.protocol + fi +} + +pkg_postinst() { + # we don't use xdg.eclass because it adds unconditional IDEPENDs + if use gui ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi + + if use daemon && [[ -z "${REPLACING_VERSIONS}" ]] ; then + efmt -su elog <<-EOF + To have ${PN} automatically use Tor when it's running, be sure your \ + 'torrc' config file has 'ControlPort' and 'CookieAuthentication' set up \ + correctly, and: + - Using an init script: add the 'bitcoin' user to the 'tor' user group. + - Running bitcoind directly: add that user to the 'tor' user group. + EOF + fi + + if use bitcoin-cli && use daemon ; then + efmt -su elog <<-EOF + To use bitcoin-cli with the /etc/init.d/bitcoind service: + - Add your user(s) to the 'bitcoin' group. + - Symlink ~/.bitcoin to /var/lib/bitcoind. + EOF + fi + + if use berkdb ; then + # https://github.com/bitcoin/bitcoin/pull/28597 + # https://bitcoincore.org/en/releases/26.0/#wallet + efmt ewarn <<-EOF + Creation of legacy (Berkeley DB) wallets is refused starting with Bitcoin + Core 26.0, pending the deprecation and eventual removal of support for + legacy wallets altogether in future releases. At present you can still + force support for the creation of legacy wallets by adding the following + line to your bitcoin.conf: + + deprecatedrpc=create_bdb + EOF + fi +} + +pkg_postrm() { + if use gui ; then + xdg_desktop_database_update + xdg_icon_cache_update + fi +} + +pkg_config() { + if [[ -d "${EROOT}/var/lib/bitcoin/.bitcoin" && ! -h "${EROOT}/var/lib/bitcoin/.bitcoin" ]] && + [[ ! -e "${EROOT}/var/lib/bitcoind" || -h "${EROOT}/var/lib/bitcoind" ]] + then + in_use() { + : ${1:?} ; local each + if command -v fuser >/dev/null ; then + fuser "${@}" >/dev/null 2>&1 + elif command -v lsof >/dev/null ; then + for each ; do + lsof -- "${each}" && return + done >/dev/null 2>&1 + elif mountpoint -q /proc ; then + { find /proc/[0-9]*/{cwd,exe,fd} -type l -exec readlink -- {} + + awk '{ print $6 }' /proc/[0-9]*/maps + } 2>/dev/null | grep -Fqx -f <(printf '%s\n' "${@}" ; readlink -m -- "${@}") + else + return 13 + fi + } + ebegin "Checking that ${EPREFIX}/var/lib/bitcoin/.bitcoin is not in use" + in_use "${EROOT}/var/lib/bitcoin/.bitcoin"{,/.lock} + case $? in + 0) + eend 1 + efmt eerror <<-EOF + ${EPREFIX}/var/lib/bitcoin/.bitcoin is currently in use. Please stop any + running bitcoind instances that may be using this data directory, and then + retry this migration. + EOF + die "${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" + ;; + 13) + eend 1 + if [[ "${BITCOIND_IS_NOT_RUNNING}" != 1 ]] ; then + efmt eerror <<-EOF + Found no way to check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use. + Do you have /proc mounted? To force the migration without checking, re-run + this command with BITCOIND_IS_NOT_RUNNING=1. + EOF + die "could not check whether ${EPREFIX}/var/lib/bitcoin/.bitcoin is in use" + fi + ;; + *) + eend 0 + ;; + esac + + # find all relative symlinks that point outside the data dir + local -A symlinks + cd -- "${EROOT}/var/lib/bitcoin/.bitcoin" || die + local each ; while read -r -d '' each ; do + local target=$(readlink -- "${each}") && [[ "${target}" == ../* ]] && + target=$(readlink -e -- "${each}") && [[ "${target}" != "${EROOT}/var/lib/bitcoin/.bitcoin/"* ]] && + symlinks["${each}"]="${target}" + done < <(find -type l -print0) + + einfo "Moving your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." + rm -f -- "${EROOT}/var/lib/bitcoind" || die + mv --no-clobber --no-copy --no-target-directory -- "${EROOT}/var/lib/bitcoin"{/.bitcoin,d} || + die "Failed to move your ${EPREFIX}/var/lib/bitcoin/.bitcoin to ${EPREFIX}/var/lib/bitcoind." + + # fix up the relative symlinks + cd -- "${EROOT}/var/lib/bitcoind" || die + for each in "${!symlinks[@]}" ; do + ln -fnrs -- "${symlinks[${each}]}" "${each}" # keep going even if this fails + done + + einfo 'Creating a transitional symlink for your convenience.' + ln -fnrsv -- "${EROOT}/var/lib/bitcoin"{d,/.bitcoin} + einfo 'You may remove this link when you no longer need it.' + else + einfo 'Nothing to do.' + fi +} diff --git a/net-p2p/bitcoin-core/files/26.0-init.patch b/net-p2p/bitcoin-core/files/26.0-init.patch new file mode 100644 index 000000000000..d42d44f0642a --- /dev/null +++ b/net-p2p/bitcoin-core/files/26.0-init.patch @@ -0,0 +1,196 @@ +From 779e7c8fe188bea5b2185be0784112104be168df Mon Sep 17 00:00:00 2001 +From: Matt Whitlock <[email protected]> +Date: Sun, 17 Sep 2023 10:02:20 -0400 +Subject: [PATCH] contrib/init: improve OpenRC scripts and systemd service unit + +--- + contrib/init/bitcoind.openrc | 112 +++++++++++++++---------------- + contrib/init/bitcoind.openrcconf | 7 +- + contrib/init/bitcoind.service | 5 ++ + 3 files changed, 64 insertions(+), 60 deletions(-) + +diff --git a/contrib/init/bitcoind.openrc b/contrib/init/bitcoind.openrc +index 013a1a6070..7d16e975e5 100644 +--- a/contrib/init/bitcoind.openrc ++++ b/contrib/init/bitcoind.openrc +@@ -1,76 +1,72 @@ + #!/sbin/openrc-run + +-# backward compatibility for existing gentoo layout +-# +-if [ -d "/var/lib/bitcoin/.bitcoin" ]; then +- BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoin/.bitcoin" +-else +- BITCOIND_DEFAULT_DATADIR="/var/lib/bitcoind" +-fi ++: ${BITCOIND_CONFIGFILE:=/etc/bitcoin/bitcoin.conf} ++: ${BITCOIND_PIDDIR:=/run/bitcoind} ++: ${BITCOIND_PIDFILE:=${BITCOIND_PIDDIR}/${SVCNAME}.pid} ++: ${BITCOIND_DATADIR:=/var/lib/bitcoind} ++: ${BITCOIND_LOGDIR:=/var/log/bitcoind} ++: ${BITCOIND_USER:=${BITCOIN_USER:-bitcoin}} ++: ${BITCOIND_GROUP:=bitcoin} ++: ${BITCOIND_BIN:=/usr/bin/bitcoind} ++: ${BITCOIND_NICE:=${NICELEVEL:-0}} ++: ${BITCOIND_OPTS=${BITCOIN_OPTS}} + +-BITCOIND_CONFIGFILE=${BITCOIND_CONFIGFILE:-/etc/bitcoin/bitcoin.conf} +-BITCOIND_PIDDIR=${BITCOIND_PIDDIR:-/var/run/bitcoind} +-BITCOIND_PIDFILE=${BITCOIND_PIDFILE:-${BITCOIND_PIDDIR}/bitcoind.pid} +-BITCOIND_DATADIR=${BITCOIND_DATADIR:-${BITCOIND_DEFAULT_DATADIR}} +-BITCOIND_USER=${BITCOIND_USER:-${BITCOIN_USER:-bitcoin}} +-BITCOIND_GROUP=${BITCOIND_GROUP:-bitcoin} +-BITCOIND_BIN=${BITCOIND_BIN:-/usr/bin/bitcoind} +-BITCOIND_NICE=${BITCOIND_NICE:-${NICELEVEL:-0}} +-BITCOIND_OPTS="${BITCOIND_OPTS:-${BITCOIN_OPTS}}" +- +-name="Bitcoin Core Daemon" ++name="Bitcoin Core daemon" + description="Bitcoin cryptocurrency P2P network daemon" + +-command="/usr/bin/bitcoind" +-command_args="-pid=\"${BITCOIND_PIDFILE}\" \ +- -conf=\"${BITCOIND_CONFIGFILE}\" \ +- -datadir=\"${BITCOIND_DATADIR}\" \ +- -daemon \ +- ${BITCOIND_OPTS}" +- + required_files="${BITCOIND_CONFIGFILE}" +-start_stop_daemon_args="-u ${BITCOIND_USER} \ +- -N ${BITCOIND_NICE} -w 2000" + pidfile="${BITCOIND_PIDFILE}" +- +-# The retry schedule to use when stopping the daemon. Could be either +-# a timeout in seconds or multiple signal/timeout pairs (like +-# "SIGKILL/180 SIGTERM/300") +-retry="${BITCOIND_SIGTERM_TIMEOUT}" ++in_background_fake="start" + + depend() { + need localmount net + } + +-# verify +-# 1) that the datadir exists and is writable (or create it) +-# 2) that a directory for the pid exists and is writable +-# 3) ownership and permissions on the config file + start_pre() { +- checkpath \ +- -d \ +- --mode 0750 \ +- --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \ +- "${BITCOIND_DATADIR}" +- +- checkpath \ +- -d \ +- --mode 0755 \ +- --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" \ +- "${BITCOIND_PIDDIR}" +- +- checkpath -f \ +- -o "${BITCOIND_USER}:${BITCOIND_GROUP}" \ +- -m 0660 \ +- "${BITCOIND_CONFIGFILE}" +- +- checkconfig || return 1 ++ checkpath -f --mode 0660 --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" "${BITCOIND_CONFIGFILE}" ++ checkpath -d --mode 0750 --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" "${BITCOIND_DATADIR}" ++ checkpath -d --mode 0755 --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" "${BITCOIND_LOGDIR}" ++ checkpath -d --mode 0755 --owner "${BITCOIND_USER}:${BITCOIND_GROUP}" "${BITCOIND_PIDDIR}" ++ checkconfig + } + +-checkconfig() +-{ +- if grep -qs '^rpcuser=' "${BITCOIND_CONFIGFILE}" && \ +- ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ; then ++start() { ++ ebegin "Starting ${name}" ++ mark_service_inactive ++ if start-stop-daemon \ ++ --pidfile="${BITCOIND_PIDFILE}" \ ++ --chdir="${BITCOIND_DATADIR}" \ ++ --user="${BITCOIND_USER}:${BITCOIND_GROUP}" \ ++ --nice="${BITCOIND_NICE}" \ ++ --exec="${BITCOIND_BIN}" \ ++ -- \ ++ -daemonwait \ ++ -pid="${BITCOIND_PIDFILE}" \ ++ -conf="${BITCOIND_CONFIGFILE}" \ ++ -datadir="${BITCOIND_DATADIR}" \ ++ -debuglogfile="${BITCOIND_LOGDIR}/debug.log" \ ++ ${BITCOIND_OPTS} ++ then ++ chmod g+r "${BITCOIND_DATADIR}/.cookie" ++ IN_BACKGROUND=yes rc-service "${SVCNAME}" --quiet start ++ else ++ rc-service "${SVCNAME}" --quiet zap ++ fi & ++} ++ ++stop() { ++ ebegin "Stopping ${name}" ++ start-stop-daemon --stop \ ++ --pidfile="${BITCOIND_PIDFILE}" \ ++ --retry="${BITCOIND_SIGTERM_TIMEOUT}" \ ++ --exec="${BITCOIND_BIN}" ++ eend $? ++} ++ ++checkconfig() { ++ if grep -qs '^rpcuser=' "${BITCOIND_CONFIGFILE}" && ++ ! grep -qs '^rpcpassword=' "${BITCOIND_CONFIGFILE}" ++ then + eerror "" + eerror "ERROR: You must set a secure rpcpassword to run bitcoind." + eerror "The setting must appear in ${BITCOIND_CONFIGFILE}" +diff --git a/contrib/init/bitcoind.openrcconf b/contrib/init/bitcoind.openrcconf +index c8a22a08d9..f5a140ab9d 100644 +--- a/contrib/init/bitcoind.openrcconf ++++ b/contrib/init/bitcoind.openrcconf +@@ -4,14 +4,17 @@ + #BITCOIND_CONFIGFILE="/etc/bitcoin/bitcoin.conf" + + # What directory to write pidfile to? (created and owned by $BITCOIND_USER) +-#BITCOIND_PIDDIR="/var/run/bitcoind" ++#BITCOIND_PIDDIR="/run/bitcoind" + + # What filename to give the pidfile +-#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/bitcoind.pid" ++#BITCOIND_PIDFILE="${BITCOIND_PIDDIR}/${SVCNAME}.pid" + + # Where to write bitcoind data (be mindful that the blockchain is large) + #BITCOIND_DATADIR="/var/lib/bitcoind" + ++# Where to write the debug.log file ++#BITCOIND_LOGDIR="/var/log/bitcoind" ++ + # User and group to own bitcoind process + #BITCOIND_USER="bitcoin" + #BITCOIND_GROUP="bitcoin" +diff --git a/contrib/init/bitcoind.service b/contrib/init/bitcoind.service +index 87da17f955..e1229f300a 100644 +--- a/contrib/init/bitcoind.service ++++ b/contrib/init/bitcoind.service +@@ -20,6 +20,7 @@ Wants=network-online.target + [Service] + ExecStart=/usr/bin/bitcoind -pid=/run/bitcoind/bitcoind.pid \ + -conf=/etc/bitcoin/bitcoin.conf \ ++ -debuglogfile=/var/log/bitcoind/debug.log \ + -datadir=/var/lib/bitcoind \ + -startupnotify='systemd-notify --ready' \ + -shutdownnotify='systemd-notify --stopping' +@@ -54,6 +55,10 @@ RuntimeDirectoryMode=0710 + ConfigurationDirectory=bitcoin + ConfigurationDirectoryMode=0710 + ++# /var/log/bitcoind ++LogsDirectory=bitcoind ++LogsDirectoryMode=0755 ++ + # /var/lib/bitcoind + StateDirectory=bitcoind + StateDirectoryMode=0710 +-- +2.43.0 + diff --git a/net-p2p/bitcoin-core/files/26.0-syslibs.patch b/net-p2p/bitcoin-core/files/26.0-syslibs.patch new file mode 100644 index 000000000000..614fc5c0ce44 --- /dev/null +++ b/net-p2p/bitcoin-core/files/26.0-syslibs.patch @@ -0,0 +1,296 @@ +From 0297368af75f834622bd8d7052168cf25aaad42f Mon Sep 17 00:00:00 2001 +From: Matt Whitlock <[email protected]> +Date: Sun, 17 Sep 2023 10:29:27 -0400 +Subject: [PATCH] support linking against system-installed leveldb and + libsecp256k1 + +- Abort if runtime leveldb != compiled-against leveldb. + +Originally based on 22.0-fix_build_without_leveldb.patch. +--- + configure.ac | 90 ++++++++++++++++++++++++++++++++++++++- + src/Makefile.am | 13 +++++- + src/Makefile.test.include | 2 + + src/dbwrapper.cpp | 27 +++++++++++- + src/dbwrapper.h | 8 ++++ + src/kernel/checks.cpp | 7 +++ + 6 files changed, 143 insertions(+), 4 deletions(-) + +diff --git a/configure.ac b/configure.ac +index 01636ab872..8ff1b04930 100644 +--- a/configure.ac ++++ b/configure.ac +@@ -1364,6 +1364,41 @@ 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[=PKG]]], ++ [build using system-installed libsecp256k1 instead of bundled, passing PKG (default: libsecp256k1) to pkg-config (default is no; DANGEROUS; NOT SUPPORTED)])], ++ [AS_IF([test "x$withval" = xyes], [with_system_libsecp256k1=libsecp256k1])], ++ [with_system_libsecp256k1=no]) ++AM_CONDITIONAL([EMBEDDED_LIBSECP256K1],[test "x$with_system_libsecp256k1" = xno]) ++AM_COND_IF([EMBEDDED_LIBSECP256K1], [ ++ libsecp256k1_CFLAGS='-I$(srcdir)/secp256k1/include' ++ libsecp256k1_LIBS='secp256k1/libsecp256k1.la' ++], [ ++ saved_CPPFLAGS=$CPPFLAGS ++ saved_LIBS=$LIBS ++ PKG_CHECK_MODULES([libsecp256k1], [$with_system_libsecp256k1]) ++ CPPFLAGS="$libsecp256k1_CFLAGS $CPPFLAGS" ++ LIBS="$libsecp256k1_LIBS $LIBS" ++ missing_modules= ++ AC_DEFUN([CHECK_MODULE], [ ++ AC_CHECK_HEADER([secp256k1_$1.h], ++ [AC_CHECK_FUNCS([$2], [], [missing_modules="${missing_modules} $1"])], ++ [missing_modules="${missing_modules} $1"]) ++ ]) ++ CHECK_MODULE([ellswift], [secp256k1_ellswift_encode]) ++ CHECK_MODULE([extrakeys], [secp256k1_xonly_pubkey_parse]) ++ CHECK_MODULE([recovery], [secp256k1_ecdsa_recover]) ++ CHECK_MODULE([schnorrsig], [secp256k1_schnorrsig_verify]) ++ AS_IF([test -n "${missing_modules}"], [ ++ AC_MSG_ERROR([system-installed libsecp256k1 does not support these required modules:${missing_modules}]) ++ ]) ++ CPPFLAGS=$saved_CPPFLAGS ++ LIBS=$saved_LIBS ++]) ++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 +@@ -1423,6 +1458,55 @@ if test "$build_bitcoind$bitcoin_enable_qt$use_bench$use_tests" = "nononono"; th + use_zmq=no + fi + ++dnl Check for leveldb, only if explicitly requested ++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]) ++AC_ARG_VAR([leveldb_CFLAGS],[C compiler flags for system-leveldb]) ++AC_ARG_VAR([leveldb_LIBS],[linker flags for system-leveldb]) ++AS_IF([test x$system_leveldb != xno],[ ++ TEMP_CPPFLAGS="$CPPFLAGS" ++ TEMP_LIBS="$LIBS" ++ CPPFLAGS="$leveldb_CFLAGS" ++ LIBS="$leveldb_LIBS" ++ AC_SEARCH_LIBS([leveldb_open],[leveldb],[leveldb_LIBS="$LIBS"], ++ [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_ERROR([LevelDB headers not found; using --with-system-leveldb is not supported anyway])]) ++ ++ AC_MSG_CHECKING([for library containing leveldb::NewMemEnv]) ++ 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 ++ LIBS="$searchlib $leveldb_LIBS" ++ AC_LINK_IFELSE([AC_LANG_PROGRAM([ ++ #include <leveldb/env.h> ++ #include <leveldb/helpers/memenv.h> ++ ],[ ++ leveldb::Env *myenv = leveldb::NewMemEnv(leveldb::Env::Default()); ++ delete myenv; ++ ]) ++ ],[ ++ AC_MSG_RESULT([$searchlib]) ++ break ++ ]) ++ done ++ leveldb_LIBS="$LIBS" ++ LIBS="$TEMP_LIBS" ++ CPPFLAGS="$TEMP_CPPFLAGS" ++],[ ++ AC_DEFINE([EMBEDDED_LEVELDB],[1],[Define to use the bundled LevelDB sources]) ++]) ++AM_CONDITIONAL([EMBEDDED_LEVELDB],[test x$system_leveldb = xno]) ++AC_SUBST(leveldb_CFLAGS) ++AC_SUBST(leveldb_LIBS) ++ + dnl Check for libminiupnpc (optional) + if test "$use_upnp" != "no"; then + TEMP_CPPFLAGS="$CPPFLAGS" +@@ -1959,8 +2043,10 @@ CPPFLAGS_TEMP="$CPPFLAGS" + unset CPPFLAGS + CPPFLAGS="$CPPFLAGS_TEMP" + +-ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --disable-module-ecdh" +-AC_CONFIG_SUBDIRS([src/secp256k1]) ++AM_COND_IF([EMBEDDED_LIBSECP256K1],[ ++ ac_configure_args="${ac_configure_args} --disable-shared --with-pic --enable-benchmark=no --enable-module-recovery --disable-module-ecdh" ++ AC_CONFIG_SUBDIRS([src/secp256k1]) ++]) + + AC_OUTPUT + +diff --git a/src/Makefile.am b/src/Makefile.am +index 8905c0ad1c..8869bf4cff 100644 +--- a/src/Makefile.am ++++ b/src/Makefile.am +@@ -24,7 +24,7 @@ check_PROGRAMS = + TESTS = + BENCHMARKS = + +-BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) -I$(srcdir)/secp256k1/include -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) ++BITCOIN_INCLUDES=-I$(builddir) -I$(srcdir)/$(MINISKETCH_INCLUDE_DIR_INT) $(libsecp256k1_CFLAGS) -I$(srcdir)/$(UNIVALUE_INCLUDE_DIR_INT) + + LIBBITCOIN_NODE=libbitcoin_node.a + LIBBITCOIN_COMMON=libbitcoin_common.a +@@ -33,7 +33,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 +@@ -68,8 +72,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: +@@ -1129,8 +1135,13 @@ endif + + include Makefile.minisketch.include + ++if EMBEDDED_LEVELDB + include Makefile.crc32c.include + include Makefile.leveldb.include ++else ++LEVELDB_CPPFLAGS = $(leveldb_CFLAGS) ++LIBLEVELDB = $(leveldb_LIBS) ++endif + + include Makefile.test_util.include + include Makefile.test_fuzz.include +diff --git a/src/Makefile.test.include b/src/Makefile.test.include +index b610dabd07..cf79094fb9 100644 +--- a/src/Makefile.test.include ++++ b/src/Makefile.test.include +@@ -392,7 +392,9 @@ if ENABLE_BENCH + $(BENCH_BINARY) -sanity-check -priority-level=high + 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 +diff --git a/src/dbwrapper.cpp b/src/dbwrapper.cpp +index 775496e21b..1304b2a2b3 100644 +--- a/src/dbwrapper.cpp ++++ b/src/dbwrapper.cpp +@@ -22,7 +22,11 @@ + #include <leveldb/db.h> + #include <leveldb/env.h> + #include <leveldb/filter_policy.h> +-#include <leveldb/helpers/memenv/memenv.h> ++#if EMBEDDED_LEVELDB ++# include <leveldb/helpers/memenv/memenv.h> ++#else ++# include <leveldb/helpers/memenv.h> ++#endif + #include <leveldb/iterator.h> + #include <leveldb/options.h> + #include <leveldb/slice.h> +@@ -51,6 +55,27 @@ static void HandleError(const leveldb::Status& status) + throw dbwrapper_error(errmsg); + } + ++#if !EMBEDDED_LEVELDB ++#include <node/interface_ui.h> ++#include <util/translation.h> ++#include <leveldb/c.h> ++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; ++} ++#endif ++ + class CBitcoinLevelDBLogger : public leveldb::Logger { + public: + // This code is adapted from posix_logger.h, which is why it is using vsprintf. +diff --git a/src/dbwrapper.h b/src/dbwrapper.h +index 63c2f99d2a..406d03f1ea 100644 +--- a/src/dbwrapper.h ++++ b/src/dbwrapper.h +@@ -5,6 +5,10 @@ + #ifndef BITCOIN_DBWRAPPER_H + #define BITCOIN_DBWRAPPER_H + ++#if defined(HAVE_CONFIG_H) ++#include <config/bitcoin-config.h> ++#endif ++ + #include <attributes.h> + #include <serialize.h> + #include <span.h> +@@ -46,6 +50,10 @@ struct DBParams { + DBOptions options{}; + }; + ++#if !EMBEDDED_LEVELDB ++bool dbwrapper_SanityCheck(); ++#endif ++ + class dbwrapper_error : public std::runtime_error + { + public: +diff --git a/src/kernel/checks.cpp b/src/kernel/checks.cpp +index bf8a2ec74c..640deb2415 100644 +--- a/src/kernel/checks.cpp ++++ b/src/kernel/checks.cpp +@@ -4,6 +4,7 @@ + + #include <kernel/checks.h> + ++#include <dbwrapper.h> + #include <key.h> + #include <random.h> + #include <util/time.h> +@@ -15,6 +16,12 @@ namespace kernel { + + util::Result<void> SanityChecks(const Context&) + { ++#if !EMBEDDED_LEVELDB ++ if (!dbwrapper_SanityCheck()) { ++ return util::Error{Untranslated("Database sanity check failure. Aborting.")}; ++ } ++#endif ++ + if (!ECC_InitSanityCheck()) { + return util::Error{Untranslated("Elliptic curve cryptography sanity check failure. Aborting.")}; + } +-- +2.43.0 +
