Version bump and revise libmnl handling.

Package-Manager: portage-2.2.20/cvs/Linux x86_64
Manifest-Sign-Key: 0xD2E96200

3 files changed, 153 insertions, 15 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 6fbc69a50e18..758b381f690f 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2015 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.267 2015/07/07 10:29:38 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.268 2015/07/07 16:07:02 vapier Exp $
+
+*iproute2-4.1.1 (07 Jul 2015)
+
+  07 Jul 2015; Mike Frysinger <vapier@gentoo.org> +iproute2-4.1.1.ebuild:
+  Version bump and revise libmnl handling.
 
   07 Jul 2015; Mike Frysinger <vapier@gentoo.org> iproute2-3.19.0.ebuild,
   iproute2-4.0.0-r2.ebuild, iproute2-4.1.0.ebuild, iproute2-9999.ebuild:
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 389748cce9bd..1e4d6194825f 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -24,6 +24,7 @@ DIST iproute2-3.3.0.tar.bz2 416353 SHA256 f328ec01bac64854f477b9440b0bbeae91895b
 DIST iproute2-3.8.0.tar.xz 407608 SHA256 579145749f1aaf60e7c7a5de24b7f00fa2200a961094733c792b4ff139181e4f SHA512 0d93070044f573055a7cc58bd006e476f5b0fcb75cb5d49a37417aa7583e637a92e460947434cef9b9449267e4529c655a23b5ed3d549a2aba128148cb8d4ade WHIRLPOOL bfb29c34953f205f7c801a86a38f58d9352b716504649e61665ced6dd48557291412de5fd8987dbab44fbd397dab4a6b55d6c371c7cbaaea3d6e29269df115df
 DIST iproute2-4.0.0.tar.xz 459364 SHA256 5cd06eb1050b858b308b65705725042bb566fd261135e35a73dafb48cd632618 SHA512 8e0587ed484a9697af99b4f37b460fddd28136b3c19898a11809b1e8ca9a75a18dcc83bc512f5b74361e6128732e69a3e66b3a62c38a5ae5f13c3e18af186be4 WHIRLPOOL 6abdf2b4587abd7a73d2b7692a4bb478ac379dc3a27f564ad78e34f25f06ae5dd9e0e4873c6510d30767a398375dcdcd2da777412c725885e0c3d4bd89c71a9b
 DIST iproute2-4.1.0.tar.xz 495312 SHA256 d1326696c6a8f81ba66aaf48d858005cf280c81d3284d8d2c99748e3d0746146 SHA512 81faa393a2c7bf5286d7b54817646fb3763d66fbda8b6902e137061827fa1d54d58e9e4fb4f8415222f5adc1b0bec77b6ecf94d1b7cc11834283593208fb4209 WHIRLPOOL 938f0f68d74c8c1bef1be005b55b1b652bf74e23671d6fde493819058e1464c0f3931d69d7dbc398f0ed99ce42fa2bcd80c5207fabfdad78389e4e19b8051112
+DIST iproute2-4.1.1.tar.xz 496388 SHA256 73077a989efb934450bd655cbd9aaddaa747cb696c64d0c9a3323768a6a8e66f SHA512 af2e4021faf931d17a67c242c66b4f6a6ce93a69cee5408dd3951d488da511c99d693534e91d0a317bd82dfdcb6a543605cecf2514d512004639db8d17afb93e WHIRLPOOL 24542b56275675609aaad69ca68e89145d4da84ddb2429ae546179a249bcc1213f89168673657966122e01e992763fec053c118fbd69b7db1677ad7be97397b6
 EBUILD iproute2-2.6.38.ebuild 2263 SHA256 7210b6028e9532acd57e584ec1aea57b11734cdc121b97ced75dea0897f6503a SHA512 5eaa87ba4ba467cb826c7b3e652e21dc505afa9e36afef5fca75ba80fae70f207739cbd28146bb4817073719675156c5fa68799cdc6897d0f4d523a59ae3b77b WHIRLPOOL 58ec9641a824db8afbf0f60372577a5240ddd7d1375f8fdacd4c163191f6e0757f5914878c8dd26cc1069b29664275949d33842c2e5d51f0a424b795d7702587
 EBUILD iproute2-3.17.0.ebuild 3638 SHA256 6c16e44f1d90bd4d113a3bb7047e3a10e27c3cd206c1040568384ee537f84b62 SHA512 fea32c02eba7cb6acdccbac187fba5a8c39e090cc6f9a92f210f0261b7d8f5f417e02d7cf6d89af160ee909090d8c869557bc27b66e44b530ba652c696b4747a WHIRLPOOL 04214acab5a60311b0ccba25bf27d4458baecd9a83de9a86b67942e0df0949d582db11752ccc5fbe476da0ea2e1f5d73a090da5c7b6e19a1ddacfb90c2594f42
 EBUILD iproute2-3.19.0.ebuild 3645 SHA256 ac54bbc8df60381eaa880c8ad8798fb8077a91815fd5b2d4c56ccb81315bfe4c SHA512 07371480b5e72674cac94af1bbf9ff6b98d425fe365d84197e501bf449b7fd72a7a8e014a08b7d7397103fa6f00184e0e972f9f633830cb3efbf5293756ae075 WHIRLPOOL ff479812db81375276ae74f85f393b2b40d8f80d594ce0a7bffdd61e126edc791cc1e7fe67f2aa9255c7879d6c0a917b1d25263fd871ea7ebcba904d3fef502c
