hak5
/
wifipineapple-openwrt
mirror of https://github.com/hak5/wifipineapple-openwrt.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

iptables: Update to 1.4.20 

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@37865 3c298f89-4303-0410-b956-a3cf2f4a3e73
master
Steven Barth 2013-09-01 13:46:10 +00:00
parent 69e11f1a53
commit 794da7c235
3 changed files with 7 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
package/network/utils/iptables/Makefile
View File

@ -9,15 +9,15 @@ include $(TOPDIR)/rules.mk
include $(INCLUDE_DIR)/kernel.mk include $(INCLUDE_DIR)/kernel.mk
PKG_NAME:=iptables PKG_NAME:=iptables
PKG_VERSION:=1.4.19.1 PKG_VERSION:=1.4.20
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \ PKG_SOURCE_URL:=http://www.netfilter.org/projects/iptables/files \
ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.be.netfilter.org/pub/netfilter/iptables/ \
ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \ ftp://ftp.de.netfilter.org/pub/netfilter/iptables/ \
ftp://ftp.no.netfilter.org/pub/netfilter/iptables/ ftp://ftp.no.netfilter.org/pub/netfilter/iptables/
PKG_MD5SUM:=be97ce9007fa42c867901b496c935a0a PKG_MD5SUM:=387b92d3efcf4f07fe31c3bf0f1d18f5
PKG_FIXUP:=autoreconf PKG_FIXUP:=autoreconf
PKG_INSTALL:=1 PKG_INSTALL:=1

8
package/network/utils/iptables/patches/400-lenient-restore.patch
View File

@ -77,10 +77,10 @@ Index: iptables-1.4.18/iptables/ip6tables-restore.c
DEBUGP("argv[%u]: %s\n", a, newargv[a]); DEBUGP("argv[%u]: %s\n", a, newargv[a]);
- ret = do_command6(newargc, newargv, - ret = do_command6(newargc, newargv,
- &newargv[2], &handle); - &newargv[2], &handle, true);
+ if (!setjmp(jmp)) + if (!setjmp(jmp))
+ ret = do_command6(newargc, newargv, + ret = do_command6(newargc, newargv,
+ &newargv[2], &handle); + &newargv[2], &handle, true);
+ else + else
+ ret = 1; + ret = 1;
@ -165,10 +165,10 @@ Index: iptables-1.4.18/iptables/iptables-restore.c
DEBUGP("argv[%u]: %s\n", a, newargv[a]); DEBUGP("argv[%u]: %s\n", a, newargv[a]);
- ret = do_command4(newargc, newargv, - ret = do_command4(newargc, newargv,
- &newargv[2], &handle); - &newargv[2], &handle, true);
+ if (!setjmp(jmp)) + if (!setjmp(jmp))
+ ret = do_command4(newargc, newargv, + ret = do_command4(newargc, newargv,
+ &newargv[2], &handle); + &newargv[2], &handle, true);
+ else + else
+ ret = 1; + ret = 1;

13
package/network/utils/iptables/patches/410-add_reap_again.patch
View File

@ -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,