diff options
| author | Sören Tempel <soeren+git@soeren-tempel.net> | 2015-10-03 03:04:29 +0200 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2015-10-06 22:31:05 +0200 |
| commit | 9ba98bbac70209e86d64273f07f323ec107f7f9c (patch) | |
| tree | 9f0571165c85b4565241dab2389a229905117d58 /main/iproute2/musl-fixes.patch | |
| parent | 294c247aaf2088e1283e466af40e7e4252edd301 (diff) | |
| download | aports-9ba98bbac70209e86d64273f07f323ec107f7f9c.tar.bz2 aports-9ba98bbac70209e86d64273f07f323ec107f7f9c.tar.xz | |
main/iproute2: upgrade to 4.2.0
Diffstat (limited to 'main/iproute2/musl-fixes.patch')
| -rw-r--r-- | main/iproute2/musl-fixes.patch | 50 |
1 files changed, 48 insertions, 2 deletions
diff --git a/main/iproute2/musl-fixes.patch b/main/iproute2/musl-fixes.patch index d9dd7d6e1d..89c1f12de5 100644 --- a/main/iproute2/musl-fixes.patch +++ b/main/iproute2/musl-fixes.patch @@ -1,7 +1,22 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. ---- a/include/linux/if_bridge.h.orig 2014-12-28 06:08:02.569567949 +0100 -+++ b/include/linux/if_bridge.h 2014-12-28 06:08:34.736569384 +0100 +--- 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 @@ #include <linux/types.h> @@ -10,3 +25,34 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. #define SYSFS_BRIDGE_ATTR "bridge" #define SYSFS_BRIDGE_FDB "brforward" +--- include/linux/netfilter.h 2015-09-01 01:31:15.000000000 +0200 ++++ include/linux/netfilter.h 2015-09-14 16:27:34.928205553 +0200 +@@ -4,8 +4,6 @@ + #include <linux/types.h> + + #include <linux/sysctl.h> +-#include <linux/in.h> +-#include <linux/in6.h> + + /* Responses from hook functions. */ + #define NF_DROP 0 +--- include/linux/xfrm.h 2015-09-01 01:31:15.000000000 +0200 ++++ include/linux/xfrm.h 2015-09-14 16:23:24.473434008 +0200 +@@ -1,7 +1,6 @@ + #ifndef _LINUX_XFRM_H + #define _LINUX_XFRM_H + +-#include <linux/in6.h> + #include <linux/types.h> + + /* All of the structures in this file may not change size as they are +--- include/utils.h 2015-09-01 01:31:15.000000000 +0200 ++++ include/utils.h 2015-09-14 16:23:24.472434012 +0200 +@@ -1,6 +1,7 @@ + #ifndef __UTILS_H__ + #define __UTILS_H__ 1 + ++#include <sys/param.h> /* MAXPATHLEN */ + #include <sys/types.h> + #include <asm/types.h> + #include <resolv.h> |