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

[Aric Belsito]

commit:     bac1505f4d82b144478a93b5d6aab3f52738a7cc
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Nov 13 21:34:42 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Nov 13 21:34:42 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=bac1505f

sys-apps/iproute2: version bump to 4.14.0

 sys-apps/iproute2/Manifest                         |  2 +-
 ....12.0-musl.patch => iproute2-4.14.0-musl.patch} | 35 +++++++++-------------
 ...route2-4.13.0.ebuild => iproute2-4.14.0.ebuild} |  4 +--
 3 files changed, 16 insertions(+), 25 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 600731a..415e1f8 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,2 +1,2 @@
-DIST iproute2-4.13.0.tar.xz 670340 SHA256 9cfb81edf8c8509e03daa77cf62aead01c4a827132f6c506578f94cc19415c50 SHA512 f96d2839aec1f439bfac504c8e3881c063dacbf4c67b15f0e3da9882d2fa013cba33c23602de3eab624e0eecbb911a13967d60bddcdf097f47a580a5a77b5e3a WHIRLPOOL 757247f1356eef49b299019f6d1809e5d781471665daedce885201b7034a6138def73c84ba2f0453f2f0f5d55cc2edf778992b3d79d06e01364c511373ea4644
+DIST iproute2-4.14.0.tar.xz 636872 SHA256 fee001307b3c018462cb010e3aa19b38017de26168d5777c05ee73a21d60fcd0 SHA512 dda8b7881d82d6d38449d69df362bd3eedde6c7f4dd315d6eaf7969673805faf82675e1df04d7dc35a826b0df429a400a3f8ac0e998c1de0d6ca500e722f058e WHIRLPOOL 62ce4fa8ba1bb84678277401c07097b26490767cd55a66f2be743dc1fec4610033437517c44339dc4cc95ffe0d255d804c25cdd6e77640eb15453160abe87f78
 DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013

diff --git a/sys-apps/iproute2/files/iproute2-4.12.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.14.0-musl.patch
similarity index 76%
rename from sys-apps/iproute2/files/iproute2-4.12.0-musl.patch
rename to sys-apps/iproute2/files/iproute2-4.14.0-musl.patch
index 792c4e7..5efd948 100644
--- a/sys-apps/iproute2/files/iproute2-4.12.0-musl.patch
+++ b/sys-apps/iproute2/files/iproute2-4.14.0-musl.patch
@@ -1,6 +1,5 @@
-diff -Naur iproute2-4.12.0.orig/include/linux/if_ether.h iproute2-4.12.0/include/linux/if_ether.h
---- iproute2-4.12.0.orig/include/linux/if_ether.h	2017-07-06 11:09:53.305214044 -0700
-+++ iproute2-4.12.0/include/linux/if_ether.h	2017-07-06 16:30:06.651369931 -0700
+--- iproute2-4.14.0.orig/include/uapi/linux/if_ether.h
++++ iproute2-4.14.0/include/uapi/linux/if_ether.h
 @@ -22,6 +22,7 @@
  #define _LINUX_IF_ETHER_H
  
@@ -23,9 +22,8 @@ diff -Naur iproute2-4.12.0.orig/include/linux/if_ether.h iproute2-4.12.0/include
  
  
  #endif /* _LINUX_IF_ETHER_H */
-diff -Naur iproute2-4.12.0.orig/include/linux/if_tunnel.h iproute2-4.12.0/include/linux/if_tunnel.h
---- iproute2-4.12.0.orig/include/linux/if_tunnel.h	2017-07-06 11:09:53.305214044 -0700
-+++ iproute2-4.12.0/include/linux/if_tunnel.h	2017-07-06 16:32:23.814172660 -0700
+--- iproute2-4.14.0.orig/include/uapi/linux/if_tunnel.h
++++ iproute2-4.14.0/include/uapi/linux/if_tunnel.h
 @@ -2,7 +2,6 @@
  #define _IF_TUNNEL_H_
  
@@ -34,9 +32,8 @@ diff -Naur iproute2-4.12.0.orig/include/linux/if_tunnel.h iproute2-4.12.0/includ
  #include <linux/ip.h>
  #include <linux/in6.h>
  #include <asm/byteorder.h>
-diff -Naur iproute2-4.12.0.orig/include/linux/ip6_tunnel.h iproute2-4.12.0/include/linux/ip6_tunnel.h
---- iproute2-4.12.0.orig/include/linux/ip6_tunnel.h	2017-07-06 11:09:53.303214021 -0700
-+++ iproute2-4.12.0/include/linux/ip6_tunnel.h	2017-07-06 16:33:41.630158864 -0700
+--- iproute2-4.14.0.orig/include/uapi/linux/ip6_tunnel.h
++++ iproute2-4.14.0/include/uapi/linux/ip6_tunnel.h
 @@ -2,7 +2,6 @@
  #define _IP6_TUNNEL_H
  
