commit: b8430274c91a8f76f33ffffb5c10b96c91389ac1
Author: Aric Belsito <lluixhi <AT> gmail <DOT> com>
AuthorDate: Mon Nov 21 21:08:24 2016 +0000
Commit: Aric Belsito <lluixhi <AT> gmail <DOT> com>
CommitDate: Mon Nov 21 21:08:24 2016 +0000
URL: https://gitweb.gentoo.org/proj/musl.git/commit/?id=b8430274
sys-apps/iproute2: Add 4.8.0
Remove r99 postfix and sync with the tree.
sys-apps/iproute2/Manifest | 7 +-
sys-apps/iproute2/files/iproute2-4.8.0-musl.patch | 102 +++++++++++++++++++++
...ute2-4.3.0-r99.ebuild => iproute2-4.3.0.ebuild} | 4 +-
...ute2-4.4.0-r99.ebuild => iproute2-4.4.0.ebuild} | 10 +-
...ute2-4.3.0-r99.ebuild => iproute2-4.8.0.ebuild} | 23 +++--
5 files changed, 130 insertions(+), 16 deletions(-)
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 0ab31c9..364ab4d 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -3,8 +3,11 @@ 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.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
-EBUILD iproute2-4.3.0-r99.ebuild 3813 SHA256
f1125f496ee229bc24d8f64aa38a8bceaa53c6845eb16a98be36e9c9b4ec35a1 SHA512
13afc682d09cec3aa9a575d525a9fdd6591d0cf1a27755fdc7fd07aa1ac9688ac7e544a6ac6908f836e6a298a795c20627bb075a451299cb03fb4b649382dc30
WHIRLPOOL
cd9361b28f021b8435991d3297255075d0abb67ba7ad8501352672cff196624bfa2d6ed8d399ba4ca8500d69e2d3f1904a015ffca52c0b53b86661ece0c931a1
-EBUILD iproute2-4.4.0-r99.ebuild 3870 SHA256
62165885127fe38746165c160a666636cc91c76b1e33887c7dd2e575be1e7488 SHA512
0bc3eb6a0d6c842912dec269619397e51c353703619307a65762b2e86452b7f8210d331729367cf39a1ec758a2c6ca5fa85bfe6be89cf400ba0c5a13e23926d9
WHIRLPOOL
8f4cde5408e50b55d1dca63f90cd6b39e3fff0f1904ae79189d8ff871c6210c7c1788baa182c4e2b849fa2797c129486c546528a2b018835768fe33ab5dded57
+DIST iproute2-4.8.0.tar.xz 594636 SHA256
a30959c8421bc8ef42719bed41d14e1d7cfdbad80d7d70c5c42ad31f2c2cb389 SHA512
9b9db053e5d6ae2e7dd17870a3081ef61788a7eeb07473430e1a26c3c948123d33840bd6bb81b4a553ac6913ea89f02ac2a1b7d52ced65523a43991f03e84f49
WHIRLPOOL
83015c0bcfc6739ce688307a6824047910d453265883d4fbb9bec67c8720a5f478d2d72e5095ffc75191e64f3525a25f019032f20fc428b622e4a5c1b8fcbe3d
+EBUILD iproute2-4.3.0.ebuild 3842 SHA256
df102b2068e6f82a8120065f798d3b7b7413f7c70da779dd667c9afeb409ffda SHA512
7577a7323f9cf24645045924a93287e1299b1b7a1abdeeec073178828d30da77b76ce477950c207e7bd819c5cfe390e14ff1d91c3ae7578400ca5a19e350b337
WHIRLPOOL
ea13875c2a5be3a07d7746ffd9444e8ec08d8bf921851f01cf76e13666fdd85dc65266e3cfc0466a8829e4ec81d7f03c2c79e35bbbbf90cfed68fde4df0fd058
+EBUILD iproute2-4.4.0.ebuild 3900 SHA256
efa73fc5b273c607754c16104b48b6a3ca7415eaa639ec3f7a16d2e324bd1599 SHA512
cc92549fb467798cdfb3e068535f86acfd110ab23d58f6cbfedb615fe036cabb13ccaafcde4ab3b9b8d3d1c2a5c0bc1bb474e14ec1d51866068c51e2e32d2468
WHIRLPOOL
f61081bc113e6b0e42a59eafb53c6fe54ed9ed76efc6c6ff90837291439220044fe3c892accda3fa60a85b4ee26f72de89577fb8db6c80bfbc12918860ae3d10
+EBUILD iproute2-4.8.0.ebuild 3900 SHA256
71af7f07b9bbbc4a656a03a630ba9d17c81950ed530fccf764ec743fe5abb35c SHA512
999e00f04a620d4a9d37f13cbb02bfa8b25580e4b06c8c9d929617bde3d488952eb072877d9bf892fc65b17d0e9a207c8dc73633878111d353cde17c60e11077
WHIRLPOOL
67957931e8ee6a6d654de9cae05a4858136e424b0995fa6759293eb9df7c75312c3314ffff45ca13149dcd3faba64eeed273d4d29938262f86c197b0ed84fe8a
MISC metadata.xml 467 SHA256
54932243a153c9130ca1862f0dce70ac6fff517e9b5c22f10e6d044ac3679e86 SHA512
34c134b1a8ee152382b9fe9872df3d15d32ec3822ba215c8b21e948b8313e2e3d045468b873b7958681e92265d57ce25455e03f4d8e6be4e882943e54331cd7c
WHIRLPOOL
188528c73a6a8b90a0e69bab32d24a05e41c6695f559da91ead84be331769f47864ca6e88a7f1a31619da51e53b7fdd8a23735ff576098998eac6f1a9d24feb1
diff --git a/sys-apps/iproute2/files/iproute2-4.8.0-musl.patch
b/sys-apps/iproute2/files/iproute2-4.8.0-musl.patch
new file mode 100644
index 0000000..7210ad9
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.8.0-musl.patch
@@ -0,0 +1,102 @@
+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.3.0-r99.ebuild
b/sys-apps/iproute2/iproute2-4.3.0.ebuild
similarity index 96%
copy from sys-apps/iproute2/iproute2-4.3.0-r99.ebuild
copy to sys-apps/iproute2/iproute2-4.3.0.ebuild
index 45841a0..0685b63 100644
--- a/sys-apps/iproute2/iproute2-4.3.0-r99.ebuild
+++ b/sys-apps/iproute2/iproute2-4.3.0.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
+ 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";
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2";
LICENSE="GPL-2"
SLOT="0"
diff --git a/sys-apps/iproute2/iproute2-4.4.0-r99.ebuild
b/sys-apps/iproute2/iproute2-4.4.0.ebuild
similarity index 96%
rename from sys-apps/iproute2/iproute2-4.4.0-r99.ebuild
rename to sys-apps/iproute2/iproute2-4.4.0.ebuild
index e9241d6..350906e 100644
--- a/sys-apps/iproute2/iproute2-4.4.0-r99.ebuild
+++ b/sys-apps/iproute2/iproute2-4.4.0.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
+ 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";
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2";
LICENSE="GPL-2"
SLOT="0"
@@ -38,11 +38,11 @@ DEPEND="${RDEPEND}
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
+ epatch "${FILESDIR}"/${PN}-4.3.0-musl.patch
+ epatch "${FILESDIR}"/${PN}-4.3.0-musl-noiptables.patch
+ epatch "${FILESDIR}"/${PN}-4.4.0-missing-limits_h.patch
sed -i \
-e '/^CC =/d' \
diff --git a/sys-apps/iproute2/iproute2-4.3.0-r99.ebuild
b/sys-apps/iproute2/iproute2-4.8.0.ebuild
similarity index 88%
rename from sys-apps/iproute2/iproute2-4.3.0-r99.ebuild
rename to sys-apps/iproute2/iproute2-4.8.0.ebuild
index 45841a0..b9cc218 100644
--- a/sys-apps/iproute2/iproute2-4.3.0-r99.ebuild
+++ b/sys-apps/iproute2/iproute2-4.8.0.ebuild
@@ -11,11 +11,11 @@ if [[ ${PV} == "9999" ]] ; then
inherit git-2
else
SRC_URI="mirror://kernel/linux/utils/net/${PN}/${P}.tar.xz"
- KEYWORDS="amd64 arm ~mips ppc x86"
+ 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";
+HOMEPAGE="https://wiki.linuxfoundation.org/networking/iproute2";
LICENSE="GPL-2"
SLOT="0"
@@ -37,14 +37,23 @@ DEPEND="${RDEPEND}
>=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.5.0-no-iptables.patch #577464
+ "${FILESDIR}"/${PN}-4.8.0-musl.patch
+)
+
src_prepare() {
- epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
- use ipv6 || epatch "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
- epatch "${FILESDIR}"/${PN}-4.3.0-musl.patch
- epatch "${FILESDIR}"/${PN}-4.3.0-musl-noiptables.patch
+ if ! use ipv6 ; then
+ PATCHES+=(
+ "${FILESDIR}"/${PN}-4.2.0-no-ipv6.patch #326849
+ )
+ fi
+
+ epatch "${PATCHES[@]}"
sed -i \
- -e '/^CC =/d' \
+ -e '/^CC :=/d' \
-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
-e "/^HOSTCC/s:=.*:= $(tc-getBUILD_CC):" \
