public inbox for gentoo-commits@lists.gentoo.org
 help / color / mirror / Atom feed
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2016-02-03  5:50 Anthony G. Basile
  0 siblings, 0 replies; 13+ messages in thread
From: Anthony G. Basile @ 2016-02-03  5:50 UTC (permalink / raw
  To: gentoo-commits

commit:     a642c22ed00bf2a06974da93b623144af40852ec
Author:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
AuthorDate: Wed Feb  3 05:59:26 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Wed Feb  3 05:59:26 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=a642c22e

sys-apps/iproute2: version bump to 4.3.0

Package-Manager: portage-2.2.26
RepoMan-Options: --force

 sys-apps/iproute2/Manifest                         |  15 +--
 .../iproute2/files/iproute2-3.1.0-no-ipv6.patch    |  41 -------
 .../iproute2/files/iproute2-3.10.0-no-ipv6.patch   |  41 -------
 sys-apps/iproute2/files/iproute2-3.19.0-musl.patch |  22 ----
 .../files/iproute2-3.8.0-musl-headers.patch        |  81 -------------
 .../files/iproute2-3.8.0-old-mount-libc.patch      |  38 ------
 .../files/iproute2-4.0.0-fix-build-with-musl.patch |  24 ----
 .../iproute2-4.0.0-tc-show-buffer-overflow.patch   |  62 ----------
 sys-apps/iproute2/iproute2-3.19.0-r99.ebuild       | 126 --------------------
 sys-apps/iproute2/iproute2-4.0.0-r99.ebuild        | 130 --------------------
 sys-apps/iproute2/iproute2-4.1.1-r99.ebuild        | 132 ---------------------
 ...ute2-4.3.0.ebuild => iproute2-4.3.0-r99.ebuild} |   2 +-
 12 files changed, 2 insertions(+), 712 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 7f0172d..cc44db1 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,20 +1,7 @@
 AUX iproute2-3.1.0-mtu.patch 1649 SHA256 d8d1d3b81a3fd5674e6c9e202bce9e84f41b579ba2c6a554df3346f4642715af SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 WHIRLPOOL b813f1d9dcdbfb525fb07a462f7faf1c13117dd3e9e584b1a033cb69f3dad9d4b8e5120f8512185f24769e6be0aabd6635ad3996342dc210ff513866e7638502
-AUX iproute2-3.1.0-no-ipv6.patch 1352 SHA256 ee93d86903e6f0aff54cd3c861f91e3d37639d7fc975c9c088f281f1ca8017da SHA512 b80f190d58c0ba5ab61185648c039133d870f72e9b270e905cc93aa335a20c1d880b00dd32eb7cd427c40f4e3182936b6b3156884ebf9ff976da0b76759ca9ab WHIRLPOOL ea155aa0e5c23b78df11b38613a763ac3e4674fd0c8aebad2f25c975e668ef00bd4b47a44e69f5bf5557d547436434a899dcfbd723d64828aaded76b207708db
-AUX iproute2-3.10.0-no-ipv6.patch 1390 SHA256 7fd8cce977876c7815990912965d056396b25885219397ac4fd469357230265e SHA512 344d19146f1e518d4631cbebf794d047f54ff845d29439cb51d1398fded38b9ead6e4b6deede1c9c412fdb9c11f8c83058c6d514ba4229a8d4c71e3c967affa8 WHIRLPOOL 5dfe8c13297cc49ce785449c224527e24eebe10b41ad791777f9c5e8c8f650ae019d127bd1a2e80a92f32d7c63b6eb2745ce664306f025db2f1241c4713fb978
-AUX iproute2-3.19.0-musl.patch 794 SHA256 f15ef3d2455f8dbddc1e1060bdfe63e91d768a5678f230bf0dd8fba5d4032834 SHA512 43bf34904f504f87c6e9acdc1824cc9aa8d16c04d8a88923553a121c06d67f48784b62d4e27923d0b2803eb98f1fc2bcae66cc5232aced6ba929e0b93cff1de5 WHIRLPOOL 3a355863a898714c8754d5ebfd506fbfd1102d25e09c020f9267e187e4117e5f004ef8b227bedfce9fb59234914adfdb57590305cc6c6c8921e55bdafd24a333
-AUX iproute2-3.8.0-musl-headers.patch 2701 SHA256 3d6c6ff432f68ab76bc818aee6228eb6272c52679c86e3e49c556fec3de4d03d SHA512 bee8782ad8f2c3fcfc000f26e3d358a189f1518e45c2a2992356653e60381f31b2209c40b14b72ed11f925c330ca052f12a409b9575aa384274e91c47cbb3d8b WHIRLPOOL 9a1fa59e12bac76ea06e33481e10808d165d4a95eabb63eff69f5258df5c84dca5403c1096557e9fc595ec5acac4a306ff29feb8f3645b2af6d2cc8c3ba0ebd2
-AUX iproute2-3.8.0-old-mount-libc.patch 871 SHA256 dc9fc407b09763f79663dbad627961f8a3446881737cc666f0cb67235f160d51 SHA512 cda73ce07c21d18c68fcff08e282e87a2d4b53cf7779e8a1ef669d7275974c8f3638ca530031aafcfc7eb4885264ceb7abb308b9da6f5568889a84cb4c7df1f9 WHIRLPOOL d2057e6bad82dce7844886d551d70af9207e111494b9cc23abc433857741afa48f30671091c8821a60aaa07ca621f243fbeee10322da11ac44d02f4f588b88bf
-AUX iproute2-4.0.0-fix-build-with-musl.patch 586 SHA256 e617316ce2803b6ad0dca43426a7a6c8762809f8e1e984da8c935bcff4db8e34 SHA512 2473432adbc02f0085be7b689af00527bc87f3ee89e313425dbc3a02e1a4569b1c397fc7160a2b26907c5edff3fdd5bd38d7e27043a9bebfbc36d714c8281953 WHIRLPOOL a6b451b38bb977a0b52fa904905c599922693c425537d5173c981dc2082d6c55f9a0d01514405e57c5719c376357f4759333ea3ad5dea849f4cef9df76d12181
-AUX iproute2-4.0.0-tc-show-buffer-overflow.patch 1717 SHA256 2ddb5ea744185f5ebff79961a054570b166ad1a5f3df0b91b59927d1b86c7aa3 SHA512 f5b507ce9d9a2cf4b86c0c2e2a18c5295226707df707eb229ec2f880b0fee64740a039fe5aa334c1dfc2d04faec4200cdb27dfaf631119a8705dd698f2767a77 WHIRLPOOL 801e25b3f6984b59d95eb494dfa63502e2c32551c8f5376ab6109a6bf5b9401f1b7bf6a0e0456dc68abb207d9505b5dbade675ea39e709e27a839357a431c444
 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
-DIST iproute2-3.19.0.tar.xz 455004 SHA256 e2f9f8c36e166f2ba6c0e1e7a9ad84cdf7c1615b93df49dac44563d7b57fd7b0 SHA512 fc533b6a526cfda234f043ac25302a3206a81ab2a740640b997b6bfb22e6f94ddc21b704191a358ea8721a327ba785e0224a4b4129111ef5008b4003379c3706 WHIRLPOOL 6a0aa1a948286d7dcb3663d787167c27760d756385295bf0ca631920aed50fbd984c19204247097116ef0d4e293c3c8dbe13b0b44c6ec83e7815a7461293c89f
-DIST iproute2-4.0.0.tar.xz 459364 SHA256 5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512 8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4 WHIRLPOOL 6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b
-DIST iproute2-4.1.1.tar.xz 496388 SHA256 73077a989efb934450bd655cbd9aaddaa747cb696c64d0c9a3323768a6a8e66f SHA512 af2e4021faf931d17a67c242c66b4f6a6ce93a69cee5408dd3951d488da511c99d693534e91d0a317bd82dfdcb6a543605cecf2514d512004639db8d17afb93e WHIRLPOOL 24542b56275675609aaad69ca68e89145d4da84ddb2429ae546179a249bcc1213f89168673657966122e01e992763fec053c118fbd69b7db1677ad7be97397b6
 DIST iproute2-4.3.0.tar.xz 525364 SHA256 f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995 SHA512 14736158e76cef3dfc3af1a881faf97901bce6dcc9ffe52de92c8a64ae466f2c8ceaa32349553215dbe371115e7cd5cedcbf9922a0d72da9e7ebe3a73fac3687 WHIRLPOOL cd772090f20bbb50e4556c609f28a07acc60ff344989f2ad112c13e1dbc6f60b09e9f5bc6bd29322b1b1635b6266d70aff1aa8f5c37ed458ae569697b7401c0e
-EBUILD iproute2-3.19.0-r99.ebuild 3700 SHA256 552f58b5f02887a93c347450df11fd236fb1bb49cb82962c0fbc75863b9750bd SHA512 a1fee8a1268ec96a6e90b5c5bc40a0d7a6cd23d4ecb8bf5617d0145b1db0a62bef85bbd37719e86997f8103feb09c98b025fb82b1bbae885cc5b6f6a3b346d39 WHIRLPOOL 73209031bf4ccebda47195632c09fc4f017854723c734f51e4bfa9f20bfd284f1272d891b4c8f22b25e6b28e12cc0289e28c78a765d0c71ce5bcbdce2b925363
-EBUILD iproute2-4.0.0-r99.ebuild 3867 SHA256 e87ce20beee93a16efc68a9eafb13b666465121e344615f8152c6b039a017d22 SHA512 5a81a56bd880012c309bebb20d55e97b0d19ced6e6ff69711f4dfa78892417f55131cd14fc285a146bf7fd75e9e4a094ab1dc584d921a49ea0f7087fd642ecc1 WHIRLPOOL 3abcb67e2fbd6b6a85095d3cbc4daa0ec1d534a67ccbbc86b0d6f540b00252fbe66a4af76b79ed2d77029580216ede5f32726f8afe5ba1d676860d3e53deef00
-EBUILD iproute2-4.1.1-r99.ebuild 4004 SHA256 0bb7fe762de032771f0c46eaf77284bfd5b0120115315ba607099b11e8ebe671 SHA512 f55d0a4004eb626678acb3aed712cc31ace1f00274b9cabdd1ea111dc6be2e5f1dd01b5d3be3304d01cd37c7c61f522511d0ff3a2e5ec628b5a089aba87c4a65 WHIRLPOOL dc2334cf12d4efe1a73c853b1c339fc7665df493552b6bc659dca623b8cea980fe5ed27daada02a93a9efa5749184a5f1a557fac3e816b08259e3497f9310a3c
-EBUILD iproute2-4.3.0.ebuild 3873 SHA256 f9f85b6689ea2b5148c0b7b9f89683181ffa140426483f3584156568dfe76ffc SHA512 6a89c4a094e714318b65fe0d23f4008ca0d08be328f66f7407b3754a6ddb39c9c3b78306a4a3c93345d8f89d605554683481cff4810399e601588fe1f60541ad WHIRLPOOL 45dc9cf6c45b9b99057034c0fb34fd61269c51e8ae75ae191002bf64537bbc4e73f571784211c0098b04788f597af19e34a7c3418791a9eb44b2eda3b16f70d3
+EBUILD iproute2-4.3.0-r99.ebuild 3813 SHA256 3c366171d7b245005a97f4f484f922f203e7f505a88e64c4fa83fb373a810853 SHA512 f288a18ba5e6e176310870229f864d7a4c366041342eb27bdd1a887bc6ac88f3e5c3b4951ba8dd2fe82322a96b3a9b427b432291ed4fb947469de478408d9fdf WHIRLPOOL 3faf3dddf082333e8f16d9b62832a0f4e44d02d9ec7890e7cec5945179aa59f97a68cc9c5b715af557688c5054c32bab1fd9ba5747f5e672788034b3cf17ab69
 MISC metadata.xml 317 SHA256 45312a0c8b9363b8eaa97110513ca39053ffcd967af978900ee0a01aa81c00aa SHA512 2e6ed50522276dd0b09a61ba0c68ccc226ff33b64da2af87e92e349354f379cae040eb753961aeedc2a894eb65415fba7763541efe21bf328fe0a69706aeb872 WHIRLPOOL 73003e9201c29cba545b3245b53da9c36dc4b3c209ece693a9401b954896f6db5d29b209318fb7dd1c33db8920d01e097feaa88ef4ec0cb07590e850803bce09

