diff options
Diffstat (limited to 'main/iproute2/musl-fixes.patch')
| -rw-r--r-- | main/iproute2/musl-fixes.patch | 35 |
1 files changed, 20 insertions, 15 deletions
diff --git a/main/iproute2/musl-fixes.patch b/main/iproute2/musl-fixes.patch index 89c1f12de5..a851e392cc 100644 --- a/main/iproute2/musl-fixes.patch +++ b/main/iproute2/musl-fixes.patch @@ -1,20 +1,5 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. ---- include/libiptc/ipt_kernel_headers.h 2015-09-01 01:31:15.000000000 +0200 -+++ include/libiptc/ipt_kernel_headers.h 2015-09-14 16:27:41.185174892 +0200 -@@ -15,12 +15,10 @@ - #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 --- include/linux/if_bridge.h 2015-09-01 01:31:15.000000000 +0200 +++ include/linux/if_bridge.h 2015-09-14 16:23:24.472434012 +0200 @@ -15,7 +15,6 @@ @@ -56,3 +41,23 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. #include <sys/types.h> #include <asm/types.h> #include <resolv.h> +--- include/linux/netfilter_ipv4/ip_tables.h.orig ++++ include/linux/netfilter_ipv4/ip_tables.h +@@ -17,7 +17,6 @@ + + #include <linux/types.h> + +-#include <linux/if.h> + #include <linux/netfilter_ipv4.h> + + #include <linux/netfilter/x_tables.h> +--- include/bpf_scm.h.orig ++++ include/bpf_scm.h +@@ -3,6 +3,7 @@ + + #include <sys/types.h> + #include <sys/socket.h> ++#include <sys/un.h> + + #include "utils.h" + #include "bpf_elf.h" |