* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/files/, net-p2p/bitcoind/
@ 2018-03-18 14:17 Andreas Sturmlechner
0 siblings, 0 replies; 4+ messages in thread
From: Andreas Sturmlechner @ 2018-03-18 14:17 UTC (permalink / raw
To: gentoo-commits
commit: b4c766b6bd4e56bff2ab948672bf75a7f79dfed4
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
AuthorDate: Sun Mar 18 14:16:29 2018 +0000
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org>
CommitDate: Sun Mar 18 14:16:29 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b4c766b6
net-p2p/bitcoind: Drop old
Package-Manager: Portage-2.3.19, Repoman-2.3.6
net-p2p/bitcoind/Manifest | 6 ---
net-p2p/bitcoind/bitcoind-0.13.0.ebuild | 68 ---------------------------------
net-p2p/bitcoind/bitcoind-0.13.1.ebuild | 68 ---------------------------------
net-p2p/bitcoind/bitcoind-0.13.2.ebuild | 68 ---------------------------------
net-p2p/bitcoind/files/bitcoind.service | 30 ---------------
net-p2p/bitcoind/metadata.xml | 2 -
6 files changed, 242 deletions(-)
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index db66e3f7bb1..7c7216450f4 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,8 +1,2 @@
-DIST bitcoin-0.13.0.knots20160814.patches.tar.xz 128520 BLAKE2B f981bc8e1233fb82a22d57c58f39ee0c3c2bf0732c0b5e2055fab18dadb4febaac56b02a9af14bc0cc68f3f62fbf7890d37f502ca044dcd3432f3a27e52f9b0c SHA512 6a02c8bdfbf4373b6e6cff6ebbfe70e71121caae50e39b68e7e73b3dbe83b5717a03710c4a444ed9b5b9d09aee9494affcf52b86f1b05987d16953324d954ca2
-DIST bitcoin-0.13.1.knots20161027.patches.tar.xz 386532 BLAKE2B 82ad8c1da3692f2d3789ffae3814791c0c8634c07325b0f4c0943d1d2bdc07937e8728e22923385976e51dca7d111f7d8319a947dd7117388bf15983f41a8f57 SHA512 de4fee50bb6fcf416f4d0d52283ae4b80fd06a544e9312808bec167b471bc1a20d6ded1ebba92cef937b2bd7ebae19c5c1153d6a10dad40cba4fb6c0a98b4fb6
-DIST bitcoin-0.13.2.knots20170102.patches.tar.xz 434012 BLAKE2B 917f6a9bf5b38c557960b1ee2ba548d75eb1fef9ef6908364dfaa7ec8b075e157c303a4eec7ad74deb5cf7ab2ea97c4d800c6fe498d0552318e15fce1b3adf3d SHA512 a19b9d469ff03396375c6f97e3e1f7f24243518e4ca46390bc33debbe5c09dffc8ee8fff4d656b385e38ef0c70e46a474170fd377b8cb94d6cdc2ff58114b061
DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
-DIST bitcoin-v0.13.0.tgz 5836862 BLAKE2B 3ce77a7e15f2de66e2d5424bb2d686839ce0eb52d61fa37f21065205052428c264080a98e00fea7118c83d0bf92fec57c9bd629a1582a952b9521b5d528bc803 SHA512 ed49df78cab36ba30c83591724f1a21f7d2c49aa9cd5185ac09b52473aebcb7f406885d593cc7d99ffc87e3607bbeb8a7668a15a892fc6c654d31a5cfe3f53c1
-DIST bitcoin-v0.13.1.tgz 5955845 BLAKE2B a86d155f44681aa93720c9620d823070224c547dd7c2a6c075f4c8dec5b0e93b28f12ec3fd8c8c97f3eddd20e8f5763df086be473ed155da9f71479c2ed74779 SHA512 396196fa5325b650c61b966820454712d7e6c3e7a61cb95bacab59a0b6257d113c60105393a2ad1c33623ae81026e15c7356433fd7bafe2888e6b961487259c3
-DIST bitcoin-v0.13.2.tgz 6088472 BLAKE2B d6b13613d90d0abf33c937ec0cd003756c4984b95bd320f026c5867ba264cb1773d869bfbb170b2b6df6801eca34af71c5dbd3225b9baa5e94ec50ba22da3f54 SHA512 2c053f1f55a426499e50cbadfccfd7c47be25fd10bb8e3d21fb6f408261c5a0c35f2745891e0eeb0fe953428337e40b6dc730499fcd3ba465315d592352833ca
DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
diff --git a/net-p2p/bitcoind/bitcoind-0.13.0.ebuild b/net-p2p/bitcoind/bitcoind-0.13.0.ebuild
deleted file mode 100644
index 926511e9183..00000000000
--- a/net-p2p/bitcoind/bitcoind-0.13.0.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2010-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="a402396dce64c42ea73535b7dde4a9164d430438"
-BITCOINCORE_LJR_DATE="20160814"
-BITCOINCORE_IUSE="examples ljr test upnp +wallet zeromq"
-BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-pkg_setup() {
- local UG='bitcoin'
- enewgroup "${UG}"
- enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
- sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
- bitcoincore_src_prepare
-}
-
-src_configure() {
- bitcoincore_conf \
- --with-daemon
-}
-
-src_install() {
- bitcoincore_src_install
-
- 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_dounit "${FILESDIR}/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
-
- dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
- doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
- use zeromq && dodoc doc/zmq.md
-
- newbashcomp contrib/${PN}.bash-completion ${PN}
-
- if use examples; then
- docinto examples
- dodoc -r contrib/{qos,spendfrom,tidy_datadir.sh}
- use zeromq && dodoc -r contrib/zmq
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}
diff --git a/net-p2p/bitcoind/bitcoind-0.13.1.ebuild b/net-p2p/bitcoind/bitcoind-0.13.1.ebuild
deleted file mode 100644
index e7c3d4fe92e..00000000000
--- a/net-p2p/bitcoind/bitcoind-0.13.1.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2010-2016 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="03422e564b552c1d3c16ae854f8471f7cb39e25d"
-BITCOINCORE_LJR_DATE="20161027"
-BITCOINCORE_IUSE="examples ljr test upnp +wallet zeromq"
-BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux"
-
-pkg_setup() {
- local UG='bitcoin'
- enewgroup "${UG}"
- enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
- sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
- bitcoincore_src_prepare
-}
-
-src_configure() {
- bitcoincore_conf \
- --with-daemon
-}
-
-src_install() {
- bitcoincore_src_install
-
- 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_dounit "${FILESDIR}/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
-
- dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
- doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
- use zeromq && dodoc doc/zmq.md
-
- newbashcomp contrib/${PN}.bash-completion ${PN}
-
- if use examples; then
- docinto examples
- dodoc -r contrib/{qos,spendfrom,tidy_datadir.sh}
- use zeromq && dodoc -r contrib/zmq
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}
diff --git a/net-p2p/bitcoind/bitcoind-0.13.2.ebuild b/net-p2p/bitcoind/bitcoind-0.13.2.ebuild
deleted file mode 100644
index 1c1405f7fcd..00000000000
--- a/net-p2p/bitcoind/bitcoind-0.13.2.ebuild
+++ /dev/null
@@ -1,68 +0,0 @@
-# Copyright 2010-2017 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=5
-
-BITCOINCORE_COMMITHASH="0d719145b018e28d48d35c2646a5962b87c60436"
-BITCOINCORE_LJR_DATE="20170102"
-BITCOINCORE_IUSE="examples knots test upnp +wallet zeromq"
-BITCOINCORE_POLICY_PATCHES="+rbf spamfilter"
-BITCOINCORE_NEED_LEVELDB=1
-BITCOINCORE_NEED_LIBSECP256K1=1
-inherit bash-completion-r1 bitcoincore user systemd
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~x86 ~amd64-linux ~x86-linux"
-
-pkg_setup() {
- local UG='bitcoin'
- enewgroup "${UG}"
- enewuser "${UG}" -1 -1 /var/lib/bitcoin "${UG}"
-}
-
-src_prepare() {
- sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\) bitcoin-cli$/\1/' contrib/${PN}.bash-completion || die
- bitcoincore_src_prepare
-}
-
-src_configure() {
- bitcoincore_conf \
- --with-daemon
-}
-
-src_install() {
- bitcoincore_src_install
-
- 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_dounit "${FILESDIR}/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
-
- dodoc doc/assets-attribution.md doc/bips.md doc/tor.md
- doman contrib/debian/manpages/{bitcoind.1,bitcoin.conf.5}
-
- use zeromq && dodoc doc/zmq.md
-
- newbashcomp contrib/${PN}.bash-completion ${PN}
-
- if use examples; then
- docinto examples
- dodoc -r contrib/{qos,spendfrom,tidy_datadir.sh}
- use zeromq && dodoc -r contrib/zmq
- fi
-
- insinto /etc/logrotate.d
- newins "${FILESDIR}/bitcoind.logrotate-r1" bitcoind
-}
diff --git a/net-p2p/bitcoind/files/bitcoind.service b/net-p2p/bitcoind/files/bitcoind.service
deleted file mode 100644
index 97747009294..00000000000
--- a/net-p2p/bitcoind/files/bitcoind.service
+++ /dev/null
@@ -1,30 +0,0 @@
-# It's not recommended to modify this file in-place, because it will be
-# overwritten during package upgrades. If you want to customize, the
-# best way is to create file
-# "/etc/systemd/system/bitcoind.service.d/*.conf"
-# containing your changes
-
-# For example, if you want to change some daemon and/or unit options,
-# create a file named
-# "/etc/systemd/system/bitcoind.service.d/myopts.conf"
-# containing:
-# [Service]
-# Environment="BITCOIN_OPTS=-debug -logtimestamps"
-# Nice=10
-# This will override the setting appearing below.
-
-# Note that almost all daemon options could be specified in
-# /etc/bitcoin/bitcoin.conf
-
-[Unit]
-Description=Bitcoin Daemon
-After=network.target
-
-[Service]
-User=bitcoin
-Environment=BITCOIN_OPTS=
-ExecStart=/usr/bin/bitcoind -daemon=0 $BITCOIN_OPTS
-ExecReload=/bin/kill -HUP $MAINPID
-
-[Install]
-WantedBy=multi-user.target
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml
index 45a60634af6..91b80520930 100644
--- a/net-p2p/bitcoind/metadata.xml
+++ b/net-p2p/bitcoind/metadata.xml
@@ -12,9 +12,7 @@
<use>
<flag name="asm">Enable assembly for optimization</flag>
<flag name="bitcoin_policy_rbf">Replace By Fee policy: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order</flag>
- <flag name="bitcoin_policy_spamfilter">Enhanced spam filter policy: Notorious spammers will not be assisted by your node</flag>
<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag>
- <flag name="ljr">Enable Luke Dashjr's patches</flag>
<flag name="upnp">Enable Universal Plug and Play</flag>
<flag name="wallet">Enable wallet support</flag>
<flag name="zeromq">Report blocks and transactions via zeromq</flag>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/files/, net-p2p/bitcoind/
@ 2018-10-23 20:38 Virgil Dupras
0 siblings, 0 replies; 4+ messages in thread
From: Virgil Dupras @ 2018-10-23 20:38 UTC (permalink / raw
To: gentoo-commits
commit: 3c847a77d54b0910d52d4852859651fa49510eb3
Author: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
AuthorDate: Tue Oct 23 20:35:00 2018 +0000
Commit: Virgil Dupras <vdupras <AT> gentoo <DOT> org>
CommitDate: Tue Oct 23 20:38:27 2018 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=3c847a77
net-p2p/bitcoind: remove old and vulnerable
Bug: https://bugs.gentoo.org/666669
Signed-off-by: Virgil Dupras <vdupras <AT> gentoo.org>
Package-Manager: Portage-2.3.51, Repoman-2.3.11
net-p2p/bitcoind/Manifest | 2 -
net-p2p/bitcoind/bitcoind-0.15.1.ebuild | 167 ---------------------
.../files/bitcoind-0.15.1-test-build-fix.patch | 24 ---
.../files/bitcoind-0.15.1-test-util-fix.patch | 15 --
4 files changed, 208 deletions(-)
diff --git a/net-p2p/bitcoind/Manifest b/net-p2p/bitcoind/Manifest
index 8c6c2a5d72d..443491598dd 100644
--- a/net-p2p/bitcoind/Manifest
+++ b/net-p2p/bitcoind/Manifest
@@ -1,4 +1,2 @@
-DIST bitcoin-0.15.1.knots20171111.patches.tar.xz 443024 BLAKE2B 5010c8d0f6a0bc8cd22ca7d7c73d9e4e689e369f0ba39b59f62fa6b6af3dcf938dfc87d33d3fe595a6e54d99734277a34af068dc29a6e984c76d529fbbe2f383 SHA512 455fadeac6ad57be111104680ec6939d6bf235eb49cde89b9716d36f6914c255b1b69cdea459d89b1bbca56099e793be0c8d7aacf592a9d78495068297bb5890
DIST bitcoin-0.16.3.knots20180918.patches.tar.xz 466344 BLAKE2B c45b96513e4b6317e6a2a55cc3b47302fbe56fb87717ae0197010694013331b5d071b85a11a73c76f08f39e9f0294d3475e89ee63272047df83893de4dbaa390 SHA512 2c3540acc668aeef4b8f01774219736d95395201ddeaccaf70e0bad4a89f05cdd5ffaf630bae0577656efb3580fae92ce0ee4bb1a720ea757ca59e3fd66e1893
-DIST bitcoin-v0.15.1.tar.gz 7550228 BLAKE2B 0cbb7d0e9d0e5e8eb33502a28289c3f9c86b7c531ed179f7e3e8b601a69a423fa736238a2caae890fd8850eb505533995e578e676860a4014922fbc238185ebb SHA512 a09b6cb64a1649d11e3fd6deeb13a07b1bf4bed504a2fc1c585919459ca8ac1af8e5ecc89dee487359e831a8f12625d54f408f95bb341033d6380b82c290c0d9
DIST bitcoin-v0.16.3.tar.gz 6658712 BLAKE2B 2c20b32ea30aed264115d1bd336b62fa28de69cbf116385508718efd7ff22537c3bd402c0965e0f6ddd8e79fc8b51f388f52f885847d36207a24523e927ca63e SHA512 2da25f56fe9b1f5a81815c14e70ff1a69ec15f742424e2c24d71303a71d57c8050dea5d5ba57425bbe0a01a3995ad9b30f0beea5dbafd1632a627cd3fd9a984d
diff --git a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild b/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
deleted file mode 100644
index c4ed72826f0..00000000000
--- a/net-p2p/bitcoind/bitcoind-0.15.1.ebuild
+++ /dev/null
@@ -1,167 +0,0 @@
-# Copyright 2010-2018 Gentoo Foundation
-# 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 user
-
-MyPV="${PV/_/}"
-MyPN="bitcoin"
-MyP="${MyPN}-${MyPV}"
-BITCOINCORE_COMMITHASH="7b57bc998f334775b50ebc8ca5e78ca728db4c58"
-KNOTS_PV="${PV}.knots20171111"
-KNOTS_P="${MyPN}-${KNOTS_PV}"
-
-IUSE="+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq"
-
-DESCRIPTION="Original Bitcoin crypto-currency wallet for automated services"
-HOMEPAGE="https://bitcoincore.org/ https://bitcoinknots.org/"
-LICENSE="MIT"
-SLOT="0"
-KEYWORDS="amd64 arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux"
-
-SRC_URI="
- https://github.com/${MyPN}/${MyPN}/archive/${BITCOINCORE_COMMITHASH}.tar.gz -> ${MyPN}-v${PV}.tar.gz
- https://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.patches.txz -> ${KNOTS_P}.patches.tar.xz
-"
-CORE_DESC="https://bitcoincore.org/en/2017/11/11/release-${PV}/"
-KNOTS_DESC="https://bitcoinknots.org/files/0.15.x/${KNOTS_PV}/${KNOTS_P}.desc.html"
-
-RDEPEND="
- !libressl? ( dev-libs/openssl:0=[-bindist] )
- libressl? ( dev-libs/libressl:0= )
- dev-libs/libevent
- >=dev-libs/libsecp256k1-0.0.0_pre20151118[recovery]
- dev-libs/univalue
- >=dev-libs/boost-1.52.0:=[threads(+)]
- upnp? ( >=net-libs/miniupnpc-1.9.20150916 )
- wallet? ( sys-libs/db:$(db_ver_to_slot "${DB_VER}")[cxx] )
- zeromq? ( net-libs/zeromq )
- virtual/bitcoin-leveldb
-"
-DEPEND="${RDEPEND}"
-
-DOCS=( doc/bips.md doc/files.md doc/reduce-traffic.md doc/release-notes.md )
-
-S="${WORKDIR}/${MyPN}-${BITCOINCORE_COMMITHASH}"
-
-pkg_pretend() {
- if use knots; then
- einfo "You are building ${PN} from Bitcoin Knots."
- einfo "For more information, see ${KNOTS_DESC}"
- else
- einfo "You are building ${PN} from Bitcoin Core."
- einfo "For more information, see ${CORE_DESC}"
- fi
- if use bitcoin_policy_rbf; then
- einfo "Replace By Fee policy is enabled: Your node will preferentially mine and relay transactions paying the highest fee, regardless of receive order."
- else
- einfo "Replace By Fee policy is disabled: Your node will only accept the first transaction seen consuming a conflicting input, regardless of fee offered by later ones."
- fi
-}
-
-pkg_setup() {
- enewgroup bitcoin
- enewuser bitcoin -1 -1 /var/lib/bitcoin bitcoin
-}
-
-KNOTS_PATCH() { echo "${WORKDIR}/${KNOTS_P}.patches/${KNOTS_P}.$@.patch"; }
-
-src_prepare() {
- sed -i 's/runscript/openrc-run/' contrib/init/${PN}.openrc || die
-
- sed -i 's/^\(complete -F _bitcoind bitcoind\) bitcoin-qt$/\1/' contrib/${PN}.bash-completion || die
-
- eapply "$(KNOTS_PATCH syslibs)"
- eapply "${FILESDIR}/${PN}-0.15.1-test-util-fix.patch"
-
- if use knots; then
- eapply "$(KNOTS_PATCH f)"
- eapply "$(KNOTS_PATCH branding)"
- eapply "$(KNOTS_PATCH ts)"
- eapply "${FILESDIR}/${PN}-0.15.1-test-build-fix.patch"
- fi
-
- eapply_user
-
- if ! use bitcoin_policy_rbf; then
- sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die
- fi
-
- 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 experimental-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 "${FILESDIR}/bitcoind.service-r1" "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
-
- dodoc doc/REST-interface.md doc/tor.md
- 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() {
- einfo "To have ${PN} automatically use Tor when it's running, be sure your 'torrc' config file has 'ControlPort' and 'CookieAuthentication' setup correctly, and:"
- einfo "- if using the init script: add the 'bitcoin' user to the 'tor' user group"
- einfo" - if running bitcoind directly: add that user to the 'tor' user group"
-}
diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch
deleted file mode 100644
index 3d953d9c0a9..00000000000
--- a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-build-fix.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-commit 91976ef251bbb693db8c4e36b62ceca1f6417413 (HEAD)
-Author: Luke Dashjr <luke-jr+git@utopios.org>
-Date: Tue Jan 23 03:37:10 2018 +0000
-
- Bugfix: script_tests: Only define debugger_cbs if HAVE_CONSENSUS_LIB
-
-diff --git a/src/test/script_tests.cpp b/src/test/script_tests.cpp
-index 7826cdc1b3..013846811b 100644
---- a/src/test/script_tests.cpp
-+++ b/src/test/script_tests.cpp
-@@ -186,11 +186,13 @@ static void script_tests_debugger_ScriptEOF(void *userdata, struct bitcoinconsen
- ++data->eof;
- }
-
-+#if defined(HAVE_CONSENSUS_LIB)
- static const struct bitcoinconsensus_script_debugger_callbacks debugger_cbs = {
- .ScriptBegin = script_tests_debugger_ScriptBegin,
- .ScriptPreStep = script_tests_debugger_ScriptPreStep,
- .ScriptEOF = script_tests_debugger_ScriptEOF,
- };
-+#endif
-
- void DoTest(const CScript& scriptPubKey, const CScript& scriptSig, const CScriptWitness& scriptWitness, int flags, const std::string& message, int scriptError, CAmount nValue = 0)
- {
diff --git a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch b/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch
deleted file mode 100644
index 60fc9d84905..00000000000
--- a/net-p2p/bitcoind/files/bitcoind-0.15.1-test-util-fix.patch
+++ /dev/null
@@ -1,15 +0,0 @@
-diff --git a/src/Makefile.test.include b/src/Makefile.test.include
-index 147add3eb5..308b1c88c0 100644
---- a/src/Makefile.test.include
-+++ b/src/Makefile.test.include
-@@ -151,8 +151,10 @@ bitcoin_test_clean : FORCE
- rm -f $(CLEAN_BITCOIN_TEST) $(test_test_bitcoin_OBJECTS) $(TEST_BINARY)
-
- check-local:
-+if BUILD_BITCOIN_TX
- @echo "Running test/util/bitcoin-util-test.py..."
- $(PYTHON) $(top_builddir)/test/util/bitcoin-util-test.py
-+endif
- if EMBEDDED_LIBSECP256K1
- $(AM_V_at)$(MAKE) $(AM_MAKEFLAGS) -C secp256k1 check
- endif
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/files/, net-p2p/bitcoind/
@ 2019-12-26 11:57 David Seifert
0 siblings, 0 replies; 4+ messages in thread
From: David Seifert @ 2019-12-26 11:57 UTC (permalink / raw
To: gentoo-commits
commit: 09466c2700ea5873259b648537738131d325d54a
Author: David Seifert <soap <AT> gentoo <DOT> org>
AuthorDate: Thu Dec 26 11:56:49 2019 +0000
Commit: David Seifert <soap <AT> gentoo <DOT> org>
CommitDate: Thu Dec 26 11:56:49 2019 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=09466c27
net-p2p/bitcoind: Add patch for missing <deque> include
Closes: https://bugs.gentoo.org/703228
Package-Manager: Portage-2.3.83, Repoman-2.3.20
Signed-off-by: David Seifert <soap <AT> gentoo.org>
net-p2p/bitcoind/bitcoind-0.16.3.ebuild | 1 +
net-p2p/bitcoind/bitcoind-0.17.1.ebuild | 1 +
net-p2p/bitcoind/bitcoind-0.18.0.ebuild | 1 +
net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch | 10 ++++++++++
4 files changed, 13 insertions(+)
diff --git a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
index 9147db4d3e0..86589b99be5 100644
--- a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild
@@ -71,6 +71,7 @@ src_prepare() {
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
diff --git a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
index 2f1df22dec8..f8e1efe4331 100644
--- a/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.17.1.ebuild
@@ -71,6 +71,7 @@ src_prepare() {
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
diff --git a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
index d758ec04196..6b144706f37 100644
--- a/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.18.0.ebuild
@@ -75,6 +75,7 @@ src_prepare() {
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
diff --git a/net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch b/net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch
new file mode 100644
index 00000000000..f413c323b92
--- /dev/null
+++ b/net-p2p/bitcoind/files/bitcoind-0.16.3-missing-include.patch
@@ -0,0 +1,10 @@
+--- 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>
^ permalink raw reply related [flat|nested] 4+ messages in thread
* [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/files/, net-p2p/bitcoind/
@ 2021-11-18 6:55 Joonas Niilola
0 siblings, 0 replies; 4+ messages in thread
From: Joonas Niilola @ 2021-11-18 6:55 UTC (permalink / raw
To: gentoo-commits
commit: 504ca74263eeb38b59de2db4bd5f2d3114ff7281
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Sat Nov 6 16:54:29 2021 +0000
Commit: Joonas Niilola <juippis <AT> gentoo <DOT> org>
CommitDate: Thu Nov 18 06:52:26 2021 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=504ca742
net-p2p/bitcoind: Add patch for boost 1.77 compatibility
Closes: https://bugs.gentoo.org/816885
Signed-off-by: Luke Dashjr <luke-jr+git <AT> utopios.org>
Closes: https://github.com/gentoo/gentoo/pull/22849
Signed-off-by: Joonas Niilola <juippis <AT> gentoo.org>
net-p2p/bitcoind/bitcoind-0.20.1.ebuild | 2 +
net-p2p/bitcoind/bitcoind-0.21.0.ebuild | 2 +
net-p2p/bitcoind/bitcoind-0.21.1.ebuild | 2 +
.../files/bitcoind-0.20.1-boost-1.77-compat.patch | 56 ++++++++++++++++++++++
4 files changed, 62 insertions(+)
diff --git a/net-p2p/bitcoind/bitcoind-0.20.1.ebuild b/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
index a5b951f9c8b7..0bbc6f4b723a 100644
--- a/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.20.1.ebuild
@@ -84,6 +84,8 @@ src_prepare() {
eapply "${knots_patchdir}/${KNOTS_P}.ts.patch"
fi
+ eapply "${FILESDIR}/${P}-boost-1.77-compat.patch"
+
default
echo '#!/bin/true' >share/genbuild.sh || die
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();
+ }
+
^ permalink raw reply related [flat|nested] 4+ messages in thread
end of thread, other threads:[~2021-11-18 6:55 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-18 14:17 [gentoo-commits] repo/gentoo:master commit in: net-p2p/bitcoind/files/, net-p2p/bitcoind/ Andreas Sturmlechner
-- strict thread matches above, loose matches on Subject: below --
2018-10-23 20:38 Virgil Dupras
2019-12-26 11:57 David Seifert
2021-11-18 6:55 Joonas Niilola
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox