From 6f0a126898bff5ae95b378d16492fa72517d18c6 Mon Sep 17 00:00:00 2001
From: Juan RP <xtraeme@voidlinux.eu>
Date: Sat, 19 Dec 2015 06:24:30 +0100
Subject: [PATCH] iptables: update to 1.6.0 (soname bump).

---
 common/shlibs                                 |   2 +-
 .../patches/iptables-1.4.14-musl-fixes.patch  | 127 ------------------
 srcpkgs/iptables/template                     |  10 +-
 3 files changed, 6 insertions(+), 133 deletions(-)
 delete mode 100644 srcpkgs/iptables/patches/iptables-1.4.14-musl-fixes.patch

diff --git a/common/shlibs b/common/shlibs
index 70a17f5d42e..b7123161b2c 100644
--- a/common/shlibs
+++ b/common/shlibs
@@ -564,7 +564,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.10 iptables-1.4.18_1
+libxtables.so.11 iptables-1.6.0_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/iptables-1.4.14-musl-fixes.patch b/srcpkgs/iptables/patches/iptables-1.4.14-musl-fixes.patch
deleted file mode 100644
index 16e86a61eb7..00000000000
--- a/srcpkgs/iptables/patches/iptables-1.4.14-musl-fixes.patch
+++ /dev/null
@@ -1,127 +0,0 @@
---- extensions/libip6t_ipv6header.c
-+++ extensions/libip6t_ipv6header.c
-@@ -10,6 +10,9 @@
- #include <netdb.h>
- #include <xtables.h>
- #include <linux/netfilter_ipv6/ip6t_ipv6header.h>
-+#ifndef IPPROTO_HOPOPTS
-+#	define IPPROTO_HOPOPTS 0
-+#endif
- 
- enum {
- 	O_HEADER = 0,
---- extensions/libxt_TCPOPTSTRIP.c
-+++ extensions/libxt_TCPOPTSTRIP.c
-@@ -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,
---- include/libiptc/ipt_kernel_headers.h
-+++ include/libiptc/ipt_kernel_headers.h
-@@ -5,7 +5,6 @@
- 
- #include <limits.h>
- 
--#if defined(__GLIBC__) && __GLIBC__ == 2
- #include <netinet/ip.h>
- #include <netinet/in.h>
- #include <netinet/ip_icmp.h>
-@@ -13,15 +12,4 @@
- #include <netinet/udp.h>
- #include <net/if.h>
- #include <sys/types.h>
--#else /* libc5 */
--#include <sys/socket.h>
--#include <linux/ip.h>
--#include <linux/in.h>
--#include <linux/if.h>
--#include <linux/icmp.h>
--#include <linux/tcp.h>
--#include <linux/udp.h>
--#include <linux/types.h>
--#include <linux/in6.h>
--#endif
- #endif
---- include/linux/netfilter_ipv4/ip_tables.h
-+++ include/linux/netfilter_ipv4/ip_tables.h
-@@ -16,6 +16,7 @@
- #define _IPTABLES_H
- 
- #include <linux/types.h>
-+#include <sys/types.h>
- 
- #include <linux/netfilter_ipv4.h>
- 
---- iptables/ip6tables-restore.c
-+++ iptables/ip6tables-restore.c
-@@ -9,7 +9,7 @@
-  */
- 
- #include <getopt.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <stdbool.h>
- #include <string.h>
- #include <stdio.h>
---- iptables/ip6tables-save.c
-+++ iptables/ip6tables-save.c
-@@ -6,7 +6,7 @@
-  * This code is distributed under the terms of GNU GPL v2
-  */
- #include <getopt.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <stdlib.h>
---- iptables/iptables-restore.c
-+++ iptables/iptables-restore.c
-@@ -6,7 +6,7 @@
-  */
- 
- #include <getopt.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <stdbool.h>
- #include <string.h>
- #include <stdio.h>
---- iptables/iptables-save.c
-+++ iptables/iptables-save.c
-@@ -6,7 +6,7 @@
-  *
-  */
- #include <getopt.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <stdio.h>
- #include <fcntl.h>
- #include <stdlib.h>
---- iptables/iptables-xml.c
-+++ iptables/iptables-xml.c
-@@ -7,7 +7,7 @@
-  */
- 
- #include <getopt.h>
--#include <sys/errno.h>
-+#include <errno.h>
- #include <string.h>
- #include <stdio.h>
- #include <stdlib.h>
diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template
index 5c03e6db10c..6b273f19037 100644
--- a/srcpkgs/iptables/template
+++ b/srcpkgs/iptables/template
@@ -1,17 +1,17 @@
 # Template file for 'iptables'
 pkgname=iptables
-version=1.4.21
-revision=8
+version=1.6.0
+revision=1
 build_style=gnu-configure
-configure_args="--sbindir=/usr/bin --enable-libipq --enable-shared --enable-devel --enable-bpf-compiler"
-hostmakedepends="pkg-config"
+configure_args="--sbindir=/usr/bin --enable-libipq --enable-shared --enable-devel --enable-bpf-compiler --disable-nftables"
+hostmakedepends="pkg-config flex"
 makedepends="libpcap-devel"
 short_desc="Linux IPv[46] packet filtering ruleset"
 maintainer="Juan RP <xtraeme@voidlinux.eu>"
 homepage="http://www.netfilter.org/"
 license="GPL-2"
 distfiles="$homepage/projects/iptables/files/$pkgname-$version.tar.bz2"
-checksum=52004c68021da9a599feed27f65defcfb22128f7da2c0531c0f75de0f479d3e0
+checksum=4bb72a0a0b18b5a9e79e87631ddc4084528e5df236bc7624472dcaa8480f1c60
 
 if [ "$CROSS_BUILD" ]; then
 	hostmakedepends="automake libtool gettext-devel pkg-config"