Fix buffer overflows (bug #337436).

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

3 files changed, 60 insertions, 2 deletions

diff --git a/net-analyzer/slurm/ChangeLog b/net-analyzer/slurm/ChangeLog
index 241c0ca07687..eea8416215de 100644
--- a/net-analyzer/slurm/ChangeLog
+++ b/net-analyzer/slurm/ChangeLog
@@ -1,6 +1,12 @@
 # ChangeLog for net-analyzer/slurm
-# Copyright 1999-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/ChangeLog,v 1.17 2009/06/02 11:59:40 flameeyes Exp $
+# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/ChangeLog,v 1.18 2011/08/01 15:32:40 jer Exp $
+
+*slurm-0.3.3-r1 (01 Aug 2011)
+
+  01 Aug 2011; Jeroen Roovers <jer@gentoo.org> +slurm-0.3.3-r1.ebuild,
+  +files/slurm-0.3.3-overflow.patch:
+  Fix buffer overflows (bug #337436).
 
   02 Jun 2009; Diego E. Pettenò <flameeyes@gentoo.org> slurm-0.3.3.ebuild,
   +files/slurm-0.3.3-asneeded.patch:
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-overflow.patch b/net-analyzer/slurm/files/slurm-0.3.3-overflow.patch
new file mode 100644
index 000000000000..d2f787c827e8
--- /dev/null
+++ b/net-analyzer/slurm/files/slurm-0.3.3-overflow.patch
@@ -0,0 +1,13 @@
+--- src/linux.c.org	2003-09-06 12:44:50.000000000 +0200
++++ src/linux.c	2011-08-01 04:44:06.622205852 +0200
+@@ -68,8 +68,8 @@
+ 
+     /* do not parse the first two lines as they only contain static garbage */
+     fseek(proc_net_dev, 0, SEEK_SET);
+-    fgets(buffer, BUFSIZ-1, proc_net_dev);
+-    fgets(buffer, BUFSIZ-1, proc_net_dev);
++    fgets(buffer, BUFSIZE-1, proc_net_dev);
++    fgets(buffer, BUFSIZE-1, proc_net_dev);
+ 
+     interfacefound = 0;
+     while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL)
diff --git a/net-analyzer/slurm/slurm-0.3.3-r1.ebuild b/net-analyzer/slurm/slurm-0.3.3-r1.ebuild
new file mode 100644
index 000000000000..46594560df23
--- /dev/null
+++ b/net-analyzer/slurm/slurm-0.3.3-r1.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2011 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/slurm-0.3.3-r1.ebuild,v 1.1 2011/08/01 15:32:40 jer Exp $
+
+EAPI="4"
+
+inherit autotools eutils
+
+DESCRIPTION="Realtime network interface monitor based on FreeBSD's pppstatus"
+HOMEPAGE="http://www.wormulon.net/projects/slurm"
+SRC_URI="http://www.wormulon.net/files/code/slurm/${P}.tar.gz"
+
+LICENSE="GPL-2"
+SLOT="0"
+KEYWORDS="~amd64 ~ppc ~sparc ~x86"
+IUSE=""
+
+DEPEND="sys-libs/ncurses"
+
+src_prepare() {
+	epatch \
+		"${FILESDIR}"/${P}-asneeded.patch \
+		"${FILESDIR}"/${P}-overflow.patch
+	eautoreconf
+}
+
+src_install() {
+	# binary
+	dobin slurm
+
+	# themes to use with -t option
+	insinto /usr/share/${PN}/themes
+	doins themes/*.theme
+
+	# manual and other docs
+	doman slurm.1
+	dodoc AUTHORS ChangeLog COPYRIGHT FAQ KEYS README THANKS \
+		THEMES.txt TODO
+}