Add fix from upstream for cached route misbehavior #331447 by ByrneG.

Package-Manager: portage-2.2_rc83/cvs/Linux x86_64

4 files changed, 153 insertions, 5 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index be347623f175..06919ca61928 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2010 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.160 2010/08/23 02:29:22 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.161 2010/09/18 11:33:40 vapier Exp $
+
+*iproute2-2.6.35-r2 (18 Sep 2010)
+
+  18 Sep 2010; Mike Frysinger <vapier@gentoo.org> +iproute2-2.6.35-r2.ebuild,
+  +files/iproute2-2.6.35-cached-routes.patch:
+  Add fix from upstream for cached route misbehavior #331447 by ByrneG.
 
   23 Aug 2010; Mike Frysinger <vapier@gentoo.org> iproute2-2.6.35-r1.ebuild,
   +files/iproute2-2.6.35-no-ipv6.patch:
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index b6b8efb553ee..212de740f7ff 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -8,6 +8,7 @@ AUX iproute2-2.6.29.1-hfsc.patch 37615 RMD160 580fbe97f4561ca9190768147100006602
 AUX iproute2-2.6.34-dnet-fix-strict-aliasing-warnings.patch 2128 RMD160 e4c75771d22ac0e555fcbbb31479863e620a0f9d SHA1 5c25dde66776e04398c791f22267b7f1d0b93464 SHA256 58a836dd863aef1c5c5b228ddfbb8bc713c5e228a74de458c035e920412364a7
 AUX iproute2-2.6.34-netem-fix-installs-of-dist-files.patch 1094 RMD160 2a9bc5b620fd685de268e718bf4f27eb022b8355 SHA1 835617938be1e1b34b0e69efdfed5b54b463c51e SHA256 5cf815fed466dacbe43cf1e5b0273485137ab1a823e0c0d8bd99c81ece84f1c9
 AUX iproute2-2.6.34-tc-revert-echo-in-install-target.patch 1096 RMD160 44150bed47a550acc712a99b6afb35379096a7db SHA1 4501f15ade43631ee1aad512ed5212d17a8bd589 SHA256 9e595622203e0546d0f71c69942935beda6458376171db91a1828da5271f8bf4
+AUX iproute2-2.6.35-cached-routes.patch 973 RMD160 ebfce18a197c7e523801752797c01459537b5f59 SHA1 c610e369a1484992d0afd0f3688d549d5602ca78 SHA256 7b8aec2ea23289eff65ee3ff42e9203c163ec43e458ec8a7963f990d5f555389
 AUX iproute2-2.6.35-no-ipv6.patch 859 RMD160 5e3760d4a9cbd9a74be4b66fbd08e272f49e86b3 SHA1 7c5c1e5e3ead449dd99ad00bf5725d3e785dc213 SHA256 643429d9dca71e505bf3ab5a8e35a89b1014cd4ffec2f77e0abc1fd3997579d3
 DIST iproute2-2.6.29-1.tar.bz2 367905 RMD160 f96c3ec0877c9d5a2dcba582b399a80ed71a4a8b SHA1 b6a43799bf5e8131307cf88b855031317af90eb4 SHA256 13ffb0ffe5404c9dcc8bed8c692f07d934aa3fd44661df79dd1efbb37f83fb9b
 DIST iproute2-2.6.31.tar.bz2 372539 RMD160 9372c1683553c5a0efbdf7a2756cc6a28e3a900f SHA1 e7dec62a4d6646f3fded4f5d34718e9fd98615e4 SHA256 56875eaed9c581645422d89e00fa7da512256c82ac3dae3c5051ff6827e83152
