Revert "miniupnpd: introduce IGDv1 variant"

Since version 2.2.3, miniupnpd will detect MS clients and force IGDv1.

This reverts commit 7f5534ac7a88124c59b23188bcdc39bd9e92d879.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>

diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile
index 6024d05ab8cafdaefb6e88e729103d53abf41407..41113edb9740604be6c310b90c41d437ac7bc49a 100644 (file)
--- a/net/miniupnpd/Makefile
+++ b/net/miniupnpd/Makefile
@@ -26,7 +26,7 @@ PKG_BUILD_PARALLEL:=1
 include $(INCLUDE_DIR)/package.mk
 include $(INCLUDE_DIR)/version.mk
 
-define Package/miniupnpd/Default
+define Package/miniupnpd
   SECTION:=net
   CATEGORY:=Network
   DEPENDS:= \
@@ -43,26 +43,10 @@ define Package/miniupnpd/Default
   URL:=https://miniupnp.tuxfamily.org/
 endef
 
-define Package/miniupnpd
-  $(call Package/miniupnpd/Default)
-  TITLE+= (IGDv2)
-  CONFLICTS:=miniupnpd-igdv1
-  VARIANT:=igdv2
-endef
-
-define Package/miniupnpd-igdv1
-  $(call Package/miniupnpd/Default)
-  TITLE+= (IGDv1)
-  PROVIDES:=miniupnpd
-  VARIANT:=igdv1
-endef
-
 define Package/miniupnpd/conffiles
 /etc/config/upnpd
 endef
 
-Package/miniupnpd-igdv1/conffiles = $(Package/miniupnpd/conffiles)
-
 define Build/Prepare
        $(call Build/Prepare/Default)
        echo "$(VERSION_NUMBER)" | tr '() ' '_' >$(PKG_BUILD_DIR)/os.openwrt
@@ -70,15 +54,12 @@ endef
 
 CONFIGURE_ARGS = \
        $(if $(CONFIG_IPV6),--ipv6) \
+       --igd2 \
        --leasefile \
        --portinuse \
        --firewall=iptables \
        --disable-fork
 
-ifeq ($(BUILD_VARIANT),igdv2)
-       CONFIGURE_ARGS += --igd2
-endif
-
 TARGET_CFLAGS += $(FPIC) -flto
 TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed
 
@@ -98,7 +79,4 @@ define Package/miniupnpd/install
        $(INSTALL_DATA) ./files/firewall.include $(1)/usr/share/miniupnpd/firewall.include
 endef
 
-Package/miniupnpd-igdv1/install = $(Package/miniupnpd/install)
-
 $(eval $(call BuildPackage,miniupnpd))
-$(eval $(call BuildPackage,miniupnpd-igdv1))