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>
URL:=http://miniupnp.free.fr/
endef
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
define Package/miniupnpd/conffiles
/etc/config/upnpd
endef
LIBS="" \
CC="$(TARGET_CC) -DIPTABLES_143 \
-lip4tc $(if $(CONFIG_IPV6),-lip6tc) -luuid" \
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
-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
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
+++ /dev/null
---- 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}
-
+++ /dev/null
---- 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}
-