Add official 3.5.1 release which fixes regressions in 3.5.0.

(Portage version: 2.2.0_alpha120/cvs/Linux x86_64)

4 files changed, 9 insertions, 125 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index bdda0b6f4d0d..a2130163dc2b 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,13 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.200 2012/08/13 15:30:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.201 2012/08/13 18:08:52 vapier Exp $
+
+*iproute2-3.5.1 (13 Aug 2012)
+
+  13 Aug 2012; Mike Frysinger <vapier@gentoo.org> +iproute2-3.5.1.ebuild,
+  -files/iproute2-3.5.0-ip-a-s.patch, -iproute2-3.5.0-r1.ebuild,
+  -iproute2-3.5.0.ebuild:
+  Add official 3.5.1 release which fixes regressions in 3.5.0.
 
 *iproute2-3.5.0-r1 (13 Aug 2012)
 
diff --git a/sys-apps/iproute2/files/iproute2-3.5.0-ip-a-s.patch b/sys-apps/iproute2/files/iproute2-3.5.0-ip-a-s.patch
deleted file mode 100644
index 7566c094e47a..000000000000
--- a/sys-apps/iproute2/files/iproute2-3.5.0-ip-a-s.patch
+++ /dev/null
@@ -1,16 +0,0 @@
-make sure `ip address show` shows addresses
-
-https://bugs.gentoo.org/430320
-http://marc.info/?l=linux-netdev&m=134436646508341&w=2
-
---- a/ip/ipaddress.c
-+++ b/ip/ipaddress.c
-@@ -1018,7 +1018,7 @@
- 		exit(1);
- 	}
- 
--	if (filter.family && filter.family != AF_PACKET) {
-+	if (filter.family != AF_PACKET) {
- 		if (filter.oneline)
- 			no_link = 1;
- 
diff --git a/sys-apps/iproute2/iproute2-3.5.0.ebuild b/sys-apps/iproute2/iproute2-3.5.0.ebuild
deleted file mode 100644
index 5ebdb8b79a86..000000000000
--- a/sys-apps/iproute2/iproute2-3.5.0.ebuild
+++ /dev/null
@@ -1,106 +0,0 @@
-# Copyright 1999-2012 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.5.0.ebuild,v 1.1 2012/08/02 03:02:44 radhermit Exp $
-
-EAPI="4"
-
-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 ~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"
-
-RDEPEND="!net-misc/arpd
-	iptables? ( >=net-firewall/iptables-1.4.5 )
-	!minimal? ( berkdb? ( sys-libs/db ) )
-	atm? ( net-dialup/linux-atm )"
-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.1.0-no-ipv6.patch #326849
-
-	sed -i \
-		-e '/^CC =/d' \
-		-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
-	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)
-	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
-
-	dolib.a lib/libnetlink.a
-	insinto /usr/include
-	doins include/libnetlink.h
-
-	if use berkdb ; then
-		dodir /var/lib/arpd
-		# bug 47482, arpd doesn't need to be in /sbin
-		dodir /usr/sbin
-		mv "${ED}"/sbin/arpd "${ED}"/usr/sbin/
-	fi
-}
diff --git a/sys-apps/iproute2/iproute2-3.5.0-r1.ebuild b/sys-apps/iproute2/iproute2-3.5.1.ebuild
index dd5924d919ad..1a0c6a654eee 100644
--- a/sys-apps/iproute2/iproute2-3.5.0-r1.ebuild
+++ b/sys-apps/iproute2/iproute2-3.5.1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2012 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.5.0-r1.ebuild,v 1.1 2012/08/13 15:30:47 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-3.5.1.ebuild,v 1.1 2012/08/13 18:08:52 vapier Exp $
 
 EAPI="4"
 
@@ -37,7 +37,6 @@ DEPEND="${RDEPEND}
 
 src_prepare() {
 	epatch "${FILESDIR}"/${PN}-3.1.0-mtu.patch #291907
-	epatch "${FILESDIR}"/${P}-ip-a-s.patch #430320
 	use ipv6 || epatch "${FILESDIR}"/${PN}-3.1.0-no-ipv6.patch #326849
 
 	sed -i \