svn commit: r399270 - in head/net-p2p: bitcoin bitcoin-utils bitcoin/files

[Jan Beich]

Author: jbeich
Date: Wed Oct 14 14:57:33 2015
New Revision: 399270
URL: https://svnweb.freebsd.org/changeset/ports/399270

Log:
  net-p2p/bitcoin: chase r399209
  
  https://github.com/miniupnp/miniupnp/commit/1da63faa4fff5cb30e5d4b848ceef80a292382b9
  
  PR:		203761
  Submitted by:	robbak at gmail.com (based on)
  Obtained from:	upstream
  MFH:		2015Q4
  X-MFH-With:	r399209

Added:
  head/net-p2p/bitcoin/files/patch-src_net.cpp   (contents, props changed)
Modified:
  head/net-p2p/bitcoin-utils/Makefile   (contents, props changed)
  head/net-p2p/bitcoin/Makefile   (contents, props changed)

Modified: head/net-p2p/bitcoin-utils/Makefile
==============================================================================
--- head/net-p2p/bitcoin-utils/Makefile	Wed Oct 14 14:57:23 2015	(r399269)
+++ head/net-p2p/bitcoin-utils/Makefile	Wed Oct 14 14:57:33 2015	(r399270)
@@ -1,6 +1,7 @@
 # $FreeBSD$
 
 MASTERDIR=	${.CURDIR}/../bitcoin
+PORTREVISION=	0
 PKGNAMESUFFIX=	-utils
 
 COMMENT=	Virtual Peer-to-Peer Currency (CLI and Utilities)

Modified: head/net-p2p/bitcoin/Makefile
==============================================================================
--- head/net-p2p/bitcoin/Makefile	Wed Oct 14 14:57:23 2015	(r399269)
+++ head/net-p2p/bitcoin/Makefile	Wed Oct 14 14:57:33 2015	(r399270)
@@ -4,6 +4,7 @@
 PORTNAME=	bitcoin
 PORTVERSION=	0.11.0
 DISTVERSIONPREFIX=	v
+PORTREVISION?=	1
 CATEGORIES=	net-p2p finance
 
 MAINTAINER=	robbak at robbak.com

Added: head/net-p2p/bitcoin/files/patch-src_net.cpp
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/net-p2p/bitcoin/files/patch-src_net.cpp	Wed Oct 14 14:57:33 2015	(r399270)
@@ -0,0 +1,31 @@
+commit 9f3e48e5219a09b5ddfd6883d1f0498910eff4b6
+Author: Pavel Vasin <pavel at 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;