break trunk temporary - upgrade to 2.6.21.1 and iptables 1.3.7

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@7315 3c298f89-4303-0410-b956-a3cf2f4a3e73

3 files changed, 17 insertions, 48 deletions

diff --git a/package/iptables/Makefile b/package/iptables/Makefile
index 1bd13a507..7d34cc68e 100644
--- a/package/iptables/Makefile
+++ b/package/iptables/Makefile
@@ -10,7 +10,7 @@ include $(TOPDIR)/rules.mk
 include $(INCLUDE_DIR)/kernel.mk
 
 PKG_NAME:=iptables
-PKG_VERSION:=1.3.5
+PKG_VERSION:=1.3.7
 PKG_RELEASE:=1
 
 PKG_SOURCE:=$(PKG_NAME)-$(PKG_VERSION).tar.bz2
@@ -18,7 +18,7 @@ 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:=00fb916fa8040ca992a5ace56d905ea5
+PKG_MD5SUM:=dd965bdacbb86ce2a6498829fddda6b7
 
 include $(INCLUDE_DIR)/package.mk
 ifeq ($(DUMP),)
diff --git a/package/iptables/patches/005-imq1.patch b/package/iptables/patches/005-imq1.patch
index 459189030..acb952f43 100644
--- a/package/iptables/patches/005-imq1.patch
+++ b/package/iptables/patches/005-imq1.patch
@@ -1,20 +1,11 @@
-diff -urN iptables.old/extensions/.IMQ-test iptables.dev/extensions/.IMQ-test
---- iptables.old/extensions/.IMQ-test	1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/.IMQ-test	2005-10-09 01:00:36.358959750 +0200
-@@ -0,0 +1,3 @@
-+#!/bin/sh
-+# True if IMQ target patch is applied.
-+[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_IMQ.c ] && echo IMQ
-diff -urN iptables.old/extensions/.IMQ-test6 iptables.dev/extensions/.IMQ-test6
---- iptables.old/extensions/.IMQ-test6	1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/.IMQ-test6	2005-10-09 01:00:36.358959750 +0200
+--- iptables-1.3.6.orig/extensions.orig/.IMQ-test6	Thu Jan  1 01:00:00 1970
++++ iptables-1.3.6/extensions/.IMQ-test6	Mon Jun 16 10:12:47 2003
 @@ -0,0 +1,3 @@
 +#!/bin/sh
 +# True if IMQ target patch is applied.
 +[ -f $KERNEL_DIR/net/ipv6/netfilter/ip6t_IMQ.c ] && echo IMQ
-diff -urN iptables.old/extensions/libip6t_IMQ.c iptables.dev/extensions/libip6t_IMQ.c
---- iptables.old/extensions/libip6t_IMQ.c	1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/libip6t_IMQ.c	2005-10-09 01:00:36.358959750 +0200
+--- iptables-1.3.6.orig/extensions.orig/libip6t_IMQ.c	Thu Jan  1 01:00:00 1970
++++ iptables-1.3.6/extensions/libip6t_IMQ.c	Mon Jun 16 10:12:47 2003
 @@ -0,0 +1,101 @@
 +/* Shared library add-on to iptables to add IMQ target support. */
 +#include <stdio.h>
@@ -113,13 +104,18 @@ diff -urN iptables.old/extensions/libip6t_IMQ.c iptables.dev/extensions/libip6t_
 +	.extra_opts	= opts
 +};
 +
-+void _init(void)
++static __attribute__((constructor)) void _init(void)
 +{
 +	register_target6(&imq);
 +}
-diff -urN iptables.old/extensions/libipt_IMQ.c iptables.dev/extensions/libipt_IMQ.c
---- iptables.old/extensions/libipt_IMQ.c	1970-01-01 01:00:00.000000000 +0100
-+++ iptables.dev/extensions/libipt_IMQ.c	2005-10-09 01:00:36.358959750 +0200
+--- iptables-1.3.6.orig/extensions.orig/.IMQ-test	Thu Jan  1 01:00:00 1970
++++ iptables-1.3.6/extensions/.IMQ-test	Mon Jun 16 10:12:47 2003
+@@ -0,0 +1,3 @@
++#!/bin/sh
++# True if IMQ target patch is applied.
++[ -f $KERNEL_DIR/net/ipv4/netfilter/ipt_IMQ.c ] && echo IMQ
+--- iptables-1.3.6.orig/extensions.orig/libipt_IMQ.c	Thu Jan  1 01:00:00 1970
++++ iptables-1.3.6/extensions/libipt_IMQ.c	Mon Jun 16 10:12:47 2003
 @@ -0,0 +1,101 @@
 +/* Shared library add-on to iptables to add IMQ target support. */
 +#include <stdio.h>
@@ -218,7 +214,8 @@ diff -urN iptables.old/extensions/libipt_IMQ.c iptables.dev/extensions/libipt_IM
 +	.extra_opts	= opts
 +};
 +
-+void _init(void)
++static __attribute__((constructor)) void _init(void)
 +{
 +	register_target(&imq);
 +}
+
diff --git a/package/iptables/patches/007-ifname_warning.patch b/package/iptables/patches/007-ifname_warning.patch
deleted file mode 100644
index d6ffe1384..000000000
--- a/package/iptables/patches/007-ifname_warning.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-diff -ur iptables.old/ip6tables.c iptables.dev/ip6tables.c
---- iptables.old/ip6tables.c	2006-01-30 09:43:12.000000000 +0100
-+++ iptables.dev/ip6tables.c	2007-01-02 00:29:50.000000000 +0100
-@@ -857,8 +857,9 @@
- 		for (i = 0; vianame[i]; i++) {
- 			if (!isalnum(vianame[i]) 
- 			    && vianame[i] != '_' 
-+			    && vianame[i] != '-' 
- 			    && vianame[i] != '.') {
--				printf("Warning: wierd character in interface"
-+				printf("Warning: weird character in interface"
- 				       " `%s' (No aliases, :, ! or *).\n",
- 				       vianame);
- 				break;
-diff -ur iptables.old/iptables.c iptables.dev/iptables.c
---- iptables.old/iptables.c	2006-01-30 09:43:09.000000000 +0100
-+++ iptables.dev/iptables.c	2007-01-02 00:29:38.000000000 +0100
-@@ -805,8 +805,9 @@
- 		for (i = 0; vianame[i]; i++) {
- 			if (!isalnum(vianame[i]) 
- 			    && vianame[i] != '_' 
-+			    && vianame[i] != '-' 
- 			    && vianame[i] != '.') {
--				printf("Warning: wierd character in interface"
-+				printf("Warning: weird character in interface"
- 				       " `%s' (No aliases, :, ! or *).\n",
- 				       vianame);
- 				break;