From: Steven Barth <steven@midlink.org>
Date: Wed, 30 Jul 2014 13:49:59 +0000 (+0200)
Subject: miniupnpd: fix integer conversion in NAT-PMP, update description
X-Git-Url: http://git.openwrt.org/?p=feed%2Frouting.git;a=commitdiff_plain;h=d7616fd1f38c53df2c7a8e7f745256f3fc1d0046

miniupnpd: fix integer conversion in NAT-PMP, update description

Signed-off-by: Steven Barth <steven@midlink.org>
---

diff --git a/miniupnpd/Makefile b/miniupnpd/Makefile
index 83e7f84..af9a940 100644
--- a/miniupnpd/Makefile
+++ b/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=1.8.20140523
-PKG_RELEASE:=3
+PKG_RELEASE:=4
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@@ -23,7 +23,7 @@ define Package/miniupnpd
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:=+iptables +libip4tc +IPV6:libip6tc +IPV6:ip6tables +libnfnetlink
-  TITLE:=Lightweight UPnP daemon
+  TITLE:=Lightweight UPnP IGD, NAT-PMP & PCP daemon
   SUBMENU:=Firewall
   URL:=http://miniupnp.free.fr/
 endef
diff --git a/miniupnpd/patches/103-nat-pmp-fix-writenu16.patch b/miniupnpd/patches/103-nat-pmp-fix-writenu16.patch
new file mode 100644
index 0000000..6e94ad8
--- /dev/null
+++ b/miniupnpd/patches/103-nat-pmp-fix-writenu16.patch
@@ -0,0 +1,11 @@
+--- 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)