miniupnpd: add IGDv2 support as build option

Make IGDv2 support a build time option (default enabled)
Some devices (xbox one, windows home server) are not happy talking to an
IGDv2 enabled upnp server.

Remove 'portinuse' & 'igdv2' enabling patches backported from freebsd as
these can be configured via build time options in package makefile.

Signed-off-by: Kevin Darbyshire-Bryant <kevin@darbyshire-bryant.me.uk>
(cherry picked from commit a7ce5a5d60)
This commit is contained in:
Kevin Darbyshire-Bryant 2017-02-09 09:18:11 +00:00 committed by Hannu Nyman
parent 73c749d279
commit b4c1d4c02b
3 changed files with 11 additions and 23 deletions

View File

@ -29,6 +29,13 @@ define Package/miniupnpd
URL:=http://miniupnp.free.fr/
endef
define Package/miniupnpd/config
config MINIUPNPD_IGDv2
bool
default y
prompt "Enable IGDv2"
endef
define Package/miniupnpd/conffiles
/etc/config/upnpd
endef
@ -54,10 +61,13 @@ MAKE_FLAGS += \
LIBS="" \
CC="$(TARGET_CC) -DIPTABLES_143 \
-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 \
miniupnpd
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_BIN) $(PKG_BUILD_DIR)/miniupnpd $(1)/usr/sbin/miniupnpd

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}

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}