iptables: new dependency: nftables

3 files changed, 62 insertions, 7 deletions

diff --git a/iptables/.footprint b/iptables/.footprint
index 47ffcfef..f1602b7c 100644
--- a/iptables/.footprint
+++ b/iptables/.footprint
@@ -1,6 +1,8 @@
 drwxr-xr-x	root/root	usr/
 drwxr-xr-x	root/root	usr/bin/
 lrwxrwxrwx	root/root	usr/bin/iptables-xml -> /usr/sbin/xtables-legacy-multi
+drwxr-xr-x	root/root	usr/etc/
+-rw-r--r--	root/root	usr/etc/ethertypes
 drwxr-xr-x	root/root	usr/include/
 -rw-r--r--	root/root	usr/include/libipq.h
 drwxr-xr-x	root/root	usr/include/libiptc/
@@ -35,6 +37,23 @@ drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libiptc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/xtables.pc
 drwxr-xr-x	root/root	usr/lib/xtables/
+-rwxr-xr-x	root/root	usr/lib/xtables/libarpt_mangle.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_802_3.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_among.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_arp.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_arpreply.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_dnat.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_ip.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_ip6.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_log.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_mark.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_mark_m.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_nflog.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_pkttype.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_redirect.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_snat.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_stp.so
+-rwxr-xr-x	root/root	usr/lib/xtables/libebt_vlan.so
 -rwxr-xr-x	root/root	usr/lib/xtables/libip6t_DNAT.so
 -rwxr-xr-x	root/root	usr/lib/xtables/libip6t_DNPT.so
 -rwxr-xr-x	root/root	usr/lib/xtables/libip6t_HL.so
@@ -144,21 +163,45 @@ lrwxrwxrwx	root/root	usr/lib/xtables/libxt_state.so -> libxt_conntrack.so
 -rwxr-xr-x	root/root	usr/lib/xtables/libxt_u32.so
 -rwxr-xr-x	root/root	usr/lib/xtables/libxt_udp.so
 drwxr-xr-x	root/root	usr/sbin/
+lrwxrwxrwx	root/root	usr/sbin/arptables -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/arptables-nft -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/arptables-nft-restore -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/arptables-nft-save -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/arptables-restore -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/arptables-save -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/ebtables -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/ebtables-nft -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/ebtables-nft-restore -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/ebtables-nft-save -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/ebtables-restore -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/ebtables-save -> xtables-nft-multi
 lrwxrwxrwx	root/root	usr/sbin/ip6tables -> xtables-legacy-multi
 lrwxrwxrwx	root/root	usr/sbin/ip6tables-apply -> iptables-apply
 lrwxrwxrwx	root/root	usr/sbin/ip6tables-legacy -> xtables-legacy-multi
 lrwxrwxrwx	root/root	usr/sbin/ip6tables-legacy-restore -> xtables-legacy-multi
 lrwxrwxrwx	root/root	usr/sbin/ip6tables-legacy-save -> xtables-legacy-multi
+lrwxrwxrwx	root/root	usr/sbin/ip6tables-nft -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/ip6tables-nft-restore -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/ip6tables-nft-save -> xtables-nft-multi
 lrwxrwxrwx	root/root	usr/sbin/ip6tables-restore -> xtables-legacy-multi
+lrwxrwxrwx	root/root	usr/sbin/ip6tables-restore-translate -> xtables-nft-multi
 lrwxrwxrwx	root/root	usr/sbin/ip6tables-save -> xtables-legacy-multi
+lrwxrwxrwx	root/root	usr/sbin/ip6tables-translate -> xtables-nft-multi
 lrwxrwxrwx	root/root	usr/sbin/iptables -> xtables-legacy-multi
 -rwxr-xr-x	root/root	usr/sbin/iptables-apply
 lrwxrwxrwx	root/root	usr/sbin/iptables-legacy -> xtables-legacy-multi
 lrwxrwxrwx	root/root	usr/sbin/iptables-legacy-restore -> xtables-legacy-multi
 lrwxrwxrwx	root/root	usr/sbin/iptables-legacy-save -> xtables-legacy-multi
+lrwxrwxrwx	root/root	usr/sbin/iptables-nft -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/iptables-nft-restore -> xtables-nft-multi
+lrwxrwxrwx	root/root	usr/sbin/iptables-nft-save -> xtables-nft-multi
 lrwxrwxrwx	root/root	usr/sbin/iptables-restore -> xtables-legacy-multi
