net/miniupnpc: update to version 2.1

Changes:

VERSION 2.1 : released 2018/05/07

2018/05/07:
  CMake Modernize and cleanup CMakeLists.txt
  Update MS Visual Studio projects

2018/04/30:
  listdevices: show devices sorted by XML desc URL

2018/04/26:
  Small fix in miniupnpcmodule.c (python module)
  Support cross compiling in Makefile.mingw

2018/04/06:
  Use SOCKET type instead of int (for Win64 compilation)
  Increments API_VERSION to 17

2018/02/22:
  Disable usage of MiniSSDPd when using -m option

2017/12/11:
  Fix buffer over run in minixml.c
  Fix uninitialized variable access in upnpreplyparse.c

2017/05/05:
  Fix CVE-2017-8798   Thanks to tin/Team OSTStrom

2016/11/11:
  check strlen before memcmp in XML parsing portlistingparse.c
  fix build under SOLARIS and CYGWIN

2016/10/11:
  Add python 3 compatibility to IGD test

5 files changed, 25 insertions, 41 deletions

diff --git a/net/miniupnpc/Makefile b/net/miniupnpc/Makefile
index 3607cf647ce..0fde087e5cc 100644
--- a/net/miniupnpc/Makefile
+++ b/net/miniupnpc/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2017/07/03 11:53:57 wiedi Exp $
+# $NetBSD: Makefile,v 1.3 2018/10/03 22:27:05 nia Exp $
 
-DISTNAME=	miniupnpc-2.0
-PKGREVISION=	1
+DISTNAME=	miniupnpc-2.1
 CATEGORIES=	net
 MASTER_SITES=	http://miniupnp.free.fr/files/download.php?file=
 
diff --git a/net/miniupnpc/buildlink3.mk b/net/miniupnpc/buildlink3.mk
index 924705c7128..8ba0536d9dc 100644
--- a/net/miniupnpc/buildlink3.mk
+++ b/net/miniupnpc/buildlink3.mk
@@ -1,11 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.1 2016/12/01 22:28:29 adam Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2018/10/03 22:27:05 nia Exp $
 
 BUILDLINK_TREE+=	miniupnpc
 
 .if !defined(MINIUPNPC_BUILDLINK3_MK)
 MINIUPNPC_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.miniupnpc+=	miniupnpc>=2.0
+BUILDLINK_API_DEPENDS.miniupnpc+=	miniupnpc>=2.1
 BUILDLINK_PKGSRCDIR.miniupnpc?=		../../net/miniupnpc
 .endif	# MINIUPNPC_BUILDLINK3_MK
 
diff --git a/net/miniupnpc/distinfo b/net/miniupnpc/distinfo
index d2421287661..554df6a195e 100644
--- a/net/miniupnpc/distinfo
+++ b/net/miniupnpc/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2017/07/03 11:53:57 wiedi Exp $
+$NetBSD: distinfo,v 1.3 2018/10/03 22:27:05 nia Exp $
 
-SHA1 (miniupnpc-2.0.tar.gz) = 21181b364be330436922459c1f81ee641ac182a6
-RMD160 (miniupnpc-2.0.tar.gz) = b3038dc6a78be0bc161dc226f79fd0fd8b66fdb3
-SHA512 (miniupnpc-2.0.tar.gz) = e8bca24265086518fa3bdc25fc31371ddf878adaa2bd6a80b30f33a3e5adb831220e906302832f2250e489a73ecd7e6c9a6bfcb1c70258a90e4c4712196275de
-Size (miniupnpc-2.0.tar.gz) = 85287 bytes
-SHA1 (patch-Makefile) = ace02ccf33a24b709d1d54869a340c84d393eb0b
-SHA1 (patch-minissdpc.c) = 74cf11e4e84e9e7e47418a657922e2b58d2ad27f
+SHA1 (miniupnpc-2.1.tar.gz) = 7abef19a5460afad704814d8db0d998781799825
+RMD160 (miniupnpc-2.1.tar.gz) = 5f5eb86988f8e5ac5c9542525ac9cfa4350ad61e
+SHA512 (miniupnpc-2.1.tar.gz) = 0af5c573206e0147f8e20cd84c394164a784cf385f3978b7ca414cc2b2e530d6af40a21de5c9d8459d31db249e06667757e723767b1d4cd0a4ec5497ad239c23
+Size (miniupnpc-2.1.tar.gz) = 91914 bytes
+SHA1 (patch-Makefile) = 646f3747de66e8451667411ad605877e61fd6c32
+SHA1 (patch-minissdpc.c) = 183fcebe7a94acb596db6ef03ee7663532808108
diff --git a/net/miniupnpc/patches/patch-Makefile b/net/miniupnpc/patches/patch-Makefile
index 581c095b4b1..8dca791cb04 100644
--- a/net/miniupnpc/patches/patch-Makefile
+++ b/net/miniupnpc/patches/patch-Makefile
@@ -1,41 +1,25 @@
-$NetBSD: patch-Makefile,v 1.2 2017/07/03 11:53:57 wiedi Exp $
+$NetBSD: patch-Makefile,v 1.3 2018/10/03 22:27:05 nia Exp $
 
 Do not pick pkgsrc libtool on Darwin.
