net-p2p/bitcoin{-qt,d}: Backport miniupnpc-14 support to older versions

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 b5a358d97cc595ed2dcde2877a6de56706cb35c8..0523266be66339abac61adbfda68d12a1dac0a7d 100644 (file)
--- 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 adf1b50ee9cf1aa9c2fcda4b0d10db7dc8322ffd..f2955eae79de951843f2b1f0a8710fe9bcf6b0e3 100644 (file)
--- 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 4f21437aa0494a030f2453c878a0082b59b352a4..b93ef9075b370858b7a1d7a09e824e1fc6b65c6c 100644 (file)
--- 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 (file)
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 <pavel@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 dcac723e3ef34c94ef384ff49bb7e3cb2a43faca..78bd4964dadf72ad6ace55a7c092e44bfa3749c9 100644 (file)
--- 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 90f110d072a4a84bf7d050596ec586d1101ff732..3b945861f5aa101ba7f1b4c24c262f731b194e7a 100644 (file)
--- 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 616e33c5d2d35b91fef166335c37b6f44b4f8247..f2ed1f49b05f8f79cef5c084eac1cd1cca330157 100644 (file)
--- 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 (file)
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 <pavel@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;