iptables: update to 1.8.1

4 files changed, 57 insertions, 14 deletions

diff --git a/iptables/.footprint b/iptables/.footprint
index 6e818ea8..3e0ae7ba 100644
--- a/iptables/.footprint
+++ b/iptables/.footprint
@@ -29,9 +29,9 @@ lrwxrwxrwx	root/root	usr/lib/libiptc.so -> libiptc.so.0.0.0
 lrwxrwxrwx	root/root	usr/lib/libiptc.so.0 -> libiptc.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libiptc.so.0.0.0
 -rwxr-xr-x	root/root	usr/lib/libxtables.la
-lrwxrwxrwx	root/root	usr/lib/libxtables.so -> libxtables.so.12.0.0
-lrwxrwxrwx	root/root	usr/lib/libxtables.so.12 -> libxtables.so.12.0.0
--rwxr-xr-x	root/root	usr/lib/libxtables.so.12.0.0
+lrwxrwxrwx	root/root	usr/lib/libxtables.so -> libxtables.so.12.1.0
+lrwxrwxrwx	root/root	usr/lib/libxtables.so.12 -> libxtables.so.12.1.0
+-rwxr-xr-x	root/root	usr/lib/libxtables.so.12.1.0
 drwxr-xr-x	root/root	usr/lib/pkgconfig/
 -rw-r--r--	root/root	usr/lib/pkgconfig/libip4tc.pc
 -rw-r--r--	root/root	usr/lib/pkgconfig/libip6tc.pc
@@ -122,7 +122,6 @@ drwxr-xr-x	root/root	usr/lib/xtables/
 -rwxr-xr-x	root/root	usr/lib/xtables/libxt_length.so
 -rwxr-xr-x	root/root	usr/lib/xtables/libxt_limit.so
 -rwxr-xr-x	root/root	usr/lib/xtables/libxt_mac.so
--rwxr-xr-x	root/root	usr/lib/xtables/libxt_mangle.so
 -rwxr-xr-x	root/root	usr/lib/xtables/libxt_mark.so
 -rwxr-xr-x	root/root	usr/lib/xtables/libxt_multiport.so
 -rwxr-xr-x	root/root	usr/lib/xtables/libxt_nfacct.so
diff --git a/iptables/.signature b/iptables/.signature
index 47d829ad..5d62df1d 100644
--- a/iptables/.signature
+++ b/iptables/.signature
@@ -1,5 +1,6 @@
 untrusted comment: verify with /etc/ports/core.pub
-RWRJc1FUaeVeqnEEgsqdocY2pjYQqPKsLfn9+qCLMJl5OHrmau5FMEnt5q0X8CKrTUwMlLzhpX0TOaNj/yY2xykne6euHa0JRQc=
-SHA256 (Pkgfile) = 4dfdd7fbcf1043f894bb8f7e676db43c61f8fba659a3420bd57eb4bc982a6579
-SHA256 (.footprint) = d2f4968efe5c4c863d8e436698f0c8378971f6ee374603e90a376d5fe2801ed7
-SHA256 (iptables-1.8.0.tar.bz2) = c4cbfa187c4296e4bc2e347ebbc21e309def7274773f20f0df0b8feaf7e8de50
+RWRJc1FUaeVeqm2Kg/LdsJ2JTplhG8P8jC5MYMCeJn5UCmsOZ/JIAGfGrD5MPct5HZ+MS2NEpMMQquBf2TtzkbHYuwb+tfRQCgs=
+SHA256 (Pkgfile) = 2a100f7379637416ba620df9723a8fc78a0b49cf30f518bbd4f4f26700c6db6e
+SHA256 (.footprint) = 9beb421aa4270bb9793c252c05f4b4f652aaa2b98323af1760ade7731ee148e5
+SHA256 (iptables-1.8.1.tar.bz2) = 8fe4f297cf9c9bbab4972f95527f3e484f60c17c61800c9bff562f06c45461d8
+SHA256 (build_without_libnftnl.patch) = 6335009b134bda21012fadd60e396b9bb649bdebae9b524474d6ac620f78544f
diff --git a/iptables/Pkgfile b/iptables/Pkgfile
index 04081c1e..6302581d 100644
--- a/iptables/Pkgfile
+++ b/iptables/Pkgfile
@@ -3,17 +3,16 @@
 # Maintainer:  CRUX System Team, core-ports at crux dot nu
 
 name=iptables
-version=1.8.0
+version=1.8.1
 release=1
-source=(https://netfilter.org/projects/$name/files/$name-$version.tar.bz2)
+source=(https://netfilter.org/projects/$name/files/$name-$version.tar.bz2
+        build_without_libnftnl.patch)
 
 build () {
     cd $name-$version
 
-    # http://www.linuxfromscratch.org/blfs/view/svn/postlfs/iptables.html
-    sed -e '/libebt_/s/^/#/' \
-        -e '/libarpt_/s/^/#/' \
-        -i extensions/GNUmakefile.in
+    # https://git.netfilter.org/iptables/commit/?id=b2fc2a368562d55fadad94d995247bb8cd7e68a3
+    patch -p1 -i $SRC/build_without_libnftnl.patch
 
     ./configure --prefix=/usr \
                 --libexecdir=/usr/lib \
diff --git a/iptables/build_without_libnftnl.patch b/iptables/build_without_libnftnl.patch
new file mode 100644
index 00000000..a0fca7ef
--- /dev/null
+++ b/iptables/build_without_libnftnl.patch
@@ -0,0 +1,44 @@
+From b2fc2a368562d55fadad94d995247bb8cd7e68a3 Mon Sep 17 00:00:00 2001
+From: Florian Westphal <fw@strlen.de>
+Date: Wed, 24 Oct 2018 12:00:11 +0200
+Subject: extensions: limit: unbreak build without libnftnl
+
+Lars Wendler reported 1.8.1 build failure when trying to build without nft backend:
+
+  In file included from ../iptables/nft.h:5, from libxt_limit.c:18: libnftnl/rule.h: No such file or directory
+
+Reported-by: Lars Wendler <polynomial-c@gentoo.org>
+Fixes: 02b80972c43 ("ebtables: Merge libebt_limit.c into libxt_limit.c")
+Signed-off-by: Florian Westphal <fw@strlen.de>
+---
+ extensions/libxt_limit.c | 1 -
+ iptables/nft-bridge.h    | 1 +
+ 2 files changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/extensions/libxt_limit.c b/extensions/libxt_limit.c
+index c7b66295..1b324657 100644
+--- a/extensions/libxt_limit.c
++++ b/extensions/libxt_limit.c
+@@ -15,7 +15,6 @@
+ #include <xtables.h>
+ #include <linux/netfilter/x_tables.h>
+ #include <linux/netfilter/xt_limit.h>
+-#include "iptables/nft.h"
+ #include "iptables/nft-bridge.h"
+ 
+ #define XT_LIMIT_AVG	"3/hour"
+diff --git a/iptables/nft-bridge.h b/iptables/nft-bridge.h
+index 9d49ccbe..de52cd71 100644
+--- a/iptables/nft-bridge.h
++++ b/iptables/nft-bridge.h
+@@ -68,6 +68,7 @@ int ebt_get_mac_and_mask(const char *from, unsigned char *to, unsigned char *mas
+ #define EBT_VERDICT_BITS 0x0000000F
+ 
+ struct nftnl_rule;
++struct iptables_command_state;
+ 
+ static const char *ebt_standard_targets[NUM_STANDARD_TARGETS] = {
+ 	"ACCEPT",
+-- 
+cgit v1.2.1
+