[gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/

[Aric Belsito]

commit:     08ff23de6c431da7289377616e26015eafd254e7
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Jan 30 20:37:39 2018 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Jan 30 20:37:39 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=08ff23de

sys-apps/iproute2: version bump to 4.15.0

 sys-apps/iproute2/Manifest                         |   3 +-
 sys-apps/iproute2/files/iproute2-4.15.0-musl.patch | 179 +++++++++++++++++++++
 sys-apps/iproute2/iproute2-4.14.1-r2.ebuild        |   2 +-
 ...te2-4.14.1-r3.ebuild => iproute2-4.15.0.ebuild} |   5 +-
 4 files changed, 184 insertions(+), 5 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index ea284a2..0390df9 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1 +1,2 @@
-DIST iproute2-4.14.1.tar.xz 636876 SHA256 d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c WHIRLPOOL 42ee7611f3fb1ceb922c606bf11cd4d72cf71020a73f96f5130f07a9cab08f1dbc973cb5924f6a15cf4613dac5b60a3a97583c0e801db960f5039d6d8c0ef095
+DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
+DIST iproute2-4.15.0.tar.xz 648836 BLAKE2B e7f3a027ec88de7c6ac82c5529b37fdf22311bc9290e71662bc3b1e32d4cb6a1845e2badb961a21b50b5ed1b9d23130e512a011767183f7df1b33eb05101044b SHA512 bcc54b8dc83d7b0e759a2de77eb38fed483d7f7f82698f482e0259000f2f55ba79c556b721730eb999e85c865ad136fd7549304ebe936545e02e848ba7f698bc

