miniupnpc: update wip/miniupnpc to 2.0

Changes:

VERSION 2.0 : released 2016/04/19

2016/01/24:
  change miniwget to return HTTP status code
  increments API_VERSION to 16

2016/01/22:
  Improve UPNPIGD_IsConnected() to check if WAN address is not private.
  parse HTTP response status line in miniwget.c

2015/10/26:
  snprintf() overflow check. check overflow in simpleUPnPcommand2()

2015/10/25:
  fix compilation with old macs
  fix compilation with mingw32 (for Appveyor)
  fix python module for python <= 2.3

2015/10/08:
  Change sameport to localport
    see https://github.com/miniupnp/miniupnp/pull/120
  increments API_VERSION to 15

2015/09/15:
  Fix buffer overflow in igd_desc_parse.c/IGDstartelt()
    Discovered by Aleksandar Nikolic of Cisco Talos

2015/08/28:
  move ssdpDiscoverDevices() to minissdpc.c

2015/08/27:
  avoid unix socket leak in getDevicesFromMiniSSDPD()

2015/08/16:
  Also accept "Up" as ConnectionStatus value

2015/07/23:
  split getDevicesFromMiniSSDPD
  add ttl argument to upnpDiscover() functions
  increments API_VERSION to 14

2015/07/22:
  Read USN from SSDP messages.

2015/07/15:
  Check malloc/calloc

2015/06/16:
  update getDevicesFromMiniSSDPD() to process longer minissdpd
    responses

2015/05/22:
  add searchalltypes param to upnpDiscoverDevices()
  increments API_VERSION to 13

2015/04/30:
  upnpc: output version on the terminal

2015/04/27:
  _BSD_SOURCE is deprecated in favor of _DEFAULT_SOURCE
  fix CMakeLists.txt COMPILE_DEFINITIONS
  fix getDevicesFromMiniSSDPD() not setting scope_id
  improve -r command of upnpc command line tool

2014/11/17:
  search all :
    upnpDiscoverDevices() / upnpDiscoverAll() functions
    listdevices executable
  increment API_VERSION to 12
  validate igd_desc_parse

2014/11/13:
  increment API_VERSION to 11

2014/11/05:
  simplified function GetUPNPUrls()

2014/09/11:
  use remoteHost arg of DeletePortMapping

2014/09/06:
  Fix python3 build

2014/07/01:
  Fix parsing of IGD2 root descriptions

2014/06/10:
  rename LIBSPEC to MINIUPNP_LIBSPEC

2014/05/15:
  Add support for IGD2 AddAnyPortMapping and DeletePortMappingRange

2014/02/05:
  handle EINPROGRESS after connect()

2014/02/03:
  minixml now handle XML comments

VERSION 1.9 : released 2014/01/31

2014/01/31:
  added argument remoteHost to UPNP_GetSpecificPortMappingEntry()
  increment API_VERSION to 10

diff --git a/miniupnpc/patches/patch-aa b/miniupnpc/patches/patch-aa
index 1f2104dd6b049350b8e68f0688e056427975b27f..c528da320a9ca80c367556154a5462692eaa4cf2 100644 (file)
--- a/miniupnpc/patches/patch-aa
+++ b/miniupnpc/patches/patch-aa
@@ -1,23 +1,24 @@
-$NetBSD: patch-aa,v 1.4 2013/06/08 15:01:16 othyro Exp $
-
-Always define RM and user-destdir support.
-
---- Makefile.orig      2013-05-03 19:24:54.000000000 +0000
-+++ Makefile
-@@ -49,6 +49,7 @@ JAVA = java
- JNAERATOR = jnaerator-0.11-shaded.jar
- JNAERATORARGS = -mode StandaloneJar -runtime JNAerator -library miniupnpc
- JNAERATORBASEURL = http://jnaerator.googlecode.com/files/
-+RM = rm
- 
- ifeq (SunOS, $(OS))
-   LDFLAGS=-lsocket -lnsl -lresolv
-@@ -119,7 +120,7 @@ endif
+--- Makefile.orig      2016-09-02 21:28:01.797166785 +0200
++++ Makefile   2016-09-02 21:31:44.033654151 +0200
+@@ -36,8 +36,11 @@
+ CFLAGS += -fno-common
+ CFLAGS += -DMINIUPNPC_SET_SOCKET_TIMEOUT
+ CFLAGS += -DMINIUPNPC_GET_SRC_ADDR
+-CFLAGS += -D_BSD_SOURCE
++CFLAGS += -D_BSD_SOURCE -D_POSIX_C_SOURCE=1
+ 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,7 +139,7 @@
  
  LIBDIR ?= lib
  # install directories
 -INSTALLPREFIX ?= $(PREFIX)/usr
-+INSTALLPREFIX ?= $(DESTDIR)$(PREFIX)
++INSTALLPREFIX ?= $(PREFIX)
  INSTALLDIRINC = $(INSTALLPREFIX)/include/miniupnpc
  INSTALLDIRLIB = $(INSTALLPREFIX)/$(LIBDIR)
  INSTALLDIRBIN = $(INSTALLPREFIX)/bin

diff --git a/miniupnpc/patches/patch-ab b/miniupnpc/patches/patch-ab
new file mode 100644 (file)
index 0000000..8575b71
--- /dev/null
+++ b/miniupnpc/patches/patch-ab
@@ -0,0 +1,12 @@
+--- minissdpc.c.orig   2016-09-02 21:23:33.298069375 +0200
++++ minissdpc.c        2016-09-02 21:29:22.527967038 +0200
+@@ -11,6 +11,9 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <sys/types.h>
++#if defined (__NetBSD__)
++#include <net/if.h>
++#endif
+ #if defined(_WIN32) || defined(__amigaos__) || defined(__amigaos4__)
+ #ifdef _WIN32
+ #include <winsock2.h>