Version bump to fix ip option handling #120874 by Jan Minar.

Package-Manager: portage-2.1_pre4-r1

4 files changed, 98 insertions, 7 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index 9d4a9cf42bea..78895a0e2ef1 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2006 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.44 2006/01/30 03:09:01 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.45 2006/01/30 03:13:11 vapier Exp $
+
+*iproute2-2.6.15.20060110 (30 Jan 2006)
+
+  30 Jan 2006; Mike Frysinger <vapier@gentoo.org>
+  +iproute2-2.6.15.20060110.ebuild:
+  Version bump to fix ip option handling #120874 by Jan Minar.
 
 *iproute2-2.6.13.051007 (30 Jan 2006)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index 536f9ab1eb61..7106ca112cd2 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -1,9 +1,9 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA1
 
-MD5 371d4964681c8fc1349fa6036a39a4cf ChangeLog 11337
-RMD160 f26ff6d24284ee7efae02b54aac7d7b66f7f0a03 ChangeLog 11337
-SHA256 bbe8143f61227767eb284f0e30379a7e93b2c1e5d4878e4616dbc988a82227ca ChangeLog 11337
+MD5 2b483480223dc6dbb7fc414989eaf2e3 ChangeLog 11528
+RMD160 c44d85ec47bdb3e17eca3f786f66ada9662ec9b0 ChangeLog 11528
+SHA256 d67e1e9006c5a2610ebc58cdf37b42958511ad2cfcdf7c3d9faaf85e94894953 ChangeLog 11528
 MD5 d3a321fa8b70eef6df11d7343a14fd02 files/2.4.7.20020116-hfsc.patch 9507
 RMD160 60822993625f7db9071433f73f34e7f7167e6e1c files/2.4.7.20020116-hfsc.patch 9507
 SHA256 d11315f8e2f45ddb9d431c9c708745485de20e739f9e06622511422115898e99 files/2.4.7.20020116-hfsc.patch 9507
@@ -40,6 +40,9 @@ SHA256 466b1a013215a23e438b8fa7e7e71630f3ea00124b298698e84ef4d7a1216ecf files/di
 MD5 e41ae590d9b4d4abb79c28d065d9da7f files/digest-iproute2-2.6.13.051007 247
 RMD160 fea297ed22316c9a34431236af964043fe103e2c files/digest-iproute2-2.6.13.051007 247
 SHA256 83e2d6c0c21534bae9a3579896adbc91df1a70b75b891bde2b5419cc87927c78 files/digest-iproute2-2.6.13.051007 247
+MD5 45377eac0df99a87c60e5f81726c7d27 files/digest-iproute2-2.6.15.20060110 268
+RMD160 b66993cd208425f21ceb2255d15bfa8aee3218ca files/digest-iproute2-2.6.15.20060110 268
+SHA256 fb8ccc446bf4164b55e461c3fc26b87a38942088ae25912fe62938abab59036b files/digest-iproute2-2.6.15.20060110 268
 MD5 efc13e1a9a4a7bd080305d540ff5d48d files/digest-iproute2-2.6.7.20040608-r1 75
 RMD160 e10651c3af65c93225c15e4d3f5b9776576af415 files/digest-iproute2-2.6.7.20040608-r1 75
 SHA256 c41ba431210ee9486b0bc258bb5980dd4e61105504663518d7c59c7a89125444 files/digest-iproute2-2.6.7.20040608-r1 75
@@ -79,6 +82,9 @@ SHA256 6c45275b31e8a0cac65e63a26a885b8172944a1be0a9e198a3f4865264302a07 iproute2
 MD5 aa3c7bdfb83be66f9b51310b9b53b0f8 iproute2-2.6.13.051007.ebuild 1899
 RMD160 d06a8793232c97a8c2e15caaccb595bff8505e1f iproute2-2.6.13.051007.ebuild 1899
 SHA256 00f0e5bce4413dc14a1c1d2328283101660571a0ceb080897f850c64471a680e iproute2-2.6.13.051007.ebuild 1899
+MD5 f07ca974dc13ce897b8542bc7cf0518b iproute2-2.6.15.20060110.ebuild 1949
+RMD160 69acb9f556855090a0aa0693ca53743a307fc950 iproute2-2.6.15.20060110.ebuild 1949
+SHA256 7bce5702e85a830c9c12bbe9d77c341611fe0ff255fa60bd91d8f5444a34d152 iproute2-2.6.15.20060110.ebuild 1949
 MD5 6965651f639e49b593086b4b1e5be994 iproute2-2.6.7.20040608-r1.ebuild 2375
 RMD160 42a98bd0e2d6a44f3e992fbae026e6408903fdb5 iproute2-2.6.7.20040608-r1.ebuild 2375
 SHA256 9d1ccdde131b22d2257f2040b6c0d32cae9cd187c3f4e76ad97e2cbd18ad87d8 iproute2-2.6.7.20040608-r1.ebuild 2375
