1 |
commit: 529e91eb1a8f1a55fa400d7ca7e9d63ae61df5e2 |
2 |
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org> |
3 |
AuthorDate: Mon Sep 30 03:27:05 2019 +0000 |
4 |
Commit: Craig Andrews <candrews <AT> gentoo <DOT> org> |
5 |
CommitDate: Sat Mar 7 21:15:14 2020 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=529e91eb |
7 |
|
8 |
net-p2p/bitcoin{-qt,d}-0.16.3: Drop bitcoin_policy_rbf USE flag |
9 |
|
10 |
It is now always enabled at build time. |
11 |
Users who don't like it can turn it off at runtime. |
12 |
|
13 |
Signed-off-by: Luke Dashjr <luke-jr+git <AT> utopios.org> |
14 |
Signed-off-by: Craig Andrews <candrews <AT> gentoo.org> |
15 |
|
16 |
net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild | 17 ++++------------- |
17 |
net-p2p/bitcoin-qt/metadata.xml | 1 - |
18 |
net-p2p/bitcoind/bitcoind-0.16.3.ebuild | 17 ++++------------- |
19 |
net-p2p/bitcoind/metadata.xml | 1 - |
20 |
4 files changed, 8 insertions(+), 28 deletions(-) |
21 |
|
22 |
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild |
23 |
index 0ee413a509b..95339d5b90b 100644 |
24 |
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild |
25 |
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.16.3.ebuild |
26 |
@@ -21,7 +21,7 @@ LICENSE="MIT" |
27 |
SLOT="0" |
28 |
KEYWORDS="amd64 ~arm ~arm64 ~ppc x86 ~amd64-linux ~x86-linux" |
29 |
|
30 |
-IUSE="+asm +bip70 +bitcoin_policy_rbf dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq" |
31 |
+IUSE="+asm +bip70 dbus kde +libevent knots libressl +qrcode test upnp +wallet zeromq" |
32 |
RESTRICT="!test? ( test )" |
33 |
|
34 |
RDEPEND=" |
35 |
@@ -69,14 +69,9 @@ pkg_pretend() { |
36 |
elog "For more information, see:" |
37 |
elog "https://bitcoincore.org/en/2018/09/18/release-${PV}/" |
38 |
fi |
39 |
- if use bitcoin_policy_rbf; then |
40 |
- elog "Replace By Fee policy is enabled: Your node will preferentially mine and" |
41 |
- elog "relay transactions paying the highest fee, regardless of receive order." |
42 |
- else |
43 |
- elog "Replace By Fee policy is disabled: Your node will only accept the first" |
44 |
- elog "transaction seen consuming a conflicting input, regardless of fee" |
45 |
- elog "offered by later ones." |
46 |
- fi |
47 |
+ elog "Replace By Fee policy is now always enabled by default: Your node will" |
48 |
+ elog "preferentially mine and relay transactions paying the highest fee, regardless" |
49 |
+ elog "of receive order. To disable RBF, set mempoolreplacement=never in bitcoin.conf" |
50 |
} |
51 |
|
52 |
src_prepare() { |
53 |
@@ -98,10 +93,6 @@ src_prepare() { |
54 |
|
55 |
eapply_user |
56 |
|
57 |
- if ! use bitcoin_policy_rbf; then |
58 |
- sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die |
59 |
- fi |
60 |
- |
61 |
echo '#!/bin/true' >share/genbuild.sh || die |
62 |
mkdir -p src/obj || die |
63 |
echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die |
64 |
|
65 |
diff --git a/net-p2p/bitcoin-qt/metadata.xml b/net-p2p/bitcoin-qt/metadata.xml |
66 |
index 0e5739a7325..d37cf8037b8 100644 |
67 |
--- a/net-p2p/bitcoin-qt/metadata.xml |
68 |
+++ b/net-p2p/bitcoin-qt/metadata.xml |
69 |
@@ -12,7 +12,6 @@ |
70 |
<use> |
71 |
<flag name="asm">Enable assembly for optimization</flag> |
72 |
<flag name="bip70">Enable support for the BIP70 payment protocol</flag> |
73 |
- <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> |
74 |
<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag> |
75 |
<flag name="libevent">Use dev-libs/libevent (needed for JSON-RPC, REST, and Tor auto-configuration</flag> |
76 |
<flag name="qrcode">Enable generation of QR Codes for receiving payments</flag> |
77 |
|
78 |
diff --git a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild |
79 |
index 86589b99be5..585ba925484 100644 |
80 |
--- a/net-p2p/bitcoind/bitcoind-0.16.3.ebuild |
81 |
+++ b/net-p2p/bitcoind/bitcoind-0.16.3.ebuild |
82 |
@@ -20,7 +20,7 @@ SRC_URI=" |
83 |
LICENSE="MIT" |
84 |
SLOT="0" |
85 |
KEYWORDS="amd64 ~arm ~arm64 ~mips ~ppc x86 ~amd64-linux ~x86-linux" |
86 |
-IUSE="+asm +bitcoin_policy_rbf examples knots libressl test upnp +wallet zeromq" |
87 |
+IUSE="+asm examples knots libressl test upnp +wallet zeromq" |
88 |
RESTRICT="!test? ( test )" |
89 |
|
90 |
DEPEND=" |
91 |
@@ -51,14 +51,9 @@ pkg_pretend() { |
92 |
elog "For more information, see:" |
93 |
elog "https://bitcoincore.org/en/2018/09/18/release-${PV}/" |
94 |
fi |
95 |
- if use bitcoin_policy_rbf; then |
96 |
- elog "Replace By Fee policy is enabled: Your node will preferentially mine and" |
97 |
- elog "relay transactions paying the highest fee, regardless of receive order." |
98 |
- else |
99 |
- elog "Replace By Fee policy is disabled: Your node will only accept the first" |
100 |
- elog "transaction seen consuming a conflicting input, regardless of fee" |
101 |
- elog "offered by later ones." |
102 |
- fi |
103 |
+ elog "Replace By Fee policy is now always enabled by default: Your node will" |
104 |
+ elog "preferentially mine and relay transactions paying the highest fee, regardless" |
105 |
+ elog "of receive order. To disable RBF, set mempoolreplacement=never in bitcoin.conf" |
106 |
} |
107 |
|
108 |
pkg_setup() { |
109 |
@@ -82,10 +77,6 @@ src_prepare() { |
110 |
|
111 |
eapply_user |
112 |
|
113 |
- if ! use bitcoin_policy_rbf; then |
114 |
- sed -i 's/\(DEFAULT_ENABLE_REPLACEMENT = \)true/\1false/' src/validation.h || die |
115 |
- fi |
116 |
- |
117 |
echo '#!/bin/true' >share/genbuild.sh || die |
118 |
mkdir -p src/obj || die |
119 |
echo "#define BUILD_SUFFIX gentoo${PVR#${PV}}" >src/obj/build.h || die |
120 |
|
121 |
diff --git a/net-p2p/bitcoind/metadata.xml b/net-p2p/bitcoind/metadata.xml |
122 |
index 6283c9d733c..31bb9103620 100644 |
123 |
--- a/net-p2p/bitcoind/metadata.xml |
124 |
+++ b/net-p2p/bitcoind/metadata.xml |
125 |
@@ -11,7 +11,6 @@ |
126 |
</maintainer> |
127 |
<use> |
128 |
<flag name="asm">Enable assembly for optimization</flag> |
129 |
- <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> |
130 |
<flag name="knots">Build enhanced Bitcoin Knots version, rather than Bitcoin Core</flag> |
131 |
<flag name="system-leveldb">Use the system-wide dev-libs/leveldb instead of bundled</flag> |
132 |
<flag name="upnp">Enable Universal Plug and Play</flag> |