Fix buffer overflows (bug #337436).

Package-Manager: portage-2.2.0_alpha49/cvs/Linux x86_64

4 files changed, 67 insertions, 7 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/Manifest b/net-analyzer/slurm/Manifest
index 08a17ee76836..376e2259a9f2 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -2,14 +2,16 @@
 Hash: SHA1
 
 AUX slurm-0.3.3-asneeded.patch 2137 RMD160 59ce2467a5c86631c09f50fd95756ea3ed7f640f SHA1 1831186095d014efd8de8cd1556de4d23df3c7fb SHA256 5f62495778a16019d1d76fbfbe992797e6e574238303c1b52b47939e365d29fa
+AUX slurm-0.3.3-overflow.patch 511 RMD160 7898924ee41de0d42d3c2953ae862da73b5dcdc5 SHA1 011792208537c753a229a47c7972b9713493a21f SHA256 ee6d107eaf8ee07a28d0d696843aac33c12060ee4bfff9e325a8da6d68d734fd
 DIST slurm-0.3.3.tar.gz 122839 RMD160 6f154e5e6be0ac746dc67e152cf9caf1580c14fe SHA1 232a7f28ec3457b2e9d554ed844a45642dea1cc5 SHA256 b25889aa1910b1bb48e4eafdac0c810bc02e8b98ddb2ade0aed2ec64672d6834
+EBUILD slurm-0.3.3-r1.ebuild 908 RMD160 83c85b7c79cb5252bd1d78b867be566e0529e682 SHA1 a937dfd33f850f66b751a1df4b06fbf92595d875 SHA256 3ddf26c9b03f060db98cf46e8613fd3ec535fe042b9b7de33137f758a613dbc1
 EBUILD slurm-0.3.3.ebuild 880 RMD160 df81ebc14a85e63819aa398932d52bb4a3fb5930 SHA1 ab8a86b7089f8cedf96c3a4975af9716e403fca8 SHA256 20d5fab59bb92189c4e739d3c7520abca52a8cd9898655a978125450b58f4b37
-MISC ChangeLog 2884 RMD160 86a50e6a9925adb5694c6785d4f44e6c34a22bd4 SHA1 a3ef5636979bd873ce225f73da0d685dac239901 SHA256 fe1c587f5e9a33e2b6bef5dff2debd29c9da0fb0419b9af06548c894f2beeb13
+MISC ChangeLog 3056 RMD160 05a45db78efc3bc920e50387953e63ec4a89e2ee SHA1 2b524251ed0e39c6c9ad7011e2b371c231b2ee28 SHA256 a99dc95bad46d4ba2b945d1c40c9318f905c8d35c0e23ec1116ad2a386b9c83d
 MISC metadata.xml 258 RMD160 d69f173c38df217e8b8c64d342606128909b2433 SHA1 110cae98b08d0a06b3dad70a20eb65e5241e2045 SHA256 d4636852964bffbd83efcad1487004b8e877c6cb59b9991cf7c493c5be8790d9
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.11 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEUEARECAAYFAkolFDIACgkQAiZjviIA2XjJkQCYmphhmJqUHCcMwj+/O2KonKph
-YwCeMkwIguRtYN1iG4H/zHtTYaOdrkU=
-=PATr
+iEYEARECAAYFAk42xyIACgkQVWmRsqeSphPe7ACeNr+XIXOfFPFv0OTY9whhC8LX
+lhIAnivgBXLOGsUfs6/iPIVZR8b5Ogu5
+=GFO4
 -----END PGP SIGNATURE-----
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
+}