@@ -45,9 +42,8 @@ diff -Naur iproute2-4.12.0.orig/include/linux/ip6_tunnel.h iproute2-4.12.0/inclu
  #include <linux/in6.h>		/* For struct in6_addr. */
  
  #define IPV6_TLV_TNL_ENCAP_LIMIT 4
-diff -Naur iproute2-4.12.0.orig/include/linux/kernel.h iproute2-4.12.0/include/linux/kernel.h
---- iproute2-4.12.0.orig/include/linux/kernel.h	2017-07-06 11:09:53.303214021 -0700
-+++ iproute2-4.12.0/include/linux/kernel.h	2017-07-06 16:30:06.650369918 -0700
+--- iproute2-4.14.0.orig/include/uapi/linux/kernel.h
++++ iproute2-4.14.0/include/uapi/linux/kernel.h
 @@ -1,7 +1,9 @@
  #ifndef _LINUX_KERNEL_H
  #define _LINUX_KERNEL_H
@@ -58,9 +54,8 @@ diff -Naur iproute2-4.12.0.orig/include/linux/kernel.h iproute2-4.12.0/include/l
  
  /*
   * 'kernel.h' contains some often-used function prototypes etc
-diff -Naur iproute2-4.12.0.orig/include/linux/libc-compat.h iproute2-4.12.0/include/linux/libc-compat.h
---- iproute2-4.12.0.orig/include/linux/libc-compat.h	2017-07-06 11:09:53.302214010 -0700
-+++ iproute2-4.12.0/include/linux/libc-compat.h	2017-07-06 16:30:06.650369918 -0700
+--- iproute2-4.14.0.orig/include/uapi/linux/libc-compat.h
++++ iproute2-4.14.0/include/uapi/linux/libc-compat.h
 @@ -48,47 +48,57 @@
  #ifndef _LIBC_COMPAT_H
  #define _LIBC_COMPAT_H
@@ -196,9 +191,8 @@ diff -Naur iproute2-4.12.0.orig/include/linux/libc-compat.h iproute2-4.12.0/incl
 +#endif /* defined(__KERNEL__) */
  
  #endif /* _LIBC_COMPAT_H */
-diff -Naur iproute2-4.12.0.orig/include/linux/netfilter_ipv4/ip_tables.h iproute2-4.12.0/include/linux/netfilter_ipv4/ip_tables.h
---- iproute2-4.12.0.orig/include/linux/netfilter_ipv4/ip_tables.h	2017-07-06 11:09:53.310214100 -0700
-+++ iproute2-4.12.0/include/linux/netfilter_ipv4/ip_tables.h	2017-07-06 16:38:57.526211238 -0700
+--- iproute2-4.14.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h
++++ iproute2-4.14.0/include/uapi/linux/netfilter_ipv4/ip_tables.h
 @@ -17,7 +17,6 @@
  
  #include <linux/types.h>
@@ -207,9 +201,8 @@ diff -Naur iproute2-4.12.0.orig/include/linux/netfilter_ipv4/ip_tables.h iproute
  #include <linux/netfilter_ipv4.h>
  
  #include <linux/netfilter/x_tables.h>
-diff -Naur iproute2-4.12.0.orig/tc/f_flower.c iproute2-4.12.0/tc/f_flower.c
---- iproute2-4.12.0.orig/tc/f_flower.c	2017-07-06 11:09:53.289213865 -0700
-+++ iproute2-4.12.0/tc/f_flower.c	2017-07-06 16:36:04.967030780 -0700
+--- iproute2-4.14.0.orig/tc/f_flower.c
++++ iproute2-4.14.0/tc/f_flower.c
 @@ -15,7 +15,7 @@
  #include <syslog.h>
  #include <string.h>

diff --git a/sys-apps/iproute2/iproute2-4.13.0.ebuild b/sys-apps/iproute2/iproute2-4.14.0.ebuild
similarity index 97%
rename from sys-apps/iproute2/iproute2-4.13.0.ebuild
rename to sys-apps/iproute2/iproute2-4.14.0.ebuild
index 53a6289..48f244b 100644
--- a/sys-apps/iproute2/iproute2-4.13.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.0.ebuild
@@ -42,7 +42,7 @@ DEPEND="
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.12.0-musl.patch
+	"${FILESDIR}"/${PN}-4.14.0-musl.patch
 )
 
 src_prepare() {
@@ -129,8 +129,6 @@ src_install() {
 		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
 		install
 
-	rm "${ED%/}"/usr/share/doc/${PF}/*.{sgml,tex} || die #455988
-
 	dodir /bin
 	mv "${ED%/}"/{s,}bin/ip || die #330115