@@ -31,23 +32,24 @@ EBUILD iproute2-3.3.0.ebuild 2972 SHA256 1e09b07a850aea92e7e57a0adef53246ff7cc8d
 EBUILD iproute2-3.8.0.ebuild 3493 SHA256 e9fb3f69673cf3e6cec6abf83ca59bbf84af19547fc5245e23f9b8af2f8d6dff SHA512 38180309ad908833407c6fa681aa4e7b0fa5e3723d8a4d9667d161adf8c90fe2a6565c82989a7681179b8943553ebd71c8858b59f1b545465189df1a4e7b4682 WHIRLPOOL a59f47eb73a56790f9314ed386fb18eae47152d1d7e4d986ee859ac59eec2798026148ec691259e0ba6011f31f0f965af9846853b670f245de3496bfcd934c20
 EBUILD iproute2-4.0.0-r2.ebuild 3863 SHA256 2722dbbca2543367d9716b3252609cc1dd289adaa089fe1e5895bee88255636c SHA512 86c279ee86da47aeb736a3a3845791f6e3200252fd3c1abd1b6cf44f89b77c3ad9748c7b43b0c0b353b04614497bd7cf13346a696f7e6cbfd3ef35a652c97822 WHIRLPOOL 0a509679977ab9a417b8ad58039aa5ffd16dfd0c164fbad41ba0acbdb66364ed19664893ce36fa60d0b6a2c7cd692ccdc7bb396776bd311a6ab80e4fa71e2d47
 EBUILD iproute2-4.1.0.ebuild 3838 SHA256 9bd421d14a8b1157aaf79647f1caca2cdc57d8b31e37b0d0f06e26ffd3ae59e7 SHA512 86a1643be8d39bd12122878182212ae1ea0ea31cb258251fdc901b84de7ed04aacc295878a7b742fadf1537ca9aaebf2ebcaa563e8f43938a26d0b1578ca64e5 WHIRLPOOL e44c21f062467aede66192f4d6babbf936fa9df4fd12e1c382c13f7b32f30a64bc804c704fb3fff0f95330f00579af9c17d76a35e5cfac4c1a09459810dd8f47
+EBUILD iproute2-4.1.1.ebuild 3944 SHA256 5655db09ad87b933ca6424f6eeadef7994b52926c2d3aaab82762c4fe1a73be1 SHA512 ca1e2dee562177d6d52ee3c597c2f638dd70a75902833c8d4f83f80dfde4e163b5801f8ac1d636fc9d4a87dfa62ad6a15a15f5b3e79769bb94c860b1c2c95792 WHIRLPOOL bcf150f9e78bcd6ac389fd0c0809e4f5fa1facb0dab4c428b23d19f6c44b00b8aa25be61610d3731eae599d82c971af7af7e14f4529207d4eaae88cfc15ab4ff
 EBUILD iproute2-9999.ebuild 3852 SHA256 2a1ff03d70084fd0b6d64a8cc0c8d46106d6a3f9d03e4be72d09615cc5dc44aa SHA512 a7fec5d1bd51dfa32b834451d927771486d56f8672d8f11a6a2a7072b84134ae9cd7ac1928a355710c06a7c81b91d68dc7653e789337b31c3d0e282b192332cb WHIRLPOOL 457ed096c27ec01eafebc7655f29a799d81ff6c651ca719fb83387dbea7b32f3bf5357d4506030d218dd66093da169a094e52e2dbbbfd8c61208d14fbdaa406a
