From mboxrd@z Thu Jan  1 00:00:00 1970
Return-Path: <gentoo-commits+bounces-933410-garchives=archives.gentoo.org@lists.gentoo.org>
Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by finch.gentoo.org (Postfix) with ESMTPS id B2B20139694
	for <garchives@archives.gentoo.org>; Tue, 21 Feb 2017 19:56:40 +0000 (UTC)
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
	by pigeon.gentoo.org (Postfix) with SMTP id 7CE7821C028;
	Tue, 21 Feb 2017 19:56:36 +0000 (UTC)
Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by pigeon.gentoo.org (Postfix) with ESMTPS id 4C32C21C028
	for <gentoo-commits@lists.gentoo.org>; Tue, 21 Feb 2017 19:56:36 +0000 (UTC)
Received: from oystercatcher.gentoo.org (oystercatcher.gentoo.org [148.251.78.52])
	(using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
	(No client certificate requested)
	by smtp.gentoo.org (Postfix) with ESMTPS id F1CE2340C97
	for <gentoo-commits@lists.gentoo.org>; Tue, 21 Feb 2017 19:56:34 +0000 (UTC)
Received: from localhost.localdomain (localhost [IPv6:::1])
	by oystercatcher.gentoo.org (Postfix) with ESMTP id 68C7A4FDE
	for <gentoo-commits@lists.gentoo.org>; Tue, 21 Feb 2017 19:56:33 +0000 (UTC)
From: "Aric Belsito" <lluixhi@gmail.com>
To: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: 8bit
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Aric Belsito" <lluixhi@gmail.com>
Message-ID: <1487706971.cf477507043af92279ee3b523e0153d09c78782e.lluixhi@gentoo>
Subject: [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
X-VCS-Repository: proj/musl
X-VCS-Files: sys-apps/iproute2/Manifest sys-apps/iproute2/files/iproute2-4.10.0-musl.patch sys-apps/iproute2/files/iproute2-4.8.0-musl.patch sys-apps/iproute2/iproute2-4.10.0.ebuild
X-VCS-Directories: sys-apps/iproute2/ sys-apps/iproute2/files/
X-VCS-Committer: lluixhi
X-VCS-Committer-Name: Aric Belsito
X-VCS-Revision: cf477507043af92279ee3b523e0153d09c78782e
X-VCS-Branch: master
Date: Tue, 21 Feb 2017 19:56:33 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
X-Archives-Salt: f799d54c-ad08-4b79-bdf6-0e08b4ae4a00
X-Archives-Hash: 94c7970c36d88147c8d5547a4a6cb8fe

commit:     cf477507043af92279ee3b523e0153d09c78782e
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Tue Feb 21 19:55:38 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Tue Feb 21 19:56:11 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=cf477507

sys-apps/iproute2: Fix patch for 4.10.0

It appears as though the symbol redefinitions are getting worse -- stick to the
libc headers in all cases.

 sys-apps/iproute2/Manifest                         |   4 +-
 sys-apps/iproute2/files/iproute2-4.10.0-musl.patch | 507 +++++++++++++++++++++
 sys-apps/iproute2/files/iproute2-4.8.0-musl.patch  | 102 -----
 sys-apps/iproute2/iproute2-4.10.0.ebuild           |   2 +-
 4 files changed, 510 insertions(+), 105 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 25bf29d..3497319 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,11 +1,11 @@
 AUX iproute2-3.1.0-mtu.patch 1649 SHA256 d8d1d3b81a3fd5674e6c9e202bce9e84f41b579ba2c6a554df3346f4642715af SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 WHIRLPOOL b813f1d9dcdbfb525fb07a462f7faf1c13117dd3e9e584b1a033cb69f3dad9d4b8e5120f8512185f24769e6be0aabd6635ad3996342dc210ff513866e7638502
+AUX iproute2-4.10.0-musl.patch 16411 SHA256 e578258aed86cc951174dccee109fa0eb34f6bf73cb0995f41832692c60fb9ba SHA512 8316c93baac8b8be185cbe03ef402965d5a69c26ae50a2da00c1d341d3bee34203712a13e6d470ffc6d3272fb2f1e14d0f49d6a2206b7876a8549e7f6cc086e9 WHIRLPOOL 31fb9ae4079a377047d469517b8d0f6b8e434db106f1ffa2ff38ad825ec90c0f38fdf9818fc66dd31faf1dec775cb26d627b0c33960f54808878f4c8c0d8a2ad
 AUX iproute2-4.2.0-no-ipv6.patch 1336 SHA256 b352b11d22e922038adb2b1ae083b6e47b89744f94d6de732bb85abd9cfa80e6 SHA512 f4219a094f367c9f8fac089beeffca31abbbc5d4ade1681e23a92f3dd2e1a95f331322938936b0b1771ea5a56224e0f14008f4d38a8708357a5d2b2b70efbbd5 WHIRLPOOL 35faf6227ad1b4409b6742cb754b6570c25f65bd6a63e2237fd9613075827811bd1b9e86dd5d099b061e14906f752ef5aecea8ccbe95748d98f892d111a3a0b7
 AUX iproute2-4.3.0-musl-noiptables.patch 1166 SHA256 1910d28fe0aa89ba71cd30bb38b43119414102ce323dc47eee8bec290e5f52e7 SHA512 f1b988c5ae5b5d159d1a2bedec678b8680b3358a6ea3a9d581b642cd706cfd1cb31c7cd590e1fe8969c3d3bebb2912fb5fa8011cfc39d2a17a4092617ae15766 WHIRLPOOL 87ee199c0f06b8c750412625e204b10261945954c07fade452ea2cf956405d7094d02357e1ed92f1aafcc9d34c7e7109cb10ee1aed31adf0e94989f2701bd877
 AUX iproute2-4.3.0-musl.patch 2989 SHA256 bf10609ba7dcb04cb134745dd7af4c8c66d6b667400dd30abb3325ebdfd446fb SHA512 8cf23bca01b111e2dfa26e944de151b35d6278833066276e603cd567f8084c16ee5b0dd527dd0626828f3099ae5907bdef4783672bfe23605f43ce9c3b4c2182 WHIRLPOOL 40d5bdb8dcd84e43a6798584aba35a11d1b5a79e54dcf80da0f465041330c5a76c2c4297fd78aa2a272181954407b404030bb9cca4dc74e4f7b36b5f98775cd7
 AUX iproute2-4.4.0-missing-limits_h.patch 385 SHA256 dbbb3b18da78d6747e67ef922d7fcbceb48877776efa5a6ca25c6facdb3d6d22 SHA512 a3c2c22c89323dedcfbe79a19fa5e211e8d66d84ada62937b091850e26d5976eedcc3c4ea0eea3372b19e3c15191ee9af696b3683d6f107d43b24a57e601a889 WHIRLPOOL 72be26a1f393ac5d7664c6b6a393efdfceb7d66720cafd2c6250e5480ac77033d0abfa0b616413d0f03d0c3cada22e5c7afa33e5ceb4910f41753d6ddf1fb74f
-AUX iproute2-4.8.0-musl.patch 3758 SHA256 737386e08312506528fda2e75410746acd282f00c9531e089bc1b06db79c1140 SHA512 fd35bd71fa26968ad5b1dd18597207d164a948999c3bf55a62054966cc95a0838c9ba5df0f7319672eec310bffd8f70101b7fd7c075aa20c77d4dc70490d8aff WHIRLPOOL 1e84ccf8a537b20e58ef1a48afc548eb4b81decdae8f0a5b94e835416aaac1b2256fcffac3e288d5b848cfe4d48bb31a3e667f56ce711ed3f31b337371eeeef8
 DIST iproute2-4.10.0.tar.xz 626944 SHA256 22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8 SHA512 e54477e167455e7ef5da4adc168d63eaa96091b63dc987fffe918cbb005eceed18a62283ca99ee2512dc0e960f47ae21b39ffbe399c1612fd9cea147c34c581b WHIRLPOOL 7034f87835b13d275d2e065ee00d869060ae20c7dd325d8974da414db20328195e5968ede2f0b6925ddf67de3712b5945f54276c6ce5c8367ba28520c2adb859
 DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
-EBUILD iproute2-4.10.0.ebuild 3969 SHA256 2eb3503dcfa35bb65220555c5a5d278c74b41bc909b5c2208f475a904d7a72f6 SHA512 16d20a55011d6f768182a561103eeb30f8d013105593556bedab3695cbea874903e3b6534b8bcf1c665469678d1bcdbf861949955c39eab4634c211180592a21 WHIRLPOOL d0814f70dbb854d7a210607549fcf93bd9ae797fe88bb4f8b7c6a7949ce169a16e7a48a5cbc24e12a4de0b93f063c2df6df3fb0280e049d1cdc56e7a7a312d00
+EBUILD iproute2-4.10.0.ebuild 3970 SHA256 082140bf19a966a2c654bfdbdac8988c84a1eab8e131c2e1dfe198f40546e7f9 SHA512 c709ca0d88050f92fb236c6028d38055a87e0ffdf8f26e29fd90f78ddb27ab70f6b65707f2a025a8e555c125b76c8b873a039327da2b16992689f0104d591b87 WHIRLPOOL 3f4b5a074af24d8157ec7f65980b144b540c6f0e0eacb7606e4f48bcb554c23d7e5a2ed8469acf6547a09003c22d407e96974f9251940882e9e68a18b68d56d7
 EBUILD iproute2-4.4.0.ebuild 3977 SHA256 e845c0f75b338afaa27b767181d8199e8f7179e703a5073a0d4c882e86ba73d3 SHA512 155be7eb501328d00459e1bfeec22a56387f48b7bdf0c16359839b9df15c2d7979341c6daae9494c5da321223f8add67cc1c000ee16c484148e907b12abb04d7 WHIRLPOOL 47918d2b0346662c8a676c83f1c89d0ba3070fd6d52ac5d5593ea07e250314bd5577f698011e4f963afe81fc6c3fd9e80278e61b7cdcc457ebc4e197fc7cc310
 MISC metadata.xml 467 SHA256 54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512 34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c WHIRLPOOL 188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1

diff --git a/sys-apps/iproute2/files/iproute2-4.10.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.10.0-musl.patch
new file mode 100644
index 0000000..0b60bef
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.10.0-musl.patch
@@ -0,0 +1,507 @@
+diff -Naur iproute2-4.10.0.orig/bridge/link.c iproute2-4.10.0/bridge/link.c
+--- iproute2-4.10.0.orig/bridge/link.c	2017-02-21 11:03:07.250296219 -0800
++++ iproute2-4.10.0/bridge/link.c	2017-02-21 11:42:30.538120752 -0800
+@@ -3,10 +3,10 @@
+ #include <stdlib.h>
+ #include <unistd.h>
+ #include <time.h>
++#include <net/if.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <netinet/in.h>
+-#include <linux/if.h>
+ #include <linux/if_bridge.h>
+ #include <string.h>
+ #include <stdbool.h>
+diff -Naur iproute2-4.10.0.orig/include/libiptc/ipt_kernel_headers.h iproute2-4.10.0/include/libiptc/ipt_kernel_headers.h
+--- iproute2-4.10.0.orig/include/libiptc/ipt_kernel_headers.h	2017-02-21 11:03:07.252296243 -0800
++++ iproute2-4.10.0/include/libiptc/ipt_kernel_headers.h	2017-02-21 11:03:17.451420794 -0800
+@@ -6,7 +6,6 @@
+ #include <limits.h>
+ 
+ #include <netinet/ip.h>
+-#include <netinet/in.h>
+ #include <netinet/ip_icmp.h>
+ #include <netinet/tcp.h>
+ #include <netinet/udp.h>
+diff -Naur iproute2-4.10.0.orig/include/linux/if_bridge.h iproute2-4.10.0/include/linux/if_bridge.h
+--- iproute2-4.10.0.orig/include/linux/if_bridge.h	2017-02-21 11:03:07.263296377 -0800
++++ iproute2-4.10.0/include/linux/if_bridge.h	2017-02-21 11:03:27.903548436 -0800
+@@ -15,7 +15,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/if_ether.h>
+-#include <linux/in6.h>
+ 
+ #define SYSFS_BRIDGE_ATTR	"bridge"
+ #define SYSFS_BRIDGE_FDB	"brforward"
+diff -Naur iproute2-4.10.0.orig/include/linux/if_tunnel.h iproute2-4.10.0/include/linux/if_tunnel.h
+--- iproute2-4.10.0.orig/include/linux/if_tunnel.h	2017-02-21 11:03:07.260296341 -0800
++++ iproute2-4.10.0/include/linux/if_tunnel.h	2017-02-21 11:03:38.648679655 -0800
+@@ -2,9 +2,7 @@
+ #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.10.0.orig/include/linux/l2tp.h iproute2-4.10.0/include/linux/l2tp.h
+--- iproute2-4.10.0.orig/include/linux/l2tp.h	2017-02-21 11:03:07.259296328 -0800
++++ iproute2-4.10.0/include/linux/l2tp.h	2017-02-21 11:04:48.101527812 -0800
+@@ -9,8 +9,6 @@
+ 
+ #include <linux/types.h>
+ #include <linux/socket.h>
+-#include <linux/in.h>
+-#include <linux/in6.h>
+ 
+ #define IPPROTO_L2TP		115
+ 
+diff -Naur iproute2-4.10.0.orig/include/linux/netfilter.h iproute2-4.10.0/include/linux/netfilter.h
+--- iproute2-4.10.0.orig/include/linux/netfilter.h	2017-02-21 11:03:07.257296304 -0800
++++ iproute2-4.10.0/include/linux/netfilter.h	2017-02-21 11:03:48.968805684 -0800
+@@ -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
+diff -Naur iproute2-4.10.0.orig/include/linux/xfrm.h iproute2-4.10.0/include/linux/xfrm.h
+--- iproute2-4.10.0.orig/include/linux/xfrm.h	2017-02-21 11:03:07.262296365 -0800
++++ iproute2-4.10.0/include/linux/xfrm.h	2017-02-21 11:03:59.822938235 -0800
+@@ -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
+diff -Naur iproute2-4.10.0.orig/include/xtables.h iproute2-4.10.0/include/xtables.h
+--- iproute2-4.10.0.orig/include/xtables.h	2017-02-21 11:03:07.268296438 -0800
++++ iproute2-4.10.0/include/xtables.h	2017-02-21 11:04:14.113112746 -0800
+@@ -13,7 +13,6 @@
+ #include <stddef.h>
+ #include <stdint.h>
+ #include <netinet/in.h>
+-#include <net/if.h>
+ #include <linux/types.h>
+ #include <linux/netfilter.h>
+ #include <linux/netfilter/x_tables.h>
+diff -Naur iproute2-4.10.0.orig/ip/ip6tunnel.c iproute2-4.10.0/ip/ip6tunnel.c
+--- iproute2-4.10.0.orig/ip/ip6tunnel.c	2017-02-21 11:03:07.293296744 -0800
++++ iproute2-4.10.0/ip/ip6tunnel.c	2017-02-21 11:25:56.151628761 -0800
+@@ -23,13 +23,13 @@
+ #include <string.h>
+ #include <stdlib.h>
+ #include <unistd.h>
++#include <net/if.h>
++#include <net/if_arp.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <sys/ioctl.h>
+ #include <linux/ip.h>
+-#include <linux/if.h>
+-#include <linux/if_arp.h>
+ #include <linux/if_tunnel.h>
+ #include <linux/ip6_tunnel.h>
+ 
+diff -Naur iproute2-4.10.0.orig/ip/ipaddress.c iproute2-4.10.0/ip/ipaddress.c
+--- iproute2-4.10.0.orig/ip/ipaddress.c	2017-02-21 11:03:07.291296719 -0800
++++ iproute2-4.10.0/ip/ipaddress.c	2017-02-21 11:23:33.232950712 -0800
+@@ -16,18 +16,18 @@
+ #include <syslog.h>
+ #include <inttypes.h>
+ #include <fcntl.h>
++#include <net/if.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <sys/param.h>
+ #include <errno.h>
+ #include <netinet/in.h>
++#include <netinet/if_ether.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+ #include <fnmatch.h>
+ 
+-#include <linux/netdevice.h>
+-#include <linux/if_arp.h>
+ #include <linux/sockios.h>
+ #include <linux/net_namespace.h>
+ 
+diff -Naur iproute2-4.10.0.orig/ip/ipl2tp.c iproute2-4.10.0/ip/ipl2tp.c
+--- iproute2-4.10.0.orig/ip/ipl2tp.c	2017-02-21 11:03:07.293296744 -0800
++++ iproute2-4.10.0/ip/ipl2tp.c	2017-02-21 11:31:27.873494720 -0800
+@@ -19,8 +19,6 @@
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <sys/ioctl.h>
+-#include <linux/if.h>
+-#include <linux/if_arp.h>
+ #include <linux/ip.h>
+ 
+ #include <linux/genetlink.h>
+diff -Naur iproute2-4.10.0.orig/ip/ipmaddr.c iproute2-4.10.0/ip/ipmaddr.c
+--- iproute2-4.10.0.orig/ip/ipmaddr.c	2017-02-21 11:03:07.290296707 -0800
++++ iproute2-4.10.0/ip/ipmaddr.c	2017-02-21 11:28:36.392504858 -0800
+@@ -15,15 +15,13 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <fcntl.h>
++#include <net/if.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+ 
+-#include <linux/netdevice.h>
+-#include <linux/if.h>
+-#include <linux/if_arp.h>
+ #include <linux/sockios.h>
+ 
+ #include "rt_names.h"
+diff -Naur iproute2-4.10.0.orig/ip/ipmroute.c iproute2-4.10.0/ip/ipmroute.c
+--- iproute2-4.10.0.orig/ip/ipmroute.c	2017-02-21 11:03:07.290296707 -0800
++++ iproute2-4.10.0/ip/ipmroute.c	2017-02-21 11:27:16.582572938 -0800
+@@ -22,9 +22,6 @@
+ #include <arpa/inet.h>
+ #include <string.h>
+ 
+-#include <linux/netdevice.h>
+-#include <linux/if.h>
+-#include <linux/if_arp.h>
+ #include <linux/sockios.h>
+ 
+ #include <rt_names.h>
+diff -Naur iproute2-4.10.0.orig/ip/iprule.c iproute2-4.10.0/ip/iprule.c
+--- iproute2-4.10.0.orig/ip/iprule.c	2017-02-21 11:03:07.287296670 -0800
++++ iproute2-4.10.0/ip/iprule.c	2017-02-21 11:22:23.660130756 -0800
+@@ -15,12 +15,12 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <fcntl.h>
++#include <net/if.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+-#include <linux/if.h>
+ #include <linux/fib_rules.h>
+ #include <errno.h>
+ 
+diff -Naur iproute2-4.10.0.orig/ip/iptoken.c iproute2-4.10.0/ip/iptoken.c
+--- iproute2-4.10.0.orig/ip/iptoken.c	2017-02-21 11:03:07.288296683 -0800
++++ iproute2-4.10.0/ip/iptoken.c	2017-02-21 11:29:24.307060858 -0800
+@@ -16,12 +16,12 @@
+ #include <syslog.h>
+ #include <fcntl.h>
+ #include <string.h>
++#include <net/if.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <netinet/ip.h>
+ #include <arpa/inet.h>
+ #include <linux/types.h>
+-#include <linux/if.h>
+ 
+ #include "rt_names.h"
+ #include "utils.h"
+diff -Naur iproute2-4.10.0.orig/ip/iptuntap.c iproute2-4.10.0/ip/iptuntap.c
+--- iproute2-4.10.0.orig/ip/iptuntap.c	2017-02-21 11:03:07.293296744 -0800
++++ iproute2-4.10.0/ip/iptuntap.c	2017-02-21 11:27:54.528018380 -0800
+@@ -14,11 +14,11 @@
+ #include <stdlib.h>
+ #include <string.h>
+ #include <unistd.h>
++#include <net/if.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <sys/ioctl.h>
+-#include <linux/if.h>
+ #include <linux/if_tun.h>
+ #include <pwd.h>
+ #include <grp.h>
+diff -Naur iproute2-4.10.0.orig/ip/tcp_metrics.c iproute2-4.10.0/ip/tcp_metrics.c
+--- iproute2-4.10.0.orig/ip/tcp_metrics.c	2017-02-21 11:03:07.294296756 -0800
++++ iproute2-4.10.0/ip/tcp_metrics.c	2017-02-21 11:32:07.345952757 -0800
+@@ -17,7 +17,6 @@
+ #include <sys/socket.h>
+ #include <arpa/inet.h>
+ #include <sys/ioctl.h>
+-#include <linux/if.h>
+ 
+ #include <linux/genetlink.h>
+ #include <linux/tcp_metrics.h>
+diff -Naur iproute2-4.10.0.orig/ip/tunnel.c iproute2-4.10.0/ip/tunnel.c
+--- iproute2-4.10.0.orig/ip/tunnel.c	2017-02-21 11:03:07.293296744 -0800
++++ iproute2-4.10.0/ip/tunnel.c	2017-02-21 11:25:12.085111465 -0800
+@@ -26,11 +26,11 @@
+ #include <string.h>
+ #include <unistd.h>
+ #include <errno.h>
++#include <net/if.h>
+ #include <sys/types.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
+-#include <linux/if.h>
+ #include <linux/ip.h>
+ #include <linux/if_tunnel.h>
+ 
+diff -Naur iproute2-4.10.0.orig/lib/ll_addr.c iproute2-4.10.0/lib/ll_addr.c
+--- iproute2-4.10.0.orig/lib/ll_addr.c	2017-02-21 11:03:07.271296475 -0800
++++ iproute2-4.10.0/lib/ll_addr.c	2017-02-21 11:20:26.002744097 -0800
+@@ -14,6 +14,7 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <fcntl.h>
++#include <net/if_arp.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+@@ -21,8 +22,6 @@
+ #include <arpa/inet.h>
+ #include <string.h>
+ 
+-#include <linux/netdevice.h>
+-#include <linux/if_arp.h>
+ #include <linux/sockios.h>
+ 
+ #include "rt_names.h"
+diff -Naur iproute2-4.10.0.orig/lib/ll_proto.c iproute2-4.10.0/lib/ll_proto.c
+--- iproute2-4.10.0.orig/lib/ll_proto.c	2017-02-21 11:03:07.272296487 -0800
++++ iproute2-4.10.0/lib/ll_proto.c	2017-02-21 11:19:45.641268414 -0800
+@@ -14,15 +14,15 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <fcntl.h>
++#include <net/if_arp.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+ #include <netinet/in.h>
++#include <netinet/if_ether.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+ 
+-#include <linux/netdevice.h>
+-#include <linux/if_arp.h>
+ #include <linux/sockios.h>
+ 
+ #include "utils.h"
+diff -Naur iproute2-4.10.0.orig/lib/ll_types.c iproute2-4.10.0/lib/ll_types.c
+--- iproute2-4.10.0.orig/lib/ll_types.c	2017-02-21 11:03:07.272296487 -0800
++++ iproute2-4.10.0/lib/ll_types.c	2017-02-21 11:19:53.585362039 -0800
+@@ -14,6 +14,7 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <fcntl.h>
++#include <net/if_arp.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/ioctl.h>
+@@ -21,8 +22,6 @@
+ #include <arpa/inet.h>
+ #include <string.h>
+ 
+-#include <linux/netdevice.h>
+-#include <linux/if_arp.h>
+ #include <linux/sockios.h>
+ 
+ #include "rt_names.h"
+diff -Naur iproute2-4.10.0.orig/lib/utils.c iproute2-4.10.0/lib/utils.c
+--- iproute2-4.10.0.orig/lib/utils.c	2017-02-21 11:03:07.272296487 -0800
++++ iproute2-4.10.0/lib/utils.c	2017-02-21 11:20:03.213475512 -0800
+@@ -17,6 +17,7 @@
+ #include <syslog.h>
+ #include <fcntl.h>
+ #include <limits.h>
++#include <net/if_arp.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <string.h>
+@@ -25,7 +26,6 @@
+ #include <asm/types.h>
+ #include <linux/pkt_sched.h>
+ #include <linux/param.h>
+-#include <linux/if_arp.h>
+ #include <linux/mpls.h>
+ #include <time.h>
+ #include <sys/time.h>
+diff -Naur iproute2-4.10.0.orig/misc/arpd.c iproute2-4.10.0/misc/arpd.c
+--- iproute2-4.10.0.orig/misc/arpd.c	2017-02-21 11:03:07.311296964 -0800
++++ iproute2-4.10.0/misc/arpd.c	2017-02-21 11:51:14.089070684 -0800
+@@ -18,18 +18,18 @@
+ #include <netdb.h>
+ #include <db_185.h>
+ #include <sys/ioctl.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <errno.h>
+ #include <fcntl.h>
++#include <net/if.h>
++#include <net/if_arp.h>
+ #include <sys/uio.h>
+ #include <sys/socket.h>
+ #include <sys/time.h>
+ #include <time.h>
+ #include <signal.h>
+-#include <linux/if.h>
+-#include <linux/if_ether.h>
+-#include <linux/if_arp.h>
+ #include <netinet/in.h>
++#include <netinet/if_ether.h>
+ #include <arpa/inet.h>
+ #include <linux/if_packet.h>
+ #include <linux/filter.h>
+diff -Naur iproute2-4.10.0.orig/misc/ifstat.c iproute2-4.10.0/misc/ifstat.c
+--- iproute2-4.10.0.orig/misc/ifstat.c	2017-02-21 11:03:07.310296951 -0800
++++ iproute2-4.10.0/misc/ifstat.c	2017-02-21 11:51:21.050149031 -0800
+@@ -21,7 +21,7 @@
+ #include <sys/file.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <signal.h>
+diff -Naur iproute2-4.10.0.orig/misc/nstat.c iproute2-4.10.0/misc/nstat.c
+--- iproute2-4.10.0.orig/misc/nstat.c	2017-02-21 11:03:07.311296964 -0800
++++ iproute2-4.10.0/misc/nstat.c	2017-02-21 11:51:27.410220614 -0800
+@@ -21,7 +21,7 @@
+ #include <sys/file.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <signal.h>
+diff -Naur iproute2-4.10.0.orig/misc/rtacct.c iproute2-4.10.0/misc/rtacct.c
+--- iproute2-4.10.0.orig/misc/rtacct.c	2017-02-21 11:03:07.310296951 -0800
++++ iproute2-4.10.0/misc/rtacct.c	2017-02-21 11:51:35.029306367 -0800
+@@ -22,7 +22,7 @@
+ #include <sys/file.h>
+ #include <sys/socket.h>
+ #include <sys/un.h>
+-#include <sys/poll.h>
++#include <poll.h>
+ #include <sys/wait.h>
+ #include <sys/stat.h>
+ #include <sys/mman.h>
+diff -Naur iproute2-4.10.0.orig/misc/ss.c iproute2-4.10.0/misc/ss.c
+--- iproute2-4.10.0.orig/misc/ss.c	2017-02-21 11:03:07.310296951 -0800
++++ iproute2-4.10.0/misc/ss.c	2017-02-21 11:47:39.236637197 -0800
+@@ -14,6 +14,7 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <fcntl.h>
++#include <net/if_arp.h>
+ #include <sys/ioctl.h>
+ #include <sys/socket.h>
+ #include <sys/uio.h>
+@@ -39,7 +40,6 @@
+ #include <linux/sock_diag.h>
+ #include <linux/inet_diag.h>
+ #include <linux/unix_diag.h>
+-#include <linux/netdevice.h>	/* for MAX_ADDR_LEN */
+ #include <linux/filter.h>
+ #include <linux/packet_diag.h>
+ #include <linux/netlink_diag.h>
+diff -Naur iproute2-4.10.0.orig/tc/f_basic.c iproute2-4.10.0/tc/f_basic.c
+--- iproute2-4.10.0.orig/tc/f_basic.c	2017-02-21 11:03:07.307296915 -0800
++++ iproute2-4.10.0/tc/f_basic.c	2017-02-21 11:33:07.491644936 -0800
+@@ -19,7 +19,6 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+-#include <linux/if.h>
+ 
+ #include "utils.h"
+ #include "tc_util.h"
+diff -Naur iproute2-4.10.0.orig/tc/f_fw.c iproute2-4.10.0/tc/f_fw.c
+--- iproute2-4.10.0.orig/tc/f_fw.c	2017-02-21 11:03:07.303296866 -0800
++++ iproute2-4.10.0/tc/f_fw.c	2017-02-21 11:37:50.341899304 -0800
+@@ -15,11 +15,11 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <fcntl.h>
++#include <net/if.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+-#include <linux/if.h> /* IFNAMSIZ */
+ #include "utils.h"
+ #include "tc_util.h"
+ 
+diff -Naur iproute2-4.10.0.orig/tc/f_matchall.c iproute2-4.10.0/tc/f_matchall.c
+--- iproute2-4.10.0.orig/tc/f_matchall.c	2017-02-21 11:03:07.306296902 -0800
++++ iproute2-4.10.0/tc/f_matchall.c	2017-02-21 11:33:23.186825281 -0800
+@@ -19,7 +19,6 @@
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+-#include <linux/if.h>
+ 
+ #include "utils.h"
+ #include "tc_util.h"
+diff -Naur iproute2-4.10.0.orig/tc/f_u32.c iproute2-4.10.0/tc/f_u32.c
+--- iproute2-4.10.0.orig/tc/f_u32.c	2017-02-21 11:03:07.301296841 -0800
++++ iproute2-4.10.0/tc/f_u32.c	2017-02-21 11:37:37.844754977 -0800
+@@ -16,12 +16,12 @@
+ #include <unistd.h>
+ #include <syslog.h>
+ #include <fcntl.h>
++#include <net/if.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <netinet/if_ether.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+-#include <linux/if.h>
+-#include <linux/if_ether.h>
+ 
+ #include "utils.h"
+ #include "tc_util.h"
+diff -Naur iproute2-4.10.0.orig/tc/m_ife.c iproute2-4.10.0/tc/m_ife.c
+--- iproute2-4.10.0.orig/tc/m_ife.c	2017-02-21 11:03:07.302296854 -0800
++++ iproute2-4.10.0/tc/m_ife.c	2017-02-21 11:41:30.971442081 -0800
+@@ -17,9 +17,9 @@
+ #include <fcntl.h>
+ #include <sys/socket.h>
+ #include <netinet/in.h>
++#include <netinet/if_ether.h>
+ #include <arpa/inet.h>
+ #include <string.h>
+-#include <linux/netdevice.h>
+ 
+ #include "rt_names.h"
+ #include "utils.h"
+diff -Naur iproute2-4.10.0.orig/tc/m_xt.c iproute2-4.10.0/tc/m_xt.c
+--- iproute2-4.10.0.orig/tc/m_xt.c	2017-02-21 11:03:07.302296854 -0800
++++ iproute2-4.10.0/tc/m_xt.c	2017-02-21 11:39:51.918303374 -0800
+@@ -14,10 +14,9 @@
+ #include <sys/socket.h>
+ #include <netinet/in.h>
+ #include <arpa/inet.h>
+-#include <net/if.h>
+ #include <limits.h>
+ #include <linux/netfilter.h>
+-#include <linux/netfilter_ipv4/ip_tables.h>
++#include <linux/netfilter_ipv4.h>
+ #include <xtables.h>
+ #include "utils.h"
+ #include "tc_util.h"

diff --git a/sys-apps/iproute2/files/iproute2-4.8.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.8.0-musl.patch
deleted file mode 100644
index 7210ad9..0000000
--- a/sys-apps/iproute2/files/iproute2-4.8.0-musl.patch
+++ /dev/null
@@ -1,102 +0,0 @@
-diff -Naur iproute2-4.8.0.orig/include/libiptc/ipt_kernel_headers.h iproute2-4.8.0/include/libiptc/ipt_kernel_headers.h
---- iproute2-4.8.0.orig/include/libiptc/ipt_kernel_headers.h	2016-10-10 16:29:55.095612698 -0700
-+++ iproute2-4.8.0/include/libiptc/ipt_kernel_headers.h	2016-10-10 16:30:11.793808479 -0700
-@@ -6,7 +6,6 @@
- #include <limits.h>
- 
- #include <netinet/ip.h>
--#include <netinet/in.h>
- #include <netinet/ip_icmp.h>
- #include <netinet/tcp.h>
- #include <netinet/udp.h>
-diff -Naur iproute2-4.8.0.orig/include/linux/if_bridge.h iproute2-4.8.0/include/linux/if_bridge.h
---- iproute2-4.8.0.orig/include/linux/if_bridge.h	2016-10-10 16:29:55.102612780 -0700
-+++ iproute2-4.8.0/include/linux/if_bridge.h	2016-10-10 16:30:11.794808491 -0700
-@@ -15,7 +15,6 @@
- 
- #include <linux/types.h>
- #include <linux/if_ether.h>
--#include <linux/in6.h>
- 
- #define SYSFS_BRIDGE_ATTR	"bridge"
- #define SYSFS_BRIDGE_FDB	"brforward"
-diff -Naur iproute2-4.8.0.orig/include/linux/if_tunnel.h iproute2-4.8.0/include/linux/if_tunnel.h
---- iproute2-4.8.0.orig/include/linux/if_tunnel.h	2016-10-10 16:29:55.103612792 -0700
-+++ iproute2-4.8.0/include/linux/if_tunnel.h	2016-10-10 16:32:16.883845219 -0700
-@@ -2,9 +2,7 @@
- #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.8.0.orig/include/linux/netfilter.h iproute2-4.8.0/include/linux/netfilter.h
---- iproute2-4.8.0.orig/include/linux/netfilter.h	2016-10-10 16:29:55.107612839 -0700
-+++ iproute2-4.8.0/include/linux/netfilter.h	2016-10-10 16:30:11.794808491 -0700
-@@ -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
-diff -Naur iproute2-4.8.0.orig/include/linux/xfrm.h iproute2-4.8.0/include/linux/xfrm.h
---- iproute2-4.8.0.orig/include/linux/xfrm.h	2016-10-10 16:29:55.113612909 -0700
-+++ iproute2-4.8.0/include/linux/xfrm.h	2016-10-10 16:30:11.794808491 -0700
-@@ -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
-diff -Naur iproute2-4.8.0.orig/include/xtables.h iproute2-4.8.0/include/xtables.h
---- iproute2-4.8.0.orig/include/xtables.h	2016-10-10 16:29:55.118612968 -0700
-+++ iproute2-4.8.0/include/xtables.h	2016-10-10 16:30:11.795808503 -0700
-@@ -13,7 +13,6 @@
- #include <stddef.h>
- #include <stdint.h>
- #include <netinet/in.h>
--#include <net/if.h>
- #include <linux/types.h>
- #include <linux/netfilter.h>
- #include <linux/netfilter/x_tables.h>
-diff -Naur iproute2-4.8.0.orig/misc/ss.c iproute2-4.8.0/misc/ss.c
---- iproute2-4.8.0.orig/misc/ss.c	2016-10-10 16:29:55.135613167 -0700
-+++ iproute2-4.8.0/misc/ss.c	2016-10-10 16:30:11.797808526 -0700
-@@ -25,6 +25,7 @@
- #include <dirent.h>
- #include <fnmatch.h>
- #include <getopt.h>
-+#include <limits.h>
- #include <stdbool.h>
- #include <limits.h>
- 
-diff -Naur iproute2-4.8.0.orig/tc/f_matchall.c iproute2-4.8.0/tc/f_matchall.c
---- iproute2-4.8.0.orig/tc/f_matchall.c	2016-10-10 16:29:55.143613261 -0700
-+++ iproute2-4.8.0/tc/f_matchall.c	2016-10-10 16:33:22.886394033 -0700
-@@ -10,6 +10,7 @@
-  *
-  */
- 
-+#include <limits.h>
- #include <stdio.h>
- #include <stdlib.h>
- #include <unistd.h>
-diff -Naur iproute2-4.8.0.orig/tc/m_xt.c iproute2-4.8.0/tc/m_xt.c
---- iproute2-4.8.0.orig/tc/m_xt.c	2016-10-10 16:29:55.148613319 -0700
-+++ iproute2-4.8.0/tc/m_xt.c	2016-10-10 16:30:11.800808561 -0700
-@@ -14,7 +14,6 @@
- #include <sys/socket.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
--#include <net/if.h>
- #include <limits.h>
- #include <linux/netfilter.h>
- #include <linux/netfilter_ipv4/ip_tables.h>

diff --git a/sys-apps/iproute2/iproute2-4.10.0.ebuild b/sys-apps/iproute2/iproute2-4.10.0.ebuild
index 943d8cd..a502b25 100644
--- a/sys-apps/iproute2/iproute2-4.10.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.10.0.ebuild
@@ -39,7 +39,7 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.8.0-musl.patch
+	"${FILESDIR}"/${PN}-4.10.0-musl.patch
 )
 
 src_prepare() {