commit aae947650fbe8a01f5ff682544f37b38f6f6fb0d Author: Juergen Daubert <jue@jue.li> Date: Tue Nov 13 19:14:59 2018 +0100 iptables: update to 1.8.2 diff --git a/iptables/.footprint b/iptables/.footprint index 3e0ae7ba..6fc2c8d4 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.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 +lrwxrwxrwx root/root usr/lib/libxtables.so -> libxtables.so.12.2.0 +lrwxrwxrwx root/root usr/lib/libxtables.so.12 -> libxtables.so.12.2.0 +-rwxr-xr-x root/root usr/lib/libxtables.so.12.2.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 diff --git a/iptables/.signature b/iptables/.signature index 5d62df1d..c76df26a 100644 --- a/iptables/.signature +++ b/iptables/.signature @@ -1,6 +1,5 @@ untrusted comment: verify with /etc/ports/core.pub -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 +RWRJc1FUaeVeqp7+AmZ9PsX5dtIkFJB1swqqJm2wkgZcvSEFkK+ueqeOi//Ru39c7AzHMoOSMrYZ2pHHuXTnvhFp8qbu4bIzZg0= +SHA256 (Pkgfile) = 5e1b53a29a86de674f0d663c9a2a89aea97782d19ec7281f9fbc2521ab8029ae +SHA256 (.footprint) = a079bff66dea8400cc584a2e64aaaa19eb4536b378a77b4e66d7516557512063 +SHA256 (iptables-1.8.2.tar.bz2) = a3778b50ed1a3256f9ca975de82c2204e508001fc2471238c8c97f3d1c4c12af diff --git a/iptables/Pkgfile b/iptables/Pkgfile index 6302581d..b7e238dc 100644 --- a/iptables/Pkgfile +++ b/iptables/Pkgfile @@ -3,17 +3,13 @@ # Maintainer: CRUX System Team, core-ports at crux dot nu name=iptables -version=1.8.1 +version=1.8.2 release=1 -source=(https://netfilter.org/projects/$name/files/$name-$version.tar.bz2 - build_without_libnftnl.patch) +source=(https://netfilter.org/projects/$name/files/$name-$version.tar.bz2) build () { cd $name-$version - # https://git.netfilter.org/iptables/commit/?id=b2fc2a368562d55fadad94d995247b... - patch -p1 -i $SRC/build_without_libnftnl.patch - ./configure --prefix=/usr \ --libexecdir=/usr/lib \ --enable-libipq \ diff --git a/iptables/build_without_libnftnl.patch b/iptables/build_without_libnftnl.patch deleted file mode 100644 index a0fca7ef..00000000 --- a/iptables/build_without_libnftnl.patch +++ /dev/null @@ -1,44 +0,0 @@ -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 -