diff options
Diffstat (limited to 'meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch')
| -rw-r--r-- | meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch | 69 |
1 files changed, 13 insertions, 56 deletions
diff --git a/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch b/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch index 7a003d912f..f1f85a6fa0 100644 --- a/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch +++ b/meta/recipes-extended/iptables/iptables/0001-fix-build-with-musl.patch @@ -1,81 +1,41 @@ -From 7c07b7fd4fdd7844dd032af822306f08e4422c34 Mon Sep 17 00:00:00 2001 -From: Khem Raj <raj.khem@gmail.com> -Date: Mon, 6 Apr 2015 20:47:29 -0700 -Subject: [PATCH] fix build with musl +[PATCH] fix build with musl -Add needed headers they are just not needed for glibc6+ but also -for musl Define additional TCOPTS if not there - u_initX types are in sys/types.h be explicit about it Upstream-Status: Pending Signed-off-by: Khem Raj <raj.khem@gmail.com> +Signed-off-by: Maxin B. John <maxin.john@intel.com> --- - extensions/libxt_TCPOPTSTRIP.c | 15 +++++++++++++++ - include/libiptc/ipt_kernel_headers.h | 12 ------------ - include/linux/netfilter_ipv4/ip_tables.h | 1 + - 3 files changed, 16 insertions(+), 12 deletions(-) - -diff --git a/extensions/libxt_TCPOPTSTRIP.c b/extensions/libxt_TCPOPTSTRIP.c -index 6897857..8a170b2 100644 ---- a/extensions/libxt_TCPOPTSTRIP.c -+++ b/extensions/libxt_TCPOPTSTRIP.c +diff -Naur iptables-1.6.0-origin/extensions/libxt_TCPOPTSTRIP.c iptables-1.6.0/extensions/libxt_TCPOPTSTRIP.c +--- iptables-1.6.0-origin/extensions/libxt_TCPOPTSTRIP.c 2015-12-09 14:55:06.000000000 +0200 ++++ iptables-1.6.0/extensions/libxt_TCPOPTSTRIP.c 2015-12-29 14:44:32.585327077 +0200 @@ -12,6 +12,21 @@ #ifndef TCPOPT_MD5SIG # define TCPOPT_MD5SIG 19 #endif +#ifndef TCPOPT_MAXSEG -+# define TCPOPT_MAXSEG 2 ++#define TCPOPT_MAXSEG 2 +#endif +#ifndef TCPOPT_WINDOW -+# define TCPOPT_WINDOW 3 ++#define TCPOPT_WINDOW 3 +#endif +#ifndef TCPOPT_SACK_PERMITTED -+# define TCPOPT_SACK_PERMITTED 4 ++#define TCPOPT_SACK_PERMITTED 4 +#endif +#ifndef TCPOPT_SACK -+# define TCPOPT_SACK 5 ++#define TCPOPT_SACK 5 +#endif +#ifndef TCPOPT_TIMESTAMP -+# define TCPOPT_TIMESTAMP 8 ++#define TCPOPT_TIMESTAMP 8 +#endif enum { O_STRIP_OPTION = 0, -diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h -index 18861fe..a5963e9 100644 ---- a/include/libiptc/ipt_kernel_headers.h -+++ b/include/libiptc/ipt_kernel_headers.h -@@ -5,7 +5,6 @@ - - #include <limits.h> - --#if defined(__GLIBC__) && __GLIBC__ == 2 - #include <netinet/ip.h> - #include <netinet/in.h> - #include <netinet/ip_icmp.h> -@@ -13,15 +12,4 @@ - #include <netinet/udp.h> - #include <net/if.h> - #include <sys/types.h> --#else /* libc5 */ --#include <sys/socket.h> --#include <linux/ip.h> --#include <linux/in.h> --#include <linux/if.h> --#include <linux/icmp.h> --#include <linux/tcp.h> --#include <linux/udp.h> --#include <linux/types.h> --#include <linux/in6.h> --#endif - #endif -diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h -index 57fd82a..4807246 100644 ---- a/include/linux/netfilter_ipv4/ip_tables.h -+++ b/include/linux/netfilter_ipv4/ip_tables.h +diff -Naur iptables-1.6.0-origin/include/linux/netfilter_ipv4/ip_tables.h iptables-1.6.0/include/linux/netfilter_ipv4/ip_tables.h +--- iptables-1.6.0-origin/include/linux/netfilter_ipv4/ip_tables.h 2015-12-09 14:55:06.000000000 +0200 ++++ iptables-1.6.0/include/linux/netfilter_ipv4/ip_tables.h 2015-12-29 14:40:21.250469195 +0200 @@ -15,6 +15,7 @@ #ifndef _IPTABLES_H #define _IPTABLES_H @@ -84,6 +44,3 @@ index 57fd82a..4807246 100644 #include <linux/types.h> #include <linux/netfilter_ipv4.h> --- -2.1.4 - |