From 7c9018dfeb6a5463db533f7f624b20fa279d1a93 Mon Sep 17 00:00:00 2001
From: Rudi Heitbaum <rudi@heitbaum.com>
Date: Sat, 14 May 2022 09:38:16 +0000
Subject: [PATCH] iptables: update to 1.8.8

announcement:
- https://lore.kernel.org/netdev/Yn5t5PQWNLRgmWuW@orbyte.nwl.cc/
---
 packages/network/iptables/package.mk          |  9 +++---
 ...ix-build-for--werror-format-security.patch | 28 +++++++++++++++++++
 ...hared-fix-for-build-in-sub-directory.patch | 11 ++++++++
 3 files changed, 43 insertions(+), 5 deletions(-)
 create mode 100644 packages/network/iptables/patches/iptables-0001-xshared-fix-build-for--werror-format-security.patch
 create mode 100644 packages/network/iptables/patches/iptables-0002-xshared-fix-for-build-in-sub-directory.patch

diff --git a/packages/network/iptables/package.mk b/packages/network/iptables/package.mk
index 3c3c1c5512..f6185f0815 100644
--- a/packages/network/iptables/package.mk
+++ b/packages/network/iptables/package.mk
@@ -3,11 +3,11 @@
 # Copyright (C) 2018-present Team LibreELEC (https://libreelec.tv)
 
 PKG_NAME="iptables"
-PKG_VERSION="1.8.7"
-PKG_SHA256="c109c96bb04998cd44156622d36f8e04b140701ec60531a10668cfdff5e8d8f0"
+PKG_VERSION="1.8.8"
+PKG_SHA256="71c75889dc710676631553eb1511da0177bbaaf1b551265b912d236c3f51859f"
 PKG_LICENSE="GPL"
-PKG_SITE="http://www.netfilter.org/"
-PKG_URL="http://www.netfilter.org/projects/iptables/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
+PKG_SITE="https://www.netfilter.org/"
+PKG_URL="https://www.netfilter.org/projects/iptables/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
 PKG_DEPENDS_TARGET="toolchain linux:host libmnl libnftnl"
 PKG_LONGDESC="IP packet filter administration."
 PKG_TOOLCHAIN="autotools"
@@ -30,4 +30,3 @@ post_makeinstall_target() {
 post_install() {
   enable_service iptables.service
 }
-
diff --git a/packages/network/iptables/patches/iptables-0001-xshared-fix-build-for--werror-format-security.patch b/packages/network/iptables/patches/iptables-0001-xshared-fix-build-for--werror-format-security.patch
new file mode 100644
index 0000000000..7c05b009c1
--- /dev/null
+++ b/packages/network/iptables/patches/iptables-0001-xshared-fix-build-for--werror-format-security.patch
@@ -0,0 +1,28 @@
+From b72eb12ea5a61df0655ad99d5048994e916be83a Mon Sep 17 00:00:00 2001
+From: Phil Sutter <phil@nwl.cc>
+Date: Fri, 13 May 2022 16:51:58 +0200
+Subject: xshared: Fix build for -Werror=format-security
+
+Gcc complains about the omitted format string.
+
+Signed-off-by: Phil Sutter <phil@nwl.cc>
+---
+ iptables/xshared.c | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/iptables/xshared.c b/iptables/xshared.c
+index fae5ddd5..a8512d38 100644
+--- a/iptables/xshared.c
++++ b/iptables/xshared.c
+@@ -1307,7 +1307,7 @@ static void check_empty_interface(struct xtables_args *args, const char *arg)
+ 		return;
+ 
+ 	if (args->family != NFPROTO_ARP)
+-		xtables_error(PARAMETER_PROBLEM, msg);
++		xtables_error(PARAMETER_PROBLEM, "%s", msg);
+ 
+ 	fprintf(stderr, "%s", msg);
+ }
+-- 
+cgit v1.2.3
+
diff --git a/packages/network/iptables/patches/iptables-0002-xshared-fix-for-build-in-sub-directory.patch b/packages/network/iptables/patches/iptables-0002-xshared-fix-for-build-in-sub-directory.patch
new file mode 100644
index 0000000000..d008285449
--- /dev/null
+++ b/packages/network/iptables/patches/iptables-0002-xshared-fix-for-build-in-sub-directory.patch
@@ -0,0 +1,11 @@
+--- a/libxtables/xtables.c	2022-05-13 13:26:26.000000000 +0000
++++ b/libxtables/xtables.c	2022-05-14 09:53:20.593250503 +0000
+@@ -49,7 +49,7 @@
+ #include <linux/netfilter_ipv4/ip_tables.h>
+ #include <linux/netfilter_ipv6/ip6_tables.h>
+ #include <libiptc/libxtc.h>
+-#include <libiptc/linux_list.h>
++#include "../libiptc/linux_list.h"
+ 
+ #ifndef NO_SHARED_LIBS
+ #include <dlfcn.h>