Patrick Williams | c124f4f | 2015-09-15 14:41:29 -0500 | [diff] [blame] | 1 | From 7c07b7fd4fdd7844dd032af822306f08e4422c34 Mon Sep 17 00:00:00 2001 |
| 2 | From: Khem Raj <raj.khem@gmail.com> |
| 3 | Date: Mon, 6 Apr 2015 20:47:29 -0700 |
| 4 | Subject: [PATCH] fix build with musl |
| 5 | |
| 6 | Add needed headers they are just not needed for glibc6+ but also |
| 7 | for musl |
| 8 | Define additional TCOPTS if not there |
| 9 | |
| 10 | u_initX types are in sys/types.h be explicit about it |
| 11 | |
| 12 | Upstream-Status: Pending |
| 13 | |
| 14 | Signed-off-by: Khem Raj <raj.khem@gmail.com> |
| 15 | --- |
| 16 | extensions/libxt_TCPOPTSTRIP.c | 15 +++++++++++++++ |
| 17 | include/libiptc/ipt_kernel_headers.h | 12 ------------ |
| 18 | include/linux/netfilter_ipv4/ip_tables.h | 1 + |
| 19 | 3 files changed, 16 insertions(+), 12 deletions(-) |
| 20 | |
| 21 | diff --git a/extensions/libxt_TCPOPTSTRIP.c b/extensions/libxt_TCPOPTSTRIP.c |
| 22 | index 6897857..8a170b2 100644 |
| 23 | --- a/extensions/libxt_TCPOPTSTRIP.c |
| 24 | +++ b/extensions/libxt_TCPOPTSTRIP.c |
| 25 | @@ -12,6 +12,21 @@ |
| 26 | #ifndef TCPOPT_MD5SIG |
| 27 | # define TCPOPT_MD5SIG 19 |
| 28 | #endif |
| 29 | +#ifndef TCPOPT_MAXSEG |
| 30 | +# define TCPOPT_MAXSEG 2 |
| 31 | +#endif |
| 32 | +#ifndef TCPOPT_WINDOW |
| 33 | +# define TCPOPT_WINDOW 3 |
| 34 | +#endif |
| 35 | +#ifndef TCPOPT_SACK_PERMITTED |
| 36 | +# define TCPOPT_SACK_PERMITTED 4 |
| 37 | +#endif |
| 38 | +#ifndef TCPOPT_SACK |
| 39 | +# define TCPOPT_SACK 5 |
| 40 | +#endif |
| 41 | +#ifndef TCPOPT_TIMESTAMP |
| 42 | +# define TCPOPT_TIMESTAMP 8 |
| 43 | +#endif |
| 44 | |
| 45 | enum { |
| 46 | O_STRIP_OPTION = 0, |
| 47 | diff --git a/include/libiptc/ipt_kernel_headers.h b/include/libiptc/ipt_kernel_headers.h |
| 48 | index 18861fe..a5963e9 100644 |
| 49 | --- a/include/libiptc/ipt_kernel_headers.h |
| 50 | +++ b/include/libiptc/ipt_kernel_headers.h |
| 51 | @@ -5,7 +5,6 @@ |
| 52 | |
| 53 | #include <limits.h> |
| 54 | |
| 55 | -#if defined(__GLIBC__) && __GLIBC__ == 2 |
| 56 | #include <netinet/ip.h> |
| 57 | #include <netinet/in.h> |
| 58 | #include <netinet/ip_icmp.h> |
| 59 | @@ -13,15 +12,4 @@ |
| 60 | #include <netinet/udp.h> |
| 61 | #include <net/if.h> |
| 62 | #include <sys/types.h> |
| 63 | -#else /* libc5 */ |
| 64 | -#include <sys/socket.h> |
| 65 | -#include <linux/ip.h> |
| 66 | -#include <linux/in.h> |
| 67 | -#include <linux/if.h> |
| 68 | -#include <linux/icmp.h> |
| 69 | -#include <linux/tcp.h> |
| 70 | -#include <linux/udp.h> |
| 71 | -#include <linux/types.h> |
| 72 | -#include <linux/in6.h> |
| 73 | -#endif |
| 74 | #endif |
| 75 | diff --git a/include/linux/netfilter_ipv4/ip_tables.h b/include/linux/netfilter_ipv4/ip_tables.h |
| 76 | index 57fd82a..4807246 100644 |
| 77 | --- a/include/linux/netfilter_ipv4/ip_tables.h |
| 78 | +++ b/include/linux/netfilter_ipv4/ip_tables.h |
| 79 | @@ -15,6 +15,7 @@ |
| 80 | #ifndef _IPTABLES_H |
| 81 | #define _IPTABLES_H |
| 82 | |
| 83 | +#include <sys/types.h> |
| 84 | #include <linux/types.h> |
| 85 | |
| 86 | #include <linux/netfilter_ipv4.h> |
| 87 | -- |
| 88 | 2.1.4 |
| 89 | |