gentoo-mirror/gentoo
1
0
Fork 0
mirror of https://github.com/gentoo-mirror/gentoo.git synced 2026-09-24 04:59:14 -07:00
Code Issues Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Luke Dashjr
2015-10-22 21:17:56 +00:00
committed by Anthony G. Basile
parent 496566c75f
commit cb1cd6d23c
8 changed files with 65 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
net-p2p/bitcoin-qt/bitcoin-qt-0.10.2-r1.ebuild
View File

@@ -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=

2
net-p2p/bitcoin-qt/bitcoin-qt-0.10.2.ebuild
View File

@@ -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=

2
net-p2p/bitcoin-qt/bitcoin-qt-0.11.0.ebuild
View File

@@ -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=

28
net-p2p/bitcoin-qt/files/miniupnpc-14.patch Normal file
View File

@@ -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;

1
net-p2p/bitcoind/bitcoind-0.10.2-r1.ebuild
View File

@@ -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

1
net-p2p/bitcoind/bitcoind-0.10.2.ebuild
View File

@@ -32,6 +32,7 @@ pkg_setup() {
}
src_prepare() {
epatch "${FILESDIR}/miniupnpc-14.patch"
epatch "${FILESDIR}/0.10.0-openrc-compat.patch"
bitcoincore_src_prepare
}

1
net-p2p/bitcoind/bitcoind-0.11.0.ebuild
View File

@@ -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
}

28
net-p2p/bitcoind/files/miniupnpc-14.patch Normal file
View File

@@ -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;