diff --git a/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch
new file mode 100644
index 0000000..bd15130
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.15.0-musl.patch
@@ -0,0 +1,179 @@
+diff -Naur iproute2-4.15.0.orig/include/uapi/linux/if_tunnel.h iproute2-4.15.0/include/uapi/linux/if_tunnel.h
+--- iproute2-4.15.0.orig/include/uapi/linux/if_tunnel.h	2018-01-30 12:22:46.392424243 -0800
++++ iproute2-4.15.0/include/uapi/linux/if_tunnel.h	2018-01-30 12:23:57.131422976 -0800
+@@ -3,7 +3,6 @@
+ #define _IF_TUNNEL_H_
+ 
+ #include <linux/types.h>
+-#include <linux/if.h>
+ #include <linux/ip.h>
+ #include <linux/in6.h>
+ #include <asm/byteorder.h>
+diff -Naur iproute2-4.15.0.orig/include/uapi/linux/ip6_tunnel.h iproute2-4.15.0/include/uapi/linux/ip6_tunnel.h
+--- iproute2-4.15.0.orig/include/uapi/linux/ip6_tunnel.h	2018-01-30 12:22:46.393424243 -0800
++++ iproute2-4.15.0/include/uapi/linux/ip6_tunnel.h	2018-01-30 12:24:05.957422818 -0800
+@@ -3,7 +3,6 @@
+ #define _IP6_TUNNEL_H
+ 
+ #include <linux/types.h>
+-#include <linux/if.h>		/* For IFNAMSIZ. */
+ #include <linux/in6.h>		/* For struct in6_addr. */
+ 
+ #define IPV6_TLV_TNL_ENCAP_LIMIT 4
+diff -Naur iproute2-4.15.0.orig/include/uapi/linux/kernel.h iproute2-4.15.0/include/uapi/linux/kernel.h
+--- iproute2-4.15.0.orig/include/uapi/linux/kernel.h	2018-01-30 12:22:46.393424243 -0800
++++ iproute2-4.15.0/include/uapi/linux/kernel.h	2018-01-30 12:24:21.576422539 -0800
+@@ -2,7 +2,9 @@
+ #ifndef _LINUX_KERNEL_H
+ #define _LINUX_KERNEL_H
+ 
++#ifdef __GLIBC__
+ #include <linux/sysinfo.h>
++#endif
+ 
+ /*
+  * 'kernel.h' contains some often-used function prototypes etc
+diff -Naur iproute2-4.15.0.orig/include/uapi/linux/libc-compat.h iproute2-4.15.0/include/uapi/linux/libc-compat.h
+--- iproute2-4.15.0.orig/include/uapi/linux/libc-compat.h	2018-01-30 12:22:46.393424243 -0800
++++ iproute2-4.15.0/include/uapi/linux/libc-compat.h	2018-01-30 12:33:58.575412206 -0800
+@@ -49,47 +49,57 @@
+ #ifndef _LIBC_COMPAT_H
+ #define _LIBC_COMPAT_H
+ 
+-/* We have included glibc headers... */
+-#if defined(__GLIBC__)
++/* We're used from userspace... */
++#if !defined(__KERNEL__)
+ 
+-/* Coordinate with glibc net/if.h header. */
++/* Coordinate with libc net/if.h header. */
+ #if defined(_NET_IF_H) && defined(__USE_MISC)
+ 
+-/* GLIBC headers included first so don't define anything
++/* libc headers included first so don't define anything
+  * that would already be defined. */
+ 
+ #define __UAPI_DEF_IF_IFCONF 0
+ #define __UAPI_DEF_IF_IFMAP 0
+ #define __UAPI_DEF_IF_IFNAMSIZ 0
+ #define __UAPI_DEF_IF_IFREQ 0
+-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 0
++#if !defined(__GLIBC__)
++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
++#else
+ /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+ #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+ #endif /* __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO */
++#endif /* !defined(__GLIBC__) */
+ 
+ #else /* _NET_IF_H */
+ 
+ /* Linux headers included first, and we must define everything
+- * we need. The expectation is that glibc will check the
++ * we need. The expectation is that libc will check the
+  * __UAPI_DEF_* defines and adjust appropriately. */
+ 
+ #define __UAPI_DEF_IF_IFCONF 1
+ #define __UAPI_DEF_IF_IFMAP 1
+ #define __UAPI_DEF_IF_IFNAMSIZ 1
+ #define __UAPI_DEF_IF_IFREQ 1
+-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
+ /* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+ 
+ #endif /* _NET_IF_H */
+ 
+-/* Coordinate with glibc netinet/in.h header. */
++/* Coordinate with libc netinet/if_ether.h */
++#ifdef _NETINET_IF_ETHER_H
++#define __UAPI_DEF_ETHHDR 0
++#else
++/* glibc uses __NETINET_IF_ETHER_H and uses the uapi header */
++#define __UAPI_DEF_ETHHDR 1
++#endif /* _NETINET_IF_ETHER_H */
++
++/* Coordinate with libc netinet/in.h header. */
+ #if defined(_NETINET_IN_H)
+ 
+-/* GLIBC headers included first so don't define anything
++/* libc headers included first so don't define anything
+  * that would already be defined. */
+ #define __UAPI_DEF_IN_ADDR		0
+ #define __UAPI_DEF_IN_IPPROTO		0
+@@ -99,15 +109,7 @@
+ #define __UAPI_DEF_IN_CLASS		0
+ 
+ #define __UAPI_DEF_IN6_ADDR		0
+-/* The exception is the in6_addr macros which must be defined
+- * if the glibc code didn't define them. This guard matches
+- * the guard in glibc/inet/netinet/in.h which defines the
+- * additional in6_addr macros e.g. s6_addr16, and s6_addr32. */
+-#if defined(__USE_MISC) || defined (__USE_GNU)
+ #define __UAPI_DEF_IN6_ADDR_ALT		0
+-#else
+-#define __UAPI_DEF_IN6_ADDR_ALT		1
+-#endif
+ #define __UAPI_DEF_SOCKADDR_IN6		0
+ #define __UAPI_DEF_IPV6_MREQ		0
+ #define __UAPI_DEF_IPPROTO_V6		0
+@@ -118,7 +120,7 @@
+ #else
+ 
+ /* Linux headers included first, and we must define everything
+- * we need. The expectation is that glibc will check the
++ * we need. The expectation is that libc will check the
+  * __UAPI_DEF_* defines and adjust appropriately. */
+ #define __UAPI_DEF_IN_ADDR		1
+ #define __UAPI_DEF_IN_IPPROTO		1
+@@ -170,7 +172,7 @@
+  * or we are being included in the kernel, then define everything
+  * that we need. Check for previous __UAPI_* definitions to give
+  * unsupported C libraries a way to opt out of any kernel definition. */
+-#else /* !defined(__GLIBC__) */
++#else /* defined(__KERNEL__) */
+ 
+ /* Definitions for if.h */
+ #ifndef __UAPI_DEF_IF_IFCONF
+@@ -185,7 +187,6 @@
+ #ifndef __UAPI_DEF_IF_IFREQ
+ #define __UAPI_DEF_IF_IFREQ 1
+ #endif
+-/* Everything up to IFF_DYNAMIC, matches net/if.h until glibc 2.23 */
+ #ifndef __UAPI_DEF_IF_NET_DEVICE_FLAGS
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS 1
+ #endif
+@@ -262,7 +263,7 @@
+ #define __UAPI_DEF_XATTR		1
+ #endif
+ 
+-#endif /* __GLIBC__ */
++#endif /* defined(__KERNEL__) */
+ 
+ /* Definitions for if_ether.h */
+ /* allow libcs like musl to deactivate this, glibc does not implement this. */
+diff -Naur iproute2-4.15.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h iproute2-4.15.0/include/uapi/linux/netfilter_ipv4/ip_tables.h
+--- iproute2-4.15.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h	2018-01-30 12:22:46.394424243 -0800
++++ iproute2-4.15.0/include/uapi/linux/netfilter_ipv4/ip_tables.h	2018-01-30 12:34:19.157411837 -0800
+@@ -18,7 +18,6 @@
+ 
+ #include <linux/types.h>
+ 
+-#include <linux/if.h>
+ #include <linux/netfilter_ipv4.h>
+ 
+ #include <linux/netfilter/x_tables.h>
+diff -Naur iproute2-4.15.0.orig/tc/f_flower.c iproute2-4.15.0/tc/f_flower.c
+--- iproute2-4.15.0.orig/tc/f_flower.c	2018-01-30 12:22:46.367424244 -0800
++++ iproute2-4.15.0/tc/f_flower.c	2018-01-30 12:34:36.182411532 -0800
+@@ -14,7 +14,7 @@
+ #include <unistd.h>
+ #include <string.h>
+ #include <net/if.h>
+-#include <linux/if_arp.h>
++#include <net/if_arp.h>
+ #include <linux/if_ether.h>
+ #include <linux/ip.h>
+ #include <linux/tc_act/tc_vlan.h>

diff --git a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
index 07bfa51..9ec67f9 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
@@ -1,4 +1,4 @@
-# Copyright 1999-2017 Gentoo Foundation
+# Copyright 1999-2018 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=6

diff --git a/sys-apps/iproute2/iproute2-4.14.1-r3.ebuild b/sys-apps/iproute2/iproute2-4.15.0.ebuild
similarity index 96%
rename from sys-apps/iproute2/iproute2-4.14.1-r3.ebuild
rename to sys-apps/iproute2/iproute2-4.15.0.ebuild
index 24c2b3b..fddcf37 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r3.ebuild
+++ b/sys-apps/iproute2/iproute2-4.15.0.ebuild
@@ -42,9 +42,8 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${P}-fix-tc-actions.patch
-	"${FILESDIR}"/${P}-configure-nomagic.patch # bug 643722
-	"${FILESDIR}"/${PN}-4.14.0-musl.patch
+	"${FILESDIR}"/${PN}-4.14.1-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${PN}-4.15.0-musl.patch
 )
 
 src_prepare() {