Merge pull request #15759 from stangri/master-miniupnpd

miniupnpd: disable ext_ip_reserved_ignore by default; fix grammar

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 5c02f13e52dc23ddb256d74a38b93130c2ab7a26..c6152648ec399d02740c8795b55c2b67bfe6fa19 100644 (file)
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
 
 PKG_NAME:=miniupnpd
 PKG_VERSION:=2.2.2
-PKG_RELEASE:=1
+PKG_RELEASE:=2
 
 PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz

diff --git a/net/miniupnpd/files/upnpd.config b/net/miniupnpd/files/upnpd.config
index 7c408683c83326adca8b4ab14347c6bd01235116..bd7c3ec4007dce6b916f7895822964e67458b3a9 100644 (file)
--- a/net/miniupnpd/files/upnpd.config
+++ b/net/miniupnpd/files/upnpd.config
@@ -12,7 +12,6 @@ config upnpd config
        option port             5000
        option upnp_lease_file  /var/run/miniupnpd.leases
        option igdv1            1
-       option ext_ip_reserved_ignore '1'
 
 config perm_rule
        option action           allow

diff --git a/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch b/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch
index fbff3d1ed238be7d779954393e9094da0bb5d068..5ec145e713aa785cb411a81ed85c4b8f33a46279 100644 (file)
--- a/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch
+++ b/net/miniupnpd/patches/301-ext_ip_reserved_ignore.patch
@@ -24,7 +24,7 @@ Date:   Sun Jul 5 10:42:52 2020 +0800
        size_t i;
  
 +      if(GETFLAG(EXTIPRESERVEDIGNOREMASK)) {
-+              syslog(LOG_NOTICE, "private/reserved address checking is ignore");
++              syslog(LOG_NOTICE, "private/reserved address checking is ignored");
 +              return 0;
 +      }
 +