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

Revert "miniupnpd: introduce IGDv1 variant"

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

This reverts commit 7f5534ac7a.

Signed-off-by: Stijn Tintel <stijn@linux-ipv6.be>
This commit is contained in:
Stijn Tintel 2021-11-06 00:31:12 +02:00
parent 82010861aa
commit 23ba57418c
1 changed files with 2 additions and 24 deletions

26
net/miniupnpd/Makefile
View file

@ -26,7 +26,7 @@ PKG_BUILD_PARALLEL:=1
include $(INCLUDE_DIR)/package.mk include $(INCLUDE_DIR)/package.mk
include $(INCLUDE_DIR)/version.mk include $(INCLUDE_DIR)/version.mk
define Package/miniupnpd/Default define Package/miniupnpd
SECTION:=net SECTION:=net
CATEGORY:=Network CATEGORY:=Network
DEPENDS:= \ DEPENDS:= \
@ -43,26 +43,10 @@ define Package/miniupnpd/Default
URL:=https://miniupnp.tuxfamily.org/ URL:=https://miniupnp.tuxfamily.org/
endef 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 define Package/miniupnpd/conffiles
/etc/config/upnpd /etc/config/upnpd
endef endef
Package/miniupnpd-igdv1/conffiles = $(Package/miniupnpd/conffiles)
define Build/Prepare define Build/Prepare
$(call Build/Prepare/Default) $(call Build/Prepare/Default)
echo "$(VERSION_NUMBER)" | tr '() ' '_' >$(PKG_BUILD_DIR)/os.openwrt echo "$(VERSION_NUMBER)" | tr '() ' '_' >$(PKG_BUILD_DIR)/os.openwrt
@ -70,15 +54,12 @@ endef
CONFIGURE_ARGS = \ CONFIGURE_ARGS = \
$(if $(CONFIG_IPV6),--ipv6) \ $(if $(CONFIG_IPV6),--ipv6) \
--igd2 \
--leasefile \ --leasefile \
--portinuse \ --portinuse \
--firewall=iptables \ --firewall=iptables \
--disable-fork --disable-fork
ifeq ($(BUILD_VARIANT),igdv2)
CONFIGURE_ARGS += --igd2
endif
TARGET_CFLAGS += $(FPIC) -flto TARGET_CFLAGS += $(FPIC) -flto
TARGET_LDFLAGS += -Wl,--gc-sections,--as-needed 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 $(INSTALL_DATA) ./files/firewall.include $(1)/usr/share/miniupnpd/firewall.include
endef endef
Package/miniupnpd-igdv1/install = $(Package/miniupnpd/install)
$(eval $(call BuildPackage,miniupnpd)) $(eval $(call BuildPackage,miniupnpd))
$(eval $(call BuildPackage,miniupnpd-igdv1))