[gentoo-commits] repo/gentoo:master commit in: net-misc/tinc/files/, net-misc/tinc/

[Yixun Lan]

commit:     2d5cfa648619324bf830739e69bab087449a8f56
Author:     Yixun Lan <dlan <AT> gentoo <DOT> org>
AuthorDate: Wed Oct 12 10:01:31 2016 +0000
Commit:     Yixun Lan <dlan <AT> gentoo <DOT> org>
CommitDate: Wed Oct 12 10:04:52 2016 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=2d5cfa64

net-misc/tinc: fix USE=upnp build err

Gentoo-Bug: 595372

Package-Manager: portage-2.3.2

 net-misc/tinc/files/tinc-1.1_pre14-upnp.patch | 13 +++++++++++++
 net-misc/tinc/tinc-1.1_pre14.ebuild           |  4 ++++
 2 files changed, 17 insertions(+)

diff --git a/net-misc/tinc/files/tinc-1.1_pre14-upnp.patch b/net-misc/tinc/files/tinc-1.1_pre14-upnp.patch
new file mode 100644
index 00000000..1d037ef
--- /dev/null
+++ b/net-misc/tinc/files/tinc-1.1_pre14-upnp.patch
@@ -0,0 +1,13 @@
+diff --git a/src/upnp.c b/src/upnp.c
+index abd2f92..3bfc770 100644
+--- a/src/upnp.c
++++ b/src/upnp.c
+@@ -57,7 +57,7 @@ static struct UPNPDev *upnp_discover(int delay, int *error) {
+ 
+ #elif MINIUPNPC_API_VERSION <= 14
+ 
+-	return upnpDiscover(delay, NULL NULL, false, false, 2, error);
++	return upnpDiscover(delay, NULL, NULL, false, false, 2, error);
+ 
+ #else
+ 

diff --git a/net-misc/tinc/tinc-1.1_pre14.ebuild b/net-misc/tinc/tinc-1.1_pre14.ebuild
index 96313dc..3a9eb67 100644
--- a/net-misc/tinc/tinc-1.1_pre14.ebuild
+++ b/net-misc/tinc/tinc-1.1_pre14.ebuild
@@ -38,6 +38,10 @@ RDEPEND="${DEPEND}
 
 S="${WORKDIR}/${MY_P}"
 
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-upnp.patch
+}
+
 src_configure() {
 	econf \
 		--enable-jumbograms \