Nanako/immortalwrt
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

iptables: move IPTABLES_{CONNLABEL,NFTABLES} to libxtables

Browse Source 
Those 2 configs are not specific to iptables(-legacy)

Signed-off-by: Etienne Champetier <champetier.etienne@gmail.com>
This commit is contained in:
Etienne Champetier 2022-02-21 16:20:36 -05:00 committed by Hauke Mehrtens
parent d35a573004
commit 316c406e62
1 changed files with 15 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
package/network/utils/iptables/Makefile
View File

@ -47,7 +47,6 @@ endef
define Package/iptables define Package/iptables
$(call Package/iptables/Default) $(call Package/iptables/Default)
TITLE:=IP firewall administration tool TITLE:=IP firewall administration tool
MENU:=1
DEPENDS+= +kmod-ipt-core +libip4tc +IPV6:libip6tc +libxtables DEPENDS+= +kmod-ipt-core +libip4tc +IPV6:libip6tc +libxtables
ALTERNATIVES:=\ ALTERNATIVES:=\
200:/usr/sbin/iptables:/usr/sbin/xtables-legacy-multi \ 200:/usr/sbin/iptables:/usr/sbin/xtables-legacy-multi \
@ -55,20 +54,6 @@ $(call Package/iptables/Default)
200:/usr/sbin/iptables-save:/usr/sbin/xtables-legacy-multi 200:/usr/sbin/iptables-save:/usr/sbin/xtables-legacy-multi
endef endef
define Package/iptables/config
config IPTABLES_CONNLABEL
bool "Enable Connlabel support"
default n
help
This enable connlabel support in iptables.
config IPTABLES_NFTABLES
bool "Enable Nftables support"
default y
help
This enable nftables support in iptables.
endef
define Package/iptables/description define Package/iptables/description
IP firewall administration tool. IP firewall administration tool.
@ -525,10 +510,25 @@ define Package/libxtables
SECTION:=libs SECTION:=libs
CATEGORY:=Libraries CATEGORY:=Libraries
TITLE:=IPv4/IPv6 firewall - shared xtables library TITLE:=IPv4/IPv6 firewall - shared xtables library
MENU:=1
ABI_VERSION:=12 ABI_VERSION:=12
DEPENDS:=+IPTABLES_CONNLABEL:libnetfilter-conntrack DEPENDS:=+IPTABLES_CONNLABEL:libnetfilter-conntrack
endef endef
define Package/libxtables/config
config IPTABLES_CONNLABEL
bool "Enable Connlabel support"
default n
help
This enable connlabel support in iptables.
config IPTABLES_NFTABLES
bool "Enable Nftables support"
default y
help
This enable nftables support in iptables.
endef
define Package/libxtables-nft define Package/libxtables-nft
$(call Package/iptables/Default) $(call Package/iptables/Default)
SECTION:=libs SECTION:=libs