diff --git a/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch
deleted file mode 100644
index 1282a1b..0000000
--- a/sys-apps/iproute2/files/iproute2-3.1.0-no-ipv6.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/326849
-
-allow ipv6 to be disabled
-
---- a/ip/iptunnel.c
-+++ b/ip/iptunnel.c
-@@ -456,13 +456,6 @@ int do_iptunnel(int argc, char **argv)
- 		break;
- 	case AF_INET:
- 		break;
--	/*
--	 * This is silly enough but we have no easy way to make it
--	 * protocol-independent because of unarranged structure between
--	 * IPv4 and IPv6.
--	 */
--	case AF_INET6:
--		return do_ip6tunnel(argc, argv);
- 	default:
- 		fprintf(stderr, "Unsupported family:%d\n", preferred_family);
- 		exit(-1);
---- a/ip/Makefile
-+++ b/ip/Makefile
-@@ -1,6 +1,6 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
--    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
--    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o \
-+    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+    ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o \
-     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
-     iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
-     iplink_macvlan.o iplink_macvtap.o ipl2tp.o
---- a/ip/ipmonitor.c
-+++ b/ip/ipmonitor.c
-@@ -76,7 +76,6 @@ int accept_msg(const struct sockaddr_nl *who,
- 	if (n->nlmsg_type == RTM_NEWPREFIX) {
- 		if (prefix_banner)
- 			fprintf(fp, "[PREFIX]");
--		print_prefix(who, n, arg);
- 		return 0;
- 	}
- 	if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {

diff --git a/sys-apps/iproute2/files/iproute2-3.10.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-3.10.0-no-ipv6.patch
deleted file mode 100644
index 86d80d2..0000000
--- a/sys-apps/iproute2/files/iproute2-3.10.0-no-ipv6.patch
+++ /dev/null
@@ -1,41 +0,0 @@
-https://bugs.gentoo.org/326849
-
-allow ipv6 to be disabled
-
---- a/ip/iptunnel.c
-+++ b/ip/iptunnel.c
-@@ -629,13 +629,6 @@ int do_iptunnel(int argc, char **argv)
- 		break;
- 	case AF_INET:
- 		break;
--	/*
--	 * This is silly enough but we have no easy way to make it
--	 * protocol-independent because of unarranged structure between
--	 * IPv4 and IPv6.
--	 */
--	case AF_INET6:
--		return do_ip6tunnel(argc, argv);
- 	default:
- 		fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
- 		exit(-1);
---- a/ip/Makefile
-+++ b/ip/Makefile
-@@ -1,6 +1,6 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
--    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
--    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
-+    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+    ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
-     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o \
-     iplink_vlan.o link_veth.o link_gre.o iplink_can.o \
-     iplink_macvlan.o iplink_macvtap.o ipl2tp.o link_vti.o \
---- a/ip/ipmonitor.c
-+++ b/ip/ipmonitor.c
-@@ -96,7 +96,6 @@ static int accept_msg(const struct socka
- 	if (n->nlmsg_type == RTM_NEWPREFIX) {
- 		if (prefix_banner)
- 			fprintf(fp, "[PREFIX]");
--		print_prefix(who, n, arg);
- 		return 0;
- 	}
- 	if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {

diff --git a/sys-apps/iproute2/files/iproute2-3.19.0-musl.patch b/sys-apps/iproute2/files/iproute2-3.19.0-musl.patch
deleted file mode 100644
index 6ebc808..0000000
--- a/sys-apps/iproute2/files/iproute2-3.19.0-musl.patch
+++ /dev/null
@@ -1,22 +0,0 @@
-diff -ur a/iproute2-3.19.0/include/linux/if_bridge.h b/iproute2-3.19.0/include/linux/if_bridge.h
---- a/iproute2-3.19.0/include/linux/if_bridge.h	2015-02-11 01:14:32.000000000 -0200
-+++ b/iproute2-3.19.0/include/linux/if_bridge.h	2015-04-25 21:39:38.130830774 -0200
-@@ -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 -ur a/iproute2-3.19.0/lib/namespace.c b/iproute2-3.19.0/lib/namespace.c
---- a/iproute2-3.19.0/lib/namespace.c	2015-02-11 01:14:32.000000000 -0200
-+++ b/iproute2-3.19.0/lib/namespace.c	2015-04-25 21:39:01.273291557 -0200
-@@ -9,6 +9,7 @@
- 
- #include <fcntl.h>
- #include <dirent.h>
-+#include <sys/param.h>
- 
- #include "utils.h"
- #include "namespace.h"

diff --git a/sys-apps/iproute2/files/iproute2-3.8.0-musl-headers.patch b/sys-apps/iproute2/files/iproute2-3.8.0-musl-headers.patch
deleted file mode 100644
index a0b2e45..0000000
--- a/sys-apps/iproute2/files/iproute2-3.8.0-musl-headers.patch
+++ /dev/null
@@ -1,81 +0,0 @@
-diff -Naur iproute2-3.8.0.orig/misc/arpd.c iproute2-3.8.0/misc/arpd.c
---- iproute2-3.8.0.orig/misc/arpd.c	2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/arpd.c	2015-01-17 12:23:52.251980551 +0000
-@@ -18,7 +18,7 @@
- #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 <sys/uio.h>
-diff -Naur iproute2-3.8.0.orig/misc/ifstat.c iproute2-3.8.0/misc/ifstat.c
---- iproute2-3.8.0.orig/misc/ifstat.c	2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/ifstat.c	2015-01-17 12:23:42.795640740 +0000
-@@ -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-3.8.0.orig/misc/lnstat.h iproute2-3.8.0/misc/lnstat.h
---- iproute2-3.8.0.orig/misc/lnstat.h	2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/lnstat.h	2015-01-17 12:33:50.391207710 +0000
-@@ -2,6 +2,7 @@
- #define _LNSTAT_H
- 
- #include <limits.h>
-+#include <sys/time.h>
- 
- #define LNSTAT_VERSION "0.02 041002"
- 
-diff -Naur iproute2-3.8.0.orig/misc/nstat.c iproute2-3.8.0/misc/nstat.c
---- iproute2-3.8.0.orig/misc/nstat.c	2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/nstat.c	2015-01-17 12:23:27.683097666 +0000
-@@ -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-3.8.0.orig/misc/rtacct.c iproute2-3.8.0/misc/rtacct.c
---- iproute2-3.8.0.orig/misc/rtacct.c	2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/misc/rtacct.c	2015-01-17 12:23:35.340372834 +0000
-@@ -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-3.8.0.orig/tc/tc_stab.c iproute2-3.8.0/tc/tc_stab.c
---- iproute2-3.8.0.orig/tc/tc_stab.c	2015-01-17 12:19:44.001058119 +0000
-+++ iproute2-3.8.0/tc/tc_stab.c	2015-01-17 12:22:35.692229262 +0000
-@@ -21,6 +21,7 @@
- #include <arpa/inet.h>
- #include <string.h>
- #include <malloc.h>
-+#include <sys/param.h>
- 
- #include "utils.h"
- #include "tc_util.h"
-diff -Naur iproute2-3.8.0.orig/tc/tc_util.c iproute2-3.8.0/tc/tc_util.c
---- iproute2-3.8.0.orig/tc/tc_util.c	2013-02-21 16:41:20.000000000 +0000
-+++ iproute2-3.8.0/tc/tc_util.c	2015-01-17 12:21:57.785866923 +0000
-@@ -20,6 +20,7 @@
- #include <arpa/inet.h>
- #include <string.h>
- #include <math.h>
-+#include <sys/param.h>
- 
- #include "utils.h"
- #include "tc_util.h"

diff --git a/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch b/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch
deleted file mode 100644
index 96280e0..0000000
--- a/sys-apps/iproute2/files/iproute2-3.8.0-old-mount-libc.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-From 03fdb011dd661315a83998af8af779d8f089e3fe Mon Sep 17 00:00:00 2001
-From: Stephen Hemminger <stephen@networkplumber.org>
-Date: Wed, 17 Apr 2013 13:33:26 -0700
-Subject: [PATCH] ipnetns: fix build on older systems
-
-Debian Squeeze has out of date <sys/mount.h> without the required flags.
----
- ip/ipnetns.c | 14 ++++++++++++++
- 1 file changed, 14 insertions(+)
-
-diff --git a/ip/ipnetns.c b/ip/ipnetns.c
-index b047b97..c9bc20a 100644
---- a/ip/ipnetns.c
-+++ b/ip/ipnetns.c
-@@ -29,6 +29,20 @@
- #define MNT_DETACH	0x00000002	/* Just detach from the tree */
- #endif /* MNT_DETACH */
- 
-+/* sys/mount.h may be out too old to have these */
-+#ifndef MS_REC
-+#define MS_REC		16384
-+#endif
-+
-+#ifndef MS_SLAVE
-+#define MS_SLAVE	(1 << 19)
-+#endif
-+
-+#ifndef MS_SHARED
-+#define MS_SHARED	(1 << 20)
-+#endif
-+
-+
- #ifndef HAVE_SETNS
- static int setns(int fd, int nstype)
- {
--- 
-1.8.2.1
-

diff --git a/sys-apps/iproute2/files/iproute2-4.0.0-fix-build-with-musl.patch b/sys-apps/iproute2/files/iproute2-4.0.0-fix-build-with-musl.patch
deleted file mode 100644
index 5281be3..0000000
--- a/sys-apps/iproute2/files/iproute2-4.0.0-fix-build-with-musl.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-diff --git a/include/linux/if_bridge.h b/include/linux/if_bridge.h
-index 913bd8e..260d1e0 100644
---- a/include/linux/if_bridge.h
-+++ b/include/linux/if_bridge.h
-@@ -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 --git a/lib/namespace.c b/lib/namespace.c
-index c03a103..f121eaa 100644
---- a/lib/namespace.c
-+++ b/lib/namespace.c
-@@ -9,6 +9,7 @@
- 
- #include <fcntl.h>
- #include <dirent.h>
-+#include <sys/param.h>
- 
- #include "utils.h"
- #include "namespace.h"

diff --git a/sys-apps/iproute2/files/iproute2-4.0.0-tc-show-buffer-overflow.patch b/sys-apps/iproute2/files/iproute2-4.0.0-tc-show-buffer-overflow.patch
deleted file mode 100644
index 6c6c9a5..0000000
--- a/sys-apps/iproute2/files/iproute2-4.0.0-tc-show-buffer-overflow.patch
+++ /dev/null
@@ -1,62 +0,0 @@
-https://bugs.gentoo.org/546928
-
-From 46679bbbe89699016d31486de7599590d02a5054 Mon Sep 17 00:00:00 2001
-From: Vadim Kochan <vadim4j@gmail.com>
-Date: Mon, 20 Apr 2015 08:33:32 +0300
-Subject: [PATCH] tc util: Fix possible buffer overflow when print class id
-
-Use correct handle buffer length.
-
-Signed-off-by: Vadim Kochan <vadim4j@gmail.com>
----
- tc/tc_util.c | 19 ++++++++++---------
- 1 file changed, 10 insertions(+), 9 deletions(-)
-
-diff --git a/tc/tc_util.c b/tc/tc_util.c
-index 1d3153d..dc2b70f 100644
---- a/tc/tc_util.c
-+++ b/tc/tc_util.c
-@@ -128,30 +128,31 @@ ok:
- 	return 0;
- }
- 
--int print_tc_classid(char *buf, int len, __u32 h)
-+int print_tc_classid(char *buf, int blen, __u32 h)
- {
--	char handle[40] = {};
-+	SPRINT_BUF(handle) = {};
-+	int hlen = SPRINT_BSIZE - 1;
- 
- 	if (h == TC_H_ROOT)
- 		sprintf(handle, "root");
- 	else if (h == TC_H_UNSPEC)
--		snprintf(handle, len, "none");
-+		snprintf(handle, hlen, "none");
- 	else if (TC_H_MAJ(h) == 0)
--		snprintf(handle, len, ":%x", TC_H_MIN(h));
-+		snprintf(handle, hlen, ":%x", TC_H_MIN(h));
- 	else if (TC_H_MIN(h) == 0)
--		snprintf(handle, len, "%x:", TC_H_MAJ(h) >> 16);
-+		snprintf(handle, hlen, "%x:", TC_H_MAJ(h) >> 16);
- 	else
--		snprintf(handle, len, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h));
-+		snprintf(handle, hlen, "%x:%x", TC_H_MAJ(h) >> 16, TC_H_MIN(h));
- 
- 	if (use_names) {
- 		char clname[IDNAME_MAX] = {};
- 
- 		if (id_to_name(cls_names, h, clname))
--			snprintf(buf, len, "%s#%s", clname, handle);
-+			snprintf(buf, blen, "%s#%s", clname, handle);
- 		else
--			snprintf(buf, len, "%s", handle);
-+			snprintf(buf, blen, "%s", handle);
- 	} else {
--		snprintf(buf, len, "%s", handle);
-+		snprintf(buf, blen, "%s", handle);
- 	}
- 
- 	return 0;
--- 
-2.3.5
-

diff --git a/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild b/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild
deleted file mode 100644
index 0fe6cdc..0000000
--- a/sys-apps/iproute2/iproute2-3.19.0-r99.ebuild
+++ /dev/null
@@ -1,126 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.19.0.ebuild,v 1.5 2015/04/25 12:36:09 zlogene Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-2
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~mips ppc x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-RDEPEND="!net-misc/arpd
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	!minimal? ( berkdb? ( sys-libs/db ) )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )"
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-kernel/linux-headers-2.6.27
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
-	epatch "${FILESDIR}"/${PN}-3.19.0-musl.patch
-	epatch "${FILESDIR}"/${PN}-4.3.0-musl-noiptables.patch
-
-	sed -i \
-		-e '/^CC =/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	# don't build arpd if USE=-berkdb #81660
-	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc:' Makefile
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	echo 'main(){return setns();};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'main(){};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	cat <<-EOF > Config
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		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
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	fi
-}

diff --git a/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild b/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild
deleted file mode 100644
index eb20fe4..0000000
--- a/sys-apps/iproute2/iproute2-4.0.0-r99.ebuild
+++ /dev/null
@@ -1,130 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.0.0-r1.ebuild,v 1.1 2015/04/20 20:51:18 vapier Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-2
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-RDEPEND="!net-misc/arpd
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )"
-# We require newer linux-headers for ipset support #549948
-DEPEND="${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	sys-devel/bison
-	sys-devel/flex
-	>=sys-kernel/linux-headers-3.7
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	epatch "${FILESDIR}"/${P}-tc-show-buffer-overflow.patch #546928
-	use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
-	epatch "${FILESDIR}"/${PN}-4.0.0-fix-build-with-musl.patch
-
-	sed -i \
-		-e '/^CC =/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	# don't build arpd if USE=-berkdb #81660
-	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	echo 'main(){return setns();};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'main(){};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	cat <<-EOF > Config
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		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
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	fi
-}

diff --git a/sys-apps/iproute2/iproute2-4.1.1-r99.ebuild b/sys-apps/iproute2/iproute2-4.1.1-r99.ebuild
deleted file mode 100644
index 5e9ea5d..0000000
--- a/sys-apps/iproute2/iproute2-4.1.1-r99.ebuild
+++ /dev/null
@@ -1,132 +0,0 @@
-# Copyright 1999-2015 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-4.1.1.ebuild,v 1.1 2015/07/07 16:07:02 vapier Exp $
-
-EAPI="5"
-
-inherit eutils toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-2
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-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 )"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-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 )"
-
-src_prepare() {
-	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.0-no-ipv6.patch #326849
-	epatch "${FILESDIR}"/${PN}-4.0.0-fix-build-with-musl.patch
-
-	sed -i \
-		-e '/^CC =/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	# don't build arpd if USE=-berkdb #81660
-	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	echo 'main(){return setns();};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'main(){};' > test.c
-	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	cat <<-EOF > Config
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		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
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	fi
-}

diff --git a/sys-apps/iproute2/iproute2-4.3.0.ebuild b/sys-apps/iproute2/iproute2-4.3.0-r99.ebuild
similarity index 97%
rename from sys-apps/iproute2/iproute2-4.3.0.ebuild
rename to sys-apps/iproute2/iproute2-4.3.0-r99.ebuild
index cb388c0..5057264 100644
--- a/sys-apps/iproute2/iproute2-4.3.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.3.0-r99.ebuild
@@ -11,7 +11,7 @@ if [[ ${PV} == "9999" ]] ; then
 	inherit git-2
 else
 	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~alpha ~amd64 ~arm ~arm64 ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	KEYWORDS="amd64 arm ~mips ppc x86"
 fi
 
 DESCRIPTION="kernel routing and traffic control utilities"


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2016-03-14  1:29 Anthony G. Basile
  0 siblings, 0 replies; 13+ messages in thread
