commit: abd05b6ec00612052aa60f1539fbb78f0674657a
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Thu Jul 6 23:42:31 2017 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Thu Jul 6 23:42:31 2017 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=abd05b6e
sys-apps/iproute2: version bump to 4.12.0
attempt to simplify patch.
sys-apps/iproute2/Manifest | 6 +-
sys-apps/iproute2/files/iproute2-4.11.0-musl.patch | 566 ---------------------
sys-apps/iproute2/files/iproute2-4.12.0-musl.patch | 221 ++++++++
...route2-4.11.0.ebuild => iproute2-4.12.0.ebuild} | 16 +-
4 files changed, 234 insertions(+), 575 deletions(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index a788ba4..4313b95 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,12 +1,12 @@
AUX iproute2-3.1.0-mtu.patch 1649 SHA256
d8d1d3b81a3fd5674e6c9e202bce9e84f41b579ba2c6a554df3346f4642715af SHA512
5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1
WHIRLPOOL
b813f1d9dcdbfb525fb07a462f7faf1c13117dd3e9e584b1a033cb69f3dad9d4b8e5120f8512185f24769e6be0aabd6635ad3996342dc210ff513866e7638502
-AUX iproute2-4.11.0-musl.patch 18360 SHA256
b55ab305e3a373e97d34c0f49b6420a8e9493716523733d2ecb9e64ab66fc9dc SHA512
33f0cc771e1152cc8c7f7507448a34493a371b961d834d8d6d646c130378742bb9b03fb2491d82a4121d8ac9bc1545d3b6e8e64d3ef22f0dbaf3ad8b11a949af
WHIRLPOOL
d6ad2d1d790ff390255df56598a09ec1fe62ee17dfa463be112368d0451dd36b081ed09d1564f927b86ed1221db65454758021eb419abc30f205ccd65befd228
AUX iproute2-4.11.0-no-ipv6.patch 1360 SHA256
4fd3e61e00805a83a9874586738af1eed617c2845dd49254c7886e44c432de11 SHA512
8e548f19079eea1d3a5a91bb657bba961c9e9206147e0e0aea1aaf04d74b46e2687c906b78561d939f53f4a33ecb9e08ad8237f401068076df5842c78bc3b577
WHIRLPOOL
46864c98b8cb79dd0f811d75271937c4cef9eb5eb4ddd9996a8ca510b030fc59fe2e39ce6666bc584f097a81c1d146af3550d20767bcf347e9315fa22e890667
+AUX iproute2-4.12.0-musl.patch 8105 SHA256
528e01ce20bc9f85648cbf5bed317c76bef0d008305f3e0e901f294e7efff9d6 SHA512
c5dabd6729bb1776158cf35b611e5e36a11326e32b38215662a9cd434226f0630834210c3da409a03da91bfc6440bc1fd3d510126880077d12deb78437d1b916
WHIRLPOOL
d602804cb2cda70601364d4e9ec78d1e509278df0317c6eec9a17456612e4709274cc3dda4a2cbf2b0a1ce6f73b0630d49b45f0c30def0d7bf8a5cf89089b8b0
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
-DIST iproute2-4.11.0.tar.xz 657100 SHA256
72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026 SHA512
e6cc3dbe2779670a752ab346c1a432b496033448d1645aa0161b3f7b683b3f9939ab09db12199b794cc64dff257faaf0d151046feea9031a6139176e08b4f4fa
WHIRLPOOL
9bf25b018d3f392a2e2f4faf4c3877f52ec4b0aebb082d9c2e2c3e80c0c8f3885c122c5d211c4c6ef014506d786213b36938728f63b581079274a3116fc85581
+DIST iproute2-4.12.0.tar.xz 662424 SHA256
2e0a4c4262d9f6c169885a6e16c4c5c5f1ef6fd57b6a0e7b41f42be5bb6ebd7d SHA512
275147f71e7c4698654f0d6d0981ab42f6f108066508c15cfcd5d9e0d3aaf8d33291968d9f06cb03f5494d801cfabf8d53308aaf56fc4fa92c52b137e970a3b0
WHIRLPOOL
590cc191e96ff0b777373603186e4416f064931d529878ec783759f31fd99e1119bb0604e8a89dc98d350f80eca2bfef05a13bca7ce24302408072002c0b17b2
DIST iproute2-4.4.0.tar.xz 528552 SHA256
bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512
48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69
WHIRLPOOL
7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
-EBUILD iproute2-4.11.0.ebuild 3964 SHA256
7670098190f2123a03686a6b93a3fd65104d4d311e520c4a7975dc5c0d6517f3 SHA512
b4b5bc2421b46012c13e0ab709ba66e63a37b10fab6b2ae5072e9cd3491bf4d5c50e7fedd14e53bf53dee31dce3b4d52e9e607b0f80bdccd7ea4dbf0c92efad7
WHIRLPOOL
d4834fdd665cbb9ef349db00fbdb54f4a2e06f54c6ccdf8760785f36614ea6a2892eace7b24c14c9089c2ada20e59d8757e91b55da0c9b5023448afae2dd2cde
+EBUILD iproute2-4.12.0.ebuild 3968 SHA256
e4469ecf058e8d1b1f37b7d3b6a43603771a2b0d00823c4f4cfeede3ea04ec16 SHA512
4371fd9e5163c18ba45171aa6872e11ab05d6cd5c5d67fb4318eaa385d52fd8315dace35698bce25f4a376c98c25188ac80590c339cb756dbab2bd753e2a5157
WHIRLPOOL
fd6b4acf3f505a90d96b9710c6bd904c4dee1487fc79e1c4fe638a3262cd98a000f01519fb7f5b294029076347fd87045a0126b6686b98ba20f909c51c35fda1
EBUILD iproute2-4.4.0.ebuild 3970 SHA256
8bacd413dcba29e38c745a676751d54cf22b59a625af45e440983a9442583484 SHA512
98ab9c6418a2ff22625c9c86d02681262e2ec581bd974eeac062e55963f211c46ecff42f4275d53befe4d5f94da1280b7525c0e9158225fef3a3be9f23fe72e8
WHIRLPOOL
b5476358ab6dfebfd7a70a822f3998521d83e729df226dfa7007a58cb2788035a0f6ec2663f462e89b8e1f9b1fd6567c53356cf76bbefc768fecf72ec32995fa
MISC metadata.xml 467 SHA256
54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512
34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c
WHIRLPOOL
188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1
diff --git a/sys-apps/iproute2/files/iproute2-4.11.0-musl.patch
b/sys-apps/iproute2/files/iproute2-4.11.0-musl.patch
deleted file mode 100644
index 47f83a3..0000000
--- a/sys-apps/iproute2/files/iproute2-4.11.0-musl.patch
+++ /dev/null
@@ -1,566 +0,0 @@
-diff -Naur iproute2-4.11.0.orig/bridge/fdb.c iproute2-4.11.0/bridge/fdb.c
---- iproute2-4.11.0.orig/bridge/fdb.c 2017-05-01 11:56:33.148926602 -0700
-+++ iproute2-4.11.0/bridge/fdb.c 2017-05-01 13:11:03.165848386 -0700
-@@ -17,7 +17,6 @@
- #include <net/if.h>
- #include <netinet/in.h>
- #include <linux/if_bridge.h>
--#include <linux/if_ether.h>
- #include <linux/neighbour.h>
- #include <string.h>
- #include <limits.h>
-diff -Naur iproute2-4.11.0.orig/bridge/link.c iproute2-4.11.0/bridge/link.c
---- iproute2-4.11.0.orig/bridge/link.c 2017-05-01 11:56:33.148926602 -0700
-+++ iproute2-4.11.0/bridge/link.c 2017-05-01 13:14:04.095744352 -0700
-@@ -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.11.0.orig/bridge/mdb.c iproute2-4.11.0/bridge/mdb.c
---- iproute2-4.11.0.orig/bridge/mdb.c 2017-05-01 11:56:33.148926602 -0700
-+++ iproute2-4.11.0/bridge/mdb.c 2017-05-01 13:12:11.880568448 -0700
-@@ -10,7 +10,6 @@
- #include <net/if.h>
- #include <netinet/in.h>
- #include <linux/if_bridge.h>
--#include <linux/if_ether.h>
- #include <string.h>
- #include <arpa/inet.h>
-
-diff -Naur iproute2-4.11.0.orig/bridge/vlan.c iproute2-4.11.0/bridge/vlan.c
---- iproute2-4.11.0.orig/bridge/vlan.c 2017-05-01 11:56:33.149926615 -0700
-+++ iproute2-4.11.0/bridge/vlan.c 2017-05-01 13:15:33.054676553 -0700
-@@ -6,7 +6,6 @@
- #include <net/if.h>
- #include <netinet/in.h>
- #include <linux/if_bridge.h>
--#include <linux/if_ether.h>
- #include <json_writer.h>
- #include <string.h>
-
-diff -Naur iproute2-4.11.0.orig/include/linux/if_bridge.h
iproute2-4.11.0/include/linux/if_bridge.h
---- iproute2-4.11.0.orig/include/linux/if_bridge.h 2017-05-01
11:56:33.169926894 -0700
-+++ iproute2-4.11.0/include/linux/if_bridge.h 2017-05-01 13:08:22.673166583
-0700
-@@ -13,9 +13,9 @@
- #ifndef _LINUX_IF_BRIDGE_H
- #define _LINUX_IF_BRIDGE_H
-
-+#include <netinet/if_ether.h>
-+
- #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.11.0.orig/include/linux/if_tunnel.h
iproute2-4.11.0/include/linux/if_tunnel.h
---- iproute2-4.11.0.orig/include/linux/if_tunnel.h 2017-05-01
11:56:33.170926908 -0700
-+++ iproute2-4.11.0/include/linux/if_tunnel.h 2017-05-01 12:16:24.498639942
-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.11.0.orig/include/linux/ip6_tunnel.h
iproute2-4.11.0/include/linux/ip6_tunnel.h
---- iproute2-4.11.0.orig/include/linux/ip6_tunnel.h 2017-05-01
11:56:33.172926936 -0700
-+++ iproute2-4.11.0/include/linux/ip6_tunnel.h 2017-05-01 12:18:31.690988206
-0700
-@@ -2,8 +2,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
- #define IPV6_DEFAULT_TNL_ENCAP_LIMIT 4
-diff -Naur iproute2-4.11.0.orig/include/linux/l2tp.h
iproute2-4.11.0/include/linux/l2tp.h
---- iproute2-4.11.0.orig/include/linux/l2tp.h 2017-05-01 11:56:33.172926936
-0700
-+++ iproute2-4.11.0/include/linux/l2tp.h 2017-05-01 12:35:54.919789280
-0700
-@@ -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.11.0.orig/include/linux/netfilter.h
iproute2-4.11.0/include/linux/netfilter.h
---- iproute2-4.11.0.orig/include/linux/netfilter.h 2017-05-01
11:56:33.174926964 -0700
-+++ iproute2-4.11.0/include/linux/netfilter.h 2017-05-01 13:00:54.521494478
-0700
-@@ -3,9 +3,6 @@
-
- #include <linux/types.h>
-
--#include <linux/in.h>
--#include <linux/in6.h>
--
- /* Responses from hook functions. */
- #define NF_DROP 0
- #define NF_ACCEPT 1
-diff -Naur iproute2-4.11.0.orig/include/linux/xfrm.h
iproute2-4.11.0/include/linux/xfrm.h
---- iproute2-4.11.0.orig/include/linux/xfrm.h 2017-05-01 11:56:33.182927075
-0700
-+++ iproute2-4.11.0/include/linux/xfrm.h 2017-05-01 12:24:33.590743764
-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.11.0.orig/ip/ip6tunnel.c iproute2-4.11.0/ip/ip6tunnel.c
---- iproute2-4.11.0.orig/ip/ip6tunnel.c 2017-05-01 11:56:33.184927103
-0700
-+++ iproute2-4.11.0/ip/ip6tunnel.c 2017-05-01 12:20:34.455279454 -0700
-@@ -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.11.0.orig/ip/ipaddress.c iproute2-4.11.0/ip/ipaddress.c
---- iproute2-4.11.0.orig/ip/ipaddress.c 2017-05-01 11:56:33.185927117
-0700
-+++ iproute2-4.11.0/ip/ipaddress.c 2017-05-01 12:10:45.042068983 -0700
-@@ -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.11.0.orig/ip/ipl2tp.c iproute2-4.11.0/ip/ipl2tp.c
---- iproute2-4.11.0.orig/ip/ipl2tp.c 2017-05-01 11:56:33.185927117 -0700
-+++ iproute2-4.11.0/ip/ipl2tp.c 2017-05-01 12:36:17.271028686 -0700
-@@ -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.11.0.orig/ip/iplink_xdp.c iproute2-4.11.0/ip/iplink_xdp.c
---- iproute2-4.11.0.orig/ip/iplink_xdp.c 2017-05-01 11:56:33.188927159
-0700
-+++ iproute2-4.11.0/ip/iplink_xdp.c 2017-05-01 12:38:14.677281664 -0700
-@@ -11,6 +11,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/un.h>
-
- #include <linux/bpf.h>
-
-diff -Naur iproute2-4.11.0.orig/ip/ipmaddr.c iproute2-4.11.0/ip/ipmaddr.c
---- iproute2-4.11.0.orig/ip/ipmaddr.c 2017-05-01 11:56:33.189927173 -0700
-+++ iproute2-4.11.0/ip/ipmaddr.c 2017-05-01 12:29:04.862528330 -0700
-@@ -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.11.0.orig/ip/ipmroute.c iproute2-4.11.0/ip/ipmroute.c
---- iproute2-4.11.0.orig/ip/ipmroute.c 2017-05-01 11:56:33.189927173 -0700
-+++ iproute2-4.11.0/ip/ipmroute.c 2017-05-01 12:22:59.960779128 -0700
-@@ -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.11.0.orig/ip/iproute_lwtunnel.c
iproute2-4.11.0/ip/iproute_lwtunnel.c
---- iproute2-4.11.0.orig/ip/iproute_lwtunnel.c 2017-05-01 11:56:33.190927187
-0700
-+++ iproute2-4.11.0/ip/iproute_lwtunnel.c 2017-05-01 12:49:46.817592280
-0700
-@@ -16,6 +16,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <string.h>
-+#include <sys/un.h>
- #include <linux/ila.h>
- #include <linux/lwtunnel.h>
- #include <linux/mpls_iptunnel.h>
-diff -Naur iproute2-4.11.0.orig/ip/iprule.c iproute2-4.11.0/ip/iprule.c
---- iproute2-4.11.0.orig/ip/iprule.c 2017-05-01 11:56:33.190927187 -0700
-+++ iproute2-4.11.0/ip/iprule.c 2017-05-01 12:11:15.793405550 -0700
-@@ -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.11.0.orig/ip/iptoken.c iproute2-4.11.0/ip/iptoken.c
---- iproute2-4.11.0.orig/ip/iptoken.c 2017-05-01 11:56:33.190927187 -0700
-+++ iproute2-4.11.0/ip/iptoken.c 2017-05-01 12:32:39.621698528 -0700
-@@ -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.11.0.orig/ip/iptuntap.c iproute2-4.11.0/ip/iptuntap.c
---- iproute2-4.11.0.orig/ip/iptuntap.c 2017-05-01 11:56:33.190927187 -0700
-+++ iproute2-4.11.0/ip/iptuntap.c 2017-05-01 12:31:35.701052593 -0700
-@@ -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.11.0.orig/ip/ipvrf.c iproute2-4.11.0/ip/ipvrf.c
---- iproute2-4.11.0.orig/ip/ipvrf.c 2017-05-01 11:56:33.191927201 -0700
-+++ iproute2-4.11.0/ip/ipvrf.c 2017-05-01 12:50:00.575735454 -0700
-@@ -13,6 +13,7 @@
- #include <sys/types.h>
- #include <sys/stat.h>
- #include <sys/socket.h>
-+#include <sys/un.h>
- #include <sys/mount.h>
- #include <linux/bpf.h>
- #include <linux/if.h>
-diff -Naur iproute2-4.11.0.orig/ip/tcp_metrics.c
iproute2-4.11.0/ip/tcp_metrics.c
---- iproute2-4.11.0.orig/ip/tcp_metrics.c 2017-05-01 11:56:33.193927228
-0700
-+++ iproute2-4.11.0/ip/tcp_metrics.c 2017-05-01 12:38:32.256468859 -0700
-@@ -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.11.0.orig/ip/tunnel.c iproute2-4.11.0/ip/tunnel.c
---- iproute2-4.11.0.orig/ip/tunnel.c 2017-05-01 11:56:33.193927228 -0700
-+++ iproute2-4.11.0/ip/tunnel.c 2017-05-01 12:25:55.244584318 -0700
-@@ -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.11.0.orig/lib/ll_addr.c iproute2-4.11.0/lib/ll_addr.c
---- iproute2-4.11.0.orig/lib/ll_addr.c 2017-05-01 11:56:33.196927270 -0700
-+++ iproute2-4.11.0/lib/ll_addr.c 2017-05-01 12:06:48.768439799 -0700
-@@ -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.11.0.orig/lib/ll_proto.c iproute2-4.11.0/lib/ll_proto.c
---- iproute2-4.11.0.orig/lib/ll_proto.c 2017-05-01 11:56:33.196927270
-0700
-+++ iproute2-4.11.0/lib/ll_proto.c 2017-05-01 12:06:17.434119257 -0700
-@@ -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.11.0.orig/lib/ll_types.c iproute2-4.11.0/lib/ll_types.c
---- iproute2-4.11.0.orig/lib/ll_types.c 2017-05-01 11:56:33.196927270
-0700
-+++ iproute2-4.11.0/lib/ll_types.c 2017-05-01 12:05:13.530477053 -0700
-@@ -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.11.0.orig/lib/utils.c iproute2-4.11.0/lib/utils.c
---- iproute2-4.11.0.orig/lib/utils.c 2017-05-01 11:56:33.197927284 -0700
-+++ iproute2-4.11.0/lib/utils.c 2017-05-01 12:04:24.147003781 -0700
-@@ -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.11.0.orig/misc/arpd.c iproute2-4.11.0/misc/arpd.c
---- iproute2-4.11.0.orig/misc/arpd.c 2017-05-01 11:56:33.216927549 -0700
-+++ iproute2-4.11.0/misc/arpd.c 2017-05-01 13:20:16.066643266 -0700
-@@ -17,6 +17,8 @@
- #include <stdlib.h>
- #include <netdb.h>
- #include <db_185.h>
-+#include <net/if.h>
-+#include <net/if_arp.h>
- #include <sys/ioctl.h>
- #include <sys/poll.h>
- #include <errno.h>
-@@ -26,10 +28,8 @@
- #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.11.0.orig/misc/ss.c iproute2-4.11.0/misc/ss.c
---- iproute2-4.11.0.orig/misc/ss.c 2017-05-01 11:56:33.217927563 -0700
-+++ iproute2-4.11.0/misc/ss.c 2017-05-01 13:17:27.544876297 -0700
-@@ -39,7 +39,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.11.0.orig/tc/e_bpf.c iproute2-4.11.0/tc/e_bpf.c
---- iproute2-4.11.0.orig/tc/e_bpf.c 2017-05-01 11:56:33.221927618 -0700
-+++ iproute2-4.11.0/tc/e_bpf.c 2017-05-01 12:59:34.679672991 -0700
-@@ -11,6 +11,7 @@
-
- #include <stdio.h>
- #include <unistd.h>
-+#include <sys/un.h>
-
- #include "utils.h"
-
-diff -Naur iproute2-4.11.0.orig/tc/f_basic.c iproute2-4.11.0/tc/f_basic.c
---- iproute2-4.11.0.orig/tc/f_basic.c 2017-05-01 11:56:33.222927632 -0700
-+++ iproute2-4.11.0/tc/f_basic.c 2017-05-01 12:51:36.993738825 -0700
-@@ -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.11.0.orig/tc/f_bpf.c iproute2-4.11.0/tc/f_bpf.c
---- iproute2-4.11.0.orig/tc/f_bpf.c 2017-05-01 11:56:33.222927632 -0700
-+++ iproute2-4.11.0/tc/f_bpf.c 2017-05-01 12:51:46.206834701 -0700
-@@ -11,6 +11,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/un.h>
-
- #include <linux/bpf.h>
-
-diff -Naur iproute2-4.11.0.orig/tc/f_flower.c iproute2-4.11.0/tc/f_flower.c
---- iproute2-4.11.0.orig/tc/f_flower.c 2017-05-01 11:56:33.223927646 -0700
-+++ iproute2-4.11.0/tc/f_flower.c 2017-05-01 12:57:03.203114459 -0700
-@@ -15,8 +15,8 @@
- #include <syslog.h>
- #include <string.h>
- #include <net/if.h>
--#include <linux/if_arp.h>
--#include <linux/if_ether.h>
-+#include <net/if_arp.h>
-+#include <netinet/if_ether.h>
- #include <linux/ip.h>
- #include <linux/tc_act/tc_vlan.h>
-
-diff -Naur iproute2-4.11.0.orig/tc/f_fw.c iproute2-4.11.0/tc/f_fw.c
---- iproute2-4.11.0.orig/tc/f_fw.c 2017-05-01 11:56:33.223927646 -0700
-+++ iproute2-4.11.0/tc/f_fw.c 2017-05-01 12:54:55.697802565 -0700
-@@ -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.11.0.orig/tc/f_matchall.c iproute2-4.11.0/tc/f_matchall.c
---- iproute2-4.11.0.orig/tc/f_matchall.c 2017-05-01 11:56:33.223927646
-0700
-+++ iproute2-4.11.0/tc/f_matchall.c 2017-05-01 12:59:52.125852494 -0700
-@@ -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.11.0.orig/tc/f_u32.c iproute2-4.11.0/tc/f_u32.c
---- iproute2-4.11.0.orig/tc/f_u32.c 2017-05-01 11:56:33.224927660 -0700
-+++ iproute2-4.11.0/tc/f_u32.c 2017-05-01 12:53:58.137207630 -0700
-@@ -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.11.0.orig/tc/m_bpf.c iproute2-4.11.0/tc/m_bpf.c
---- iproute2-4.11.0.orig/tc/m_bpf.c 2017-05-01 11:56:33.224927660 -0700
-+++ iproute2-4.11.0/tc/m_bpf.c 2017-05-01 12:59:17.771499024 -0700
-@@ -12,6 +12,7 @@
-
- #include <stdio.h>
- #include <stdlib.h>
-+#include <sys/un.h>
-
- #include <linux/bpf.h>
- #include <linux/tc_act/tc_bpf.h>
-diff -Naur iproute2-4.11.0.orig/tc/m_ife.c iproute2-4.11.0/tc/m_ife.c
---- iproute2-4.11.0.orig/tc/m_ife.c 2017-05-01 11:56:33.225927674 -0700
-+++ iproute2-4.11.0/tc/m_ife.c 2017-05-01 13:03:14.431936521 -0700
-@@ -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.11.0.orig/tc/m_xt.c iproute2-4.11.0/tc/m_xt.c
---- iproute2-4.11.0.orig/tc/m_xt.c 2017-05-01 11:56:33.227927702 -0700
-+++ iproute2-4.11.0/tc/m_xt.c 2017-05-01 13:06:33.494022493 -0700
-@@ -17,7 +17,7 @@
- #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.12.0-musl.patch
b/sys-apps/iproute2/files/iproute2-4.12.0-musl.patch
new file mode 100644
index 0000000..792c4e7
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.12.0-musl.patch
@@ -0,0 +1,221 @@
+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
+@@ -22,6 +22,7 @@
+ #define _LINUX_IF_ETHER_H
+
+ #include <linux/types.h>
++#include <linux/libc-compat.h>
+
+ /*
+ * IEEE 802.3 Ethernet magic constants. The frame sizes omit the preamble
+@@ -142,11 +143,13 @@
+ * This is an Ethernet frame header.
+ */
+
++#if __UAPI_DEF_ETHHDR
+ struct ethhdr {
+ unsigned char h_dest[ETH_ALEN]; /* destination eth addr */
+ unsigned char h_source[ETH_ALEN]; /* source ether addr */
+ __be16 h_proto; /* packet type ID field */
+ } __attribute__((packed));
++#endif
+
+
+ #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
+@@ -2,7 +2,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.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
+@@ -2,7 +2,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.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
+@@ -1,7 +1,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.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
+@@ -48,47 +48,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
+-/* For the future if glibc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
++#if !defined(__GLIBC__)
++#define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 0
++#else
+ #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 */
++/* If libc 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
+@@ -98,15 +108,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
+@@ -117,7 +119,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
+@@ -127,7 +129,7 @@
+ #define __UAPI_DEF_IN_CLASS 1
+
+ #define __UAPI_DEF_IN6_ADDR 1
+-/* We unconditionally define the in6_addr macros and glibc must
++/* We unconditionally define the in6_addr macros and libc must
+ * coordinate. */
+ #define __UAPI_DEF_IN6_ADDR_ALT 1
+ #define __UAPI_DEF_SOCKADDR_IN6 1
+@@ -168,18 +170,20 @@
+ /* If we did not see any headers from any supported C libraries,
+ * or we are being included in the kernel, then define everything
+ * that we need. */
+-#else /* !defined(__GLIBC__) */
++#else /* defined(__KERNEL__) */
+
+ /* Definitions for if.h */
+ #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 */
++/* If libc adds IFF_LOWER_UP, IFF_DORMANT and IFF_ECHO */
+ #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
+
++/* Definitions for if/ether.h */
++#define __UAPI_DEF_ETHHDR 1
++
+ /* Definitions for in.h */
+ #define __UAPI_DEF_IN_ADDR 1
+ #define __UAPI_DEF_IN_IPPROTO 1
+@@ -208,6 +212,6 @@
+ /* Definitions for xattr.h */
+ #define __UAPI_DEF_XATTR 1
+
+-#endif /* __GLIBC__ */
++#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
+@@ -17,7 +17,6 @@
+
+ #include <linux/types.h>
+
+-#include <linux/if.h>
+ #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
+@@ -15,7 +15,7 @@
+ #include <syslog.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.11.0.ebuild
b/sys-apps/iproute2/iproute2-4.12.0.ebuild
similarity index 95%
rename from sys-apps/iproute2/iproute2-4.11.0.ebuild
rename to sys-apps/iproute2/iproute2-4.12.0.ebuild
index 2b9683f..0d9b891 100644
--- a/sys-apps/iproute2/iproute2-4.11.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.12.0.ebuild
@@ -1,7 +1,7 @@
# Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
-EAPI="5"
+EAPI=5
inherit eutils toolchain-funcs flag-o-matic multilib
@@ -21,24 +21,28 @@ SLOT="0"
IUSE="atm berkdb +iptables ipv6 minimal selinux"
# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="!net-misc/arpd
+RDEPEND="
+ !net-misc/arpd
!minimal? ( net-libs/libmnl )
iptables? ( >=net-firewall/iptables-1.4.20:= )
berkdb? ( sys-libs/db:= )
atm? ( net-dialup/linux-atm )
- selinux? ( sys-libs/libselinux )"
+ selinux? ( sys-libs/libselinux )
+"
# We require newer linux-headers for ipset support #549948 and some defines
#553876
-DEPEND="${RDEPEND}
+DEPEND="
+ ${RDEPEND}
app-arch/xz-utils
iptables? ( virtual/pkgconfig )
sys-devel/bison
sys-devel/flex
>=sys-kernel/linux-headers-3.16
- elibc_glibc? ( >=sys-libs/glibc-2.7 )"
+ elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
PATCHES=(
"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- "${FILESDIR}"/${PN}-4.11.0-musl.patch
+ "${FILESDIR}"/${PN}-4.12.0-musl.patch
)
src_prepare() {
