From a38840ef6a80afe08d78d68934534c2b2a881cea Mon Sep 17 00:00:00 2001
From: Christian Buschau <christian.buschau@mailbox.org>
Date: Wed, 9 Jan 2019 00:17:00 +0100
Subject: [PATCH] iptables: update to 1.8.2.

---
 .../patches/0001-Fix-glibc-build.patch        | 28 +++++++++++++++++++
 .../patches/0002-Fix-musl-build.patch         | 26 +++++++++++++++++
 srcpkgs/iptables/template                     | 17 +++--------
 3 files changed, 58 insertions(+), 13 deletions(-)
 create mode 100644 srcpkgs/iptables/patches/0001-Fix-glibc-build.patch
 create mode 100644 srcpkgs/iptables/patches/0002-Fix-musl-build.patch

diff --git a/srcpkgs/iptables/patches/0001-Fix-glibc-build.patch b/srcpkgs/iptables/patches/0001-Fix-glibc-build.patch
new file mode 100644
index 00000000000..f120ac962ad
--- /dev/null
+++ b/srcpkgs/iptables/patches/0001-Fix-glibc-build.patch
@@ -0,0 +1,28 @@
+From e8ba70f898179ede0170e36db49ca27570b12371 Mon Sep 17 00:00:00 2001
+From: Nathan <ndowens04@gmail.com>
+Date: Wed, 9 Jan 2019 21:03:56 -0600
+Subject: [PATCH 1/2] Fix glibc build
+
+---
+ include/linux/netfilter.h | 3 ++-
+ 1 file changed, 2 insertions(+), 1 deletion(-)
+
+diff --git include/linux/netfilter.h include/linux/netfilter.h
+index c3f087a..c934044 100644
+--- include/linux/netfilter.h
++++ include/linux/netfilter.h
+@@ -2,9 +2,10 @@
+ #define __LINUX_NETFILTER_H
+ 
+ #include <linux/types.h>
+-
++#ifndef __GLIBC__
+ #include <linux/in.h>
+ #include <linux/in6.h>
++#endif
+ #include <limits.h>
+ 
+ /* Responses from hook functions. */
+-- 
+2.20.1
+
diff --git a/srcpkgs/iptables/patches/0002-Fix-musl-build.patch b/srcpkgs/iptables/patches/0002-Fix-musl-build.patch
new file mode 100644
index 00000000000..365f03926f6
--- /dev/null
+++ b/srcpkgs/iptables/patches/0002-Fix-musl-build.patch
@@ -0,0 +1,26 @@
+From 3186b4418d5c11fd7943623722478eec9727282a Mon Sep 17 00:00:00 2001
+From: Nathan <ndowens04@gmail.com>
+Date: Wed, 9 Jan 2019 21:04:59 -0600
+Subject: [PATCH 2/2] Fix musl build
+
+---
+ extensions/libebt_vlan.c | 2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git extensions/libebt_vlan.c extensions/libebt_vlan.c
+index 4a2eb71..a5c7dc4 100644
+--- extensions/libebt_vlan.c
++++ extensions/libebt_vlan.c
+@@ -13,7 +13,9 @@
+ #include <ctype.h>
+ #include <xtables.h>
+ #include <linux/netfilter_bridge/ebt_vlan.h>
++#ifdef __GLIBC__
+ #include <linux/if_ether.h>
++#endif
+ #include "iptables/nft.h"
+ #include "iptables/nft-bridge.h"
+ 
+-- 
+2.20.1
+
diff --git a/srcpkgs/iptables/template b/srcpkgs/iptables/template
index b07abcbbc90..5d39ee796fd 100644
--- a/srcpkgs/iptables/template
+++ b/srcpkgs/iptables/template
@@ -1,7 +1,7 @@
 # Template file for 'iptables'
 pkgname=iptables
-version=1.6.2
-revision=4
+version=1.8.2
+revision=1
 build_style=gnu-configure
 configure_args="--enable-libipq --enable-shared --enable-devel --enable-bpf-compiler"
 hostmakedepends="pkg-config flex"
@@ -10,18 +10,9 @@ makedepends="libpcap-devel libfl-devel libmnl-devel libnfnetlink-devel
 short_desc="Linux IPv[46] packet filtering ruleset"
 maintainer="Juan RP <xtraeme@voidlinux.org>"
 license="GPL-2.0-or-later"
-homepage="http://www.netfilter.org/"
+homepage="https://www.netfilter.org/"
 distfiles="${homepage}/projects/iptables/files/${pkgname}-${version}.tar.bz2"
-checksum=55d02dfa46263343a401f297d44190f2a3e5113c8933946f094ed40237053733
-
-disable_parallel_build=yes
-
-if [ "$CROSS_BUILD" ]; then
-	hostmakedepends+=" automake libtool gettext-devel"
-	pre_configure() {
-		autoreconf -fi
-	}
-fi
+checksum=a3778b50ed1a3256f9ca975de82c2204e508001fc2471238c8c97f3d1c4c12af
 
 pre_build() {
 	rm include/linux/types.h