+lrwxrwxrwx	root/root	usr/sbin/iptables-restore-translate -> xtables-nft-multi
 lrwxrwxrwx	root/root	usr/sbin/iptables-save -> xtables-legacy-multi
+lrwxrwxrwx	root/root	usr/sbin/iptables-translate -> xtables-nft-multi
 -rwxr-xr-x	root/root	usr/sbin/xtables-legacy-multi
+lrwxrwxrwx	root/root	usr/sbin/xtables-monitor -> xtables-nft-multi
+-rwxr-xr-x	root/root	usr/sbin/xtables-nft-multi
 drwxr-xr-x	root/root	usr/share/
 drwxr-xr-x	root/root	usr/share/man/
 drwxr-xr-x	root/root	usr/share/man/man1/
@@ -176,12 +219,24 @@ drwxr-xr-x	root/root	usr/share/man/man3/
 -rw-r--r--	root/root	usr/share/man/man3/ipq_set_verdict.3.gz
 -rw-r--r--	root/root	usr/share/man/man3/libipq.3.gz
 drwxr-xr-x	root/root	usr/share/man/man8/
+-rw-r--r--	root/root	usr/share/man/man8/arptables-nft-restore.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/arptables-nft-save.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/arptables-nft.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ebtables-nft.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ip6tables-apply.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ip6tables-restore-translate.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ip6tables-restore.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ip6tables-save.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/ip6tables-translate.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/ip6tables.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/iptables-apply.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/iptables-extensions.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/iptables-restore-translate.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/iptables-restore.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/iptables-save.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/iptables-translate.8.gz
 -rw-r--r--	root/root	usr/share/man/man8/iptables.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/xtables-legacy.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/xtables-monitor.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/xtables-nft.8.gz
+-rw-r--r--	root/root	usr/share/man/man8/xtables-translate.8.gz
diff --git a/iptables/.signature b/iptables/.signature
index 60f3b546..04139310 100644
--- a/iptables/.signature
+++ b/iptables/.signature
@@ -1,5 +1,5 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqv2CU1v1kr0hfaEcdjkjhYQ8KlXSKbN4P3TGZTP0O6ysmGgalz/I1Sp8Ji89/bIR4BHZEylBnsx2j++nF9hoJQ8=
-SHA256 (Pkgfile) = a466ad5c646387a665046684e940fdc62c8ed2f58d78a97655f8626b4c41ca46
-SHA256 (.footprint) = 06545581d424fe7df1b48f8da1162c59d1061d4e41828c3580e363d83bdcb6ad
+RWRJc1FUaeVeqsyW5yZfPPala0qUtHDUDBA0Ehb9USlnP4CG2HQcH7v4GE9nKyPvp2dN54Z/kfESA//5ihVXdkp4is4yS3jg0g4=
+SHA256 (Pkgfile) = e2386aaabb372eee747a52e0f38c5cefe46e1e4c94e2080fe20369662791d76b
+SHA256 (.footprint) = 004c7c5f2f7477484e27797055e46b36c14965dcc9d3105dcc6267d33d861d4c
 SHA256 (iptables-1.8.7.tar.bz2) = c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0
diff --git a/iptables/Pkgfile b/iptables/Pkgfile
index bad00775..f8e59b27 100644
--- a/iptables/Pkgfile
+++ b/iptables/Pkgfile
@@ -1,20 +1,20 @@
 # Description: A Linux kernel packet filter control tool
 # URL: https://www.iptables.org/
 # Maintainer: CRUX System Team, core-ports at crux dot nu
+# Depends on: nftables
 
 name=iptables
 version=1.8.7
-release=2
+release=3
 source=(https://www.netfilter.org/projects/$name/files/$name-$version.tar.bz2)
 
 build () {
 	cd $name-$version
 
-	prt-get isinst nftables || PKGMK_IPTABLES="--disable-nftables"
-
 	./configure --prefix=/usr $PKGMK_IPTABLES \
 		--libexecdir=/usr/lib \
-		--enable-libipq
+		--enable-libipq \
+		--enable-nftables
 
 	make
 	make DESTDIR=$PKG install