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 <[email protected]> -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 <[email protected]> -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 <[email protected]> ---- - 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"