-MISC ChangeLog 43974 SHA256 f528e2c7ae9009bb3b129214cad22e8e7fd397869bda627887964ba934b14fd6 SHA512 0824eb8baff30cf6835b58994c7568786a551628a639911444fd1be9f897ec1ad12ee4dd54ec7f27c3811b631d5aa8904a6eb06c76cddaabcecf0b0c214cb33f WHIRLPOOL 12a24701dd573891882e5bf176f9a2fe3dfea4e22a5cb3afe36aebf19a13f2d1fa55e1400333dc7ceb53a361282829644615d1d4d16bf1193eaeab7f37883798
+MISC ChangeLog 44123 SHA256 02a46c92f3bc47dbd131de2afe816a0fd77c314dcc25546c5f6918bddc79803f SHA512 2dd40095e9ac5f6af5a91162ce62d71dffd3af8f47fa41d6b9c3f89a1d2fa376bd152df0f04a968d7b11acb8dbfccb6f144f5b0ecc3a2a190d33389797e69505 WHIRLPOOL a5a52e3b3bdb3a21e71cb2ec61d009dc2e664922e4017d1937ea6e858e9340fb8a99032b4c36a91fe0b26bf1a186fa5d96b96562382a578a2f731f563e0f12f2
 MISC metadata.xml 378 SHA256 ce154f89a4a5279c86abb4c1794849f7f3126ed5597db0459d3a7e639ef27de0 SHA512 aa181ac7826b756d8ca929df93c8445552a867ded0a3e3e78b30387b8241191f8f99c3a598835f38ea1a20c068dcc95b0bf9ebfd9c04aa9359c332bfdb3a2770 WHIRLPOOL 2b2ea65050de53e25da24cdd48c59bfd802b9176e9571aac010d5b6a8b7b63833b1dda1e84dcbddfd7113f3614b0bd1e929984078a5f69a791a17cc807fc7da2
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2
 
-iQIcBAEBCAAGBQJVm6oSAAoJEPGu1DbS6WIABWwP/jWu9FSy4zLK3csOk4LZHLda
-NVZr7UV3OLZfpCabK7Jg6SbRDCLVmH3L8Xahi4UKzTf8SzHmmaIvb5SpqSppdj5g
-lBaGsWjfR+pAozgqjB/djX7EudF749MNlNLnkcwD8ffnL0SlF6Xe2hDtVpPmjisy
-Uedcn+KuSSelGE+aOLZgg3jpmfdmbPwAk2PU7PphM/PQ5XApKBgN/xDRCd3s69Pu
-PZs6uEHZMY/PI+Ncj/pTL+nborO0rssTdcdfASWvX5QgxKezvS7yebzA2wsxomu1
-xEBG5RP9kpK79RP6VdNt+VgjWZsy7P/SKYBDCVWHeigg9I4jVIY8vkkEHGQVB71P
-sfgJ2IstScYFsrY55R7tqxomTCveHIe4QX58d7xcw1E0pZQahSJz+MAMLy3UlMR+
-woYRWD2Fkcb0w5mreJXurvqFPXo1qBoXdt4LMXHM4LSP5lJm710PMD0cGcunDny2
-8MdF3AeX6gmMNGwwdtUape2n1c/EQ+DjB2CFkRq0HSHClUK6vrwefjZ00aJu2kxu
-tuBQkK0GHjYSCpw5Xp1S0r60kWM2IsQLXTocyoX+w+HMxLGMW1WtIYfzhcu0UMmz
-v/SJhgAUrxRivoJTpsYV1QfNqhF5IGFoB65y4IL7xEveFF9QhaK0YFqUI7s/s6c6
-3/DYdKCjQQsOdJk5otyn
-=xxZF
+iQIcBAEBCAAGBQJVm/knAAoJEPGu1DbS6WIAY8YQAIFyOtO76bF0xOJnfhad+DL0
+D0uMrSQrHUQmqNwu5lsN71gnIau+8nFLKXWN+mtk7QzuPpFJcR+kXY3kGKJKsTN4
+9W0AIYOYyBiPGqsAySv1UqGitm7krBmOBfujTF4edMX4QSfQI3Cfu3OUB06wl9mf
+sO2mWtYD684hq5tgBfDE1AEQrwvbOKyo0S2JUijNkWXpxxuHb/R8amdsONUy4RDO
+W8Iz4EaaCXnA6wlNtjtLNFzS10YP1mFloQiyBA7ONi6mwZMJ9IOFe+E4baoi+kHI
+d2nLI1LNDVlvfmGxwrW9I2cnqF6/Yd7mA/zfW89hbo/Q6gYb0v6YkKTR7hrgx/zK
+D10zHd7Yp4alSNxqK3KwOu/ly0YwHS0B0WYyfWdSryKhAKZupMyeCt4fJAmycH9o
+ubp1vXEIbF9h7cLmoGFs3w+i2NkoWsFQqIIIxiiDQcs6jpYtWFpNzi6pSJEFtyjB
+7d+rVVWwT4EMhITizi/jnLPetGHWOKlR25rwCFfSspeAZbeaYXF2rH01sZG0ZTlu
+pI10QLpMY9Zw+N93VPoYJE/LaK9fosQekhT70JK4M7nFhpeyv+fpgO/rLdqfQywX
+Pd5/rdRdsWNRtvWxtgxhPHZ3reeqn55UA0bD2O2Vs0IbcMGPOAzy5umMA5piGBBL
+iVUvAHyHvbLK3P4GhPD2
+=YZoC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/iproute2-4.1.1.ebuild b/sys-apps/iproute2/iproute2-4.1.1.ebuild
new file mode 100644
index 000000000000..73ade46ba9d4
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-4.1.1.ebuild
@@ -0,0 +1,131 @@
+# 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
+
+	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
+}