net-p2p/bitcoind: security cleanup

Bug: https://bugs.gentoo.org/711198
Package-Manager: Portage-3.0.12, Repoman-3.0.2
Signed-off-by: John Helmert III <jchelmert3@posteo.net>
Signed-off-by: Sam James <sam@gentoo.org>
This commit is contained in:
John Helmert III
2021-01-21 23:22:53 +00:00
committed by Sam James
parent bd458a9df3
commit d00a0f0f3e
5 changed files with 0 additions and 508 deletions
-6
View File
@@ -1,8 +1,2 @@
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
DIST bitcoin-0.19.1.knots20200304.patches.tar.xz 399864 BLAKE2B de5591072b62c65c8a0fdcee7a7ed4b74d13614e47b679a05f272207b9ca0a09d476aa8ecb66321f39953a320f4d47f7d2aa62848192d493de02525c3d5abdfa SHA512 3b08023f0788535dc5943e47a595da5637172263ac8c2ad97d42c0707da7468a9843efbf90a2eb6ac99db65e362e99cbe9209ab64785c79de908e20801ba4fe5
DIST bitcoin-0.20.0.knots20200614.patches.tar.xz 392356 BLAKE2B 17c5d5c89e279c870492ac4f98cfde6545fa3c4b5169f42c020e45ca14c133673e271b248e90286ae875aaef6b031e578d14554777a89dca5366aa4bda079012 SHA512 208234b2e7fa46e19da9954dab9828993aa62a7623d85de8e7d43ffd4b367c5e8641e82154357526a11b95c0426ec16039d2910dbbe9187daba9d14a3b2fda92
DIST bitcoin-0.20.1.knots20200815.patches.tar.xz 413244 BLAKE2B bc8fd6bfe0454439ae514086ea3e728df4f1ba069d33f79b047049a1a4d18543334217f25607b738f7f2d1245f64e5289aed00473c94edf5d660e0953e4d6b93 SHA512 98468f4f22d5b9d35c616796aa5a8fda20f775606f0cd4927b3b822dd5afd0fc208c23136306f79d01dbfd532b14a5905a8fb60a2d171d5022d2008772cf7b58
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
DIST bitcoin-v0.19.1.tar.gz 6660702 BLAKE2B 93ed83f663a833f6be40195ddaf62a8ef9fcd86c3f983fe0cf1e75eaf9ae54cdc88fcdfc36d798842f29636dc8037af5b67e82643c90a6c276fa504ed022f863 SHA512 bc1afad7de5b43042d24780b07e3faf73dda69af9ef0c75fa1a32bd25b0b37e315955614ffbb2864fe827b77b63446fd88cae22da3d0706ff73df495a519ba5d
DIST bitcoin-v0.20.0.tar.gz 6984988 BLAKE2B 2c189826b7171276df62fb8cbf713d8b4cb4307de413247f2951950ec173d069930447d7d420d1c73ba0abc97fd613a05fc527bcc796e5e2d2f3dfb57fb29b80 SHA512 7628efb70bf51e4165605d9e77f6119b855994e99d8cb6653dfbd89628304862f3a98cfe352aa8b435913000e74d297565d8a7e3f22a23006d1779b70d04a8cd
DIST bitcoin-v0.20.1.tar.gz 6986090 BLAKE2B ef0e6c424bcb7ffe9a2461e60499cebdfcd13faa794d534b4c508a61fa218dd58e64c9088584ea658736deeadc0306fbdf08daa3c395dac3d8f096a08ba42262 SHA512 73a103d4192eb12abed5aa84e9c7999d57e4da37f32e54107ab9f4297a29af64c0c56930674559073bed360f794d87ba5eb9e1ce4d1bd03402d56937490fa16e
-153
View File
@@ -1,153 +0,0 @@
# Copyright 2010-2019 Gentoo Authors
# Distributed under the terms of the GNU General Public License v2
EAPI=6
DB_VER="4.8"
inherit autotools bash-completion-r1 db-use systemd
BITCOINCORE_COMMITHASH="49e34e288005a5b144a642e197b628396f5a0765"
KNOTS_PV="${PV}.knots20180918"
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.16.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
"
LICENSE="MIT"
SLOT="0"
KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
IUSE="+asm examples knots libressl 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.0.0_pre20151118:=[recovery]
dev-libs/univalue:=
virtual/bitcoin-leveldb
!libressl? ( dev-libs/openssl:0=[-bindist] )
libressl? ( dev-libs/libressl:0= )
upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
zeromq? ( net-libs/zeromq:= )
"
RDEPEND="${DEPEND}"
DOCS=( doc/bips.md doc/files.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.16.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/2018/09/18/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 "${FILESDIR}"/${PN}-0.16.3-missing-include.patch
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_user
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/leveldb src/secp256k1 || die
}
src_configure() {
local my_econf=(
$(use_enable asm)
--without-qtdbus
--with-libevent
--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-bench
--without-libs
--without-gui
--disable-ccache
--disable-static
--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,tidy_datadir.sh}
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."
}
-168
View File
@@ -1,168 +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="58ba7c314d552cea8cb024960a8504577aee586f"
KNOTS_PV="${PV}.knots20200304"
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.19.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 libressl +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 )
!libressl? ( dev-libs/openssl:0=[-bindist] )
libressl? ( dev-libs/libressl:0= )
upnp? ( >=net-libs/miniupnpc-1.9.20150916:= )
wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")=[cxx] )
zeromq? ( net-libs/zeromq:= )
"
RDEPEND="${DEPEND}"
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.19.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/03/04/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
--without-rapidcheck
--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."
}
-171
View File
@@ -1,171 +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="a62f0ed64f8bbbdfe6467ac5ce92ef5b5222d1bd"
KNOTS_PV="${PV}.knots20200614"
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 libressl +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 )
!libressl? ( dev-libs/openssl:0=[-bindist] )
libressl? ( dev-libs/libressl:0= )
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/06/03/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."
}
@@ -1,10 +0,0 @@
--- a/src/httpserver.cpp
+++ b/src/httpserver.cpp
@@ -13,6 +13,7 @@
#include <sync.h>
#include <ui_interface.h>
+#include <deque>
#include <memory>
#include <stdio.h>
#include <stdlib.h>