Subject: [alpine-aports] [PATCH] main/iptables: upgrade to 1.8.2, add openrc subpackage

From: Milan P. Stanić <[email-masked]>
Date: Mon, 27 May 2019 16:14:46 +0200

add missing $pkgname-openrc to subpackages
add patch to fix build on musl
---
 main/iptables/0002-Fix-musl-build.patch | 26 +++++++++++++++++++++++++
 main/iptables/APKBUILD                  | 10 ++++++----
 2 files changed, 32 insertions(+), 4 deletions(-)
 create mode 100644 main/iptables/0002-Fix-musl-build.patch

diff --git a/main/iptables/0002-Fix-musl-build.patch b/main/iptables/0002-Fix-musl-build.patch
new file mode 100644
index 0000000000..4987aa933e
--- /dev/null
+++ b/main/iptables/0002-Fix-musl-build.patch
@@ -0,0 +1,26 @@
+From 3186b4418d5c11fd7943623722478eec9727282a Mon Sep 17 00:00:00 2001
+From: Nathan <[email-masked]>
+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
+--- a/extensions/libebt_vlan.c
++++ b/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/main/iptables/APKBUILD b/main/iptables/APKBUILD
index 65dc7bf1e1..5d620b5410 100644
--- a/main/iptables/APKBUILD
+++ b/main/iptables/APKBUILD
@@ -1,17 +1,18 @@
 # Maintainer: Natanael Copa <[email-masked]>
 
 pkgname=iptables
-pkgver=1.6.2
-pkgrel=2
+pkgver=1.8.2
+pkgrel=0
 pkgdesc="Linux kernel firewall, NAT and packet mangling tools"
 url="http://www.netfilter.org/projects/iptables/index.html"
 arch="all"
 license="GPL-2.0-or-later"
 depends_dev="linux-headers"
 makedepends="$depends_dev libnftnl-dev bison flex autoconf automake"
-subpackages="ip6tables $pkgname-doc $pkgname-dev"
+subpackages="ip6tables $pkgname-doc $pkgname-dev $pkgname-openrc"
 source="http://ftp.netfilter.org/pub/iptables/iptables-$pkgver.tar.bz2
 	iptables-1.6.0-musl-fixes.patch
+	0002-Fix-musl-build.patch
 	iptables.initd
 	iptables.confd
 	ip6tables.confd
@@ -83,8 +84,9 @@ ip6tables() {
 	install -D -m644 "$srcdir"/ip6tables.confd etc/conf.d/ip6tables
 }
 
-sha512sums="04f22e969c794246b9aa28055b202638081cfb0bb4a5625c049a30c48ac84cdd41db12a53c5831398cfe47c8f5691aa02b30b0ae3b5afe0f20ec48cf86a799c0  iptables-1.6.2.tar.bz2
+sha512sums="8cf0f515764e1dc6e03284581d682d1949b33e8f25fea29c27ae856f1089fe8ca7b1814524b85f4378fd1fc7c7c7d002f06557b257ae2bbc945f8555bad0dc76  iptables-1.8.2.tar.bz2
 e79344cab67c4fa0449dfeef6d1504bcd41d16d595010a18a7d9e75eba46021617d31fbb79c62894fd35898ec643b542a6111b06d405c79ffff41a3078327b62  iptables-1.6.0-musl-fixes.patch
+8ff2c728f20ab3622236b096e13bb224e8eb2fd074fe78b7514f9f46264de40bda3e8fc9925dd6452988d19d9fc264b2591dca34923e5c9694a8d1a68fbc36ac  0002-Fix-musl-build.patch
 059b3bd8dd7dec60060ec5eb1e639fe8203207629f3a7dd4fdbe5ebca3f7e9b80df5592ebb27542e31830fd15a53cffac5772567053c104dfccf9b78613a31a1  iptables.initd
 cb7fecd5cab2c78bd3f215a41f39ec11c37eb360efbe83982378a0e647e0aa9dc0b7ec915a5b5081aa2f7747464787e69404aa15ba15a063c32cb8fb7dd13d1e  iptables.confd
 0897a7a22f8b700f7f1f5c355ad6cbf39740e44d6c962af99e479978d8a2d556ca7fe4e31f238829046b4a871ce0b5fd52e2544f1361d15dd1ea3e33992646c4  ip6tables.confd"
-- 
2.20.1

---
Unsubscribe:  [email-masked]
Help:         [email-masked]
---