diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-07-17 12:37:10 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-07-17 12:37:10 +0000 |
| commit | 8729e943e23552580ceabddad4a66207181b6070 (patch) | |
| tree | d21015fd14c633263f7a8efaefa929a893d8d41c /package/iptables | |
| parent | e3f302189fa353584eee92cb2a922867e15a1b42 (diff) | |
| download | master-187ad058-8729e943e23552580ceabddad4a66207181b6070.tar.gz master-187ad058-8729e943e23552580ceabddad4a66207181b6070.tar.bz2 master-187ad058-8729e943e23552580ceabddad4a66207181b6070.zip | |
[package] make patches against iptables apply again after update to 1.4.4 (#5540)
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16878 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/iptables')
| -rw-r--r-- | package/iptables/patches/1.4.3.2/010-xtables-parse-protocol-crash.patch | 13 | ||||
| -rw-r--r-- | package/iptables/patches/1.4.4/002-layer7_2.17.patch (renamed from package/iptables/patches/1.4.3.2/002-layer7_2.17.patch) | 0 | ||||
| -rw-r--r-- | package/iptables/patches/1.4.4/005-imq.patch (renamed from package/iptables/patches/1.4.3.2/005-imq.patch) | 0 | ||||
| -rw-r--r-- | package/iptables/patches/1.4.4/008-netfilter_include_linux_type_h.patch (renamed from package/iptables/patches/1.4.3.2/008-netfilter_include_linux_type_h.patch) | 0 | ||||
| -rw-r--r-- | package/iptables/patches/1.4.4/009-table-alignment.patch (renamed from package/iptables/patches/1.4.3.2/009-table-alignment.patch) | 0 |
5 files changed, 0 insertions, 13 deletions
diff --git a/package/iptables/patches/1.4.3.2/010-xtables-parse-protocol-crash.patch b/package/iptables/patches/1.4.3.2/010-xtables-parse-protocol-crash.patch deleted file mode 100644 index e779aaa9cf..0000000000 --- a/package/iptables/patches/1.4.3.2/010-xtables-parse-protocol-crash.patch +++ /dev/null @@ -1,13 +0,0 @@ -diff -ur iptables-1.4.3.2.orig/xtables.c iptables-1.4.3.2/xtables.c ---- iptables-1.4.3.2.orig/xtables.c 2009-05-03 16:17:53.000000000 +0200 -+++ iptables-1.4.3.2/xtables.c 2009-05-03 16:27:37.000000000 +0200 -@@ -1502,7 +1502,8 @@ - else { - unsigned int i; - for (i = 0; i < ARRAY_SIZE(xtables_chain_protos); ++i) { -- if (strcmp(s, xtables_chain_protos[i].name) == 0) { -+ if ((xtables_chain_protos[i].name != NULL) && -+ (strcmp(s, xtables_chain_protos[i].name) == 0)) { - proto = xtables_chain_protos[i].num; - break; - } diff --git a/package/iptables/patches/1.4.3.2/002-layer7_2.17.patch b/package/iptables/patches/1.4.4/002-layer7_2.17.patch index a62d87f61f..a62d87f61f 100644 --- a/package/iptables/patches/1.4.3.2/002-layer7_2.17.patch +++ b/package/iptables/patches/1.4.4/002-layer7_2.17.patch diff --git a/package/iptables/patches/1.4.3.2/005-imq.patch b/package/iptables/patches/1.4.4/005-imq.patch index fb5860a39b..fb5860a39b 100644 --- a/package/iptables/patches/1.4.3.2/005-imq.patch +++ b/package/iptables/patches/1.4.4/005-imq.patch diff --git a/package/iptables/patches/1.4.3.2/008-netfilter_include_linux_type_h.patch b/package/iptables/patches/1.4.4/008-netfilter_include_linux_type_h.patch index 761f1c4977..761f1c4977 100644 --- a/package/iptables/patches/1.4.3.2/008-netfilter_include_linux_type_h.patch +++ b/package/iptables/patches/1.4.4/008-netfilter_include_linux_type_h.patch diff --git a/package/iptables/patches/1.4.3.2/009-table-alignment.patch b/package/iptables/patches/1.4.4/009-table-alignment.patch index b11c0afd6f..b11c0afd6f 100644 --- a/package/iptables/patches/1.4.3.2/009-table-alignment.patch +++ b/package/iptables/patches/1.4.4/009-table-alignment.patch |