Fix by solar to prevent stack overflow in build util #99487.

Package-Manager: portage-2.0.51.22-r2

4 files changed, 32 insertions, 9 deletions

diff --git a/sys-apps/iproute2/ChangeLog b/sys-apps/iproute2/ChangeLog
index df03d6901ea3..9fd78a3efff2 100644
--- a/sys-apps/iproute2/ChangeLog
+++ b/sys-apps/iproute2/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for sys-apps/iproute2
 # Copyright 1999-2005 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.39 2005/07/19 00:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/ChangeLog,v 1.40 2005/08/09 22:33:50 vapier Exp $
+
+  09 Aug 2005; Mike Frysinger <vapier@gentoo.org>
+  +files/iproute2-2.6.11.20050330-stack.patch,
+  iproute2-2.6.11.20050330.ebuild:
+  Fix by solar to prevent stack overflow in build util #99487.
 
 *iproute2-2.6.11.20050330 (19 Jul 2005)
 
diff --git a/sys-apps/iproute2/Manifest b/sys-apps/iproute2/Manifest
index bf8c43f924b5..a97ecfc0cf7c 100644
--- a/sys-apps/iproute2/Manifest
+++ b/sys-apps/iproute2/Manifest
@@ -7,8 +7,8 @@ MD5 d3cde7b6b34b2e85954f70dc2742ac63 iproute2-2.6.10.20050112-r1.ebuild 1791
 MD5 d0dad7daa0e6d356fc35f778fed36006 metadata.xml 225
 MD5 c85837da88acbf2b1650f1bc8a1170d0 iproute2-2.6.11.20050310-r1.ebuild 1953
 MD5 988666dfd51295a76a3d0c57d5140462 iproute2-2.6.11.20050310-r2.ebuild 1959
-MD5 b44cd68cf57879d1326eadce2b0d24e8 iproute2-2.6.11.20050330.ebuild 1897
-MD5 3936bc2bbd67d0137d54a344148bd676 ChangeLog 10083
+MD5 fc285c9e4e6f6ce87f8e83718908f5db iproute2-2.6.11.20050330.ebuild 1942
+MD5 eb96723fc5fe2484d9393a9c5d57b5d2 ChangeLog 10279
 MD5 24a69d69fb222231a8d0f4358743190f files/2.6.7.20040608-misc-gentoo-fixes.patch 3970
 MD5 6076b8af87231defd7a1c2db9473c299 files/iproute2-2.6.11.20050310-dsmark-qdisc.patch 1354
 MD5 01450900cfa9fb721b061db655723598 files/2.6.9.20041106-esfq.patch 5621
@@ -20,13 +20,14 @@ MD5 f2f62bc9b7aa8ad751e47fa11a952976 files/iproute2-2.6.11.20050330-wrr.patch 13
 MD5 2469b9a3673ce5a18fa92cfb7c98a71f files/2.6.12-rc1-esfq.patch 5677
 MD5 5375310c6504f47ed3050805eb2675bc files/digest-iproute2-2.6.10.20050112-r1 76
 MD5 c697aa743be2a6d8eb675cc5e02877e3 files/digest-iproute2-2.6.11.20050330 74
+MD5 cee6b6e2c0150fe55bd1a413d43d2aa1 files/iproute2-2.6.11.20050330-stack.patch 295
 MD5 9b7de448bf17e80895da676709f9e93e files/digest-iproute2-2.6.11.20050310-r2 74
 MD5 9b7de448bf17e80895da676709f9e93e files/digest-iproute2-2.6.11.20050310-r1 74
 MD5 d3a321fa8b70eef6df11d7343a14fd02 files/2.4.7.20020116-hfsc.patch 9507
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v1.4.1 (GNU/Linux)
+Version: GnuPG v1.4.2 (GNU/Linux)
 
-iD8DBQFC3ELtgIKl8Uu19MoRAvU1AJ9L0utXWAY4/qovqBaxDo15q8pOOgCaAiXd
-2LGoNS2STkBYfTkQWkzUrao=
-=wnFu
+iD8DBQFC+S9rgIKl8Uu19MoRAg4yAJ4mp65aMT3reN7umQ2OzYIluhaN3ACeNK2r
+wb/Fap6RIHwbNYHK6s83o6o=
+=U8bk
 -----END PGP SIGNATURE-----
diff --git a/sys-apps/iproute2/files/iproute2-2.6.11.20050330-stack.patch b/sys-apps/iproute2/files/iproute2-2.6.11.20050330-stack.patch
new file mode 100644
index 000000000000..a6130d754730
--- /dev/null
+++ b/sys-apps/iproute2/files/iproute2-2.6.11.20050330-stack.patch
@@ -0,0 +1,16 @@
+Add some overflow checks.
+
+Patch by solar.
+
+http://bugs.gentoo.org/99487
+
+--- netem/paretonormal.c
++++ netem/paretonormal.c
+@@ -55,6 +55,7 @@
+ 
+ 	for (x = -10.0; x < 10.05; x += .00005) {
+ 		i = rint(TABLESIZE*normal(x, 0.0, 1.0));
++		if (i > TABLESIZE) continue;
+ 		table[i] = x;
+ 	}
+ 	printf(
diff --git a/sys-apps/iproute2/iproute2-2.6.11.20050330.ebuild b/sys-apps/iproute2/iproute2-2.6.11.20050330.ebuild
index d3baf663a02a..55a4bb3a3890 100644
--- a/sys-apps/iproute2/iproute2-2.6.11.20050330.ebuild
+++ b/sys-apps/iproute2/iproute2-2.6.11.20050330.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2005 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.11.20050330.ebuild,v 1.1 2005/07/19 00:01:30 vapier Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-apps/iproute2/iproute2-2.6.11.20050330.ebuild,v 1.2 2005/08/09 22:33:50 vapier Exp $
 
 inherit eutils toolchain-funcs
 
@@ -27,6 +27,7 @@ src_unpack() {
 	unpack ${A}
 	cd "${S}"
 	sed -i -e "s:-O2:${CFLAGS}:" Makefile || die "sed Makefile failed"
+	epatch "${FILESDIR}"/${P}-stack.patch
 	#68948 - esfq/wrr patches
 	epatch \
 		"${FILESDIR}"/2.6.12-rc1-esfq.patch \
@@ -45,7 +46,7 @@ src_compile() {
 		&& echo 'y' >> Config \
 		|| echo 'n' >> Config
 
-	local SUBDIRS="lib ip tc misc"
+	local SUBDIRS="lib ip tc misc netem"
 	use minimal && SUBDIRS="lib tc"
 	emake \
 		CC="$(tc-getCC)" \