Update sys-apps/iproute2-9999

3 files changed, 89 insertions, 13 deletions

diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 99a55c88..72ef754b 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -13,6 +13,7 @@ AUX iproute2-3.6.0-pkg-config.patch 2286 SHA256 46649856ad9e735e403bc0654d1c1afc
 AUX iproute2-3.7.0-clang.patch 2636 SHA256 f56ba110293cf383e67e18df494cbbf2d934e79ed3b21ddd8644c78183d27e16 SHA512 f89dc88ddbd2ffab3d6735261c2117e6cd4a92111fe2b167d453112ff90ce8fc2dd8de83eae3a76b2eed5dedf4a5f631b9ed48f4427acbfaa75382fef1fa1783 WHIRLPOOL a4272f6d58672a4039df57a6585c935af50bbf8f6541d39fefc59acb80ec44b0da18ef5bb2c05f963e6376bc28d1cf9eab3b80c570019ee77bb651d70af94e3d
 AUX iproute2-3.7.0-man7.patch 1350 SHA256 71653ab06c937de2c01370b39c16e5a9d22c1b25d8b5ade3febff7be888ad29e SHA512 0fdfa23e7c51b09335ef32b8baa53a6fd60490b5a531252a5b192f4470e08b4acec2cd568d5644df203e72b62ff0fcf656a57c089ce4511db2a5fe8b10f01d0a WHIRLPOOL 6afd7653447a17b9ecd40d44490a01e610f9fc5f281081508b5421498460ae58bf37ef5fd7b36e4928a0ecb7ec404f50f3d984812d0e33ce08cd735da8e7e03c
 AUX iproute2-3.8.0-old-mount-libc.patch 871 SHA256 dc9fc407b09763f79663dbad627961f8a3446881737cc666f0cb67235f160d51 SHA512 cda73ce07c21d18c68fcff08e282e87a2d4b53cf7779e8a1ef669d7275974c8f3638ca530031aafcfc7eb4885264ceb7abb308b9da6f5568889a84cb4c7df1f9 WHIRLPOOL d2057e6bad82dce7844886d551d70af9207e111494b9cc23abc433857741afa48f30671091c8821a60aaa07ca621f243fbeee10322da11ac44d02f4f588b88bf
+AUX iproute2-4.0.0-tc-show-buffer-overflow.patch 1717 SHA256 2ddb5ea744185f5ebff79961a054570b166ad1a5f3df0b91b59927d1b86c7aa3 SHA512 f5b507ce9d9a2cf4b86c0c2e2a18c5295226707df707eb229ec2f880b0fee64740a039fe5aa334c1dfc2d04faec4200cdb27dfaf631119a8705dd698f2767a77 WHIRLPOOL 801e25b3f6984b59d95eb494dfa63502e2c32551c8f5376ab6109a6bf5b9401f1b7bf6a0e0456dc68abb207d9505b5dbade675ea39e709e27a839357a431c444
 DIST iproute2-2.6.35.tar.bz2 387193 SHA256 8ab2f47e129925fb8acb09421008d07aeafa01b2ddd1fcba4a056de079f090a3 SHA512 df93100d350f3153e6f7ca627ebb207af53a2f99a1187a12dcc046da9d87aa847817f77a50c3fed86034437d7394b376b7b316449690150ed2e3db2d998b6a94 WHIRLPOOL 865a2570314f7b4bc32c6d7c722ecbcfc007662c29801cd9402161943e9d9f7a1e7b0954ffbfa215960056c9fe1e1d327dcb7f0be899f398fd4fe5a0c14d9eb4
 DIST iproute2-3.1.0.tar.bz2 404147 SHA256 c9d6366a3835a244008170e6d7752ca08414270175fce575e4f516f057688df1 SHA512 cc56448b3dc119022301cfbbcafc7a78568172e95565da6f71a23f05f8d95be5b86a574a3d0915f6b6f2018ec785d31123050a685ebe9108cd291f4cc4fcb250 WHIRLPOOL ec790b94c02132b2aea598a91095f049e9480512919bc6257a61aa9c063838a5aa2beba06ecdb5066fd421abfa8c73617f61c7f08c05287a367d3683f5745537
 DIST iproute2-3.10.0.tar.xz 419320 SHA256 c4023d8d722a1ed673474ca0e5a2d61ebd747cc7001a91321757422d9074c97e SHA512 afe81462e0d1ed4483cd7ab99abb15ccc9795fbd1276c162d0c8af236357d97fcbfc0ce3356f9ad94fbe048de9e13b2eb98cad60196d6cdbe1a3f2367887ce9f WHIRLPOOL 7d912bedd7d269a00ab0bd6df0e9a5530a2624f70fd24856a85d32ab50de3d3d77d6d5d457b5ffbc9fc3f659eb14a6f22980f1845d51fee905cc5eb39bf047a0
