Merge e5b92b1754 into 2f90fe406c

miniupnpd/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=2.0.20170421
-PKG_RELEASE:=2
+PKG_VERSION:=2.0.20180422
+PKG_RELEASE:=1
 
 PKG_SOURCE_URL:=http://miniupnp.free.fr/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=9677aeccadf73b4bf8bb9d832c32b5da8266b4d58eed888f3fd43d7656405643
+PKG_HASH:=fe73dd48cbd2eeb30b1ae4f2b6ff46922f214019a50b9a8dd447849b42c9e90d
 
 PKG_LICENSE:=BSD-3-Clause
 
@@ -28,13 +28,6 @@ define Package/miniupnpd
   URL:=http://miniupnp.free.fr/
 endef
 
-define Package/miniupnpd/config
-config MINIUPNPD_IGDv2
-	bool
-	default n
-	prompt "Enable IGDv2"
-endef
-
 define Package/miniupnpd/conffiles
 /etc/config/upnpd
 endef
@@ -60,9 +53,8 @@ MAKE_FLAGS += \
 	LIBS="" \
 	CC="$(TARGET_CC) -DIPTABLES_143 \
 		-lip4tc $(if $(CONFIG_IPV6),-lip6tc) -luuid" \
-	CONFIG_OPTIONS="--portinuse --leasefile \
-		$(if $(CONFIG_IPV6),--ipv6) \
-		$(if $(CONFIG_MINIUPNPD_IGDv2),--igd2)" \
+	CONFIG_OPTIONS="--portinuse --leasefile --igd2 \
+		$(if $(CONFIG_IPV6),--ipv6)" \
 	-f Makefile.linux \
 	miniupnpd
 

miniupnpd/files/miniupnpd.init

@@ -141,6 +141,7 @@ start() {
 		upnpd_write_bool secure_mode 1
 		upnpd_write_bool pcp_allow_thirdparty 0
 		upnpd_write_bool system_uptime 1
+		upnpd_write_bool force_igd_desc_v1 0
 
 		[ -n "$upnp_lease_file" ] && \
 			echo "lease_file=$upnp_lease_file" >>$tmpconf

miniupnpd/files/upnpd.config

@@ -11,6 +11,7 @@ config upnpd config
 	option internal_iface	lan
 	option port		5000
 	option upnp_lease_file	/var/upnp.leases
+	option force_igd_desc_v1 0
 	
 config perm_rule
 	option action		allow

miniupnpd/patches/102-ipv6-ext-port.patch

@@ -1,10 +0,0 @@
---- a/pcpserver.c
-+++ b/pcpserver.c
-@@ -982,6 +982,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;
- }
- 

miniupnpd/patches/104-always-libuuid.patch

@@ -4,7 +4,7 @@ hardcode it.
 
 --- a/genconfig.sh
 +++ b/genconfig.sh
-@@ -367,12 +367,7 @@ case $FW in
+@@ -379,12 +379,7 @@ case $FW in
  esac
  
  # UUID API