From cd64d4ce6e9cedb9172e6b8eda39437244bfa2bc Mon Sep 17 00:00:00 2001 From: Florian Fainelli Date: Fri, 17 Jul 2009 12:37:10 +0000 Subject: [PATCH] make patches against iptables apply again after update to 1.4.4 (#5540) SVN-Revision: 16878 --- .../1.4.3.2/010-xtables-parse-protocol-crash.patch | 13 ------------- .../{1.4.3.2 => 1.4.4}/002-layer7_2.17.patch | 0 .../patches/{1.4.3.2 => 1.4.4}/005-imq.patch | 0 .../008-netfilter_include_linux_type_h.patch | 0 .../{1.4.3.2 => 1.4.4}/009-table-alignment.patch | 0 5 files changed, 13 deletions(-) delete mode 100644 package/iptables/patches/1.4.3.2/010-xtables-parse-protocol-crash.patch rename package/iptables/patches/{1.4.3.2 => 1.4.4}/002-layer7_2.17.patch (100%) rename package/iptables/patches/{1.4.3.2 => 1.4.4}/005-imq.patch (100%) rename package/iptables/patches/{1.4.3.2 => 1.4.4}/008-netfilter_include_linux_type_h.patch (100%) rename package/iptables/patches/{1.4.3.2 => 1.4.4}/009-table-alignment.patch (100%) 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 similarity index 100% rename from package/iptables/patches/1.4.3.2/002-layer7_2.17.patch rename to 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 similarity index 100% rename from package/iptables/patches/1.4.3.2/005-imq.patch rename to 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 similarity index 100% rename from package/iptables/patches/1.4.3.2/008-netfilter_include_linux_type_h.patch rename to 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 similarity index 100% rename from package/iptables/patches/1.4.3.2/009-table-alignment.patch rename to package/iptables/patches/1.4.4/009-table-alignment.patch