diff options
| author | Steven Barth <steven@midlink.org> | 2013-03-06 12:55:48 +0000 |
|---|---|---|
| committer | Steven Barth <steven@midlink.org> | 2013-03-06 12:55:48 +0000 |
| commit | bddbaf57c53f2e88e63c1812af6f282fdfb7db3e (patch) | |
| tree | 0443bf769b96f5cfa92b021c1908ea0613163c84 /package/network/utils/iptables/patches/300-musl_fixes.patch | |
| parent | 0b5d0905be5a9ca6ff1b4cc74d3a40cff123a2e9 (diff) | |
| download | upstream-bddbaf57c53f2e88e63c1812af6f282fdfb7db3e.tar.gz upstream-bddbaf57c53f2e88e63c1812af6f282fdfb7db3e.tar.bz2 upstream-bddbaf57c53f2e88e63c1812af6f282fdfb7db3e.zip | |
Revert "iptables: update to 1.4.18" due to toolchain-issue:
binaries cause segfaults when stripped on ar71xx
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@35894 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'package/network/utils/iptables/patches/300-musl_fixes.patch')
| -rw-r--r-- | package/network/utils/iptables/patches/300-musl_fixes.patch | 40 |
1 files changed, 20 insertions, 20 deletions
diff --git a/package/network/utils/iptables/patches/300-musl_fixes.patch b/package/network/utils/iptables/patches/300-musl_fixes.patch index 039af7ce0a..e329aa9ed8 100644 --- a/package/network/utils/iptables/patches/300-musl_fixes.patch +++ b/package/network/utils/iptables/patches/300-musl_fixes.patch @@ -1,18 +1,18 @@ --- a/extensions/libip6t_ipv6header.c +++ b/extensions/libip6t_ipv6header.c -@@ -10,6 +10,9 @@ on whether they contain certain headers - #include <netdb.h> - #include <xtables.h> +@@ -15,6 +15,9 @@ on whether they contain certain headers + #include <sys/types.h> + #include <linux/netfilter_ipv6/ip6t_ipv6header.h> +#ifndef IPPROTO_HOPOPTS +# define IPPROTO_HOPOPTS 0 +#endif - enum { - O_HEADER = 0, + /* This maybe required + #include <linux/in.h> --- a/extensions/libxt_TCPOPTSTRIP.c +++ b/extensions/libxt_TCPOPTSTRIP.c -@@ -12,6 +12,21 @@ +@@ -16,6 +16,21 @@ #ifndef TCPOPT_MD5SIG # define TCPOPT_MD5SIG 19 #endif @@ -33,7 +33,7 @@ +#endif enum { - O_STRIP_OPTION = 0, + FLAG_STRIP = 1 << 0, --- a/include/libiptc/ipt_kernel_headers.h +++ b/include/libiptc/ipt_kernel_headers.h @@ -5,7 +5,6 @@ @@ -82,9 +82,9 @@ #include <linux/netfilter_ipv4.h> ---- a/iptables/ip6tables-restore.c -+++ b/iptables/ip6tables-restore.c -@@ -9,7 +9,7 @@ +--- a/ip6tables-restore.c ++++ b/ip6tables-restore.c +@@ -11,7 +11,7 @@ */ #include <getopt.h> @@ -93,8 +93,8 @@ #include <stdbool.h> #include <string.h> #include <stdio.h> ---- a/iptables/ip6tables-save.c -+++ b/iptables/ip6tables-save.c +--- a/ip6tables-save.c ++++ b/ip6tables-save.c @@ -6,7 +6,7 @@ * This code is distributed under the terms of GNU GPL v2 */ @@ -104,9 +104,9 @@ #include <stdio.h> #include <fcntl.h> #include <stdlib.h> ---- a/iptables/iptables-restore.c -+++ b/iptables/iptables-restore.c -@@ -6,7 +6,7 @@ +--- a/iptables-restore.c ++++ b/iptables-restore.c +@@ -8,7 +8,7 @@ */ #include <getopt.h> @@ -115,8 +115,8 @@ #include <stdbool.h> #include <string.h> #include <stdio.h> ---- a/iptables/iptables-save.c -+++ b/iptables/iptables-save.c +--- a/iptables-save.c ++++ b/iptables-save.c @@ -6,7 +6,7 @@ * */ @@ -126,9 +126,9 @@ #include <stdio.h> #include <fcntl.h> #include <stdlib.h> ---- a/iptables/iptables-xml.c -+++ b/iptables/iptables-xml.c -@@ -7,7 +7,7 @@ +--- a/iptables-xml.c ++++ b/iptables-xml.c +@@ -9,7 +9,7 @@ */ #include <getopt.h> |