@@ -19,13 +20,14 @@ EBUILD iproute2-2.6.31.ebuild 2594 RMD160 eae592770337edde8c2ac7b8ef247d1dc66ed1
 EBUILD iproute2-2.6.33.ebuild 2605 RMD160 5e542a3837ca7bf1dbbe1a8f0dcd54e570aa3f88 SHA1 08fbca5a06eaaa386f74c5d86121985523b76a12 SHA256 f3c4ce385505757e6ec432026ef07e2f4a39cff8b0b1469aa92e54e0984a0806
 EBUILD iproute2-2.6.34.ebuild 2718 RMD160 41bb59dbec85feaabf439340c589a30b1ee78bce SHA1 12c48d54c40abe9cba17f8567a60008561ce930a SHA256 7e99ba00e0950211d14b4bf84759881280907cf926f5ec56601f20cff18a6921
 EBUILD iproute2-2.6.35-r1.ebuild 2542 RMD160 79e74bac0f291e1e77bd1bd5c70af52fdf98baa1 SHA1 a3bd6943e3ad5d22a24a871650b75f8bb3ea02be SHA256 c159b0bf203d654e441fd9574b6250e3406f0c7975f91af049b9254616b5d65c
+EBUILD iproute2-2.6.35-r2.ebuild 2597 RMD160 e764eddbdfb30fe44790beb798b9a9d8efa179c9 SHA1 a51721381bdfe0507389d777449469314084e16a SHA256 5b3081685a09231956e55ca4a0992a49b0c63a0162e7bab1e91c5fba14523ab5
 EBUILD iproute2-9999.ebuild 2433 RMD160 28f228f3af5e42e6b7b2cbdcea2330e38d26310d SHA1 a5473e6af6cb456b357e24c134f5fa5a80983a75 SHA256 abb49123cf276dc1b4662c6248641c39ee41d700795007c8be5d0fc2443a8c7d
-MISC ChangeLog 27694 RMD160 40b9811baa3c7aaf1e12b0b55f9ecd2609932ffb SHA1 26ad95f208ef442f304c207acaa0a0bbbe46e275 SHA256 446306f9c1f94a820c9cae25a81c2000612f9c1e63ac28ed4b54167da2553a24
+MISC ChangeLog 27926 RMD160 a7e2515d39cdc9e6e0c62b0d3a448a60d09eb3ed SHA1 7156700aaffa9eb31e7f2e1e7530104e78c0855c SHA256 3c3cc81977592d4592de32334f15876a4e9adbd4a5f352cb56329219e72425c8
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.16 (GNU/Linux)
 