From: Anthony G. Basile @ 2016-03-14  1:29 UTC (permalink / raw
  To: gentoo-commits

commit:     ff41fd97f980f3754d3dfd43b24df82509019ecd
Author:     layman <layman <AT> localhost>
AuthorDate: Sun Mar 13 22:23:49 2016 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Mon Mar 14 01:39:16 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=ff41fd97

sys-apps/iproute2: bump to 4.4.0

Package-Manager: portage-2.2.26
RepoMan-Options: --force

 sys-apps/iproute2/Manifest                         |   3 +
 .../files/iproute2-4.4.0-missing-limits_h.patch    |  11 ++
 sys-apps/iproute2/iproute2-4.4.0-r99.ebuild        | 132 +++++++++++++++++++++
 3 files changed, 146 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 2db1a34..7a5328b 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -2,6 +2,9 @@ AUX iproute2-3.1.0-mtu.patch 1649 SHA256 d8d1d3b81a3fd5674e6c9e202bce9e84f41b579
 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.3.0.tar.xz 525364 SHA256 f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995 SHA512 14736158e76cef3dfc3af1a881faf97901bce6dcc9ffe52de92c8a64ae466f2c8ceaa32349553215dbe371115e7cd5cedcbf9922a0d72da9e7ebe3a73fac3687 WHIRLPOOL cd772090f20bbb50e4556c609f28a07acc60ff344989f2ad112c13e1dbc6f60b09e9f5bc6bd29322b1b1635b6266d70aff1aa8f5c37ed458ae569697b7401c0e
+DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
 EBUILD iproute2-4.3.0-r99.ebuild 3813 SHA256 3c366171d7b245005a97f4f484f922f203e7f505a88e64c4fa83fb373a810853 SHA512 f288a18ba5e6e176310870229f864d7a4c366041342eb27bdd1a887bc6ac88f3e5c3b4951ba8dd2fe82322a96b3a9b427b432291ed4fb947469de478408d9fdf WHIRLPOOL 3faf3dddf082333e8f16d9b62832a0f4e44d02d9ec7890e7cec5945179aa59f97a68cc9c5b715af557688c5054c32bab1fd9ba5747f5e672788034b3cf17ab69
+EBUILD iproute2-4.4.0-r99.ebuild 3870 SHA256 62165885127fe38746165c160a666636cc91c76b1e33887c7dd2e575be1e7488 SHA512 0bc3eb6a0d6c842912dec269619397e51c353703619307a65762b2e86452b7f8210d331729367cf39a1ec758a2c6ca5fa85bfe6be89cf400ba0c5a13e23926d9 WHIRLPOOL 8f4cde5408e50b55d1dca63f90cd6b39e3fff0f1904ae79189d8ff871c6210c7c1788baa182c4e2b849fa2797c129486c546528a2b018835768fe33ab5dded57
 MISC metadata.xml 467 SHA256 54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512 34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c WHIRLPOOL 188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1

diff --git a/sys-apps/iproute2/files/iproute2-4.4.0-missing-limits_h.patch b/sys-apps/iproute2/files/iproute2-4.4.0-missing-limits_h.patch
new file mode 100644
index 0000000..d08f300
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.4.0-missing-limits_h.patch
@@ -0,0 +1,11 @@
+diff -Naur iproute2-4.4.0.orig/lib/rt_names.c iproute2-4.4.0/lib/rt_names.c
+--- iproute2-4.4.0.orig/lib/rt_names.c	2016-01-11 16:33:03.000000000 +0000
++++ iproute2-4.4.0/lib/rt_names.c	2016-03-13 22:19:57.103454162 +0000
+@@ -18,6 +18,7 @@
+ #include <sys/time.h>
+ #include <sys/socket.h>
+ #include <dirent.h>
++#include <limits.h>
+ 
+ #include <asm/types.h>
+ #include <linux/rtnetlink.h>

diff --git a/sys-apps/iproute2/iproute2-4.4.0-r99.ebuild b/sys-apps/iproute2/iproute2-4.4.0-r99.ebuild
new file mode 100644
index 0000000..e9241d6
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.4.0-r99.ebuild
@@ -0,0 +1,132 @@
+# Copyright 1999-2016 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Id$
+
+EAPI="5"
+
+inherit eutils toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-2
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="amd64 arm ~mips ppc x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+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 )"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+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 )"
+
+src_prepare() {
+	epatch "${FILESDIR}"/${PN}-4.4.0-missing-limits_h.patch
+	epatch "${FILESDIR}"/${PN}-4.3.0-musl.patch
+	epatch "${FILESDIR}"/${PN}-4.3.0-musl-noiptables.patch
+	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
+
+	sed -i \
+		-e '/^CC =/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^WFLAGS/s:-Werror::" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	echo 'main(){return setns();};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'main(){};' > test.c
+	${CC} ${CFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	cat <<-EOF > Config
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX}"/$(get_libdir) \
+		SBINDIR="${EPREFIX}"/sbin \
+		CONFDIR="${EPREFIX}"/etc/iproute2 \
+		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX}"/usr/share/man \
+		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
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2016-11-21 21:34 Aric Belsito
  0 siblings, 0 replies; 13+ messages in thread
From: Aric Belsito @ 2016-11-21 21:34 UTC (permalink / raw
  To: gentoo-commits

commit:     f0d988ba985629dc40485836bada1cb0711c7f5e
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Nov 21 21:34:08 2016 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Nov 21 21:34:08 2016 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=f0d988ba

sys-apps/iproute2: Add missing patch

 sys-apps/iproute2/Manifest                         |  1 +
 .../files/iproute2-4.5.0-no-iptables.patch         | 42 ++++++++++++++++++++++
 2 files changed, 43 insertions(+)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 364ab4d..3914086 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -3,6 +3,7 @@ AUX iproute2-4.2.0-no-ipv6.patch 1336 SHA256 b352b11d22e922038adb2b1ae083b6e47b8
 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.5.0-no-iptables.patch 1022 SHA256 b6f69d8123e034d1be462d6672f8f59915f6e25b890c8d3068a1e0af658a85e1 SHA512 3a3e7a66f1528dc8d03fc6a13f363ce890d0c23c2ab8df966144d8764e95cafca168bdb7dd79cf1a8dd1e54be36939f2e6465ca6176e3bfedd222eb29901f98e WHIRLPOOL 42351420125199e5149d321d583fcc967ec253f1aa7f338757c38849e841c9c89f7f8861f36803a3a849a0454c0fdc605d50549eeebaf97c1aba0fe770e6cd4e
 AUX iproute2-4.8.0-musl.patch 3758 SHA256 737386e08312506528fda2e75410746acd282f00c9531e089bc1b06db79c1140 SHA512 fd35bd71fa26968ad5b1dd18597207d164a948999c3bf55a62054966cc95a0838c9ba5df0f7319672eec310bffd8f70101b7fd7c075aa20c77d4dc70490d8aff WHIRLPOOL 1e84ccf8a537b20e58ef1a48afc548eb4b81decdae8f0a5b94e835416aaac1b2256fcffac3e288d5b848cfe4d48bb31a3e667f56ce711ed3f31b337371eeeef8
 DIST iproute2-4.3.0.tar.xz 525364 SHA256 f03b1188dd6c039512424de82ff7a8f3b446680bd4e908ff42a7b9b137422995 SHA512 14736158e76cef3dfc3af1a881faf97901bce6dcc9ffe52de92c8a64ae466f2c8ceaa32349553215dbe371115e7cd5cedcbf9922a0d72da9e7ebe3a73fac3687 WHIRLPOOL cd772090f20bbb50e4556c609f28a07acc60ff344989f2ad112c13e1dbc6f60b09e9f5bc6bd29322b1b1635b6266d70aff1aa8f5c37ed458ae569697b7401c0e
 DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013

diff --git a/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch b/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch
new file mode 100644
index 0000000..7ed9dfb
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.5.0-no-iptables.patch
@@ -0,0 +1,42 @@
+--- iproute2-4.5.0/configure~	2016-03-14 23:02:31.000000000 +0000
++++ iproute2-4.5.0/configure	2016-03-17 13:24:17.634743197 +0000
+@@ -169,10 +169,25 @@
+ 
+ check_ipt()
+ {
+-	if ! grep TC_CONFIG_XT Config > /dev/null
++	if grep -q TC_CONFIG_XT Config
+ 	then
++		return
++	fi
++
++	cat >$TMPDIR/ipttest.c <<EOF
++#include <iptables.h>
++int main() { return 0; }
++EOF
++
++	if $CC -std=c90 -I$INCLUDE $IPTC -o $TMPDIR/ipttest $TMPDIR/ipttest.c $IPTL \
++		$(${PKG_CONFIG} libiptc --cflags --libs 2>/dev/null) -ldl >/dev/null 2>&1
++	then
++		echo "TC_CONFIG_IPT:=y" >>Config
+ 		echo "using iptables"
++	else
++		echo "no"
+ 	fi
++	rm -f $TMPDIR/ipttest.c $TMPDIR/ipttest
+ }
+ 
+ check_ipt_lib_dir()
+--- iproute2-4.5.0/tc/Makefile~	2016-03-14 23:02:31.000000000 +0000
++++ iproute2-4.5.0/tc/Makefile	2016-03-17 13:18:18.686689985 +0000
+@@ -88,7 +88,9 @@
+ 	CFLAGS += -DTC_CONFIG_XT_H
+ 	TCSO += m_xt_old.so
+     else
+-      TCMODULES += m_ipt.o
++      ifeq ($(TC_CONFIG_IPT),y)
++        TCMODULES += m_ipt.o
++      endif
+     endif
+   endif
+ endif


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2017-02-21 19:56 Aric Belsito
  0 siblings, 0 replies; 13+ messages in thread
From: Aric Belsito @ 2017-02-21 19:56 UTC (permalink / raw
  To: gentoo-commits

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() {


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2017-05-01 20:26 Aric Belsito
  0 siblings, 0 replies; 13+ messages in thread
From: Aric Belsito @ 2017-05-01 20:26 UTC (permalink / raw
  To: gentoo-commits

commit:     b792d920fbfef39781a27c71fba1bcb371b5d116
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon May  1 20:25:57 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon May  1 20:25:57 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=b792d920

sys-apps/iproute2: version bump to 4.11.0

 sys-apps/iproute2/Manifest                         |   9 +-
 sys-apps/iproute2/files/iproute2-4.10.0-musl.patch | 486 ------------------
 sys-apps/iproute2/files/iproute2-4.11.0-musl.patch | 566 +++++++++++++++++++++
 .../iproute2/files/iproute2-4.11.0-no-ipv6.patch   |  37 ++
 ...route2-4.10.0.ebuild => iproute2-4.11.0.ebuild} |   5 +-
 sys-apps/iproute2/iproute2-4.4.0.ebuild            |   1 -
 6 files changed, 610 insertions(+), 494 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 77e2dcc..a788ba4 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,11 +1,12 @@
 AUX iproute2-3.1.0-mtu.patch 1649 SHA256 d8d1d3b81a3fd5674e6c9e202bce9e84f41b579ba2c6a554df3346f4642715af SHA512 5479c2085b4aca958a89d3e265ebc3763c9e7cb273bd4046d7b7585209739f75ff04cc9b84d8eb9e3afae821ff788f0f0c7ab443260ab07943b6fad6946403e1 WHIRLPOOL b813f1d9dcdbfb525fb07a462f7faf1c13117dd3e9e584b1a033cb69f3dad9d4b8e5120f8512185f24769e6be0aabd6635ad3996342dc210ff513866e7638502
-AUX iproute2-4.10.0-musl.patch 15514 SHA256 c9da583db199833b4fb3f4a57f3c7905ab194ebb928bc267915ef8fec9a19c9e SHA512 7145498b46531e60d7dc5d7d149e5af790c24f2297d0ab91d87627a677e31324617fbfd8713d6ac160c64b2898c41682a673005a53b9342193688ab3227263e2 WHIRLPOOL 78ca358b52d712bf149c71ba049a99f09aa34408d538962217eb9c872b51786517445c91fba0281a7dac6c3b5bb15eb0a291cc8e7728875bc1d03fe79ac3ddc1
+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.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.10.0.tar.xz 626944 SHA256 22b1e1c1fc704ad35837e5a66103739727b8b48ac90b48c13f79b7367ff0a9a8 SHA512 e54477e167455e7ef5da4adc168d63eaa96091b63dc987fffe918cbb005eceed18a62283ca99ee2512dc0e960f47ae21b39ffbe399c1612fd9cea147c34c581b WHIRLPOOL 7034f87835b13d275d2e065ee00d869060ae20c7dd325d8974da414db20328195e5968ede2f0b6925ddf67de3712b5945f54276c6ce5c8367ba28520c2adb859
+DIST iproute2-4.11.0.tar.xz 657100 SHA256 72671028bda696d0cb8f48ec8e702581c3a501caeed33eec3a81d7041cbc8026 SHA512 e6cc3dbe2779670a752ab346c1a432b496033448d1645aa0161b3f7b683b3f9939ab09db12199b794cc64dff257faaf0d151046feea9031a6139176e08b4f4fa WHIRLPOOL 9bf25b018d3f392a2e2f4faf4c3877f52ec4b0aebb082d9c2e2c3e80c0c8f3885c122c5d211c4c6ef014506d786213b36938728f63b581079274a3116fc85581
 DIST iproute2-4.4.0.tar.xz 528552 SHA256 bc91c367288a19f78ef800cd6840363be1f22da8436fbae88e1a7250490d6514 SHA512 48236fc6103a55d977efa4f93ad7fdfc0944df975ce771d57fd3dcfb13b761b0c05dbe749978ac86c7a471d023bee62a2f1648a6ca75f50da9252acfde174b69 WHIRLPOOL 7e90c98805e12b28de284bb998e5a27cf524a78d0bd7632c0d49a7ddff8f11f5229ac6867076e9fea6f21b6b31360bddb21138673d94de766bdf7324a09bc013
-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
+EBUILD iproute2-4.11.0.ebuild 3964 SHA256 7670098190f2123a03686a6b93a3fd65104d4d311e520c4a7975dc5c0d6517f3 SHA512 b4b5bc2421b46012c13e0ab709ba66e63a37b10fab6b2ae5072e9cd3491bf4d5c50e7fedd14e53bf53dee31dce3b4d52e9e607b0f80bdccd7ea4dbf0c92efad7 WHIRLPOOL d4834fdd665cbb9ef349db00fbdb54f4a2e06f54c6ccdf8760785f36614ea6a2892eace7b24c14c9089c2ada20e59d8757e91b55da0c9b5023448afae2dd2cde
+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.10.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.10.0-musl.patch
deleted file mode 100644
index bfab37d..0000000
--- a/sys-apps/iproute2/files/iproute2-4.10.0-musl.patch
+++ /dev/null
@@ -1,486 +0,0 @@
-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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/bridge/link.c	2017-02-21 12:17:02.219298749 -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/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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/include/linux/if_bridge.h	2017-02-21 12:28:42.531792431 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/include/linux/if_tunnel.h	2017-02-21 12:26:13.871203393 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/include/linux/l2tp.h	2017-02-21 12:17:02.220298759 -0800
-@@ -9,8 +9,7 @@
- 
- #include <linux/types.h>
- #include <linux/socket.h>
--#include <linux/in.h>
--#include <linux/in6.h>
-+#include <netinet/in.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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/include/linux/netfilter.h	2017-02-21 12:30:04.969673613 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/include/linux/xfrm.h	2017-02-21 12:27:48.169211348 -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/ip/ip6tunnel.c iproute2-4.10.0/ip/ip6tunnel.c
---- iproute2-4.10.0.orig/ip/ip6tunnel.c	2017-02-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/ip/ip6tunnel.c	2017-02-21 12:23:12.679266625 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/ip/ipaddress.c	2017-02-21 12:17:02.221298770 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/ip/ipl2tp.c	2017-02-21 12:17:02.222298781 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/ip/ipmaddr.c	2017-02-21 12:17:02.222298781 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/ip/ipmroute.c	2017-02-21 12:17:02.223298792 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/ip/iprule.c	2017-02-21 12:17:02.223298792 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/ip/iptoken.c	2017-02-21 12:17:02.224298802 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/ip/iptuntap.c	2017-02-21 12:17:02.224298802 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/ip/tcp_metrics.c	2017-02-21 12:17:02.224298802 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/ip/tunnel.c	2017-02-21 12:22:52.571051688 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/lib/ll_addr.c	2017-02-21 12:17:02.225298813 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/lib/ll_proto.c	2017-02-21 12:17:02.225298813 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/lib/ll_types.c	2017-02-21 12:17:02.225298813 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/lib/utils.c	2017-02-21 12:17:02.225298813 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/misc/arpd.c	2017-02-21 12:17:02.226298824 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/misc/ifstat.c	2017-02-21 12:17:02.226298824 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/misc/nstat.c	2017-02-21 12:17:02.227298835 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/misc/rtacct.c	2017-02-21 12:17:02.227298835 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/misc/ss.c	2017-02-21 12:17:02.228298845 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/tc/f_basic.c	2017-02-21 12:17:02.228298845 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/tc/f_fw.c	2017-02-21 12:17:02.229298856 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/tc/f_matchall.c	2017-02-21 12:17:02.229298856 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/tc/f_u32.c	2017-02-21 12:17:02.229298856 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/tc/m_ife.c	2017-02-21 12:17:02.230298867 -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-20 08:47:52.000000000 -0800
-+++ iproute2-4.10.0/tc/m_xt.c	2017-02-21 12:17:02.230298867 -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.11.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.11.0-musl.patch
new file mode 100644
index 0000000..47f83a3
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.11.0-musl.patch
@@ -0,0 +1,566 @@
+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.11.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
new file mode 100644
index 0000000..fc855dc
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
@@ -0,0 +1,37 @@
+--- iproute2-4.11.0/ip/ipmonitor.c
++++ iproute2-4.11.0/ip/ipmonitor.c
+@@ -114,7 +114,6 @@
+ 	}
+ 	if (n->nlmsg_type == RTM_NEWPREFIX) {
+ 		print_headers(fp, "[PREFIX]", ctrl);
+-		print_prefix(who, n, arg);
+ 		return 0;
+ 	}
+ 	if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
+--- iproute2-4.11.0/ip/iptunnel.c
++++ iproute2-4.11.0/ip/iptunnel.c
+@@ -589,13 +589,6 @@
+ 		break;
+ 	case AF_INET:
+ 		break;
+-	/*
+-	 * This is silly enough but we have no easy way to make it
+-	 * protocol-independent because of unarranged structure between
+-	 * IPv4 and IPv6.
+-	 */
+-	case AF_INET6:
+-		return do_ip6tunnel(argc, argv);
+ 	default:
+ 		fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
+ 		exit(-1);
+--- iproute2-4.11.0/ip/Makefile
++++ iproute2-4.11.0/ip/Makefile
+@@ -1,6 +1,6 @@
+ IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
+-    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
+-    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
++    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
++    ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
+     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \
+     iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o \
+     iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \

diff --git a/sys-apps/iproute2/iproute2-4.10.0.ebuild b/sys-apps/iproute2/iproute2-4.11.0.ebuild
similarity index 97%
rename from sys-apps/iproute2/iproute2-4.10.0.ebuild
rename to sys-apps/iproute2/iproute2-4.11.0.ebuild
index a502b25..2b9683f 100644
--- a/sys-apps/iproute2/iproute2-4.10.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.11.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 
@@ -39,13 +38,13 @@ DEPEND="${RDEPEND}
 
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.10.0-musl.patch
+	"${FILESDIR}"/${PN}-4.11.0-musl.patch
 )
 
 src_prepare() {
 	if ! use ipv6 ; then
 		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
+			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
 		)
 	fi
 

diff --git a/sys-apps/iproute2/iproute2-4.4.0.ebuild b/sys-apps/iproute2/iproute2-4.4.0.ebuild
index 4f98a02..3741d1f 100644
--- a/sys-apps/iproute2/iproute2-4.4.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.4.0.ebuild
@@ -1,6 +1,5 @@
 # Copyright 1999-2016 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Id$
 
 EAPI="5"
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2017-07-06 23:43 Aric Belsito
  0 siblings, 0 replies; 13+ messages in thread
From: Aric Belsito @ 2017-07-06 23:43 UTC (permalink / raw
  To: gentoo-commits

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() {


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2017-11-13 21:35 Aric Belsito
  0 siblings, 0 replies; 13+ messages in thread
From: Aric Belsito @ 2017-11-13 21:35 UTC (permalink / raw
  To: gentoo-commits

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
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2017-12-15 17:36 Aric Belsito
  0 siblings, 0 replies; 13+ messages in thread
From: Aric Belsito @ 2017-12-15 17:36 UTC (permalink / raw
  To: gentoo-commits

commit:     5ca9d1eac576d80b1ca5879be94bf0502768d763
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Fri Dec 15 17:33:23 2017 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Fri Dec 15 17:33:23 2017 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=5ca9d1ea

sys-apps/iproute2: version bump to 4.14.1-r2

 .../files/iproute2-4.14.1-fix-tc-actions.patch     | 222 +++++++++++++++++++++
 sys-apps/iproute2/iproute2-4.14.1-r2.ebuild        | 147 ++++++++++++++
 2 files changed, 369 insertions(+)

diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch b/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch
new file mode 100644
index 0000000..a8b7aaa
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.14.1-fix-tc-actions.patch
@@ -0,0 +1,222 @@
+From 3572e01a090a298e2f4c4f796bad6639b652e031 Mon Sep 17 00:00:00 2001
+From: Michal Privoznik <mprivozn@redhat.com>
+Date: Fri, 8 Dec 2017 11:18:07 +0100
+Subject: tc: util: Don't call NEXT_ARG_FWD() in __parse_action_control()
+
+Not all callers want parse_action_control*() to advance the
+arguments. For instance act_parse_police() does the argument
+advancing itself.
+
+Fixes: e67aba559581 ("tc: actions: add helpers to parse and print control actions")
+Signed-off-by: Michal Privoznik <mprivozn@redhat.com>
+---
+ tc/m_bpf.c        |  1 +
+ tc/m_connmark.c   |  1 +
+ tc/m_csum.c       |  1 +
+ tc/m_gact.c       | 10 +++++-----
+ tc/m_ife.c        |  1 +
+ tc/m_mirred.c     |  4 +++-
+ tc/m_nat.c        |  1 +
+ tc/m_pedit.c      |  1 +
+ tc/m_sample.c     |  1 +
+ tc/m_skbedit.c    |  1 +
+ tc/m_skbmod.c     |  1 +
+ tc/m_tunnel_key.c |  1 +
+ tc/m_vlan.c       |  1 +
+ tc/tc_util.c      |  1 -
+ 14 files changed, 19 insertions(+), 7 deletions(-)
+
+diff --git a/tc/m_bpf.c b/tc/m_bpf.c
+index 1c1f71c..576f69c 100644
+--- a/tc/m_bpf.c
++++ b/tc/m_bpf.c
+@@ -129,6 +129,7 @@ opt_bpf:
+ 
+ 	parse_action_control_dflt(&argc, &argv, &parm.action,
+ 				  false, TC_ACT_PIPE);
++	NEXT_ARG_FWD();
+ 
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+diff --git a/tc/m_connmark.c b/tc/m_connmark.c
+index 37d7185..47c7a8c 100644
+--- a/tc/m_connmark.c
++++ b/tc/m_connmark.c
+@@ -82,6 +82,7 @@ parse_connmark(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
+ 	}
+ 
+ 	parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_PIPE);
++	NEXT_ARG_FWD();
+ 
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+diff --git a/tc/m_csum.c b/tc/m_csum.c
+index 7b15673..e1352c0 100644
+--- a/tc/m_csum.c
++++ b/tc/m_csum.c
+@@ -124,6 +124,7 @@ parse_csum(struct action_util *a, int *argc_p,
+ 	}
+ 
+ 	parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK);
++	NEXT_ARG_FWD();
+ 
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+diff --git a/tc/m_gact.c b/tc/m_gact.c
+index e7d91da..b30b042 100644
+--- a/tc/m_gact.c
++++ b/tc/m_gact.c
+@@ -87,14 +87,13 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
+ 	if (argc < 0)
+ 		return -1;
+ 
+-
+-	if (matches(*argv, "gact") == 0) {
+-		argc--;
+-		argv++;
+-	} else if (parse_action_control(&argc, &argv, &p.action, false) == -1) {
++	if (matches(*argv, "gact") != 0 &&
++		parse_action_control(&argc, &argv, &p.action, false) == -1) {
+ 		usage();	/* does not return */
+ 	}
+ 
++	NEXT_ARG_FWD();
++
+ #ifdef CONFIG_GACT_PROB
+ 	if (argc > 0) {
+ 		if (matches(*argv, "random") == 0) {
+@@ -114,6 +113,7 @@ parse_gact(struct action_util *a, int *argc_p, char ***argv_p,
+ 			if (parse_action_control(&argc, &argv,
+ 						 &pp.paction, false) == -1)
+ 				usage();
++			NEXT_ARG_FWD();
+ 			if (get_u16(&pp.pval, *argv, 10)) {
+ 				fprintf(stderr,
+ 					"Illegal probability val 0x%x\n",
+diff --git a/tc/m_ife.c b/tc/m_ife.c
+index 205efc9..4647f6a 100644
+--- a/tc/m_ife.c
++++ b/tc/m_ife.c
+@@ -159,6 +159,7 @@ static int parse_ife(struct action_util *a, int *argc_p, char ***argv_p,
+ 
+ 	parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE);
+ 
++	NEXT_ARG_FWD();
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+ 			NEXT_ARG();
+diff --git a/tc/m_mirred.c b/tc/m_mirred.c
+index 3870d3a..aa7ce6d 100644
+--- a/tc/m_mirred.c
++++ b/tc/m_mirred.c
+@@ -202,8 +202,10 @@ parse_direction(struct action_util *a, int *argc_p, char ***argv_p,
+ 	}
+ 
+ 
+-	if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR)
++	if (p.eaction == TCA_EGRESS_MIRROR || p.eaction == TCA_INGRESS_MIRROR) {
+ 		parse_action_control(&argc, &argv, &p.action, false);
++		NEXT_ARG_FWD();
++	}
+ 
+ 	if (argc) {
+ 		if (iok && matches(*argv, "index") == 0) {
+diff --git a/tc/m_nat.c b/tc/m_nat.c
+index 1e4ff51..f5de4d4 100644
+--- a/tc/m_nat.c
++++ b/tc/m_nat.c
+@@ -116,6 +116,7 @@ parse_nat(struct action_util *a, int *argc_p, char ***argv_p, int tca_id, struct
+ 
+ 	parse_action_control_dflt(&argc, &argv, &sel.action, false, TC_ACT_OK);
+ 
++	NEXT_ARG_FWD();
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+ 			NEXT_ARG();
+diff --git a/tc/m_pedit.c b/tc/m_pedit.c
+index 26549ee..dc57f14 100644
+--- a/tc/m_pedit.c
++++ b/tc/m_pedit.c
+@@ -672,6 +672,7 @@ int parse_pedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
+ 
+ 	parse_action_control_dflt(&argc, &argv, &sel.sel.action, false, TC_ACT_OK);
+ 
++	NEXT_ARG_FWD();
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+ 			NEXT_ARG();
+diff --git a/tc/m_sample.c b/tc/m_sample.c
+index ff5ee6b..31774c0 100644
+--- a/tc/m_sample.c
++++ b/tc/m_sample.c
+@@ -100,6 +100,7 @@ static int parse_sample(struct action_util *a, int *argc_p, char ***argv_p,
+ 
+ 	parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE);
+ 
++	NEXT_ARG_FWD();
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+ 			NEXT_ARG();
+diff --git a/tc/m_skbedit.c b/tc/m_skbedit.c
+index aa374fc..c41a7bb 100644
+--- a/tc/m_skbedit.c
++++ b/tc/m_skbedit.c
+@@ -123,6 +123,7 @@ parse_skbedit(struct action_util *a, int *argc_p, char ***argv_p, int tca_id,
+ 	parse_action_control_dflt(&argc, &argv, &sel.action,
+ 				  false, TC_ACT_PIPE);
+ 
++	NEXT_ARG_FWD();
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+ 			NEXT_ARG();
+diff --git a/tc/m_skbmod.c b/tc/m_skbmod.c
+index 561b73f..bc268df 100644
+--- a/tc/m_skbmod.c
++++ b/tc/m_skbmod.c
+@@ -124,6 +124,7 @@ static int parse_skbmod(struct action_util *a, int *argc_p, char ***argv_p,
+ 
+ 	parse_action_control_dflt(&argc, &argv, &p.action, false, TC_ACT_PIPE);
+ 
++	NEXT_ARG_FWD();
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+ 			NEXT_ARG();
+diff --git a/tc/m_tunnel_key.c b/tc/m_tunnel_key.c
+index 1cdd035..2dc9187 100644
+--- a/tc/m_tunnel_key.c
++++ b/tc/m_tunnel_key.c
+@@ -175,6 +175,7 @@ static int parse_tunnel_key(struct action_util *a, int *argc_p, char ***argv_p,
+ 	parse_action_control_dflt(&argc, &argv, &parm.action,
+ 				  false, TC_ACT_PIPE);
+ 
++	NEXT_ARG_FWD();
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+ 			NEXT_ARG();
+diff --git a/tc/m_vlan.c b/tc/m_vlan.c
+index 161759f..edae0d1 100644
+--- a/tc/m_vlan.c
++++ b/tc/m_vlan.c
+@@ -131,6 +131,7 @@ static int parse_vlan(struct action_util *a, int *argc_p, char ***argv_p,
+ 	parse_action_control_dflt(&argc, &argv, &parm.action,
+ 				  false, TC_ACT_PIPE);
+ 
++	NEXT_ARG_FWD();
+ 	if (argc) {
+ 		if (matches(*argv, "index") == 0) {
+ 			NEXT_ARG();
+diff --git a/tc/tc_util.c b/tc/tc_util.c
+index 1887905..ee9a70a 100644
+--- a/tc/tc_util.c
++++ b/tc/tc_util.c
+@@ -586,7 +586,6 @@ static int __parse_action_control(int *argc_p, char ***argv_p, int *result_p,
+ 		}
+ 		result |= jump_cnt;
+ 	}
+-	NEXT_ARG_FWD();
+ 	*argc_p = argc;
+ 	*argv_p = argv;
+ 	*result_p = result;
+-- 
+cgit v1.1
+

diff --git a/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
new file mode 100644
index 0000000..854bdd9
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.14.1-r2.ebuild
@@ -0,0 +1,147 @@
+# Copyright 1999-2017 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl virtual/libelf )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.16
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${P}-fix-tc-actions.patch
+	"${FILESDIR}"/${PN}-4.14.0-musl.patch
+)
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^WFLAGS/s:-Werror::" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	default
+
+	# ...now switch on/off requested features via USE flags
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex minimal n y)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
+		SBINDIR="${EPREFIX%/}"/sbin \
+		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
+		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX%/}"/usr/share/man \
+		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED%/}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2018-01-08 18:02 Aric Belsito
  0 siblings, 0 replies; 13+ messages in thread
From: Aric Belsito @ 2018-01-08 18:02 UTC (permalink / raw
  To: gentoo-commits

commit:     71b270a2c3253eef7b5133b252fcf3144964c334
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Jan  8 18:01:55 2018 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Jan  8 18:01:55 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=71b270a2

sys-apps/iproute2: version bump to 4.14.1-r3

 sys-apps/iproute2/Manifest                         |   2 +-
 .../files/iproute2-4.14.1-configure-nomagic.patch  | 196 +++++++++++++++++++++
 sys-apps/iproute2/iproute2-4.14.1-r3.ebuild        | 153 ++++++++++++++++
 3 files changed, 350 insertions(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index ea284a2..504a07c 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1 +1 @@
-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

diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch
new file mode 100644
index 0000000..919249b
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.14.1-configure-nomagic.patch
@@ -0,0 +1,196 @@
+The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
+a variable as well as modifying CFLAGS & LDLIBS.
+
+If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
+are still in place.
+
+Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
+are only passed when correctly needed.
+
+Prior Gentoo testcase for reproduction:
+USE=minimal ebuild ... compile.
+- Linking with libelf & libmnl based only on presence.
+- Links based on libselinux based only on presence.
+
+Closes: https://bugs.gentoo.org/643722
+Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
+
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/bridge/Makefile iproute2-4.14.1/bridge/Makefile
+--- iproute2-4.14.1.orig/bridge/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/bridge/Makefile	2018-01-07 14:24:23.350726423 -0800
+@@ -1,6 +1,7 @@
+ BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ all: bridge
+ 
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/config.include iproute2-4.14.1/config.include
+--- iproute2-4.14.1.orig/config.include	1969-12-31 16:00:00.000000000 -0800
++++ iproute2-4.14.1/config.include	2018-01-07 14:25:34.406126921 -0800
+@@ -0,0 +1,22 @@
++# We can only modify CFLAGS/LDLIBS after all the config options are known.
++ifeq ($(IP_CONFIG_SETNS),y)
++	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
++endif
++ifeq ($(HAVE_ELF),y)
++	CFLAGS += $(HAVE_ELF_CFLAGS)
++	LDLIBS += $(HAVE_ELF_LDLIBS)
++endif
++ifeq ($(HAVE_SELINUX),y)
++	CFLAGS += $(HAVE_SELINUX_CFLAGS)
++	LDLIBS += $(HAVE_SELINUX_LDLIBS)
++endif
++ifeq ($(HAVE_MNL),y)
++	CFLAGS += $(HAVE_MNL_CFLAGS)
++	LDLIBS += $(HAVE_MNL_LDLIBS)
++endif
++
++# Rules can only be declared after all variables in them are known.
++%.o: %.c
++	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
++
++# vim: ft=make:
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/configure iproute2-4.14.1/configure
+--- iproute2-4.14.1.orig/configure	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/configure	2018-01-07 14:25:49.242419367 -0800
+@@ -223,7 +223,7 @@
+     then
+ 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
+ 	echo "yes"
+-	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
++	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -268,8 +268,8 @@
+ 	echo "HAVE_ELF:=y" >>$CONFIG
+ 	echo "yes"
+ 
+-	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
+-	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
++	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
++	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
+     else
+ 	echo "no"
+     fi
+@@ -283,8 +283,8 @@
+ 		echo "HAVE_SELINUX:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+-		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
++		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
++		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -297,8 +297,8 @@
+ 		echo "HAVE_MNL:=y" >>$CONFIG
+ 		echo "yes"
+ 
+-		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
+-		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
++		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
++		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
+ 	else
+ 		echo "no"
+ 	fi
+@@ -425,7 +425,3 @@
+ echo -n "docs:"
+ check_docs
+ echo
+-
+-echo >> $CONFIG
+-echo "%.o: %.c" >> $CONFIG
+-echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/devlink/Makefile iproute2-4.14.1/devlink/Makefile
+--- iproute2-4.14.1.orig/devlink/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/devlink/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -1,4 +1,5 @@
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_MNL),y)
+ 
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/genl/Makefile iproute2-4.14.1/genl/Makefile
+--- iproute2-4.14.1.orig/genl/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/genl/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -1,6 +1,7 @@
+ GENLOBJ=genl.o
+ 
+ include ../config.mk
++include ../config.include
+ SHARED_LIBS ?= y
+ 
+ CFLAGS += -fno-strict-aliasing
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/ip/Makefile iproute2-4.14.1/ip/Makefile
+--- iproute2-4.14.1.orig/ip/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/ip/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -14,6 +14,7 @@
+ RTMONOBJ=rtmon.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ALLOBJ=$(IPOBJ) $(RTMONOBJ)
+ SCRIPTS=ifcfg rtpr routel routef
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/lib/Makefile iproute2-4.14.1/lib/Makefile
+--- iproute2-4.14.1.orig/lib/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/lib/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -1,4 +1,5 @@
+ include ../config.mk
++include ../config.include
+ 
+ CFLAGS += -fPIC
+ 
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/misc/Makefile iproute2-4.14.1/misc/Makefile
+--- iproute2-4.14.1.orig/misc/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/misc/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -4,6 +4,7 @@
+ TARGETS=ss nstat ifstat rtacct lnstat
+ 
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_BERKELEY_DB),y)
+ 	TARGETS += arpd
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/netem/Makefile iproute2-4.14.1/netem/Makefile
+--- iproute2-4.14.1.orig/netem/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/netem/Makefile	2018-01-07 14:24:23.351726442 -0800
+@@ -1,4 +1,5 @@
+ include ../config.mk
++include ../config.include
+ 
+ DISTGEN = maketable normal pareto paretonormal
+ DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/rdma/Makefile iproute2-4.14.1/rdma/Makefile
+--- iproute2-4.14.1.orig/rdma/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/rdma/Makefile	2018-01-07 14:24:23.352726462 -0800
+@@ -1,4 +1,5 @@
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_MNL),y)
+ 
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tc/Makefile iproute2-4.14.1/tc/Makefile
+--- iproute2-4.14.1.orig/tc/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/tc/Makefile	2018-01-07 14:24:23.352726462 -0800
+@@ -3,6 +3,7 @@
+        emp_ematch.yacc.o emp_ematch.lex.o
+ 
+ include ../config.mk
++include ../config.include
+ 
+ SHARED_LIBS ?= y
+ 
+diff -Nuar --exclude '*~' --exclude '.*.swp' --exclude '*.orig' iproute2-4.14.1.orig/tipc/Makefile iproute2-4.14.1/tipc/Makefile
+--- iproute2-4.14.1.orig/tipc/Makefile	2017-11-13 10:09:57.000000000 -0800
++++ iproute2-4.14.1/tipc/Makefile	2018-01-07 14:24:23.352726462 -0800
+@@ -1,4 +1,5 @@
+ include ../config.mk
++include ../config.include
+ 
+ ifeq ($(HAVE_MNL),y)
+ 

diff --git a/sys-apps/iproute2/iproute2-4.14.1-r3.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r3.ebuild
new file mode 100644
index 0000000..24c2b3b
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.14.1-r3.ebuild
@@ -0,0 +1,153 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl virtual/libelf )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.16
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
+
+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
+)
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^WFLAGS/s:-Werror::" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	econf
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex minimal n y)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
+		SBINDIR="${EPREFIX%/}"/sbin \
+		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
+		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX%/}"/usr/share/man \
+		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED%/}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2018-01-11  1:09 Jory Pratt
  0 siblings, 0 replies; 13+ messages in thread
From: Jory Pratt @ 2018-01-11  1:09 UTC (permalink / raw
  To: gentoo-commits

commit:     fe0fb601c6efed45c1bb801d55ff45099a715388
Author:     Jory A. Pratt <anarchy <AT> gentoo <DOT> org>
AuthorDate: Thu Jan 11 01:08:03 2018 +0000
Commit:     Jory Pratt <anarchy <AT> gentoo <DOT> org>
CommitDate: Thu Jan 11 01:08:03 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=fe0fb601

sys-apps/iproute2 - clean up scripts to use /bin/sh only

 sys-apps/iproute2/Manifest                         |   2 +-
 .../files/iproute2-4.14.1-posix-shell.patch        |  65 +++++++++
 sys-apps/iproute2/iproute2-4.14.1-r4.ebuild        | 154 +++++++++++++++++++++
 3 files changed, 220 insertions(+), 1 deletion(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 504a07c..ea284a2 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1 +1 @@
-DIST iproute2-4.14.1.tar.xz 636876 BLAKE2B 232dbe29b9af516d8345c86c044359d3b0cfe73fb88a2ba1dcd05534b52dea37c9155d2b273a4a0d40b55fba8b5503a0fbe5bc71f37864c0a2ba9d6f08b6bf41 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c
+DIST iproute2-4.14.1.tar.xz 636876 SHA256 d43ac068afcc350a448f4581b6e292331ef7e4e7aa746e34981582d5fdb10067 SHA512 e593b68c46ef5f98bd6911ee7beb38388a14935a29fefabdeccc96aa012593b6f3a49b3bb1baed7d77e54f1f4a857172e058b73407f4070f158b8713f44f5d2c WHIRLPOOL 42ee7611f3fb1ceb922c606bf11cd4d72cf71020a73f96f5130f07a9cab08f1dbc973cb5924f6a15cf4613dac5b60a3a97583c0e801db960f5039d6d8c0ef095

diff --git a/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch b/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch
new file mode 100644
index 0000000..e5efc90
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.14.1-posix-shell.patch
@@ -0,0 +1,65 @@
+https://marc.info/?l=linux-netdev&m=151554000532498&w=2
+
+From aec69bbc285e5498add5384b6018564355594233 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@chromium.org>
+Date: Tue, 9 Jan 2018 18:16:53 -0500
+Subject: [PATCH iproute2] ifcfg/rtpr: convert to POSIX shell
+
+These files are already mostly written in POSIX shell, so convert their
+shebangs to /bin/sh and tweak the few bashisms in here.
+
+URL: https://crbug.com/756559
+Reported-by: Pat Erley <perley@chromium.org>
+Signed-off-by: Mike Frysinger <vapier@chromium.org>
+---
+ ip/ifcfg | 12 ++++++------
+ ip/rtpr  |  2 +-
+ 2 files changed, 7 insertions(+), 7 deletions(-)
+
+diff --git a/ip/ifcfg b/ip/ifcfg
+index 851b9215ab63..5b34decd4480 100644
+--- a/ip/ifcfg
++++ b/ip/ifcfg
+@@ -1,3 +1,3 @@
+-#! /bin/bash
++#! /bin/sh
+ 
+ CheckForwarding () {
+@@ -7,7 +7,7 @@ CheckForwarding () {
+   fwd=0
+   if [ -d $sbase ]; then
+     for dir in $sbase/*/forwarding; do
+-      fwd=$[$fwd + `cat $dir`]
++      fwd=$(( fwd + $(cat "$dir") ))
+     done
+   else
+     fwd=2
+@@ -128,12 +128,12 @@ fi
+ arping -q -A -c 1 -I $dev $ipaddr
+ noarp=$?
+ ( sleep 2 ;
+-  arping -q -U -c 1 -I $dev $ipaddr ) >& /dev/null </dev/null &
++  arping -q -U -c 1 -I $dev $ipaddr ) >/dev/null 2>&1 </dev/null &
+ 
+-ip route add unreachable 224.0.0.0/24 >& /dev/null
+-ip route add unreachable 255.255.255.255 >& /dev/null
++ip route add unreachable 224.0.0.0/24 >/dev/null 2>&1
++ip route add unreachable 255.255.255.255 >/dev/null 2>&1
+ if [ "`ip link ls $dev | grep -c MULTICAST`" -ge 1 ]; then
+-  ip route add 224.0.0.0/4 dev $dev scope global >& /dev/null
++  ip route add 224.0.0.0/4 dev $dev scope global >/dev/null 2>&1
+ fi
+ 
+ if [ $fwd -eq 0 ]; then
+diff --git a/ip/rtpr b/ip/rtpr
+index 192a476f817e..7e48674bcf53 100644
+--- a/ip/rtpr
++++ b/ip/rtpr
+@@ -1,3 +1,3 @@
+-#! /bin/bash
++#! /bin/sh
+ 
+ exec tr "[\\\\]" "[
+-- 
+2.15.1
+

diff --git a/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild
new file mode 100644
index 0000000..8e877b0
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild
@@ -0,0 +1,154 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=6
+
+inherit toolchain-funcs flag-o-matic multilib
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git-r3
+else
+	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
+	KEYWORDS="~amd64 ~arm ~mips ~ppc ~x86"
+fi
+
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
+
+LICENSE="GPL-2"
+SLOT="0"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
+
+# We could make libmnl optional, but it's tiny, so eh
+RDEPEND="
+	!net-misc/arpd
+	!minimal? ( net-libs/libmnl virtual/libelf )
+	iptables? ( >=net-firewall/iptables-1.4.20:= )
+	berkdb? ( sys-libs/db:= )
+	atm? ( net-dialup/linux-atm )
+	selinux? ( sys-libs/libselinux )
+"
+# We require newer linux-headers for ipset support #549948 and some defines #553876
+DEPEND="
+	${RDEPEND}
+	app-arch/xz-utils
+	iptables? ( virtual/pkgconfig )
+	>=sys-devel/bison-2.4
+	sys-devel/flex
+	>=sys-kernel/linux-headers-3.16
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+"
+
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
+	"${FILESDIR}"/${P}-fix-tc-actions.patch
+	"${FILESDIR}"/${P}-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${P}-posix-shell.patch
+	"${FILESDIR}"/${PN}-4.14.0-musl.patch
+)
+
+src_prepare() {
+	if ! use ipv6 ; then
+		PATCHES+=(
+			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
+		)
+	fi
+
+	default
+
+	sed -i \
+		-e '/^CC :\?=/d' \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
+		-e "/^WFLAGS/s:-Werror::" \
+		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
+		Makefile || die
+
+	# Use /run instead of /var/run.
+	sed -i \
+		-e 's:/var/run:/run:g' \
+		include/namespace.h \
+		man/man8/ip-netns.8 || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
+
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
+}
+
+src_configure() {
+	tc-export AR CC PKG_CONFIG
+
+	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
+	local setns
+	pushd "${T}" >/dev/null
+	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
+	echo 'int main(){return 0;}' > test.c
+	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
+	popd >/dev/null
+
+	# run "configure" script first which will create "config.mk"...
+	econf
+
+	# ...now switch on/off requested features via USE flags
+	# this is only useful if the test did not set other things, per bug #643722
+	cat <<-EOF >> config.mk
+	TC_CONFIG_ATM := $(usex atm y n)
+	TC_CONFIG_XT  := $(usex iptables y n)
+	TC_CONFIG_NO_XT := $(usex iptables n y)
+	# We've locked in recent enough kernel headers #549948
+	TC_CONFIG_IPSET := y
+	HAVE_BERKELEY_DB := $(usex berkdb y n)
+	HAVE_MNL      := $(usex minimal n y)
+	HAVE_ELF      := $(usex minimal n y)
+	HAVE_SELINUX  := $(usex selinux y n)
+	IP_CONFIG_SETNS := ${setns}
+	# Use correct iptables dir, #144265 #293709
+	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
+	EOF
+}
+
+src_compile() {
+	emake V=1
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc
+		dobin ip/ip
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
+		SBINDIR="${EPREFIX%/}"/sbin \
+		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
+		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
+		MANDIR="${EPREFIX%/}"/usr/share/man \
+		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
+		install
+
+	dodir /bin
+	mv "${ED%/}"/{s,}bin/ip || die #330115
+
+	dolib.a lib/libnetlink.a
+	insinto /usr/include
+	doins include/libnetlink.h
+	# This local header pulls in a lot of linux headers it
+	# doesn't directly need.  Delete this header that requires
+	# linux-headers-3.8 until that goes stable.  #467716
+	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/bin
+		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
+	fi
+}


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2018-01-30 20:38 Aric Belsito
  0 siblings, 0 replies; 13+ messages in thread
From: Aric Belsito @ 2018-01-30 20:38 UTC (permalink / raw
  To: gentoo-commits

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() {


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2018-04-16 17:09 Aric Belsito
  0 siblings, 0 replies; 13+ messages in thread
From: Aric Belsito @ 2018-04-16 17:09 UTC (permalink / raw
  To: gentoo-commits

commit:     1b11970eed843e35971308ae52e1d8b5c591d432
Author:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Apr 16 17:07:32 2018 +0000
Commit:     Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Apr 16 17:07:32 2018 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=1b11970e

sys-apps/iproute2: version bump to 4.16.0-r1

sync with upstream

 .../files/iproute2-4.16.0-keep-family.patch        | 25 ++++++++++++++++++++++
 sys-apps/iproute2/iproute2-4.14.1-r4.ebuild        |  1 -
 sys-apps/iproute2/iproute2-4.15.0.ebuild           |  1 -
 ...te2-4.16.0.ebuild => iproute2-4.16.0-r1.ebuild} |  2 +-
 sys-apps/iproute2/iproute2-4.16.0.ebuild           |  1 -
 5 files changed, 26 insertions(+), 4 deletions(-)

diff --git a/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch b/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch
new file mode 100644
index 0000000..d2940c9
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.16.0-keep-family.patch
@@ -0,0 +1,25 @@
+Bug: https://bugs.gentoo.org/652986
+
+https://marc.info/?l=linux-netdev&m=152363743818340&w=2
+
+--- a/lib/utils.c
++++ b/lib/utils.c
+@@ -568,7 +568,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family)
+ 	if (strcmp(name, "default") == 0) {
+ 		if ((family == AF_DECnet) || (family == AF_MPLS))
+ 			return -1;
+-		addr->family = (family != AF_UNSPEC) ? family : AF_INET;
++		addr->family = family;
+ 		addr->bytelen = af_byte_len(addr->family);
+ 		addr->bitlen = -2;
+ 		addr->flags |= PREFIXLEN_SPECIFIED;
+@@ -579,7 +579,7 @@ static int __get_addr_1(inet_prefix *addr, const char *name, int family)
+ 	    strcmp(name, "any") == 0) {
+ 		if ((family == AF_DECnet) || (family == AF_MPLS))
+ 			return -1;
+-		addr->family = AF_UNSPEC;
++		addr->family = family;
+ 		addr->bytelen = 0;
+ 		addr->bitlen = -2;
+ 		return 0;
+-- 

diff --git a/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild b/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild
index 8e877b0..6679ba7 100644
--- a/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild
+++ b/sys-apps/iproute2/iproute2-4.14.1-r4.ebuild
@@ -62,7 +62,6 @@ src_prepare() {
 		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
 		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
 		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
 		Makefile || die
 

diff --git a/sys-apps/iproute2/iproute2-4.15.0.ebuild b/sys-apps/iproute2/iproute2-4.15.0.ebuild
index 4b485e8..a8c212b 100644
--- a/sys-apps/iproute2/iproute2-4.15.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.15.0.ebuild
@@ -61,7 +61,6 @@ src_prepare() {
 		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
 		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
 		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
 		Makefile || die
 

diff --git a/sys-apps/iproute2/iproute2-4.16.0.ebuild b/sys-apps/iproute2/iproute2-4.16.0-r1.ebuild
similarity index 98%
copy from sys-apps/iproute2/iproute2-4.16.0.ebuild
copy to sys-apps/iproute2/iproute2-4.16.0-r1.ebuild
index 842de0b..dd450e4 100644
--- a/sys-apps/iproute2/iproute2-4.16.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.16.0-r1.ebuild
@@ -44,6 +44,7 @@ DEPEND="
 PATCHES=(
 	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
 	"${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722
+	"${FILESDIR}"/${P}-keep-family.patch # bug 652986
 	"${FILESDIR}"/${PN}-4.15.0-musl.patch
 )
 
@@ -61,7 +62,6 @@ src_prepare() {
 		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
 		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
 		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
 		Makefile || die
 

diff --git a/sys-apps/iproute2/iproute2-4.16.0.ebuild b/sys-apps/iproute2/iproute2-4.16.0.ebuild
index 842de0b..7157a09 100644
--- a/sys-apps/iproute2/iproute2-4.16.0.ebuild
+++ b/sys-apps/iproute2/iproute2-4.16.0.ebuild
@@ -61,7 +61,6 @@ src_prepare() {
 		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
 		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
 		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^WFLAGS/s:-Werror::" \
 		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
 		Makefile || die
 


^ permalink raw reply related	[flat|nested] 13+ messages in thread
* [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/
@ 2020-04-23 14:56 Anthony G. Basile
  0 siblings, 0 replies; 13+ messages in thread
From: Anthony G. Basile @ 2020-04-23 14:56 UTC (permalink / raw
  To: gentoo-commits

commit:     a02386560ae073b2bf14a2ddb6e30b8a396d653a
Author:     Michael Everitt <gentoo <AT> veremit <DOT> xyz>
AuthorDate: Thu Apr 23 04:32:01 2020 +0000
Commit:     Anthony G. Basile <blueness <AT> gentoo <DOT> org>
CommitDate: Thu Apr 23 14:56:07 2020 +0000
URL:        https://gitweb.gentoo.org/proj/musl.git/commit/?id=a0238656

iproute2: Fixed upstream in 3326701, release v5.3.0.

In-tree builds fine:
> michael@ananke ~ $ qlist -ISSRUv iproute2
> sys-apps/iproute2-5.2.0-r1:0::gentoo -atm -berkdb -caps -elf iptables ipv6 -minimal -selinux

Signed-off-by: Michael Everitt <gentoo <AT> veremit.xyz>
Signed-off-by: Anthony G. Basile <blueness <AT> gentoo.org>

 sys-apps/iproute2/Manifest                         |   3 -
 sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch   |  48 ----
 .../iproute2/files/iproute2-4.11.0-no-ipv6.patch   |  37 ---
 .../files/iproute2-4.16.0-configure-nomagic.patch  | 191 ---------------
 .../files/iproute2-4.17.0-configure-nomagic.patch  | 207 ----------------
 sys-apps/iproute2/files/iproute2-4.17.0-musl.patch | 268 ---------------------
 .../files/iproute2-4.20.0-configure-nomagic.patch  | 208 ----------------
 .../iproute2/files/iproute2-4.20.0-limits.patch    |  21 --
 .../iproute2/files/iproute2-4.20.0-no-ipv6.patch   |  38 ---
 .../files/iproute2-5.1.0-portability.patch         |  33 ---
 sys-apps/iproute2/iproute2-4.17.0-r1.ebuild        | 154 ------------
 sys-apps/iproute2/iproute2-4.17.0.ebuild           | 152 ------------
 sys-apps/iproute2/iproute2-4.20.0.ebuild           | 156 ------------
 sys-apps/iproute2/iproute2-5.2.0.ebuild            | 162 -------------
 sys-apps/iproute2/metadata.xml                     |  14 --
 15 files changed, 1692 deletions(-)

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
deleted file mode 100644
index 761d0f0..0000000
--- a/sys-apps/iproute2/Manifest
+++ /dev/null
@@ -1,3 +0,0 @@
-DIST iproute2-4.17.0.tar.xz 675268 BLAKE2B 3d1455c119c9c56b11a64092c152fcea2b161f571006878215425b95deef779fed523368252ce672a1a70251c019edbe6ff2bdac8c3ee8abab1fb29e2a3c669c SHA512 ccd7fb70afd58f1fcd4e17c38a24607207da853c4d6118fda423efa6e51faad3ad03c4d6d58a579c40ef9c68aaf13b1c455e12b0c36e155712d3d4db3c2ff4b5
-DIST iproute2-4.20.0.tar.xz 707016 BLAKE2B d62c6b995c4c1f79617e2f8149ff2ed297d741965e81bffebfa475514f5e96f0c9300e65d12bdd14ab492ce66675677eb41af6816876d5e1360218e4f32f4bc8 SHA512 ed29638c864062e199152c7b3b24b6495987ca6f79cc9ab1b529dab37a8a840fa2b5858d5db2b94eeefa1c0d72ff666a790107e27d11a597b189bfb7a01a4b8b
-DIST iproute2-5.2.0.tar.xz 729540 BLAKE2B 72d082b4f39b6b9f0040149ea14d3c5c6d999eb4955b708ef49a3276f3c574eab757e2c81f10a11e2ce5f709c7849bbf6556e40c7f261fc72d498046f73eade4 SHA512 82bbeae29d98129d822c95ff7523186569e32c66132b8d781d501d61f396b04d122e3d13057dd4236455264008e5bfac7cb63c325908fc1c46d416cbde6ac7e1

diff --git a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch b/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch
deleted file mode 100644
index fa12dad..0000000
--- a/sys-apps/iproute2/files/iproute2-3.1.0-mtu.patch
+++ /dev/null
@@ -1,48 +0,0 @@
-http://bugs.gentoo.org/291907
-
-This patch was merged from two patches extracted from this thread:
-http://markmail.org/thread/qkd76gpdgefpjlfn
-
-tc_stab.c: small fixes to commandline help
-
-
-tc_core.c:
-As kernel part of things relies on cell align which is always set to -1,
-I also added it to userspace computation stage. This way if someone
-specified e.g. 2048 and 512 for mtu and tsize respectively, one wouldn't
-end with tsize supporting mtu 4096 suddenly, New default mtu is also set
-to 2048 (disregarding weirdness of setting mtu to such values).
-
-
-Unless I missed something, this is harmless and feels cleaner, but if it's
-not allowed, documentation will have to be changed back to 2047 + extra
-explanation as well.
-
---- iproute2/tc/tc_core.c
-+++ iproute2/tc/tc_core.c
-@@ -155,12 +155,12 @@
- 	}
- 
- 	if (s->mtu == 0)
--		s->mtu = 2047;
-+		s->mtu = 2048;
- 	if (s->tsize == 0)
- 		s->tsize = 512;
- 
- 	s->cell_log = 0;
--	while ((s->mtu >> s->cell_log) > s->tsize - 1)
-+	while ((s->mtu - 1 >> s->cell_log) > s->tsize - 1)
- 		s->cell_log++;
- 
- 	*stab = malloc(s->tsize * sizeof(__u16));
---- iproute2/tc/tc_stab.c
-+++ iproute2/tc/tc_stab.c
-@@ -32,7 +32,7 @@
- 	fprintf(stderr,
- 		"Usage: ... stab [ mtu BYTES ] [ tsize SLOTS ] [ mpu BYTES ] \n"
- 		"                [ overhead BYTES ] [ linklayer TYPE ] ...\n"
--		"   mtu       : max packet size we create rate map for {2047}\n"
-+		"   mtu       : max packet size we create size table for {2048}\n"
- 		"   tsize     : how many slots should size table have {512}\n"
- 		"   mpu       : minimum packet size used in rate computations\n"
- 		"   overhead  : per-packet size overhead used in rate computations\n"

diff --git a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
deleted file mode 100644
index fc855dc..0000000
--- a/sys-apps/iproute2/files/iproute2-4.11.0-no-ipv6.patch
+++ /dev/null
@@ -1,37 +0,0 @@
---- iproute2-4.11.0/ip/ipmonitor.c
-+++ iproute2-4.11.0/ip/ipmonitor.c
-@@ -114,7 +114,6 @@
- 	}
- 	if (n->nlmsg_type == RTM_NEWPREFIX) {
- 		print_headers(fp, "[PREFIX]", ctrl);
--		print_prefix(who, n, arg);
- 		return 0;
- 	}
- 	if (n->nlmsg_type == RTM_NEWRULE || n->nlmsg_type == RTM_DELRULE) {
---- iproute2-4.11.0/ip/iptunnel.c
-+++ iproute2-4.11.0/ip/iptunnel.c
-@@ -589,13 +589,6 @@
- 		break;
- 	case AF_INET:
- 		break;
--	/*
--	 * This is silly enough but we have no easy way to make it
--	 * protocol-independent because of unarranged structure between
--	 * IPv4 and IPv6.
--	 */
--	case AF_INET6:
--		return do_ip6tunnel(argc, argv);
- 	default:
- 		fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
- 		exit(-1);
---- iproute2-4.11.0/ip/Makefile
-+++ iproute2-4.11.0/ip/Makefile
-@@ -1,6 +1,6 @@
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
--    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
--    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
-+    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+    ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
-     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \
-     iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o \
-     iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \

diff --git a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch
deleted file mode 100644
index 01a1fe2..0000000
--- a/sys-apps/iproute2/files/iproute2-4.16.0-configure-nomagic.patch
+++ /dev/null
@@ -1,191 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libelf & libmnl based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
-
---- iproute2-4.16.0/bridge/Makefile
-+++ iproute2-4.16.0/bridge/Makefile
-@@ -2,6 +2,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
- 
- include ../config.mk
-+include ../config.include
- 
- all: bridge
- 
---- iproute2-4.16.0/config.include
-+++ iproute2-4.16.0/config.include
-@@ -0,0 +1,22 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+	CFLAGS += $(HAVE_ELF_CFLAGS)
-+	LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+	CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+	LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+	CFLAGS += $(HAVE_MNL_CFLAGS)
-+	LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
---- iproute2-4.16.0/configure
-+++ iproute2-4.16.0/configure
-@@ -212,7 +212,7 @@
-     then
- 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- 	echo "yes"
--	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -257,8 +257,8 @@
- 	echo "HAVE_ELF:=y" >>$CONFIG
- 	echo "yes"
- 
--	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
--	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -272,8 +272,8 @@
- 		echo "HAVE_SELINUX:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
--		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -286,8 +286,8 @@
- 		echo "HAVE_MNL:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -426,7 +426,3 @@
- 
- echo -n "libcap support: "
- check_cap
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
---- iproute2-4.16.0/devlink/Makefile
-+++ iproute2-4.16.0/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-4.16.0/genl/Makefile
-+++ iproute2-4.16.0/genl/Makefile
-@@ -2,6 +2,7 @@
- GENLOBJ=genl.o
- 
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
- 
- CFLAGS += -fno-strict-aliasing
---- iproute2-4.16.0/ip/Makefile
-+++ iproute2-4.16.0/ip/Makefile
-@@ -15,6 +15,7 @@
- RTMONOBJ=rtmon.o
- 
- include ../config.mk
-+include ../config.include
- 
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
---- iproute2-4.16.0/lib/Makefile
-+++ iproute2-4.16.0/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -fPIC
- 
---- iproute2-4.16.0/misc/Makefile
-+++ iproute2-4.16.0/misc/Makefile
-@@ -5,6 +5,7 @@
- TARGETS=ss nstat ifstat rtacct lnstat
- 
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_BERKELEY_DB),y)
- 	TARGETS += arpd
---- iproute2-4.16.0/netem/Makefile
-+++ iproute2-4.16.0/netem/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
---- iproute2-4.16.0/rdma/Makefile
-+++ iproute2-4.16.0/rdma/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-4.16.0/tc/Makefile
-+++ iproute2-4.16.0/tc/Makefile
-@@ -4,6 +4,7 @@
-        emp_ematch.yacc.o emp_ematch.lex.o
- 
- include ../config.mk
-+include ../config.include
- 
- SHARED_LIBS ?= y
- 
---- iproute2-4.16.0/tipc/Makefile
-+++ iproute2-4.16.0/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 

diff --git a/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
deleted file mode 100644
index 30b5db3..0000000
--- a/sys-apps/iproute2/files/iproute2-4.17.0-configure-nomagic.patch
+++ /dev/null
@@ -1,207 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libelf, libmnl & libcap based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
-
---- iproute2-4.17.0/bridge/Makefile
-+++ iproute2-4.17.0/bridge/Makefile
-@@ -2,6 +2,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
- 
- include ../config.mk
-+include ../config.include
- 
- all: bridge
- 
---- iproute2-4.17.0/config.include
-+++ iproute2-4.17.0/config.include
-@@ -0,0 +1,26 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+	CFLAGS += $(HAVE_ELF_CFLAGS)
-+	LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+	CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+	LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+	CFLAGS += $(HAVE_MNL_CFLAGS)
-+	LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+ifeq ($(HAVE_CAP),y)
-+	CFLAGS += $(HAVE_CAP_CFLAGS)
-+	LDLIBS += $(HAVE_CAP_LDLIBS)
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
---- iproute2-4.17.0/configure
-+++ iproute2-4.17.0/configure
-@@ -212,7 +212,7 @@
-     then
- 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- 	echo "yes"
--	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -257,8 +257,8 @@
- 	echo "HAVE_ELF:=y" >>$CONFIG
- 	echo "yes"
- 
--	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
--	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -272,8 +272,8 @@
- 		echo "HAVE_SELINUX:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
--		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -286,8 +286,8 @@
- 		echo "HAVE_MNL:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -343,8 +343,8 @@
- 		echo "HAVE_CAP:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
-+		echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
-+		echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -426,7 +426,3 @@
- 
- echo -n "libcap support: "
- check_cap
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) -c -o $@ $<' >> $CONFIG
---- iproute2-4.17.0/devlink/Makefile
-+++ iproute2-4.17.0/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-4.17.0/genl/Makefile
-+++ iproute2-4.17.0/genl/Makefile
-@@ -2,6 +2,7 @@
- GENLOBJ=genl.o
- 
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
- 
- CFLAGS += -fno-strict-aliasing
---- iproute2-4.17.0/ip/Makefile
-+++ iproute2-4.17.0/ip/Makefile
-@@ -15,6 +15,7 @@
- RTMONOBJ=rtmon.o
- 
- include ../config.mk
-+include ../config.include
- 
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
---- iproute2-4.17.0/lib/Makefile
-+++ iproute2-4.17.0/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -fPIC
- 
---- iproute2-4.17.0/misc/Makefile
-+++ iproute2-4.17.0/misc/Makefile
-@@ -5,6 +5,7 @@
- TARGETS=ss nstat ifstat rtacct lnstat
- 
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_BERKELEY_DB),y)
- 	TARGETS += arpd
---- iproute2-4.17.0/netem/Makefile
-+++ iproute2-4.17.0/netem/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
---- iproute2-4.17.0/rdma/Makefile
-+++ iproute2-4.17.0/rdma/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-4.17.0/tc/Makefile
-+++ iproute2-4.17.0/tc/Makefile
-@@ -4,6 +4,7 @@
-        emp_ematch.yacc.o emp_ematch.lex.o
- 
- include ../config.mk
-+include ../config.include
- 
- SHARED_LIBS ?= y
- 
---- iproute2-4.17.0/tipc/Makefile
-+++ iproute2-4.17.0/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 

diff --git a/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch b/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch
deleted file mode 100644
index 2a75596..0000000
--- a/sys-apps/iproute2/files/iproute2-4.17.0-musl.patch
+++ /dev/null
@@ -1,268 +0,0 @@
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/if_tunnel.h iproute2-4.17.0/include/uapi/linux/if_tunnel.h
---- iproute2-4.17.0.orig/include/uapi/linux/if_tunnel.h	2018-06-11 10:31:44.723159108 -0700
-+++ iproute2-4.17.0/include/uapi/linux/if_tunnel.h	2018-06-11 10:32:17.676158518 -0700
-@@ -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.17.0.orig/include/uapi/linux/ip6_tunnel.h iproute2-4.17.0/include/uapi/linux/ip6_tunnel.h
---- iproute2-4.17.0.orig/include/uapi/linux/ip6_tunnel.h	2018-06-11 10:31:44.722159108 -0700
-+++ iproute2-4.17.0/include/uapi/linux/ip6_tunnel.h	2018-06-11 10:32:24.676158393 -0700
-@@ -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.17.0.orig/include/uapi/linux/kernel.h iproute2-4.17.0/include/uapi/linux/kernel.h
---- iproute2-4.17.0.orig/include/uapi/linux/kernel.h	2018-06-11 10:31:44.722159108 -0700
-+++ iproute2-4.17.0/include/uapi/linux/kernel.h	2018-06-11 10:32:41.676158088 -0700
-@@ -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.17.0.orig/include/uapi/linux/libc-compat.h iproute2-4.17.0/include/uapi/linux/libc-compat.h
---- iproute2-4.17.0.orig/include/uapi/linux/libc-compat.h	2018-06-11 10:31:44.721159108 -0700
-+++ iproute2-4.17.0/include/uapi/linux/libc-compat.h	2018-06-11 10:37:37.376152793 -0700
-@@ -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
-@@ -128,7 +130,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
-@@ -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
-@@ -194,6 +195,11 @@
- #define __UAPI_DEF_IF_NET_DEVICE_FLAGS_LOWER_UP_DORMANT_ECHO 1
- #endif
- 
-+/* Definitions for netinet/if_ether.h */
-+#ifndef __UAPI_DEF_ETHHDR
-+#define __UAPI_DEF_ETHHDR 1
-+#endif
-+
- /* Definitions for in.h */
- #ifndef __UAPI_DEF_IN_ADDR
- #define __UAPI_DEF_IN_ADDR		1
-@@ -262,6 +268,6 @@
- #define __UAPI_DEF_XATTR		1
- #endif
- 
--#endif /* __GLIBC__ */
-+#endif /* defined(__KERNEL__) */
- 
- #endif /* _LIBC_COMPAT_H */
-diff -Naur iproute2-4.17.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h iproute2-4.17.0/include/uapi/linux/netfilter_ipv4/ip_tables.h
---- iproute2-4.17.0.orig/include/uapi/linux/netfilter_ipv4/ip_tables.h	2018-06-11 10:31:44.722159108 -0700
-+++ iproute2-4.17.0/include/uapi/linux/netfilter_ipv4/ip_tables.h	2018-06-11 10:38:07.727152249 -0700
-@@ -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.17.0.orig/rdma/include/uapi/rdma/rdma_user_cm.h iproute2-4.17.0/rdma/include/uapi/rdma/rdma_user_cm.h
---- iproute2-4.17.0.orig/rdma/include/uapi/rdma/rdma_user_cm.h	2018-06-11 10:31:44.742159108 -0700
-+++ iproute2-4.17.0/rdma/include/uapi/rdma/rdma_user_cm.h	2018-06-11 10:44:48.746145068 -0700
-@@ -34,9 +34,9 @@
- #ifndef RDMA_USER_CM_H
- #define RDMA_USER_CM_H
- 
-+#include <netinet/in.h>
- #include <linux/types.h>
- #include <linux/socket.h>
--#include <linux/in6.h>
- #include <rdma/ib_user_verbs.h>
- #include <rdma/ib_user_sa.h>
- 
-diff -Naur iproute2-4.17.0.orig/tc/f_flower.c iproute2-4.17.0/tc/f_flower.c
---- iproute2-4.17.0.orig/tc/f_flower.c	2018-06-11 10:31:44.746159108 -0700
-+++ iproute2-4.17.0/tc/f_flower.c	2018-06-11 10:38:29.389151861 -0700
-@@ -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 -Naur iproute2-4.17.0.orig/tc/m_mirred.c iproute2-4.17.0/tc/m_mirred.c
---- iproute2-4.17.0.orig/tc/m_mirred.c	2018-06-11 10:31:44.745159108 -0700
-+++ iproute2-4.17.0/tc/m_mirred.c	2018-06-11 10:38:41.545151644 -0700
-@@ -17,6 +17,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <string.h>
-diff -Naur iproute2-4.17.0.orig/tc/tc_class.c iproute2-4.17.0/tc/tc_class.c
---- iproute2-4.17.0.orig/tc/tc_class.c	2018-06-11 10:31:44.743159108 -0700
-+++ iproute2-4.17.0/tc/tc_class.c	2018-06-11 10:38:53.705151426 -0700
-@@ -15,6 +15,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <string.h>
-diff -Naur iproute2-4.17.0.orig/tc/tc_filter.c iproute2-4.17.0/tc/tc_filter.c
---- iproute2-4.17.0.orig/tc/tc_filter.c	2018-06-11 10:31:44.743159108 -0700
-+++ iproute2-4.17.0/tc/tc_filter.c	2018-06-11 10:39:04.147151239 -0700
-@@ -15,6 +15,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <string.h>
-diff -Naur iproute2-4.17.0.orig/tc/tc_qdisc.c iproute2-4.17.0/tc/tc_qdisc.c
---- iproute2-4.17.0.orig/tc/tc_qdisc.c	2018-06-11 10:31:44.743159108 -0700
-+++ iproute2-4.17.0/tc/tc_qdisc.c	2018-06-11 10:39:17.997150991 -0700
-@@ -15,6 +15,7 @@
- #include <unistd.h>
- #include <fcntl.h>
- #include <sys/socket.h>
-+#include <net/if.h>
- #include <netinet/in.h>
- #include <arpa/inet.h>
- #include <string.h>
-diff -Naur iproute2-4.17.0.orig/tc/tc_util.h iproute2-4.17.0/tc/tc_util.h
---- iproute2-4.17.0.orig/tc/tc_util.h	2018-06-11 10:31:44.743159108 -0700
-+++ iproute2-4.17.0/tc/tc_util.h	2018-06-11 10:39:25.558150855 -0700
-@@ -4,7 +4,6 @@
- 
- #define MAX_MSG 16384
- #include <limits.h>
--#include <linux/if.h>
- 
- #include <linux/pkt_sched.h>
- #include <linux/pkt_cls.h>

diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch b/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch
deleted file mode 100644
index 94df850..0000000
--- a/sys-apps/iproute2/files/iproute2-4.20.0-configure-nomagic.patch
+++ /dev/null
@@ -1,208 +0,0 @@
-The hand-rolled configure script, for multiple options (selinux,mnl,elf), sets
-a variable as well as modifying CFLAGS & LDLIBS.
-
-If config.mk is later amended to disable a feature, the CFLAGS/LDLIBS tweaks
-are still in place.
-
-Push the CFLAGS/LDLIBS changes into new conditional Makefile code, so that they
-are only passed when correctly needed.
-
-Prior Gentoo testcase for reproduction:
-USE=minimal ebuild ... compile.
-- Linking with libelf, libmnl & libcap based only on presence.
-- Links based on libselinux based only on presence.
-
-Closes: https://bugs.gentoo.org/643722
-Signed-off-by: Robin H. Johnson <robbat2@gentoo.org>
-
-Forward-ported from v4.14.1 to v4.16.0 by Lars Wendler <polynomial-c@gentoo.org>
-Added libcap to v4.17.0 by Lars Wendler <polynomial-c@gentoo.org>
-Forward-ported from v4.17.0 to v4.20.0 by Lars Wendler <polynomial-c@gentoo.org>
-
---- iproute2-4.20.0/bridge/Makefile
-+++ iproute2-4.20.0/bridge/Makefile
-@@ -2,6 +2,7 @@
- BROBJ = bridge.o fdb.o monitor.o link.o mdb.o vlan.o
- 
- include ../config.mk
-+include ../config.include
- 
- all: bridge
- 
---- iproute2-4.20.0/config.include
-+++ iproute2-4.20.0/config.include
-@@ -0,0 +1,26 @@
-+# We can only modify CFLAGS/LDLIBS after all the config options are known.
-+ifeq ($(IP_CONFIG_SETNS),y)
-+	CFLAGS += $(IP_CONFIG_SETNS_CFLAGS)
-+endif
-+ifeq ($(HAVE_ELF),y)
-+	CFLAGS += $(HAVE_ELF_CFLAGS)
-+	LDLIBS += $(HAVE_ELF_LDLIBS)
-+endif
-+ifeq ($(HAVE_SELINUX),y)
-+	CFLAGS += $(HAVE_SELINUX_CFLAGS)
-+	LDLIBS += $(HAVE_SELINUX_LDLIBS)
-+endif
-+ifeq ($(HAVE_MNL),y)
-+	CFLAGS += $(HAVE_MNL_CFLAGS)
-+	LDLIBS += $(HAVE_MNL_LDLIBS)
-+endif
-+ifeq ($(HAVE_CAP),y)
-+	CFLAGS += $(HAVE_CAP_CFLAGS)
-+	LDLIBS += $(HAVE_CAP_LDLIBS)
-+endif
-+
-+# Rules can only be declared after all variables in them are known.
-+%.o: %.c
-+	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<
-+
-+# vim: ft=make:
---- iproute2-4.20.0/configure
-+++ iproute2-4.20.0/configure
-@@ -188,7 +188,7 @@
-     if $CC -I$INCLUDE -o $TMPDIR/setnstest $TMPDIR/setnstest.c >/dev/null 2>&1; then
- 	echo "IP_CONFIG_SETNS:=y" >>$CONFIG
- 	echo "yes"
--	echo "CFLAGS += -DHAVE_SETNS" >>$CONFIG
-+	echo "IP_CONFIG_SETNS_CFLAGS += -DHAVE_SETNS" >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -231,8 +231,8 @@
- 	echo "HAVE_ELF:=y" >>$CONFIG
- 	echo "yes"
- 
--	echo 'CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
--	echo 'LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-+	echo 'HAVE_ELF_CFLAGS += -DHAVE_ELF' `${PKG_CONFIG} libelf --cflags` >> $CONFIG
-+	echo 'HAVE_ELF_LDLIBS += ' `${PKG_CONFIG} libelf --libs` >>$CONFIG
-     else
- 	echo "no"
-     fi
-@@ -245,8 +245,8 @@
- 		echo "HAVE_SELINUX:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
--		echo 'CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_CFLAGS += -DHAVE_SELINUX' `${PKG_CONFIG} --cflags libselinux` >>$CONFIG
-+		echo 'HAVE_SELINUX_LDLIBS +=' `${PKG_CONFIG} --libs libselinux` >>$CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -258,8 +258,8 @@
- 		echo "HAVE_MNL:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
-+		echo 'HAVE_MNL_CFLAGS += -DHAVE_LIBMNL' `${PKG_CONFIG} libmnl --cflags` >>$CONFIG
-+		echo 'HAVE_MNL_LDLIBS +=' `${PKG_CONFIG} libmnl --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -316,8 +316,8 @@
- 		echo "HAVE_CAP:=y" >>$CONFIG
- 		echo "yes"
- 
--		echo 'CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
--		echo 'LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
-+		echo 'HAVE_CAP_CFLAGS += -DHAVE_LIBCAP' `${PKG_CONFIG} libcap --cflags` >>$CONFIG
-+		echo 'HAVE_CAP_LDLIBS +=' `${PKG_CONFIG} libcap --libs` >> $CONFIG
- 	else
- 		echo "no"
- 	fi
-@@ -397,7 +397,3 @@
- 
- echo -n "libcap support: "
- check_cap
--
--echo >> $CONFIG
--echo "%.o: %.c" >> $CONFIG
--echo '	$(QUIET_CC)$(CC) $(CFLAGS) $(EXTRA_CFLAGS) $(CPPFLAGS) -c -o $@ $<' >> $CONFIG
---- iproute2-4.20.0/devlink/Makefile
-+++ iproute2-4.20.0/devlink/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-4.20.0/genl/Makefile
-+++ iproute2-4.20.0/genl/Makefile
-@@ -2,6 +2,7 @@
- GENLOBJ=genl.o
- 
- include ../config.mk
-+include ../config.include
- SHARED_LIBS ?= y
- 
- CFLAGS += -fno-strict-aliasing
---- iproute2-4.20.0/ip/Makefile
-+++ iproute2-4.20.0/ip/Makefile
-@@ -15,6 +15,7 @@
- RTMONOBJ=rtmon.o
- 
- include ../config.mk
-+include ../config.include
- 
- ALLOBJ=$(IPOBJ) $(RTMONOBJ)
- SCRIPTS=ifcfg rtpr routel routef
---- iproute2-4.20.0/lib/Makefile
-+++ iproute2-4.20.0/lib/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- CFLAGS += -fPIC
- 
---- iproute2-4.20.0/misc/Makefile
-+++ iproute2-4.20.0/misc/Makefile
-@@ -5,6 +5,7 @@
- TARGETS=ss nstat ifstat rtacct lnstat
- 
- include ../config.mk
-+include ../config.include
- 
- ifeq ($(HAVE_BERKELEY_DB),y)
- 	TARGETS += arpd
---- iproute2-4.20.0/netem/Makefile
-+++ iproute2-4.20.0/netem/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- DISTGEN = maketable normal pareto paretonormal
- DISTDATA = normal.dist pareto.dist paretonormal.dist experimental.dist
---- iproute2-4.20.0/rdma/Makefile
-+++ iproute2-4.20.0/rdma/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 
---- iproute2-4.20.0/tc/Makefile
-+++ iproute2-4.20.0/tc/Makefile
-@@ -4,6 +4,7 @@
-        emp_ematch.yacc.o emp_ematch.lex.o
- 
- include ../config.mk
-+include ../config.include
- 
- SHARED_LIBS ?= y
- 
---- iproute2-4.20.0/tipc/Makefile
-+++ iproute2-4.20.0/tipc/Makefile
-@@ -1,5 +1,6 @@
- # SPDX-License-Identifier: GPL-2.0
- include ../config.mk
-+include ../config.include
- 
- TARGETS :=
- 

diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-limits.patch b/sys-apps/iproute2/files/iproute2-4.20.0-limits.patch
deleted file mode 100644
index f42ff0a..0000000
--- a/sys-apps/iproute2/files/iproute2-4.20.0-limits.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-XATTR_SIZE_MAX requires the usage of linux/limits.h; let's include it
-
-Signed-off-by: Hans Dedecker <dedeckeh@xxxxxxxxx>
----
- tc/f_flower.c | 1 +
- 1 file changed, 1 insertion(+)
-
-diff --git a/tc/f_flower.c b/tc/f_flower.c
-index c5636667..9659e894 100644
---- a/tc/f_flower.c
-+++ b/tc/f_flower.c
-@@ -14,6 +14,7 @@
- #include <unistd.h>
- #include <string.h>
- #include <net/if.h>
-+#include <linux/limits.h>
- #include <linux/if_arp.h>
- #include <linux/if_ether.h>
- #include <linux/ip.h>
--- 
-2.19.1

diff --git a/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch b/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch
deleted file mode 100644
index 31733e9..0000000
--- a/sys-apps/iproute2/files/iproute2-4.20.0-no-ipv6.patch
+++ /dev/null
@@ -1,38 +0,0 @@
---- iproute2-4.20.0/ip/ipmonitor.c
-+++ iproute2-4.20.0/ip/ipmonitor.c
-@@ -118,7 +118,6 @@
- 
- 	case RTM_NEWPREFIX:
- 		print_headers(fp, "[PREFIX]", ctrl);
--		print_prefix(n, arg);
- 		return 0;
- 
- 	case RTM_NEWRULE:
---- iproute2-4.20.0/ip/iptunnel.c
-+++ iproute2-4.20.0/ip/iptunnel.c
-@@ -549,13 +549,6 @@
- 		break;
- 	case AF_INET:
- 		break;
--	/*
--	 * This is silly enough but we have no easy way to make it
--	 * protocol-independent because of unarranged structure between
--	 * IPv4 and IPv6.
--	 */
--	case AF_INET6:
--		return do_ip6tunnel(argc, argv);
- 	default:
- 		fprintf(stderr, "Unsupported protocol family: %d\n", preferred_family);
- 		exit(-1);
---- iproute2-4.20.0/ip/Makefile
-+++ iproute2-4.20.0/ip/Makefile
-@@ -1,7 +1,7 @@
- # SPDX-License-Identifier: GPL-2.0
- IPOBJ=ip.o ipaddress.o ipaddrlabel.o iproute.o iprule.o ipnetns.o \
--    rtm_map.o iptunnel.o ip6tunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
--    ipmaddr.o ipmonitor.o ipmroute.o ipprefix.o iptuntap.o iptoken.o \
-+    rtm_map.o iptunnel.o tunnel.o ipneigh.o ipntable.o iplink.o \
-+    ipmaddr.o ipmonitor.o ipmroute.o iptuntap.o iptoken.o \
-     ipxfrm.o xfrm_state.o xfrm_policy.o xfrm_monitor.o iplink_dummy.o \
-     iplink_ifb.o iplink_nlmon.o iplink_team.o iplink_vcan.o iplink_vxcan.o \
-     iplink_vlan.o link_veth.o link_gre.o iplink_can.o iplink_xdp.o \

diff --git a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch b/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch
deleted file mode 100644
index 3fdca40..0000000
--- a/sys-apps/iproute2/files/iproute2-5.1.0-portability.patch
+++ /dev/null
@@ -1,33 +0,0 @@
-From 202d79fcf4e184818bd074f8c06e94e700670898 Mon Sep 17 00:00:00 2001
-From: Jory Pratt <anarchy@gentoo.org>
-Date: Tue, 11 Jun 2019 01:48:01 -0500
-Subject: [PATCH] including sysinfo.h from kernel.h makes no sense whatsoever,
- but removing it breaks glibc's userspace header, which includes kernel.h
- instead of sysinfo.h from their sys/sysinfo.h. this seems to be a historical
- mistake. on musl, including any header that uses kernel.h directly or
- indirectly plus sys/sysinfo.h will produce a compile error due to
- redefinition of struct sysinfo. so for now, only include it on glibc in order
- not to break their headers.
-
-Signed-off-by: Jory Pratt <anarchy@gentoo.org>
----
- include/uapi/linux/kernel.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/include/uapi/linux/kernel.h b/include/uapi/linux/kernel.h
-index d99ffa1..f917115 100644
---- a/include/uapi/linux/kernel.h
-+++ b/include/uapi/linux/kernel.h
-@@ -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
--- 
-2.22.0
-

diff --git a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild b/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
deleted file mode 100644
index 5c01038..0000000
--- a/sys-apps/iproute2/iproute2-4.17.0-r1.ebuild
+++ /dev/null
@@ -1,154 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm arm64 ~mips ppc ppc64 x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	!minimal? ( net-libs/libmnl )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	>=sys-kernel/linux-headers-3.16
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.17.0-configure-nomagic.patch # bug 643722
-	"${FILESDIR}"/${P}-musl.patch
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	# run "configure" script first which will create "config.mk"...
-	econf
-
-	# ...now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_CAP      := $(usex caps y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
-		SBINDIR="${EPREFIX%/}"/sbin \
-		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
-		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX%/}"/usr/share/man \
-		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
-		install
-
-	dodir /bin
-	mv "${ED%/}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
-	fi
-}

diff --git a/sys-apps/iproute2/iproute2-4.17.0.ebuild b/sys-apps/iproute2/iproute2-4.17.0.ebuild
deleted file mode 100644
index 7c90076..0000000
--- a/sys-apps/iproute2/iproute2-4.17.0.ebuild
+++ /dev/null
@@ -1,152 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="amd64 arm ~arm64 ~mips ppc ppc64 x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	!minimal? ( net-libs/libmnl )
-	elf? ( virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	>=sys-kernel/linux-headers-3.16
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.16.0-configure-nomagic.patch # bug 643722
-	"${FILESDIR}"/${P}-musl.patch
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.11.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	# run "configure" script first which will create "config.mk"...
-	econf
-
-	# ...now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
-		SBINDIR="${EPREFIX%/}"/sbin \
-		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
-		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX%/}"/usr/share/man \
-		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
-		install
-
-	dodir /bin
-	mv "${ED%/}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
-	fi
-}

diff --git a/sys-apps/iproute2/iproute2-4.20.0.ebuild b/sys-apps/iproute2/iproute2-4.20.0.ebuild
deleted file mode 100644
index 5b654d9..0000000
--- a/sys-apps/iproute2/iproute2-4.20.0.ebuild
+++ /dev/null
@@ -1,156 +0,0 @@
-# Copyright 1999-2020 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=6
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	dev-libs/libbsd
-	!minimal? ( net-libs/libmnl )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	app-arch/xz-utils
-	iptables? ( virtual/pkgconfig )
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	>=sys-kernel/linux-headers-3.16
-	virtual/pkgconfig
-	elibc_glibc? ( >=sys-libs/glibc-2.7 )
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
-	"${FILESDIR}"/${PN}-4.20.0-limits.patch
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	# run "configure" script first which will create "config.mk"...
-	econf
-
-	# ...now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_CAP      := $(usex caps y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX%/}"/$(get_libdir) \
-		SBINDIR="${EPREFIX%/}"/sbin \
-		CONFDIR="${EPREFIX%/}"/etc/iproute2 \
-		DOCDIR="${EPREFIX%/}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX%/}"/usr/share/man \
-		ARPDDIR="${EPREFIX%/}"/var/lib/arpd \
-		install
-
-	dodir /bin
-	mv "${ED%/}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED%/}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED%/}"/sbin/arpd "${ED%/}"/usr/bin/ || die
-	fi
-}

diff --git a/sys-apps/iproute2/iproute2-5.2.0.ebuild b/sys-apps/iproute2/iproute2-5.2.0.ebuild
deleted file mode 100644
index f77a9c4..0000000
--- a/sys-apps/iproute2/iproute2-5.2.0.ebuild
+++ /dev/null
@@ -1,162 +0,0 @@
-# Copyright 1999-2019 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-inherit toolchain-funcs flag-o-matic multilib
-
-if [[ ${PV} == "9999" ]] ; then
-	EGIT_REPO_URI="https://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
-	inherit git-r3
-else
-	SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
-	KEYWORDS="~amd64 ~arm ~arm64 ~mips ~ppc ~ppc64 ~x86"
-fi
-
-DESCRIPTION="kernel routing and traffic control utilities"
-HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2"
-
-LICENSE="GPL-2"
-SLOT="0"
-IUSE="atm berkdb caps elf +iptables ipv6 minimal selinux"
-
-# We could make libmnl optional, but it's tiny, so eh
-RDEPEND="
-	!net-misc/arpd
-	dev-libs/libbsd
-	!minimal? ( net-libs/libmnl )
-	caps? ( sys-libs/libcap )
-	elf? ( virtual/libelf )
-	iptables? ( >=net-firewall/iptables-1.4.20:= )
-	berkdb? ( sys-libs/db:= )
-	atm? ( net-dialup/linux-atm )
-	selinux? ( sys-libs/libselinux )
-	elibc_musl? ( sys-libs/queue-standalone )
-"
-# We require newer linux-headers for ipset support #549948 and some defines #553876
-DEPEND="
-	${RDEPEND}
-	>=sys-kernel/linux-headers-3.16
-"
-BDEPEND="
-	app-arch/xz-utils
-	>=sys-devel/bison-2.4
-	sys-devel/flex
-	virtual/pkgconfig
-"
-
-PATCHES=(
-	"${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	"${FILESDIR}"/${PN}-4.20.0-configure-nomagic.patch # bug 643722
-	"${FILESDIR}"/${PN}-5.1.0-portability.patch
-)
-
-src_prepare() {
-	if ! use ipv6 ; then
-		PATCHES+=(
-			"${FILESDIR}"/${PN}-4.20.0-no-ipv6.patch #326849
-		)
-	fi
-
-	default
-
-	# echo -n is not POSIX compliant
-	sed 's@echo -n@printf@' -i configure || die
-
-	sed -i \
-		-e '/^CC :\?=/d' \
-		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-		-e "s|-O2|${CFLAGS} ${CPPFLAGS}|" \
-		-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
-		-e "/^DBM_INCLUDE/s:=.*:=${T}:" \
-		Makefile || die
-
-	# Use /run instead of /var/run.
-	sed -i \
-		-e 's:/var/run:/run:g' \
-		include/namespace.h \
-		man/man8/ip-netns.8 || die
-
-	# build against system headers
-	rm -r include/netinet || die #include/linux include/ip{,6}tables{,_common}.h include/libiptc
-	sed -i 's:TCPI_OPT_ECN_SEEN:16:' misc/ss.c || die
-
-	if use minimal ; then
-		sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile || die
-	fi
-}
-
-src_configure() {
-	tc-export AR CC PKG_CONFIG
-
-	# This sure is ugly.  Should probably move into toolchain-funcs at some point.
-	local setns
-	pushd "${T}" >/dev/null
-	printf '#include <sched.h>\nint main(){return setns(0, 0);}\n' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} -D_GNU_SOURCE ${LDFLAGS} test.c >&/dev/null && setns=y || setns=n
-	echo 'int main(){return 0;}' > test.c
-	${CC} ${CFLAGS} ${CPPFLAGS} ${LDFLAGS} test.c -lresolv >&/dev/null || sed -i '/^LDLIBS/s:-lresolv::' "${S}"/Makefile
-	popd >/dev/null
-
-	# run "configure" script first which will create "config.mk"...
-	econf
-
-	# ...now switch on/off requested features via USE flags
-	# this is only useful if the test did not set other things, per bug #643722
-	cat <<-EOF >> config.mk
-	TC_CONFIG_ATM := $(usex atm y n)
-	TC_CONFIG_XT  := $(usex iptables y n)
-	TC_CONFIG_NO_XT := $(usex iptables n y)
-	# We've locked in recent enough kernel headers #549948
-	TC_CONFIG_IPSET := y
-	HAVE_BERKELEY_DB := $(usex berkdb y n)
-	HAVE_CAP      := $(usex caps y n)
-	HAVE_MNL      := $(usex minimal n y)
-	HAVE_ELF      := $(usex elf y n)
-	HAVE_SELINUX  := $(usex selinux y n)
-	IP_CONFIG_SETNS := ${setns}
-	# Use correct iptables dir, #144265 #293709
-	IPT_LIB_DIR := $(use iptables && ${PKG_CONFIG} xtables --variable=xtlibdir)
-	EOF
-}
-
-src_compile() {
-	emake V=1
-}
-
-src_install() {
-	if use minimal ; then
-		into /
-		dosbin tc/tc
-		dobin ip/ip
-		return 0
-	fi
-
-	emake \
-		DESTDIR="${D}" \
-		LIBDIR="${EPREFIX}"/$(get_libdir) \
-		SBINDIR="${EPREFIX}"/sbin \
-		CONFDIR="${EPREFIX}"/etc/iproute2 \
-		DOCDIR="${EPREFIX}"/usr/share/doc/${PF} \
-		MANDIR="${EPREFIX}"/usr/share/man \
-		ARPDDIR="${EPREFIX}"/var/lib/arpd \
-		install
-
-	dodir /bin
-	mv "${ED}"/{s,}bin/ip || die #330115
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-	# This local header pulls in a lot of linux headers it
-	# doesn't directly need.  Delete this header that requires
-	# linux-headers-3.8 until that goes stable.  #467716
-	sed -i '/linux\/netconf.h/d' "${ED}"/usr/include/libnetlink.h || die
-
-	if use berkdb ; then
-		keepdir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/bin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/bin/ || die
-	fi
-}

diff --git a/sys-apps/iproute2/metadata.xml b/sys-apps/iproute2/metadata.xml
deleted file mode 100644
index ad652ef..0000000
--- a/sys-apps/iproute2/metadata.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE pkgmetadata SYSTEM "http://www.gentoo.org/dtd/metadata.dtd">
-<pkgmetadata>
-<maintainer type="project">
-	<email>base-system@gentoo.org</email>
-	<name>Gentoo Base System</name>
-</maintainer>
-<use>
-	<flag name="berkdb">build programs that use berkdb (just arpd)</flag>
-	<flag name="elf">support loading eBPF programs from ELFs (e.g. LLVM's eBPF backend)</flag>
-	<flag name="iptables">include support for iptables filtering</flag>
-	<flag name="minimal">only install ip and tc programs, without eBPF support</flag>
-</use>
-</pkgmetadata>


^ permalink raw reply related	[flat|nested] 13+ messages in thread
end of thread, other threads:[~2020-04-23 14:56 UTC | newest]

Thread overview: 13+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-11-21 21:34 [gentoo-commits] proj/musl:master commit in: sys-apps/iproute2/, sys-apps/iproute2/files/ Aric Belsito
  -- strict thread matches above, loose matches on Subject: below --
2020-04-23 14:56 Anthony G. Basile
2018-04-16 17:09 Aric Belsito
2018-01-30 20:38 Aric Belsito
2018-01-11  1:09 Jory Pratt
2018-01-08 18:02 Aric Belsito
2017-12-15 17:36 Aric Belsito
2017-11-13 21:35 Aric Belsito
2017-07-06 23:43 Aric Belsito
2017-05-01 20:26 Aric Belsito
2017-02-21 19:56 Aric Belsito
2016-03-14  1:29 Anthony G. Basile
2016-02-03  5:50 Anthony G. Basile

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox