Skip to content

Commit

Permalink
Revert "miniupnpd: introduce IGDv1 variant"
Browse files Browse the repository at this point in the history
Since version 2.2.3, miniupnpd will detect MS clients and force IGDv1.

This reverts commit 7f5534a.
  • Loading branch information
stintel committed Nov 7, 2021
1 parent 95c13b9 commit c7c240b
Showing 1 changed file with 2 additions and 24 deletions.
26 changes: 2 additions & 24 deletions net/miniupnpd/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -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:= \
Expand All @@ -43,42 +43,23 @@ 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
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

Expand All @@ -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))

0 comments on commit c7c240b

Please sign in to comment.