From 20a10fda47a1d462c39628315ba89a6c94eaa078 Mon Sep 17 00:00:00 2001 From: Juan RP Date: Mon, 30 Jan 2017 11:51:50 +0100 Subject: [PATCH] iptables: update to 1.6.1 (xtables sobump). --- common/shlibs | 2 +- srcpkgs/iptables/patches/musl.patch | 24 ------------------------ srcpkgs/iptables/template | 6 +++--- 3 files changed, 4 insertions(+), 28 deletions(-) delete mode 100644 srcpkgs/iptables/patches/musl.patch diff --git a/common/shlibs b/common/shlibs index 5d518aaa84b..46941340d7c 100644 --- a/common/shlibs +++ b/common/shlibs @@ -580,7 +580,7 @@ libgdata.so.19 libgdata-0.15.0_1 libpcap.so.1 libpcap-1.1.1_1 libiptc.so.0 iptables-1.4.7_1 libip6tc.so.0 iptables-1.4.7_1 -libxtables.so.11 iptables-1.6.0_1 +libxtables.so.12 iptables-1.6.1_1 libip4tc.so.0 iptables-1.4.7_1 libipq.so.0 iptables-1.4.7_1 libnm-util.so.2 libnm-0.9.1.90_1 diff --git a/srcpkgs/iptables/patches/musl.patch b/srcpkgs/iptables/patches/musl.patch deleted file mode 100644 index cb1aa3809c3..00000000000 --- a/srcpkgs/iptables/patches/musl.patch +++ /dev/null @@ -1,24 +0,0 @@ ---- extensions/libxt_TCPOPTSTRIP.c.orig 2015-12-19 06:19:51.762676172 +0100 -+++ extensions/libxt_TCPOPTSTRIP.c 2015-12-19 06:20:19.081609317 +0100 -@@ -12,6 +12,21 @@ - #ifndef TCPOPT_MD5SIG - # define TCPOPT_MD5SIG 19 - #endif -+#ifndef TCPOPT_MAXSEG -+# define TCPOPT_MAXSEG 2 -+#endif -+#ifndef TCPOPT_WINDOW -+# define TCPOPT_WINDOW 3 -+#endif -+#ifndef TCPOPT_SACK_PERMITTED -+# define TCPOPT_SACK_PERMITTED 4 -+#endif -+#ifndef TCPOPT_SACK -+# define TCPOPT_SACK 5 -+#endif -+#ifndef TCPOPT_TIMESTAMP -+# define TCPOPT_TIMESTAMP 8 -+#endif - - enum { - O_STRIP_OPTION = 0, diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template index d166faec66d..c51d228b9c5 100644 --- a/srcpkgs/iptables/template +++ b/srcpkgs/iptables/template @@ -1,7 +1,7 @@ # Template file for 'iptables' pkgname=iptables -version=1.6.0 -revision=2 +version=1.6.1 +revision=1 build_style=gnu-configure configure_args="--sbindir=/usr/bin --enable-libipq --enable-shared --enable-devel --enable-bpf-compiler" hostmakedepends="pkg-config flex" @@ -11,7 +11,7 @@ maintainer="Juan RP " homepage="http://www.netfilter.org/" license="GPL-2" distfiles="$homepage/projects/iptables/files/$pkgname-$version.tar.bz2" -checksum=4bb72a0a0b18b5a9e79e87631ddc4084528e5df236bc7624472dcaa8480f1c60 +checksum=0fc2d7bd5d7be11311726466789d4c65fb4c8e096c9182b56ce97440864f0cf5 disable_parallel_build=yes