diff options
| author | André Klitzing <aklitzing@gmail.com> | 2017-03-05 00:07:39 +0100 |
|---|---|---|
| committer | Natanael Copa <ncopa@alpinelinux.org> | 2017-03-07 11:31:12 +0000 |
| commit | 47c8fda1d2a54d7c4fba220db6396146599bc30a (patch) | |
| tree | 934accc2a40bb1adb50c58760268b4103b3e3fe0 /main/iproute2/musl-fixes.patch | |
| parent | 2690b82e6e2a0b5e265869ec9aa381235a6f8ac0 (diff) | |
| download | aports-47c8fda1d2a54d7c4fba220db6396146599bc30a.tar.bz2 aports-47c8fda1d2a54d7c4fba220db6396146599bc30a.tar.xz | |
main/iproute2: upgrade to 4.10
* Modernize abuild
* Update musl-fixes.patch
Diffstat (limited to 'main/iproute2/musl-fixes.patch')
| -rw-r--r-- | main/iproute2/musl-fixes.patch | 39 |
1 files changed, 25 insertions, 14 deletions
diff --git a/main/iproute2/musl-fixes.patch b/main/iproute2/musl-fixes.patch index 0a4019180e..ea50ed227a 100644 --- a/main/iproute2/musl-fixes.patch +++ b/main/iproute2/musl-fixes.patch @@ -1,7 +1,7 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. ---- 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 +--- a/include/linux/if_bridge.h 2015-09-01 01:31:15.000000000 +0200 ++++ b/include/linux/if_bridge.h 2015-09-14 16:23:24.472434012 +0200 @@ -15,7 +15,6 @@ #include <linux/types.h> @@ -10,8 +10,8 @@ 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 +--- a/include/linux/netfilter.h 2015-09-01 01:31:15.000000000 +0200 ++++ b/include/linux/netfilter.h 2015-09-14 16:27:34.928205553 +0200 @@ -4,8 +4,6 @@ #include <linux/types.h> @@ -21,8 +21,8 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. /* 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 +--- a/include/linux/xfrm.h 2015-09-01 01:31:15.000000000 +0200 ++++ b/include/linux/xfrm.h 2015-09-14 16:23:24.473434008 +0200 @@ -1,7 +1,6 @@ #ifndef _LINUX_XFRM_H #define _LINUX_XFRM_H @@ -31,8 +31,8 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. #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 +--- a/include/utils.h 2015-09-01 01:31:15.000000000 +0200 ++++ b/include/utils.h 2015-09-14 16:23:24.472434012 +0200 @@ -1,6 +1,7 @@ #ifndef __UTILS_H__ #define __UTILS_H__ 1 @@ -41,8 +41,8 @@ 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 +--- a/include/linux/netfilter_ipv4/ip_tables.h ++++ b/include/linux/netfilter_ipv4/ip_tables.h @@ -17,7 +17,6 @@ #include <linux/types.h> @@ -51,8 +51,8 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. #include <linux/netfilter_ipv4.h> #include <linux/netfilter/x_tables.h> ---- include/bpf_scm.h.orig -+++ include/bpf_scm.h +--- a/include/bpf_scm.h ++++ b/include/bpf_scm.h @@ -3,6 +3,7 @@ #include <sys/types.h> @@ -61,8 +61,8 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. #include "utils.h" #include "bpf_elf.h" ---- include/linux/if_tunnel.h -+++ include/linux/if_tunnel.h +--- a/include/linux/if_tunnel.h ++++ b/include/linux/if_tunnel.h @@ -2,9 +2,7 @@ #define _IF_TUNNEL_H_ @@ -73,3 +73,14 @@ Don't redefine in6_addr due to including linux/in6.h; use netinet/in.h instead. #include <asm/byteorder.h> +--- a/include/linux/l2tp.h ++++ b/include/linux/l2tp.h +@@ -9,8 +9,6 @@ + + #include <linux/types.h> + #include <linux/socket.h> +-#include <linux/in.h> +-#include <linux/in6.h> + + #define IPPROTO_L2TP 115 + |