commit: cb1cd6d23c56ff06009803702be87a2a2a229331
Author: Luke Dashjr <luke-jr+git <AT> utopios <DOT> org>
AuthorDate: Thu Oct 22 21:17:56 2015 +0000
Commit: Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Fri Oct 23 10:13:14 2015 +0000
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=cb1cd6d2
net-p2p/bitcoin{-qt,d}: Backport miniupnpc-14 support to older versions
net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild | 2 ++
net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild | 2 ++
net-p2p/bitcoin-qt/bitcoin-qt-0.11.0.ebuild | 2 ++
net-p2p/bitcoin-qt/files/miniupnpc-14.patch | 28 ++++++++++++++++++++++++++
net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild | 1 +
net-p2p/bitcoind/bitcoind-0.10.2.ebuild | 1 +
net-p2p/bitcoind/bitcoind-0.11.0.ebuild | 1 +
net-p2p/bitcoind/files/miniupnpc-14.patch | 28 ++++++++++++++++++++++++++
8 files changed, 65 insertions(+)
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild
b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild
index b5a358d..0523266 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild
@@ -38,6 +38,8 @@ DEPEND="${RDEPEND}
REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
src_prepare() {
+ epatch "${FILESDIR}/miniupnpc-14.patch"
+
bitcoincore_prepare
local filt= yeslang= nolang=
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
index adf1b50..f2955ea 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
@@ -37,6 +37,8 @@ DEPEND="${RDEPEND}
REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
src_prepare() {
+ epatch "${FILESDIR}/miniupnpc-14.patch"
+
bitcoincore_prepare
local filt= yeslang= nolang=
diff --git a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.0.ebuild
b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.0.ebuild
index 4f21437..b93ef90 100644
--- a/net-p2p/bitcoin-qt/bitcoin-qt-0.11.0.ebuild
+++ b/net-p2p/bitcoin-qt/bitcoin-qt-0.11.0.ebuild
@@ -36,6 +36,8 @@ DEPEND="${RDEPEND}
REQUIRED_USE="${REQUIRED_USE} ^^ ( qt4 qt5 )"
src_prepare() {
+ epatch "${FILESDIR}/miniupnpc-14.patch"
+
bitcoincore_prepare
local filt= yeslang= nolang=
diff --git a/net-p2p/bitcoin-qt/files/miniupnpc-14.patch
b/net-p2p/bitcoin-qt/files/miniupnpc-14.patch
new file mode 100644
index 0000000..aa8e32f
--- /dev/null
+++ b/net-p2p/bitcoin-qt/files/miniupnpc-14.patch
@@ -0,0 +1,28 @@
+commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 (origin-pull/6583/head)
+Author: Pavel Vasin <pa...@vasin.nl>
+Date: Sun Aug 23 23:53:49 2015 +0300
+
+ add support for miniupnpc api version 14
+
+ The value of new arg ttl is set to 2 as it's recommended default.
+
+diff --git a/src/net.cpp b/src/net.cpp
+index fb5726a..4c6331f 100644
+--- a/src/net.cpp
++++ b/src/net.cpp
+@@ -1120,10 +1120,14 @@ void ThreadMapPort()
+ #ifndef UPNPDISCOVER_SUCCESS
+ /* miniupnpc 1.5 */
+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
+-#else
++#elif MINIUPNPC_API_VERSION < 14
+ /* miniupnpc 1.6 */
+ int error = 0;
+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
++#else
++ /* miniupnpc 1.9.20150730 */
++ int error = 0;
++ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
+ #endif
+
+ struct UPNPUrls urls;
diff --git a/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild
b/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild
index dcac723..78bd496 100644
--- a/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild
@@ -33,6 +33,7 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}/miniupnpc-14.patch"
sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\)
bitcoin-cli$/\1/' contrib/${PN}.bash-completion
epatch "${FILESDIR}/0.10.0-openrc-compat.patch"
bitcoincore_src_prepare
diff --git a/net-p2p/bitcoind/bitcoind-0.10.2.ebuild
b/net-p2p/bitcoind/bitcoind-0.10.2.ebuild
index 90f110d..3b94586 100644
--- a/net-p2p/bitcoind/bitcoind-0.10.2.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.10.2.ebuild
@@ -32,6 +32,7 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}/miniupnpc-14.patch"
epatch "${FILESDIR}/0.10.0-openrc-compat.patch"
bitcoincore_src_prepare
}
diff --git a/net-p2p/bitcoind/bitcoind-0.11.0.ebuild
b/net-p2p/bitcoind/bitcoind-0.11.0.ebuild
index 616e33c..f2ed1f4 100644
--- a/net-p2p/bitcoind/bitcoind-0.11.0.ebuild
+++ b/net-p2p/bitcoind/bitcoind-0.11.0.ebuild
@@ -31,6 +31,7 @@ pkg_setup() {
}
src_prepare() {
+ epatch "${FILESDIR}/miniupnpc-14.patch"
sed -i 's/have bitcoind &&//;s/^\(complete -F _bitcoind bitcoind\)
bitcoin-cli$/\1/' contrib/${PN}.bash-completion
bitcoincore_src_prepare
}
diff --git a/net-p2p/bitcoind/files/miniupnpc-14.patch
b/net-p2p/bitcoind/files/miniupnpc-14.patch
new file mode 100644
index 0000000..aa8e32f
--- /dev/null
+++ b/net-p2p/bitcoind/files/miniupnpc-14.patch
@@ -0,0 +1,28 @@
+commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 (origin-pull/6583/head)
+Author: Pavel Vasin <pa...@vasin.nl>
+Date: Sun Aug 23 23:53:49 2015 +0300
+
+ add support for miniupnpc api version 14
+
+ The value of new arg ttl is set to 2 as it's recommended default.
+
+diff --git a/src/net.cpp b/src/net.cpp
+index fb5726a..4c6331f 100644
+--- a/src/net.cpp
++++ b/src/net.cpp
+@@ -1120,10 +1120,14 @@ void ThreadMapPort()
+ #ifndef UPNPDISCOVER_SUCCESS
+ /* miniupnpc 1.5 */
+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0);
+-#else
++#elif MINIUPNPC_API_VERSION < 14
+ /* miniupnpc 1.6 */
+ int error = 0;
+ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, &error);
++#else
++ /* miniupnpc 1.9.20150730 */
++ int error = 0;
++ devlist = upnpDiscover(2000, multicastif, minissdpdpath, 0, 0, 2, &error);
+ #endif
+
+ struct UPNPUrls urls;
