Version bump. Install libnetlink files #314967 by Daniel Deptula. Fix dist lookup with tc #320333 by Ryan Twitchell.

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

6 files changed, 287 insertions, 3 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 99453b8fb878..88dfa5ada4f4 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,15 @@
 # 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.154 2010/05/08 18:16:09 armin76 Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.155 2010/06/10 00:55:34 vapier Exp $
+
+*iproute2-2.6.34 (10 Jun 2010)
+
+  10 Jun 2010; Mike Frysinger <vapier@gentoo.org> +iproute2-2.6.34.ebuild,
+  +files/iproute2-2.6.34-dnet-fix-strict-aliasing-warnings.patch,
+  +files/iproute2-2.6.34-netem-fix-installs-of-dist-files.patch,
+  +files/iproute2-2.6.34-tc-revert-echo-in-install-target.patch:
+  Version bump. Install libnetlink files #314967 by Daniel Deptula. Fix dist
+  lookup with tc #320333 by Ryan Twitchell.
 
   08 May 2010; Raúl Porcel <armin76@gentoo.org> iproute2-2.6.31.ebuild:
   alpha/ia64/m68k/s390/sh/sparc stable wrt #308137
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 0be97d1df2cc..740b217ac8f7 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,14 +1,28 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA256
+
 AUX iproute2-2.6.26-ldflags.patch 330 RMD160 0dd7dd7837120eb31ffc8b9650063c4f8c8f8889 SHA1 a2dead0f194cfa039ecab330b0a945748f894948 SHA256 c7206270a72a9e0aa66ddf641d10a384501e58b87917b1e3161f297349b8ec13
 AUX iproute2-2.6.26-linux-2.6.27-API.patch 1445 RMD160 0980fa108440f1b8ca96879ae5181c8a316a013d SHA1 577ce6ca0d01b3b6a5e17682e4c3ed7ad95005ca SHA256 728376e0c13d3714895f20271c7951502b52fb159813bb1156d13c3f63ba18d4
 AUX iproute2-2.6.29.1-flush.patch 5669 RMD160 63441945760ddaa5de5678934fc5e2d2a7f960f0 SHA1 289383e5d198e33992eda9984bdd2fea1071a894 SHA256 13007eb0335e4a8a88f4946cea9fc61ee4fbe840ce308279696212b11aa1928a
 AUX iproute2-2.6.29.1-hfsc.patch 37615 RMD160 580fbe97f4561ca9190768147100006602bef82e SHA1 276401d6ca4965a1008a1e7098de3acd2d4684d6 SHA256 4d41873a00841749a47142dc5591572b2d7df3b4d4c56d8dcebeb3c4cab30672
+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
 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
 DIST iproute2-2.6.33.tar.bz2 375000 RMD160 263bd12e4af88dbaa6c4b4fc75f186cca0a9266d SHA1 09d12790458b1d9e4fbd72d962304ac81530c4da SHA256 ef50a1f04a7f551a6a7802f4eef60fb06eed77bc8a8cbde7ffef950ded0abe02
+DIST iproute2-2.6.34.tar.bz2 385281 RMD160 2d308f517e2e56e6399757c89f081f1c39bcea15 SHA1 b57f98e284c68a464b9c3e132d29760de6331688 SHA256 f7feb3c34df4714cae0265f7629863af8b0a88550f4f38aba0ffc81a10c29bbb
 EBUILD iproute2-2.6.29.1-r1.ebuild 2696 RMD160 70887d2d603e1241dbb88c46a9611f91ae8da117 SHA1 a17de7e23be9fbc956aa6521c9b8385261b98447 SHA256 702da0ee8ab3597e51029f08d948de9ec31295e7e72cec2f6cd3eb870d145d03
-EBUILD iproute2-2.6.29.1-r3.ebuild 2724 RMD160 dab30bef80ed398773f03c408e229882139f0071 SHA1 8a662d0684effda45f5aee2ec51433c3b19309ed SHA256 84af160e662cd39bf822fc0b3d40df3145160b87cedfbfc1b1f7bd3a19d6f8d3
 EBUILD iproute2-2.6.31.ebuild 2594 RMD160 eae592770337edde8c2ac7b8ef247d1dc66ed146 SHA1 00d96f0b0ca62123fc1ae0f62cbb061b5d0e4805 SHA256 fed86f3b964a122cf606979c999053305aca65af0e4057ff11c8a84ac09680dd
 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-9999.ebuild 2604 RMD160 f8472e82eff1e97e84729db2291b19a7b83f7eca SHA1 3557ce1eb4aa2827eab4ec749e26c55520e3a8a4 SHA256 796fd2515705c235faca8c301a366f4821b880095a26c50da600dac7028af02d
