Difuse/routing
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

miniupnpd: bump to 20180422

Browse source 
Refresh patches.
Drop 102-ipv6-ext-port.patch as this looks upstreamed in the pinhole
code to me.

Add support for runtime IGDv1 mode switch (default to IGDv2)

(not extensively) Tested-on: ar71xx Archer C7 v2 in IGDv1 compatibility
mode.  A variety of devices/applications appear to be able to create
mappings.

Signed-off-by: Kevin Darbyshire-Bryant <ldir@darbyshire-bryant.me.uk>
This commit is contained in:
Kevin Darbyshire-Bryant 2018-04-29 19:29:54 +01:00
parent 2f90fe406c
commit e5b92b1754
5 changed files with 8 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
miniupnpd/Makefile
View file

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

1
miniupnpd/files/miniupnpd.init
View file

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

1
miniupnpd/files/upnpd.config
View file

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

10
miniupnpd/patches/102-ipv6-ext-port.patch
View file

@ -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;
}

2
miniupnpd/patches/104-always-libuuid.patch
View file

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