From 3445645d18173e468464dcae2d86fa8b3e116383 Mon Sep 17 00:00:00 2001
From: Felix Fietkau <nbd@openwrt.org>
Date: Wed, 2 Jul 2014 19:18:09 +0000
Subject: [PATCH] iptables: refresh patches
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 41479
---
.../020-iptables-disable-modprobe.patch | 2 +-
.../patches/030-no-libnfnetlink.patch | 22 ++++++++-----------
2 files changed, 10 insertions(+), 14 deletions(-)
diff --git a/package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch b/package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch
index ad4889b706..2b6c57ec9e 100644
--- a/package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch
+++ b/package/network/utils/iptables/patches/020-iptables-disable-modprobe.patch
@@ -8,7 +8,7 @@
char *buf = NULL;
char *argv[4];
int status;
-@@ -380,6 +381,7 @@ int xtables_insmod(const char *modname,
+@@ -380,6 +381,7 @@ int xtables_insmod(const char *modname,
free(buf);
if (WIFEXITED(status) && WEXITSTATUS(status) == 0)
return 0;
diff --git a/package/network/utils/iptables/patches/030-no-libnfnetlink.patch b/package/network/utils/iptables/patches/030-no-libnfnetlink.patch
index ac825e9b21..50542ac0b5 100644
--- a/package/network/utils/iptables/patches/030-no-libnfnetlink.patch
+++ b/package/network/utils/iptables/patches/030-no-libnfnetlink.patch
@@ -1,11 +1,9 @@
-Index: iptables-1.4.19.1/configure
-===================================================================
---- iptables-1.4.19.1.orig/configure 2013-05-29 16:37:33.176674855 +0200
-+++ iptables-1.4.19.1/configure 2013-05-29 16:37:33.168674855 +0200
-@@ -12198,77 +12198,7 @@
- fi
+--- a/configure
++++ b/configure
+@@ -12367,77 +12367,7 @@ fi
fi
+
-pkg_failed=no
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for libnfnetlink" >&5
-$as_echo_n "checking for libnfnetlink... " >&6; }
@@ -81,13 +79,11 @@ Index: iptables-1.4.19.1/configure
HAVE_LIBNFNETLINK_TRUE=
HAVE_LIBNFNETLINK_FALSE='#'
else
-Index: iptables-1.4.19.1/configure.ac
-===================================================================
---- iptables-1.4.19.1.orig/configure.ac 2013-05-29 16:37:33.176674855 +0200
-+++ iptables-1.4.19.1/configure.ac 2013-05-29 16:37:33.168674855 +0200
-@@ -93,9 +93,7 @@
- AM_CONDITIONAL([ENABLE_LIBIPQ], [test "$enable_libipq" = "yes"])
- AM_CONDITIONAL([ENABLE_BPFC], [test "$enable_bpfc" = "yes"])
+--- a/configure.ac
++++ b/configure.ac
+@@ -111,9 +111,7 @@ if test "x$enable_bpfc" = "xyes" || test
+ AC_CHECK_LIB(pcap, pcap_compile,, AC_MSG_ERROR(missing libpcap library required by bpf compiler or nfsynproxy tool))
+ fi
-PKG_CHECK_MODULES([libnfnetlink], [libnfnetlink >= 1.0],
- [nfnetlink=1], [nfnetlink=0])
--
GitLab