aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSteven Barth <cyrus@openwrt.org>2013-09-01 13:46:10 +0000
committerSteven Barth <cyrus@openwrt.org>2013-09-01 13:46:10 +0000
commit3e647ac9b6c432571c7969a6f25852443b6b2705 (patch)
treed77667c6be36e5e4e5be73b005bae4977b09fffc
parente532d653738fc7a45d6fe4b485ab39ee33730283 (diff)
downloadupstream-3e647ac9b6c432571c7969a6f25852443b6b2705.tar.gz
upstream-3e647ac9b6c432571c7969a6f25852443b6b2705.tar.bz2
upstream-3e647ac9b6c432571c7969a6f25852443b6b2705.zip
iptables: Update to 1.4.20
SVN-Revision: 37865
-rw-r--r--package/network/utils/iptables/Makefile6
-rw-r--r--package/network/utils/iptables/patches/400-lenient-restore.patch8
-rw-r--r--package/network/utils/iptables/patches/410-add_reap_again.patch13
3 files changed, 7 insertions, 20 deletions
diff --git a/package/network/utils/iptables/Makefile b/package/network/utils/iptables/Makefile
index c510700b9f..879d786e8f 100644
--- a/package/network/utils/iptables/Makefile
+++ b/package/network/utils/iptables/Makefile
@@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=iptables
-PKG_VERSION:=1.4.19.1
-PKG_RELEASE:=2
+PKG_VERSION:=1.4.20
+PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
-PKG_MD5SUM:=be97ce9007fa42c867901b496c935a0a
+PKG_MD5SUM:=387b92d3efcf4f07fe31c3bf0f1d18f5
PKG_FIXUP:=autoreconf
PKG_INSTALL:=1
diff --git a/package/network/utils/iptables/patches/400-lenient-restore.patch b/package/network/utils/iptables/patches/400-lenient-restore.patch
index 696d733225..c9c490602b 100644
--- a/package/network/utils/iptables/patches/400-lenient-restore.patch
+++ b/package/network/utils/iptables/patches/400-lenient-restore.patch
@@ -77,10 +77,10 @@ Index: iptables-1.4.18/iptables/ip6tables-restore.c
DEBUGP("argv[%u]: %s\n", a, newargv[a]);
- ret = do_command6(newargc, newargv,
-- &newargv[2], &handle);
+- &newargv[2], &handle, true);
+ if (!setjmp(jmp))
+ ret = do_command6(newargc, newargv,
-+ &newargv[2], &handle);
++ &newargv[2], &handle, true);
+ else
+ ret = 1;
@@ -165,10 +165,10 @@ Index: iptables-1.4.18/iptables/iptables-restore.c
DEBUGP("argv[%u]: %s\n", a, newargv[a]);
- ret = do_command4(newargc, newargv,
-- &newargv[2], &handle);
+- &newargv[2], &handle, true);
+ if (!setjmp(jmp))
+ ret = do_command4(newargc, newargv,
-+ &newargv[2], &handle);
++ &newargv[2], &handle, true);
+ else
+ ret = 1;
diff --git a/package/network/utils/iptables/patches/410-add_reap_again.patch b/package/network/utils/iptables/patches/410-add_reap_again.patch
deleted file mode 100644
index 0bb40fbcf0..0000000000
--- a/package/network/utils/iptables/patches/410-add_reap_again.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: iptables-1.4.19.1/extensions/libxt_recent.c
-===================================================================
---- iptables-1.4.19.1.orig/extensions/libxt_recent.c
-+++ iptables-1.4.19.1/extensions/libxt_recent.c
-@@ -63,6 +63,8 @@ static const struct xt_option_entry rece
- .excl = F_ANY_OP, .flags = XTOPT_INVERT},
- {.name = "seconds", .id = O_SECONDS, .type = XTTYPE_UINT32,
- .flags = XTOPT_PUT, XTOPT_POINTER(s, seconds)},
-+ {.name = "reap", .id = O_REAP, .type = XTTYPE_NONE,
-+ .also = F_SECONDS },
- {.name = "hitcount", .id = O_HITCOUNT, .type = XTTYPE_UINT32,
- .flags = XTOPT_PUT, XTOPT_POINTER(s, hit_count)},
- {.name = "rttl", .id = O_RTTL, .type = XTTYPE_NONE,