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

Merge pull request #312 from hnyman/miniupnpd-1701

Browse source 
Backport miniupnpd changes to 17.01
This commit is contained in:
Jo-Philipp Wich 2017-07-05 22:09:45 +02:00 committed by GitHub
commit 7c31a144b7
5 changed files with 20 additions and 27 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.20161216 PKG_VERSION:=2.0.20170421
PKG_RELEASE:=1 PKG_RELEASE:=2
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_MD5SUM:=9e73d50ac830b5e08b6eb1df4e4c917833a5ab54351809f615d15d0f30cdeef3 PKG_HASH:=9677aeccadf73b4bf8bb9d832c32b5da8266b4d58eed888f3fd43d7656405643
PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi> PKG_MAINTAINER:=Markus Stenberg <fingon@iki.fi>
PKG_LICENSE:=BSD-3-Clause PKG_LICENSE:=BSD-3-Clause
@ -29,6 +29,13 @@ 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
@ -54,10 +61,13 @@ 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="$(if $(CONFIG_IPV6),--ipv6) --leasefile" \ CONFIG_OPTIONS="--portinuse --leasefile \
$(if $(CONFIG_IPV6),--ipv6) \
$(if $(CONFIG_MINIUPNPD_IGDv2),--igd2)" \
-f Makefile.linux \ -f Makefile.linux \
miniupnpd miniupnpd
define Package/miniupnpd/install define Package/miniupnpd/install
$(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config $(1)/etc/uci-defaults $(1)/etc/hotplug.d/iface $(1)/usr/share/miniupnpd $(INSTALL_DIR) $(1)/usr/sbin $(1)/etc/init.d $(1)/etc/config $(1)/etc/uci-defaults $(1)/etc/hotplug.d/iface $(1)/usr/share/miniupnpd
$(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/sbin/miniupnpd $(INSTALL_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/sbin/miniupnpd

6
miniupnpd/files/miniupnpd.init
View file

@ -68,7 +68,11 @@ start() {
local extip port usesysuptime conffile serial_number model_number local extip port usesysuptime conffile serial_number model_number
local uuid notify_interval presentation_url enable_upnp local uuid notify_interval presentation_url enable_upnp
local upnp_lease_file clean_ruleset_threshold clean_ruleset_interval local upnp_lease_file clean_ruleset_threshold clean_ruleset_interval
local ipv6_listening_ip local ipv6_listening_ip enabled
config_get_bool enabled config enabled 1
[ "$enabled" -gt 0 ] || return 1
config_get extiface config external_iface config_get extiface config external_iface
config_get extzone config external_zone config_get extzone config external_zone

1
miniupnpd/files/upnpd.config
View file

@ -1,4 +1,5 @@
config upnpd config config upnpd config
option enabled 0
option enable_natpmp 1 option enable_natpmp 1
option enable_upnp 1 option enable_upnp 1
option secure_mode 1 option secure_mode 1

11
miniupnpd/patches/105-enable_check_portinuse.patch
View file

@ -1,11 +0,0 @@
--- a/genconfig.sh
+++ b/genconfig.sh
@@ -467,7 +467,7 @@ echo "/* Uncomment the following line to
if [ -n "$PORTINUSE" ]; then
echo "#define CHECK_PORTINUSE" >> ${CONFIGFILE}
else
- echo "/*#define CHECK_PORTINUSE*/" >> ${CONFIGFILE}
+ echo "#define CHECK_PORTINUSE" >> ${CONFIGFILE}
fi
echo "" >> ${CONFIGFILE}

11
miniupnpd/patches/106-enable_igdv2.patch
View file

@ -1,11 +0,0 @@
--- a/genconfig.sh
+++ b/genconfig.sh
@@ -516,7 +516,7 @@ echo " * control points, so enable with
if [ -n "$IGD2" ]; then
echo "#define IGD_V2" >> ${CONFIGFILE}
else
- echo "/*#define IGD_V2*/" >> ${CONFIGFILE}
+ echo "#define IGD_V2" >> ${CONFIGFILE}
fi
echo "" >> ${CONFIGFILE}