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

miniupnpd: declare nftables variant as DEFAULT_VARIANT

Browse source 
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 <hannu.nyman@iki.fi>
This commit is contained in:
Hannu Nyman 2022-01-26 19:30:29 +02:00 committed by Etienne Champetier
parent 5a2178a344
commit 569f3710fe
1 changed files with 3 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/miniupnpd/Makefile
View file

@ -9,7 +9,7 @@ include $(TOPDIR)/rules.mk
PKG_NAME:=miniupnpd PKG_NAME:=miniupnpd
PKG_VERSION:=2.2.3 PKG_VERSION:=2.2.3
PKG_RELEASE:=2 PKG_RELEASE:=$(AUTORELEASE)
PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files PKG_SOURCE_URL:=https://miniupnp.tuxfamily.org/files
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.gz
@ -41,7 +41,6 @@ endef
define Package/miniupnpd-iptables define Package/miniupnpd-iptables
$(call Package/miniupnpd/Default) $(call Package/miniupnpd/Default)
CONFLICTS:=miniupnpd-nftables
DEPENDS+= \ DEPENDS+= \
+IPV6:ip6tables \ +IPV6:ip6tables \
+IPV6:libip6tc \ +IPV6:libip6tc \
@ -58,6 +57,8 @@ define Package/miniupnpd-nftables
+libnftnl +libnftnl
TITLE+= (nftables) TITLE+= (nftables)
VARIANT:=nftables VARIANT:=nftables
DEFAULT_VARIANT:=1
CONFLICTS:=miniupnpd-iptables
endef endef
define Package/miniupnpd/conffiles/Default define Package/miniupnpd/conffiles/Default