From: Florian Fainelli <florian@openwrt.org>
Date: Sun, 16 Nov 2008 22:09:18 +0000 (+0000)
Subject: Merge r13235 to 8.09
X-Git-Url: http://git.cdn.openwrt.org/?a=commitdiff_plain;h=d9cce87105528d99ef43a307742c509c0816f6c6;p=openwrt%2Fsvn-archive%2Farchive.git

Merge r13235 to 8.09

SVN-Revision: 13242
---

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index ff2f314d15..44a00a1bbd 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -13,7 +13,7 @@ PKG_NAME:=iptables
 
 ifeq ($(CONFIG_LINUX_2_4),y)
   PKG_VERSION:=1.3.8
-  PKG_RELEASE:=3
+  PKG_RELEASE:=4
   PKG_MD5SUM:=0a9209f928002e5eee9cdff8fef4d4b3
   MAKE_TARGETS:=experimental install-experimental
 endif
diff --git a/package/iptables/patches/1.3.8/006-ipt_conntrack.patch b/package/iptables/patches/1.3.8/006-ipt_conntrack.patch
new file mode 100644
index 0000000000..65ea074e9a
--- /dev/null
+++ b/package/iptables/patches/1.3.8/006-ipt_conntrack.patch
@@ -0,0 +1,11 @@
+--- ./include/linux/netfilter_ipv4/ipt_conntrack.h.orig	2008-09-27 10:26:49.000000000 -0400
++++ ./include/linux/netfilter_ipv4/ipt_conntrack.h	2008-09-27 01:15:57.000000000 -0400
+@@ -52,7 +52,7 @@
+ 	struct {
+ 		u_int32_t ip;
+ 		union {
+-			u_int16_t all;
++			u_int32_t all;
+ 		} u;
+ 
+ 		/* The protocol. */