@@ -41,4 +42,4 @@ EBUILD iproute2-3.6.0.ebuild 3152 SHA256 88b4069d2f03585a8bb8a85971b65865011686a
 EBUILD iproute2-3.7.0.ebuild 3237 SHA256 f4276015a1daa78fd1868dc3e0f84da45b1790976e5ba5df3b89a834212e4ab4 SHA512 37121dd5fc893780f57dd7869db294d2b192a70644271c3a16ae8e69717337ea5038bc7d35abee82b3162bf4a4a8030739ea2d81667b5a4485b1f1d94aebe2e8 WHIRLPOOL cd43ad2c10e95ee7272828312b283cfefce2538bbd4060b89f0f88620ee5d00aac40272489506d7bca24976f1a796898408cb2fd51f29f9d43b0d5a41d027736
 EBUILD iproute2-3.8.0.ebuild 3531 SHA256 e4895b08f89a1fa11bc34a246de6c9657f742ae8c11b7956ad90a2dc4386359c SHA512 9f21885f095a4f1727986dc2668725c8cc9ad3984356379c9c1258b1ba1b38e9e3f283b6cd745c9c8ad94da6c66c6616b5acc626a7917d3c4c9325b7e2d91310 WHIRLPOOL 59af061adfae4dcda6ae10acacb8303262e0b69fed2a97247d0b9feac0f4062dc628e213ef9b60be4d798adab4d25d34cd42bd78e0330c0bce0e94db84273ecc
 EBUILD iproute2-3.9.0.ebuild 3486 SHA256 73079adc7d4d0f9b1d2c0a0242da2e469652ad28f686048ff9800fbc7e50fb16 SHA512 9c2302ca5148f544a470b84ad8e59800776d57e2f59ced41e34c38a3a81a963b2d022b404ce4c6ef16eafe56768fb11812462fc299361762b35f0f3ece590417 WHIRLPOOL decfe2e5901bc9753d94844f58119b2aa2101e665a047be32157c433eeddeadea0655e5e1b7037083c6a959a327137f10121bcc65c3aedf861503d2103717408
-EBUILD iproute2-9999.ebuild 3100 SHA256 61690e6e04d8a5f42391d4d1b077da42e052c672e48ecdea33bdc7e60a5724e4 SHA512 d2bd55bada0a60e57c12b4c38c3d6fe0b23034d01cad17e2567acaa548c6af79e1d495d5137e9350b505ab0aed6e94451eebea53a9b9d3844715ecc234e4e5d0 WHIRLPOOL 0e7721862d956b4ff47ca7e5a87ee6c30649c4ad1cfd9f1bb68085871c0b91612a96f9f83e2ecc7740883b9c0835848c24d0de961663e82587dd33ccbabbf515
+EBUILD iproute2-9999.ebuild 3763 SHA256 1395932d0ee47916dffafb2cfc17a1c06914875be3e8693603e027158c3a3d47 SHA512 2b70f05609ed9e70c3c7408737599cb6ba07d7704dc388b036f6ae6e4bb9168bdbed52d482674dc909a854b98e50dee5a9eed1c9bae8745d6a1f21277c3283cc WHIRLPOOL 2c27b7f761af431b9c317c2a2c756e304e673c2eb1042273ad3351926c5fb6b32bef48a220cb5ee1f40c3ad96059a25d3cd4c5aa2861f6124b88a0b14dedc5c5
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
new file mode 100644
index 00000000..6c6c9a5c
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-4.0.0-tc-show-buffer-overflow.patch
@@ -0,0 +1,62 @@
+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-9999.ebuild b/sys-apps/iproute2/iproute2-9999.ebuild
index 5eda0b84..4f5b654b 100644
--- a/sys-apps/iproute2/iproute2-9999.ebuild
+++ b/sys-apps/iproute2/iproute2-9999.ebuild
@@ -1,16 +1,14 @@
-# Copyright 1999-2014 Gentoo Foundation
+# 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-9999.ebuild,v 1.24 2014/01/18 05:37:49 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-9999.ebuild,v 1.25 2015/05/24 03:42:06 vapier Exp $
 
-EAPI="4"
+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
-	SRC_URI=""
-	#KEYWORDS=""
 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"
@@ -21,28 +19,34 @@ HOMEPAGE="http://www.linuxfoundation.org/collaborate/workgroups/networking/iprou
 
 LICENSE="GPL-2"
 SLOT="0"
-IUSE="atm berkdb +iptables ipv6 minimal"
+IUSE="atm berkdb +iptables ipv6 minimal selinux"
 
 RDEPEND="!net-misc/arpd
 	iptables? ( || ( >=net-firewall/iptables-1.4.5 net-firewall/iptables-nftables ) )
-	!minimal? ( berkdb? ( sys-libs/db ) )
-	atm? ( net-dialup/linux-atm )"
+	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-2.6.27
+	>=sys-kernel/linux-headers-3.7
 	elibc_glibc? ( >=sys-libs/glibc-2.7 )"
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
+	epatch "${FILESDIR}"/${P}-tc-show-buffer-overflow.patch #546928
+	use ipv6 || epatch "${FILESDIR}"/${PN}-3.10.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
 
 	# build against system headers
@@ -52,7 +56,7 @@ src_prepare() {
 	# 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
+	use minimal && sed -i -e '/^SUBDIRS=/s:=.*:=lib tc ip:' Makefile
 }
 
 src_configure() {
@@ -70,6 +74,9 @@ src_configure() {
 	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)
@@ -79,7 +86,7 @@ src_configure() {
 src_install() {
 	if use minimal ; then
 		into /
-		dosbin tc/tc
+		dosbin tc/tc ip/ip
 		return 0
 	fi
 
@@ -93,12 +100,18 @@ 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
 
 	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