@@ -88,7 +94,7 @@ SHA256 8c13ed9cb8e178d0e1af782bee862350146dc46765dedd79e6f531211ef52a68 metadata
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFD3YNv2+ySkm8kpY0RAn5vAJ0QOF8jA18kK6vDAaOE9LTbi0D1iACgrh10
-2pa5c9HPrc0AGKYE1IgN72c=
-=Yshh
+iD8DBQFD3YRk2+ySkm8kpY0RAqeaAJ40wDC1PAEPJltd06Z+wUTyp/YrtQCeO6/e
+HNpoOBxXXiU2eAlaZb4vNI8=
+=o814
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/digest-iproute2-2.6.15.20060110 b/sys-apps/iproute2/files/digest-iproute2-2.6.15.20060110
new file mode 100644
index 000000000000..edd9ea894146
--- /dev/null
+++ b/sys-apps/iproute2/files/digest-iproute2-2.6.15.20060110
@@ -0,0 +1,3 @@
+MD5 04f57a6d366d36426d276178b600f5c5 iproute2-2.6.15-060110.tar.gz 394322
+RMD160 6738587d26a95cb2563fa5d218c00bd3ed3e598f iproute2-2.6.15-060110.tar.gz 394322
+SHA256 9736c27e606b31af714e319bfad5bb9abdcbaf9b4f2ec496ca6310ff56b815d8 iproute2-2.6.15-060110.tar.gz 394322
diff --git a/sys-apps/iproute2/iproute2-2.6.15.20060110.ebuild b/sys-apps/iproute2/iproute2-2.6.15.20060110.ebuild
new file mode 100644
index 000000000000..d6def1957b91
--- /dev/null
+++ b/sys-apps/iproute2/iproute2-2.6.15.20060110.ebuild
@@ -0,0 +1,76 @@
+# Copyright 1999-2006 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.15.20060110.ebuild,v 1.1 2006/01/30 03:13:11 vapier Exp $
+
+inherit eutils toolchain-funcs
+
+MY_PV=${PV%.*}
+SNAP=${PV##*.}
+SNAP=${SNAP:2}
+DESCRIPTION="kernel routing and traffic control utilities"
+HOMEPAGE="http://linux-net.osdl.org/index.php/Iproute2"
+SRC_URI="http://developer.osdl.org/dev/iproute2/download/${PN}-${MY_PV}-${SNAP}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~arm ~hppa ~ia64 ~mips ~ppc ~ppc64 ~s390 ~sparc ~x86"
+IUSE="atm berkdb minimal"
+
+RDEPEND="!minimal? ( berkdb? ( sys-libs/db ) )
+	atm? ( net-dialup/linux-atm )"
+DEPEND="${RDEPEND}
+	>=virtual/os-headers-2.4.21"
+
+S=${WORKDIR}/${PN}-${MY_PV}-${SNAP}
+
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+	sed -i -e "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
+
+	#68948 - esfq/wrr patches
+	epatch "${FILESDIR}"/${PN}-051007-esfq-2.6.13.patch
+	epatch "${FILESDIR}"/${PN}-2.6.11.20050330-wrr.patch
+
+	# don't build arpd if USE=-berkdb #81660
+	use berkdb || sed -i '/^TARGETS=/s: arpd : :' misc/Makefile
+	# Multilib fixes
+	sed -i 's:/usr/local:/usr:' tc/m_ipt.c
+	sed -i "s:/usr/lib:/usr/$(get_libdir):g" \
+		netem/Makefile tc/{Makefile,tc.c,q_netem.c,m_ipt.c} || die
+}
+
+src_compile() {
+	echo -n 'TC_CONFIG_ATM:=' > Config
+	use atm \
+		&& echo 'y' >> Config \
+		|| echo 'n' >> Config
+
+	local SUBDIRS="lib ip tc misc netem"
+	use minimal && SUBDIRS="lib tc"
+	emake \
+		CC="$(tc-getCC)" \
+		AR="$(tc-getAR)" \
+		SUBDIRS="${SUBDIRS}" \
+		|| die "make"
+}
+
+src_install() {
+	if use minimal; then
+		into /
+		dosbin tc/tc || die "minimal"
+		return 0
+	fi
+
+	make \
+		DESTDIR="${D}" \
+		SBINDIR=/sbin \
+		DOCDIR=/usr/share/doc/${PF} \
+		install \
+		|| die "make install failed"
+	if use berkdb ; then
+		# bug 47482, arpd doesn't need to be in /sbin
+		dodir /usr/sbin
+		mv "${D}"/sbin/arpd "${D}"/usr/sbin/
+	fi
+}