summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMike Frysinger <vapier@gentoo.org>2005-08-09 22:33:50 +0000
committerMike Frysinger <vapier@gentoo.org>2005-08-09 22:33:50 +0000
commit890a39699c18096c394f7953c7009d1aea1d87e8 (patch)
tree1f6251cecd24819f881b9663c76d09daffad4faa /sys-apps/iproute2
parentVersion bump. (diff)
downloadgentoo-2-890a39699c18096c394f7953c7009d1aea1d87e8.tar.gz
gentoo-2-890a39699c18096c394f7953c7009d1aea1d87e8.tar.bz2
gentoo-2-890a39699c18096c394f7953c7009d1aea1d87e8.zip
Fix by solar to prevent stack overflow in build util #99487.
(Portage version: 2.0.51.22-r2)
Diffstat (limited to 'sys-apps/iproute2')
-rw-r--r--sys-apps/iproute2/ChangeLog7
-rw-r--r--sys-apps/iproute2/files/iproute2-2.6.11.20050330-stack.patch16
-rw-r--r--sys-apps/iproute2/iproute2-2.6.11.20050330.ebuild5
3 files changed, 25 insertions, 3 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/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)" \