Merge 69f9d910e9 into 660aa8091f

net/miniupnpd/Makefile

@@ -8,12 +8,12 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
-PKG_VERSION:=2.3.3
+PKG_VERSION:=2.3.5
 PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
-PKG_HASH:=6fd7019f936ff88c41e7c822f46f10b51bd72d665978f6586483de75b30c36bf
+PKG_HASH:=9637a412c33d2778cdae561058933b4e0b67465ff134e96761a7b19751b2fa0f
 
 PKG_MAINTAINER:=
 PKG_LICENSE:=BSD-3-Clause
@@ -34,7 +34,7 @@ define Package/miniupnpd/Default
 	+libmnl \
 	+libuuid
   PROVIDES:=miniupnpd
-  TITLE:=Lightweight UPnP IGD, NAT-PMP & PCP daemon
+  TITLE:=Lightweight UPnP IGD & PCP/NAT-PMP daemon
   SUBMENU:=Firewall
   URL:=https://miniupnp.tuxfamily.org/
 endef

net/miniupnpd/files/miniupnpd.init

@@ -135,7 +135,7 @@ upnpd() {
 		done
 
 		config_load "upnpd"
-		upnpd_write_bool enable_natpmp 1
+		upnpd_write_bool enable_pcp_pmp 1
 		upnpd_write_bool enable_upnp 1
 		upnpd_write_bool secure_mode 1
 		upnpd_write_bool system_uptime 1

net/miniupnpd/files/upnpd.config

@@ -1,6 +1,6 @@
 config upnpd config
 	option enabled		0
-	option enable_natpmp	1
+	option enable_pcp_pmp	1
 	option enable_upnp	1
 	option secure_mode	1
 	option log_output	0