Update miniupnpd to v2.0 Refresh patches Signed-off-by: Kevin Darbyshire-Bryant <[email protected]> --- miniupnpd/Makefile | 4 ++-- miniupnpd/patches/100-no-ssl.patch | 6 +++--- miniupnpd/patches/102-ipv6-ext-port.patch | 2 +- miniupnpd/patches/103-no-ipv6-autodetection.patch | 2 +- 4 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile index 1000929..0207036 100644 --- a/miniupnpd/Makefile +++ b/miniupnpd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miniupnpd -PKG_VERSION:=1.9.20151212 +PKG_VERSION:=2.0 PKG_RELEASE:=1 PKG_SOURCE_URL:=http://miniupnp.free.fr/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=86465b35f711ca9982d48b34c094033a +PKG_MD5SUM:=1c07a215dd9b362e75a9efc05e2fb3b4 PKG_MAINTAINER:=Markus Stenberg <[email protected]> PKG_LICENSE:=BSD-3-Clause diff --git a/miniupnpd/patches/100-no-ssl.patch b/miniupnpd/patches/100-no-ssl.patch index 343e615..5caafc2 100644 --- a/miniupnpd/patches/100-no-ssl.patch +++ b/miniupnpd/patches/100-no-ssl.patch @@ -1,6 +1,6 @@ --- a/Makefile.linux +++ b/Makefile.linux -@@ -147,7 +147,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static +@@ -153,7 +153,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack) endif # ($(TEST),1) @@ -8,5 +8,5 @@ +# n/a - we don't enable https server for IGD v2 anyway +#LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libssl) - TESTUPNPDESCGENOBJS = testupnpdescgen.o upnpdescgen.o - + TEST := $(shell $(PKG_CONFIG) --exists uuid && echo 1) + ifeq ($(TEST),1) diff --git a/miniupnpd/patches/102-ipv6-ext-port.patch b/miniupnpd/patches/102-ipv6-ext-port.patch index fdb2af4..806c7fd 100644 --- a/miniupnpd/patches/102-ipv6-ext-port.patch +++ b/miniupnpd/patches/102-ipv6-ext-port.patch @@ -1,6 +1,6 @@ --- a/pcpserver.c +++ b/pcpserver.c -@@ -1004,6 +1004,7 @@ static int CreatePCPMap_NAT(pcp_info_t * +@@ -982,6 +982,7 @@ static int CreatePCPMap_NAT(pcp_info_t * timestamp); if (r < 0) return PCP_ERR_NO_RESOURCES; diff --git a/miniupnpd/patches/103-no-ipv6-autodetection.patch b/miniupnpd/patches/103-no-ipv6-autodetection.patch index 61c023a..50d5a39 100644 --- a/miniupnpd/patches/103-no-ipv6-autodetection.patch +++ b/miniupnpd/patches/103-no-ipv6-autodetection.patch @@ -17,7 +17,7 @@ As the OpenWRT buildsystem already passes the right compile flags, we can skip t # testiptpinhole --- a/Makefile.linux +++ b/Makefile.linux -@@ -70,7 +70,6 @@ CPPFLAGS += -DIPTABLES_143 +@@ -73,7 +73,6 @@ CPPFLAGS += -DIPTABLES_143 endif CFLAGS += $(shell $(PKG_CONFIG) --cflags libiptc) -- 1.9.1 _______________________________________________ openwrt-devel mailing list [email protected] https://lists.openwrt.org/cgi-bin/mailman/listinfo/openwrt-devel
