diff options
| author | Jan Beich <jbeich@FreeBSD.org> | 2015-10-14 14:57:33 +0000 |
|---|---|---|
| committer | Jan Beich <jbeich@FreeBSD.org> | 2015-10-14 14:57:33 +0000 |
| commit | 5dc469fd40275dc1a3c79904c3d83709e8a8dfab (patch) | |
| tree | 269aba01dece45a53dbbf4d0f03501e7b402db12 /net-p2p | |
| parent | 6f0aac24f900cf4c2cf55b910acd88f26ac0811b (diff) | |
net-p2p/bitcoin: chase r399209
https://github.com/miniupnp/miniupnp/commit/1da63faa4fff5cb30e5d4b848ceef80a292382b9
PR: 203761
Submitted by: robbak@gmail.com (based on)
Obtained from: upstream
MFH: 2015Q4
X-MFH-With: r399209
Notes
Notes:
svn path=/head/; revision=399270
Diffstat (limited to 'net-p2p')
| -rw-r--r-- | net-p2p/bitcoin-utils/Makefile | 1 | ||||
| -rw-r--r-- | net-p2p/bitcoin/Makefile | 1 | ||||
| -rw-r--r-- | net-p2p/bitcoin/files/patch-src_net.cpp | 31 |
3 files changed, 33 insertions, 0 deletions
diff --git a/net-p2p/bitcoin-utils/Makefile b/net-p2p/bitcoin-utils/Makefile index c22e1bb5fc6c..9bdd091896af 100644 --- a/net-p2p/bitcoin-utils/Makefile +++ b/net-p2p/bitcoin-utils/Makefile @@ -1,6 +1,7 @@ # $FreeBSD$ MASTERDIR= ${.CURDIR}/../bitcoin +PORTREVISION= 0 PKGNAMESUFFIX= -utils COMMENT= Virtual Peer-to-Peer Currency (CLI and Utilities) diff --git a/net-p2p/bitcoin/Makefile b/net-p2p/bitcoin/Makefile index 147ee5703034..2f4e3af832d9 100644 --- a/net-p2p/bitcoin/Makefile +++ b/net-p2p/bitcoin/Makefile @@ -4,6 +4,7 @@ PORTNAME= bitcoin PORTVERSION= 0.11.0 DISTVERSIONPREFIX= v +PORTREVISION?= 1 CATEGORIES= net-p2p finance MAINTAINER= robbak@robbak.com diff --git a/net-p2p/bitcoin/files/patch-src_net.cpp b/net-p2p/bitcoin/files/patch-src_net.cpp new file mode 100644 index 000000000000..f985b18bf708 --- /dev/null +++ b/net-p2p/bitcoin/files/patch-src_net.cpp @@ -0,0 +1,31 @@ +commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6 +Author: Pavel Vasin <pavel@vasin.nl> +Date: Sun, 23 Aug 2015 23:53:49 +0300 + + add support for miniupnpc api version 14 + + The value of new arg ttl is set to 2 as it's recommended default. +--- + src/net.cpp | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) + +diff --git a/src/net.cpp b/src/net.cpp +index fb5726a..4c6331f 100644 +--- src/net.cpp.orig 2015-07-10 17:23:55 UTC ++++ 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; |