-MISC ChangeLog 26314 RMD160 e03ea834aeff17f439452d300af423f2d489fd1e SHA1 ac6787cb5e22a3ce0deab3da6284746c999d8ae1 SHA256 5fbfe8678e4d6a6b2240df321d2738c080270103198ca085836d0696891bb146
+MISC ChangeLog 26738 RMD160 8735e9a979c755fe94f00f515f354e3e41f90bcf SHA1 ee09629d38ccf9ced4083f4a175a8651bc835a55 SHA256 17161ce2d76bc24d7e66e8e3413b1aa1739190fa335069b72073592b57768abd
 MISC metadata.xml 164 RMD160 f43cbec30b7074319087c9acffdb9354b17b0db3 SHA1 9c213f5803676c56439df3716be07d6692588856 SHA256 f5f2891f2a4791cd31350bb2bb572131ad7235cd0eeb124c9912c187ac10ce92
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.15 (GNU/Linux)
+
+iF4EAREIAAYFAkwQN/IACgkQTwhj9JtAlp6+2QD+KaLwxZEQiatWZefkGcpuqsox
+MV96SXMysmEEMv0/KSgBAKMWYtix7wvkuW/54qq4i3bmDJO8B9ptwVFlI8GDi5Nk
+=yIHo
+-----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/iproute2-2.6.34-dnet-fix-strict-aliasing-warnings.patch b/sys-apps/iproute2/files/iproute2-2.6.34-dnet-fix-strict-aliasing-warnings.patch
new file mode 100644
index 000000000000..7dbe9fa970d4
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-2.6.34-dnet-fix-strict-aliasing-warnings.patch
@@ -0,0 +1,75 @@
+From f9ec992065291ddada270aebad0d5c82d8ed72db Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 9 Jun 2010 20:46:33 -0400
+Subject: [PATCH] dnet: fix strict aliasing warnings
+
+Recent gcc doesn't like it when you cast char pointers to uint16_t
+pointers and then dereference it.  So use memcpy() instead and let
+gcc take care of optimizing things away (when appropriate).  This
+should also fix alignment issues on arches where gcc packs the char
+pointer tighter than 16bits.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ lib/dnet_ntop.c |    8 ++++++--
+ lib/dnet_pton.c |    5 ++++-
+ 2 files changed, 10 insertions(+), 3 deletions(-)
+
+diff --git a/lib/dnet_ntop.c b/lib/dnet_ntop.c
+index 9500df8..507a7eb 100644
+--- a/lib/dnet_ntop.c
++++ b/lib/dnet_ntop.c
+@@ -1,4 +1,5 @@
+ #include <errno.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ 
+@@ -35,11 +36,14 @@ static __inline__ int do_digit(char *str, u_int16_t *addr, u_int16_t scale, size
+ 
+ static const char *dnet_ntop1(const struct dn_naddr *dna, char *str, size_t len)
+ {
+-	u_int16_t addr = dn_ntohs(*(u_int16_t *)dna->a_addr);
+-	u_int16_t area = addr >> 10;
++	u_int16_t addr, area;
+ 	size_t pos = 0;
+ 	int started = 0;
+ 
++	memcpy(&addr, dna->a_addr, sizeof(addr));
++	addr = dn_ntohs(addr);
++	area = addr >> 10;
++
+ 	if (dna->a_len != 2)
+ 		return NULL;
+ 
+diff --git a/lib/dnet_pton.c b/lib/dnet_pton.c
+index bd7727a..7385756 100644
+--- a/lib/dnet_pton.c
++++ b/lib/dnet_pton.c
+@@ -1,4 +1,5 @@
+ #include <errno.h>
++#include <string.h>
+ #include <sys/types.h>
+ #include <netinet/in.h>
+ 
+@@ -37,6 +38,7 @@ static int dnet_num(const char *src, u_int16_t * dst)
+ 
+ static int dnet_pton1(const char *src, struct dn_naddr *dna)
+ {
++	u_int16_t addr;
+ 	u_int16_t area = 0;
+ 	u_int16_t node = 0;
+ 	int pos;
+@@ -48,7 +50,8 @@ static int dnet_pton1(const char *src, struct dn_naddr *dna)
+ 	if ((pos == 0) || (node > 1023))
+ 		return 0;
+ 	dna->a_len = 2;
+-	*(u_int16_t *)dna->a_addr = dn_htons((area << 10) | node);
++	addr = dn_htons((area << 10) | node);
++	memcpy(dna->a_addr, &addr, sizeof(addr));
+ 
+ 	return 1;
+ }
+-- 
+1.7.1
+
diff --git a/sys-apps/iproute2/files/iproute2-2.6.34-netem-fix-installs-of-dist-files.patch b/sys-apps/iproute2/files/iproute2-2.6.34-netem-fix-installs-of-dist-files.patch
new file mode 100644
index 000000000000..fc74638fc24c
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-2.6.34-netem-fix-installs-of-dist-files.patch
@@ -0,0 +1,36 @@
+From a84389f8d3f0960c60db81f83057140a17f5c841 Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 9 Jun 2010 20:36:57 -0400
+Subject: [PATCH] netem: fix installs of dist files
+
+The tc program searches LIBDIR by default for the .dist files, and that
+defaults to /usr/lib.  But the netem subdir has /lib/ hardcoded which
+means the default build+install results in the files not being found.
+
+Further, these are plain text files which are read at runtime, so it
+doesn't make sense to give them executable bits.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ netem/Makefile |    4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/netem/Makefile b/netem/Makefile
+index b6ccfc6..e52e125 100644
+--- a/netem/Makefile
++++ b/netem/Makefile
+@@ -20,9 +20,9 @@ stats: stats.c
+ 	$(HOSTCC) $(CCOPTS) -I../include -o $@ $@.c -lm
+ 
+ install: all
+-	mkdir -p $(DESTDIR)/lib/tc
++	mkdir -p $(DESTDIR)$(LIBDIR)/tc
+ 	for i in $(DISTDATA); \
+-	do install -m 755 $$i $(DESTDIR)/lib/tc; \
++	do install -m 644 $$i $(DESTDIR)$(LIBDIR)/tc; \
+ 	done
+ 
+ clean:
+-- 
+1.7.1
+
diff --git a/sys-apps/iproute2/files/iproute2-2.6.34-tc-revert-echo-in-install-target.patch b/sys-apps/iproute2/files/iproute2-2.6.34-tc-revert-echo-in-install-target.patch
new file mode 100644
index 000000000000..f9c90898fa9e
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-2.6.34-tc-revert-echo-in-install-target.patch
@@ -0,0 +1,36 @@
+From 94efd93e2bdd2a1d739f4f86bf6a013b081a481a Mon Sep 17 00:00:00 2001
+From: Mike Frysinger <vapier@gentoo.org>
+Date: Wed, 9 Jun 2010 20:32:26 -0400
+Subject: [PATCH] tc: revert "echo" in install target
+
+The recent commit "iproute2: add option to build m_xt as a tc module"
+(ab814d635529787) looks like it wrongly included debug changes in the
+install target.  So drop the `echo` so the tc binary actually gets
+installed again.
+
+Signed-off-by: Mike Frysinger <vapier@gentoo.org>
+---
+ tc/Makefile |    6 +++---
+ 1 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/tc/Makefile b/tc/Makefile
+index 01a16fc..3aa9f26 100644
+--- a/tc/Makefile
++++ b/tc/Makefile
+@@ -99,10 +99,10 @@ libtc.a: $(TCLIB)
+ 	$(AR) rcs $@ $(TCLIB)
+ 
+ install: all
+-	echo mkdir -p $(MODDESTDIR)
+-	echo install -m 0755 tc $(DESTDIR)$(SBINDIR)
++	mkdir -p $(MODDESTDIR)
++	install -m 0755 tc $(DESTDIR)$(SBINDIR)
+ 	for i in $(TCSO); \
+-	do echo install -m 755 $$i $(MODDESTDIR); \
++	do install -m 755 $$i $(MODDESTDIR); \
+ 	done
+ 	if [ ! -f $(MODDESTDIR)/m_ipt.so ]; then \
+ 	if [ -f $(MODDESTDIR)/m_xt.so ]; \
+-- 
+1.7.1
+
diff --git a/sys-apps/iproute2/iproute2-2.6.34.ebuild b/sys-apps/iproute2/iproute2-2.6.34.ebuild
new file mode 100644
index 000000000000..eb930f8d4fc7
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.34.ebuild
@@ -0,0 +1,114 @@
+# 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.34.ebuild,v 1.1 2010/06/10 00:55:34 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 minimal"
+
+RDEPEND="!net-misc/arpd
+	!minimal? ( berkdb? ( sys-libs/db ) )
+	atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+	elibc_glibc? ( >=sys-libs/glibc-2.7 )
+	>=virtual/os-headers-2.6.27"
+
+src_unpack() {
+	if [[ ${PV} == "9999" ]] ; then
+		git_src_unpack
+	else
+		unpack ${A}
+	fi
+}
+
+src_prepare() {
+	epatch "${FILESDIR}"/${P}-tc-revert-echo-in-install-target.patch
+	epatch "${FILESDIR}"/${P}-netem-fix-installs-of-dist-files.patch #320333
+	epatch "${FILESDIR}"/${P}-dnet-fix-strict-aliasing-warnings.patch
+
+	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_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)" \
+		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
+}