From 044c8c897f18d92e8ea8077a5d7e85aa32a36496 Mon Sep 17 00:00:00 2001 From: Felix Fietkau Date: Thu, 20 Mar 2014 13:51:40 +0000 Subject: [PATCH] iptables: fix issues with the new musl version Signed-off-by: Felix Fietkau git-svn-id: svn://svn.openwrt.org/openwrt/trunk@39964 3c298f89-4303-0410-b956-a3cf2f4a3e73 --- .../patches/200-configurable_builtin.patch | 12 +++---- .../iptables/patches/300-musl_fixes.patch | 14 +------- .../patches/400-lenient-restore.patch | 36 +++++++++---------- 3 files changed, 22 insertions(+), 40 deletions(-) diff --git a/package/network/utils/iptables/patches/200-configurable_builtin.patch b/package/network/utils/iptables/patches/200-configurable_builtin.patch index ef426e2145..d35bc5a85d 100644 --- a/package/network/utils/iptables/patches/200-configurable_builtin.patch +++ b/package/network/utils/iptables/patches/200-configurable_builtin.patch @@ -1,8 +1,6 @@ -Index: iptables-1.4.19.1/extensions/GNUmakefile.in -=================================================================== ---- iptables-1.4.19.1.orig/extensions/GNUmakefile.in 2013-05-29 16:37:41.304675049 +0200 -+++ iptables-1.4.19.1/extensions/GNUmakefile.in 2013-05-29 16:37:41.296675048 +0200 -@@ -45,9 +45,24 @@ +--- a/extensions/GNUmakefile.in ++++ b/extensions/GNUmakefile.in +@@ -45,9 +45,24 @@ pfx_symlinks := NOTRACK state pfx_build_mod := $(filter-out @blacklist_modules@,${pfx_build_mod}) pf4_build_mod := $(filter-out @blacklist_modules@,${pf4_build_mod}) pf6_build_mod := $(filter-out @blacklist_modules@,${pf6_build_mod}) @@ -30,7 +28,7 @@ Index: iptables-1.4.19.1/extensions/GNUmakefile.in pfx_solibs := $(patsubst %,libxt_%.so,${pfx_build_mod} ${pfx_symlinks}) pf4_solibs := $(patsubst %,libipt_%.so,${pf4_build_mod}) pf6_solibs := $(patsubst %,libip6t_%.so,${pf6_build_mod}) -@@ -58,11 +73,11 @@ +@@ -58,11 +73,11 @@ pf6_solibs := $(patsubst %,libip6t_%. # targets := libext.a libext4.a libext6.a matches.man targets.man targets_install := @@ -47,7 +45,7 @@ Index: iptables-1.4.19.1/extensions/GNUmakefile.in .SECONDARY: -@@ -123,9 +138,9 @@ +@@ -126,9 +141,9 @@ libext4.a: initext4.o ${libext4_objs} libext6.a: initext6.o ${libext6_objs} ${AM_VERBOSE_AR} ${AR} crs $@ $^; diff --git a/package/network/utils/iptables/patches/300-musl_fixes.patch b/package/network/utils/iptables/patches/300-musl_fixes.patch index 039af7ce0a..a78eda775d 100644 --- a/package/network/utils/iptables/patches/300-musl_fixes.patch +++ b/package/network/utils/iptables/patches/300-musl_fixes.patch @@ -1,6 +1,6 @@ --- a/extensions/libip6t_ipv6header.c +++ b/extensions/libip6t_ipv6header.c -@@ -10,6 +10,9 @@ on whether they contain certain headers +@@ -10,6 +10,9 @@ on whether they contain certain headers #include #include #include @@ -60,18 +60,6 @@ -#include -#endif #endif ---- a/include/linux/netfilter/xt_osf.h -+++ b/include/linux/netfilter/xt_osf.h -@@ -21,6 +21,9 @@ - #define _XT_OSF_H - - #include -+#if !defined(__UCLIBC__) && !defined(__GLIBC__) -+#include -+#endif - - #define MAXGENRELEN 32 - --- a/include/linux/netfilter_ipv4/ip_tables.h +++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -16,6 +16,7 @@ diff --git a/package/network/utils/iptables/patches/400-lenient-restore.patch b/package/network/utils/iptables/patches/400-lenient-restore.patch index c9c490602b..55ced4a872 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 #include @@ -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=]\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 #include @@ -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= ]\n" " [ --modprobe=]\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]);