-iF4EAREIAAYFAkxx3boACgkQTwhj9JtAlp6BFwD9Fr+oNzs1cEjCqqHMvFfqduuR
-dMV3j+xH1Wj/AphmDZAA/iyBHmzpdm/xbnsokRXGKHHUDB1i+rQox/ZShzHcUOAu
-=wmmg
+iF4EAREIAAYFAkyUpFQACgkQTwhj9JtAlp7nBgEAxWgstlOKEd7QGx8cf0LlLZ2M
+wJO9QNXcVkwGJCpm9oMBAJJJu9SP+2ZgzE7dcANtUp+iGQewNzXw7lFbY9SIZLe3
+=LAoC
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/iproute2-2.6.35-cached-routes.patch b/sys-apps/iproute2/files/iproute2-2.6.35-cached-routes.patch
new file mode 100644
index 000000000000..821d8c3fae5a
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-2.6.35-cached-routes.patch
@@ -0,0 +1,34 @@
+http://bugs.gentoo.org/331447
+
+From c73f3e02f8ae25e5daad0367690a3069895dd8a3 Mon Sep 17 00:00:00 2001
+From: Ulrich Weber <uweber@astaro.com>
+Date: Thu, 12 Aug 2010 11:05:19 +0200
+Subject: [PATCH] iproute2: dont filter cached routes on iproute_get
+
+iproute_get will return cloned routes for IPv4
+and cloned as well non-cloned routes for IPv6.
+
+Therefore RTM_F_CLONED flag should not be checked
+for iproute_get routes. Check in print_route will
+always fail because valid values are 0 and 1.
+
+Signed-off-by: Ulrich Weber <uweber@astaro.com>
+---
+ ip/iproute.c |    1 +
+ 1 files changed, 1 insertions(+), 0 deletions(-)
+
+diff --git a/ip/iproute.c b/ip/iproute.c
+index 711576e..b43933c 100644
+--- a/ip/iproute.c
++++ b/ip/iproute.c
+@@ -1286,6 +1286,7 @@ int iproute_get(int argc, char **argv)
+ 	memset(&req, 0, sizeof(req));
+ 
+ 	iproute_reset_filter();
++	filter.cloned = 2;
+ 
+ 	req.n.nlmsg_len = NLMSG_LENGTH(sizeof(struct rtmsg));
+ 	req.n.nlmsg_flags = NLM_F_REQUEST;
+-- 
+1.7.2
+
diff --git a/sys-apps/iproute2/iproute2-2.6.35-r2.ebuild b/sys-apps/iproute2/iproute2-2.6.35-r2.ebuild
new file mode 100644
index 000000000000..4d96b11dce70
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.35-r2.ebuild
@@ -0,0 +1,106 @@
+# Copyright 1999-2010 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.35-r2.ebuild,v 1.1 2010/09/18 11:33:40 vapier Exp $
+
+EAPI="2"
+
+inherit eutils toolchain-funcs flag-o-matic
+
+if [[ ${PV} == "9999" ]] ; then
+	EGIT_REPO_URI="git://git.kernel.org/pub/scm/linux/kernel/git/shemminger/iproute2.git"
+	inherit git
+	SRC_URI=""
+	#KEYWORDS=""
+else
+	if [[ ${PV} == *.*.*.* ]] ; then
+		MY_PV=${PV%.*}-${PV##*.}
+	else
+		MY_PV=${PV}
+	fi
+	MY_P="${PN}-${MY_PV}"
+	SRC_URI="http://developer.osdl.org/dev/iproute2/download/${MY_P}.tar.bz2"
+	KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~m68k ~mips ~ppc ~ppc64 ~s390 ~sh ~sparc ~x86"
+	S=${WORKDIR}/${MY_P}
+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 ipv6 minimal"
+
+RDEPEND="!net-misc/arpd
+	!minimal? ( berkdb? ( sys-libs/db ) )
+	atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+	sys-devel/flex
+	>=virtual/os-headers-2.6.27"
+
+src_prepare() {
+	sed -i \
+		-e "/^LIBDIR/s:=.*:=/$(get_libdir):" \
+		-e "s:-O2:${CFLAGS} ${CPPFLAGS}:" \
+		Makefile || die
+
+	# build against system headers
+	rm -r include/netinet #include/linux include/ip{,6}tables{,_common}.h include/libiptc
+
+	epatch "${FILESDIR}"/${PN}-2.6.29.1-hfsc.patch #291907
+	epatch "${FILESDIR}"/${P}-cached-routes.patch #331447
+	use ipv6 || epatch "${FILESDIR}"/${PN}-2.6.35-no-ipv6.patch #326849
+
+	epatch_user
+
+	# 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() {
+	echo -n 'TC_CONFIG_ATM:=' > Config
+	use atm \
+		&& echo 'y' >> Config \
+		|| echo 'n' >> Config
+
+	# Use correct iptables dir, #144265 #293709
+	append-cppflags -DIPT_LIB_DIR=\\\"`$(tc-getPKG_CONFIG) xtables --variable=xtlibdir`\\\"
+}
+
+src_compile() {
+	emake \
+		CC="$(tc-getCC)" \
+		HOSTCC="$(tc-getBUILD_CC)" \
+		AR="$(tc-getAR)" \
+		|| die
+}
+
+src_install() {
+	if use minimal ; then
+		into /
+		dosbin tc/tc || die "minimal"
+		return 0
+	fi
+
+	emake \
+		DESTDIR="${D}" \
+		SBINDIR=/sbin \
+		DOCDIR=/usr/share/doc/${PF} \
+		MANDIR=/usr/share/man \
+		install \
+		|| die
+	prepalldocs
+
+	dolib.a lib/libnetlink.a || die
+	insinto /usr/include
+	doins include/libnetlink.h || die
+
+	if use berkdb ; then
+		dodir /var/lib/arpd
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/sbin
+		mv "${D}"/sbin/arpd "${D}"/usr/sbin/
+	fi
+}