Revert.

packages/network/iptables/package.mk

@@ -4,6 +4,7 @@
 # Copyright (C) 2018-present Team CoreELEC (https://coreelec.org)
 
 PKG_NAME="iptables"
+PKG_VERSION="1.8.3"
 PKG_LICENSE="GPL"
 PKG_SITE="http://www.netfilter.org/"
 PKG_URL="http://www.netfilter.org/projects/iptables/files/${PKG_NAME}-${PKG_VERSION}.tar.bz2"
@@ -11,16 +12,6 @@ PKG_DEPENDS_TARGET="toolchain linux libmnl libnftnl"
 PKG_LONGDESC="IP packet filter administration."
 PKG_TOOLCHAIN="autotools"
 
-## Workaround until I can fix this correctly, or we get to mainline.
-if [[ "$(kernel_version)" =~ ^5. ]]
-then
-  PKG_VERSION="1.8.8"
-  PKG_PATCH_DIRS+="5.x"
-else
-  PKG_VERSION="1.8.3"
-  PKG_PATCH_DIRS+="4.x"
-fi
-
 PKG_CONFIGURE_OPTS_TARGET="--with-kernel=$(kernel_path)
                            CPPFLAGS=-I${SYSROOT_PREFIX}/usr/include"
 

packages/network/iptables/patches/4.x/01-libiptc.patch

@@ -1,16 +0,0 @@
-diff --git a/libxtables/Makefile.am b/libxtables/Makefile.am
-index 8ff6b0ca..3bfded85 100644
---- a/libxtables/Makefile.am
-+++ b/libxtables/Makefile.am
-@@ -1,7 +1,7 @@
- # -*- Makefile -*-
- 
- AM_CFLAGS   = ${regular_CFLAGS}
--AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include -I${top_srcdir}/iptables ${kinclude_CPPFLAGS}
-+AM_CPPFLAGS = ${regular_CPPFLAGS} -I${top_builddir}/include -I${top_srcdir}/include -I${top_srcdir}/iptables -I${top_srcdir} ${kinclude_CPPFLAGS}
- 
- lib_LTLIBRARIES       = libxtables.la
- libxtables_la_SOURCES = xtables.c xtoptions.c getethertype.c
--- 
-2.36.1
-

packages/network/iptables/patches/5.x/iptables-0001-xshared-fix-build-for--werror-format-security.patch

@@ -1,28 +0,0 @@
-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
-

packages/network/iptables/patches/5.x/iptables-0002-xshared-fix-for-build-in-sub-directory.patch

@@ -1,11 +0,0 @@
---- 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>