From ee80086e1ad08b6dc554b3945373347dfee10f48 Mon Sep 17 00:00:00 2001 From: Steven Barth Date: Mon, 15 Sep 2014 11:51:21 +0200 Subject: [PATCH] miniupnpd: bump to 1.8.20140906 Signed-off-by: Steven Barth --- miniupnpd/Makefile | 6 +++--- miniupnpd/patches/100-no-ssl.patch | 4 +--- miniupnpd/patches/101-ipv6-pinhole.patch | 13 ------------- miniupnpd/patches/102-ipv6-ext-port.patch | 10 ++++------ miniupnpd/patches/103-nat-pmp-fix-writenu16.patch | 11 ----------- 5 files changed, 8 insertions(+), 36 deletions(-) delete mode 100644 miniupnpd/patches/101-ipv6-pinhole.patch delete mode 100644 miniupnpd/patches/103-nat-pmp-fix-writenu16.patch diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile index af9a940..139320f 100644 --- a/miniupnpd/Makefile +++ b/miniupnpd/Makefile @@ -8,12 +8,12 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miniupnpd -PKG_VERSION:=1.8.20140523 -PKG_RELEASE:=4 +PKG_VERSION:=1.8.20140906 +PKG_RELEASE:=1 PKG_SOURCE_URL:=http://miniupnp.free.fr/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz -PKG_MD5SUM:=fcac89e11da091b1cc61f43d83c9e4f5 +PKG_MD5SUM:=72a68c5757031d906a555f84e9a2a8f2 PKG_MAINTAINER:=Markus Stenberg diff --git a/miniupnpd/patches/100-no-ssl.patch b/miniupnpd/patches/100-no-ssl.patch index f058c3b..343e615 100644 --- a/miniupnpd/patches/100-no-ssl.patch +++ b/miniupnpd/patches/100-no-ssl.patch @@ -1,8 +1,6 @@ -diff --git a/Makefile.linux b/Makefile.linux -index bcca779..7946108 100644 --- a/Makefile.linux +++ b/Makefile.linux -@@ -147,7 +147,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libmnl) +@@ -147,7 +147,8 @@ LDLIBS += $(shell $(PKG_CONFIG) --static LDLIBS += $(shell $(PKG_CONFIG) --static --libs-only-l libnetfilter_conntrack) endif # ($(TEST),1) diff --git a/miniupnpd/patches/101-ipv6-pinhole.patch b/miniupnpd/patches/101-ipv6-pinhole.patch deleted file mode 100644 index 0ab4d4d..0000000 --- a/miniupnpd/patches/101-ipv6-pinhole.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff --git a/netfilter/iptpinhole.c b/netfilter/iptpinhole.c -index 61ed41b..5cb0e0e 100644 ---- a/netfilter/iptpinhole.c -+++ b/netfilter/iptpinhole.c -@@ -206,6 +206,8 @@ int add_pinhole(const char * ifname, - - e = calloc(1, sizeof(struct ip6t_entry)); - e->ipv6.proto = proto; -+ if (proto) -+ e->ipv6.flags |= IP6T_F_PROTO; - - if(ifname) - strncpy(e->ipv6.iniface, ifname, IFNAMSIZ); diff --git a/miniupnpd/patches/102-ipv6-ext-port.patch b/miniupnpd/patches/102-ipv6-ext-port.patch index d0c68ae..fdb2af4 100644 --- a/miniupnpd/patches/102-ipv6-ext-port.patch +++ b/miniupnpd/patches/102-ipv6-ext-port.patch @@ -1,12 +1,10 @@ -diff --git a/pcpserver.c b/pcpserver.c -index dec4b58..3cdf460 100644 --- a/pcpserver.c +++ b/pcpserver.c -@@ -1020,6 +1020,7 @@ static int CreatePCPMap_FW(pcp_info_t *pcp_msg_info) - &uid); +@@ -1004,6 +1004,7 @@ static int CreatePCPMap_NAT(pcp_info_t * + timestamp); if (r < 0) return PCP_ERR_NO_RESOURCES; + pcp_msg_info->ext_port = pcp_msg_info->int_port; return PCP_SUCCESS; - #else - return PCP_ERR_NO_RESOURCES; + } + diff --git a/miniupnpd/patches/103-nat-pmp-fix-writenu16.patch b/miniupnpd/patches/103-nat-pmp-fix-writenu16.patch deleted file mode 100644 index 6e94ad8..0000000 --- a/miniupnpd/patches/103-nat-pmp-fix-writenu16.patch +++ /dev/null @@ -1,11 +0,0 @@ ---- a/natpmp.c -+++ b/natpmp.c -@@ -54,7 +54,7 @@ INLINE void writenu32(uint8_t * p, uint3 - #define WRITENU32(p, n) writenu32(p, n) - INLINE void writenu16(uint8_t * p, uint16_t n) - { -- p[0] = (n < 0xff00) >> 8; -+ p[0] = (n & 0xff00) >> 8; - p[1] = n & 0xff; - } - #define WRITENU16(p, n) writenu16(p, n) -- 2.30.2