-NetBSD needs _NETBSD_SOURCE to be defined.
 Use correct installation dirs.
 
---- Makefile.orig	2016-02-09 09:38:56.000000000 +0000
+--- Makefile.orig	2018-04-06 10:53:30.000000000 +0000
 +++ Makefile
 @@ -15,7 +15,7 @@ VERSION = $(shell cat VERSION)
  
- ifeq ($(OS), Darwin)
+ ifneq (, $(findstring darwin, $(OS)))
  JARSUFFIX=mac
 -LIBTOOL ?= $(shell which libtool)
 +LIBTOOL ?= /usr/bin/libtool
  endif
- ifeq ($(OS), Linux)
+ ifneq (, $(findstring linux, $(OS)))
  JARSUFFIX=linux
-@@ -38,6 +38,9 @@ CFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT
- CFLAGS += -DMINIUPNPC_GET_SRC_ADDR
- CFLAGS += -D_BSD_SOURCE
- CFLAGS += -D_DEFAULT_SOURCE
-+ifeq ($(OS), NetBSD)
-+CFLAGS += -D_NETBSD_SOURCE
-+endif
- ifneq ($(OS), FreeBSD)
- ifneq ($(OS), Darwin)
- #CFLAGS += -D_POSIX_C_SOURCE=200112L
-@@ -136,11 +139,11 @@ endif
- 
- LIBDIR ?= lib
- # install directories
--INSTALLPREFIX ?= $(PREFIX)/usr
-+INSTALLPREFIX ?= $(PREFIX)
+@@ -149,7 +149,7 @@ endif
  INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
  INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
  INSTALLDIRBIN = $(INSTALLPREFIX)/bin
 -INSTALLDIRMAN = $(INSTALLPREFIX)/share/man
 +INSTALLDIRMAN = $(INSTALLPREFIX)/$(PKGMANDIR)
+ PKGCONFIGDIR = $(INSTALLDIRLIB)/pkgconfig
  
  FILESTOINSTALL = $(LIBRARY) $(EXECUTABLES)
- ifneq ($(OS), AmigaOS)
diff --git a/net/miniupnpc/patches/patch-minissdpc.c b/net/miniupnpc/patches/patch-minissdpc.c
index 2b255d6cbed..b7862f260ae 100644
--- a/net/miniupnpc/patches/patch-minissdpc.c
+++ b/net/miniupnpc/patches/patch-minissdpc.c
@@ -1,14 +1,15 @@
-$NetBSD: patch-minissdpc.c,v 1.1 2017/07/03 11:53:57 wiedi Exp $
+$NetBSD: patch-minissdpc.c,v 1.2 2018/10/03 22:27:05 nia Exp $
 
 need sockio.h for SIOCGIFADDR on SunOS
---- minissdpc.c.orig	2016-01-19 10:26:58.000000000 +0000
+
+--- minissdpc.c.orig	2018-04-06 10:53:30.000000000 +0000
 +++ minissdpc.c
-@@ -11,6 +11,9 @@
- #include <string.h>
- #include <stdlib.h>
- #include <sys/types.h>
+@@ -14,6 +14,9 @@
+ #if defined (__NetBSD__)
+ #include <net/if.h>
+ #endif
 +#if defined(__sun)
-+#include <sys/sockio.h> 
++#include <sys/sockio.h>
 +#endif
  #if defined(_WIN32) || defined(__amigaos__) || defined(__amigaos4__)
  #ifdef _WIN32