From 569f3710fe49461228ff393ceef81a566261fa8a Mon Sep 17 00:00:00 2001 From: Hannu Nyman Date: Wed, 26 Jan 2022 19:30:29 +0200 Subject: [PATCH] miniupnpd: declare nftables variant as DEFAULT_VARIANT Declare the nftables variant as the DEFAULT_VARIANT as nftables firewall4 is the now default in OpenWrt. Additionally, * toggle CONFLICTS placement to avoid circular dependency warning * use AUTORELEASE Signed-off-by: Hannu Nyman --- net/miniupnpd/Makefile | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/net/miniupnpd/Makefile b/net/miniupnpd/Makefile index deeac1ccd..2a1372755 100644 --- a/net/miniupnpd/Makefile +++ b/net/miniupnpd/Makefile @@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk PKG_NAME:=miniupnpd PKG_VERSION:=2.2.3 -PKG_RELEASE:=2 +PKG_RELEASE:=$(AUTORELEASE) PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz @@ -41,7 +41,6 @@ endef define Package/miniupnpd-iptables $(call Package/miniupnpd/Default) - CONFLICTS:=miniupnpd-nftables DEPENDS+= \ +IPV6:ip6tables \ +IPV6:libip6tc \ @@ -58,6 +57,8 @@ define Package/miniupnpd-nftables +libnftnl TITLE+= (nftables) VARIANT:=nftables + DEFAULT_VARIANT:=1 + CONFLICTS:=miniupnpd-iptables endef define Package/miniupnpd/conffiles/Default