diff options
author | Felix Fietkau <nbd@openwrt.org> | 2014-03-20 13:51:40 +0000 |
---|---|---|
committer | Felix Fietkau <nbd@openwrt.org> | 2014-03-20 13:51:40 +0000 |
commit | 0ccec8179dacc017884fa33f9e570cd95de649bb (patch) | |
tree | 10eb39f20d04c0a074d237d31def0a53ee07acaa /package/network/utils/iptables/patches/400-lenient-restore.patch | |
parent | 7fa3fe6741b08fb26058e92a43dfd9d3798d102a (diff) | |
download | mtk-20170518-0ccec8179dacc017884fa33f9e570cd95de649bb.zip mtk-20170518-0ccec8179dacc017884fa33f9e570cd95de649bb.tar.gz mtk-20170518-0ccec8179dacc017884fa33f9e570cd95de649bb.tar.bz2 |
iptables: fix issues with the new musl version
Signed-off-by: Felix Fietkau <nbd@openwrt.org>
SVN-Revision: 39964
Diffstat (limited to 'package/network/utils/iptables/patches/400-lenient-restore.patch')
-rw-r--r-- | package/network/utils/iptables/patches/400-lenient-restore.patch | 36 |
1 files changed, 16 insertions, 20 deletions
diff --git a/package/network/utils/iptables/patches/400-lenient-restore.patch b/package/network/utils/iptables/patches/400-lenient-restore.patch index c9c4906..55ced4a 100644 --- a/package/network/utils/iptables/patches/400-lenient-restore.patch +++ b/package/network/utils/iptables/patches/400-lenient-restore.patch @@ -1,7 +1,5 @@ -Index: iptables-1.4.18/iptables/ip6tables-restore.c -=================================================================== ---- iptables-1.4.18.orig/iptables/ip6tables-restore.c 2013-03-05 16:37:31.000000000 +0100 -+++ iptables-1.4.18/iptables/ip6tables-restore.c 2013-03-05 16:42:57.475249794 +0100 +--- a/iptables/ip6tables-restore.c ++++ b/iptables/ip6tables-restore.c @@ -14,6 +14,8 @@ #include <string.h> #include <stdio.h> @@ -19,7 +17,7 @@ Index: iptables-1.4.18/iptables/ip6tables-restore.c static int binary = 0, counters = 0, verbose = 0, noflush = 0; /* Keeping track of external matches and targets. */ -@@ -35,6 +38,7 @@ +@@ -35,6 +38,7 @@ static const struct option options[] = { {.name = "test", .has_arg = false, .val = 't'}, {.name = "help", .has_arg = false, .val = 'h'}, {.name = "noflush", .has_arg = false, .val = 'n'}, @@ -27,7 +25,7 @@ Index: iptables-1.4.18/iptables/ip6tables-restore.c {.name = "modprobe", .has_arg = true, .val = 'M'}, {.name = "table", .has_arg = true, .val = 'T'}, {NULL}, -@@ -51,6 +55,7 @@ +@@ -51,6 +55,7 @@ static void print_usage(const char *name " [ --test ]\n" " [ --help ]\n" " [ --noflush ]\n" @@ -35,7 +33,7 @@ Index: iptables-1.4.18/iptables/ip6tables-restore.c " [ --modprobe=<command>]\n", name); exit(1); -@@ -114,6 +119,17 @@ +@@ -114,6 +119,17 @@ static void free_argv(void) { free(newargv[i]); } @@ -53,7 +51,7 @@ Index: iptables-1.4.18/iptables/ip6tables-restore.c static void add_param_to_argv(char *parsestart) { int quote_open = 0, escaped = 0, param_len = 0; -@@ -204,7 +220,7 @@ +@@ -204,7 +220,7 @@ int ip6tables_restore_main(int argc, cha init_extensions6(); #endif @@ -62,7 +60,7 @@ Index: iptables-1.4.18/iptables/ip6tables-restore.c switch (c) { case 'b': binary = 1; -@@ -225,6 +241,9 @@ +@@ -225,6 +241,9 @@ int ip6tables_restore_main(int argc, cha case 'n': noflush = 1; break; @@ -72,7 +70,7 @@ Index: iptables-1.4.18/iptables/ip6tables-restore.c case 'M': xtables_modprobe_program = optarg; break; -@@ -437,8 +456,11 @@ +@@ -437,8 +456,11 @@ int ip6tables_restore_main(int argc, cha for (a = 0; a < newargc; a++) DEBUGP("argv[%u]: %s\n", a, newargv[a]); @@ -86,10 +84,8 @@ Index: iptables-1.4.18/iptables/ip6tables-restore.c free_argv(); fflush(stdout); -Index: iptables-1.4.18/iptables/iptables-restore.c -=================================================================== ---- iptables-1.4.18.orig/iptables/iptables-restore.c 2013-03-05 16:37:31.000000000 +0100 -+++ iptables-1.4.18/iptables/iptables-restore.c 2013-03-05 16:44:56.303247355 +0100 +--- a/iptables/iptables-restore.c ++++ b/iptables/iptables-restore.c @@ -11,6 +11,8 @@ #include <string.h> #include <stdio.h> @@ -107,7 +103,7 @@ Index: iptables-1.4.18/iptables/iptables-restore.c static int binary = 0, counters = 0, verbose = 0, noflush = 0; /* Keeping track of external matches and targets. */ -@@ -32,6 +35,7 @@ +@@ -32,6 +35,7 @@ static const struct option options[] = { {.name = "test", .has_arg = false, .val = 't'}, {.name = "help", .has_arg = false, .val = 'h'}, {.name = "noflush", .has_arg = false, .val = 'n'}, @@ -115,7 +111,7 @@ Index: iptables-1.4.18/iptables/iptables-restore.c {.name = "modprobe", .has_arg = true, .val = 'M'}, {.name = "table", .has_arg = true, .val = 'T'}, {NULL}, -@@ -50,6 +54,7 @@ +@@ -50,6 +54,7 @@ static void print_usage(const char *name " [ --test ]\n" " [ --help ]\n" " [ --noflush ]\n" @@ -123,7 +119,7 @@ Index: iptables-1.4.18/iptables/iptables-restore.c " [ --table=<TABLE> ]\n" " [ --modprobe=<command>]\n", name); -@@ -113,6 +118,17 @@ +@@ -113,6 +118,17 @@ static void free_argv(void) { free(newargv[i]); } @@ -141,7 +137,7 @@ Index: iptables-1.4.18/iptables/iptables-restore.c static void add_param_to_argv(char *parsestart) { int quote_open = 0, escaped = 0, param_len = 0; -@@ -204,7 +220,7 @@ +@@ -204,7 +220,7 @@ iptables_restore_main(int argc, char *ar init_extensions4(); #endif @@ -150,7 +146,7 @@ Index: iptables-1.4.18/iptables/iptables-restore.c switch (c) { case 'b': binary = 1; -@@ -225,6 +241,9 @@ +@@ -225,6 +241,9 @@ iptables_restore_main(int argc, char *ar case 'n': noflush = 1; break; @@ -160,7 +156,7 @@ Index: iptables-1.4.18/iptables/iptables-restore.c case 'M': xtables_modprobe_program = optarg; break; -@@ -437,8 +456,11 @@ +@@ -437,8 +456,11 @@ iptables_restore_main(int argc, char *ar for (a = 0; a < newargc; a++) DEBUGP("argv[%u]: %s\n", a, newargv[a]); |