diff options
| author | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-23 19:48:34 +0000 |
|---|---|---|
| committer | kaloz <kaloz@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2007-05-23 19:48:34 +0000 |
| commit | e148281b008b6e71f06e26e603e3d3c50377b28a (patch) | |
| tree | ff6ea55e0827dbb86f63faf337088dcffaa0521c /package/iptables/patches | |
| parent | e51ca296c7aed056695210b24904177f67bc4246 (diff) | |
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
Diffstat (limited to 'package/iptables/patches')
| -rw-r--r-- | package/iptables/patches/005-imq1.patch | 33 | ||||
| -rw-r--r-- | package/iptables/patches/007-ifname_warning.patch | 28 |
2 files changed, 15 insertions, 46 deletions
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; |