Clean up patch. Fix one more buffer overflow.

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

4 files changed, 22 insertions, 14 deletions

diff --git a/net-analyzer/slurm/ChangeLog b/net-analyzer/slurm/ChangeLog
index eea8416215de..512db310fd61 100644
--- a/net-analyzer/slurm/ChangeLog
+++ b/net-analyzer/slurm/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for net-analyzer/slurm
-# 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 $
+# Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/net-analyzer/slurm/ChangeLog,v 1.19 2012/06/04 11:48:44 jer Exp $
+
+  04 Jun 2012; Jeroen Roovers <jer@gentoo.org>
+  files/slurm-0.3.3-asneeded.patch, files/slurm-0.3.3-overflow.patch:
+  Clean up patch. Fix one more buffer overflow.
 
 *slurm-0.3.3-r1 (01 Aug 2011)
 
diff --git a/net-analyzer/slurm/Manifest b/net-analyzer/slurm/Manifest
index 376e2259a9f2..ec7e586b30b8 100644
--- a/net-analyzer/slurm/Manifest
+++ b/net-analyzer/slurm/Manifest
@@ -1,17 +1,17 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 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
+AUX slurm-0.3.3-asneeded.patch 2065 RMD160 c239fb40cf508ea1866a27dd537a0dcbfab70cca SHA1 10fa85205436a34ff18cc5af1c6e88c52b9625ec SHA256 3953cd9e3bf320a955da025227b5538aa6d6cf7c2281230f07016cf38111cb91
+AUX slurm-0.3.3-overflow.patch 596 RMD160 a18e4e0b87a6903448d445a9b67abf791d43c107 SHA1 6ccd4c715fbacb57816fdd446f1d45d900d8cdb2 SHA256 7904579870c73f286934b6f35c5deb6fb4dcaa5ae2428359e23bd45f935e4adf
 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 3056 RMD160 05a45db78efc3bc920e50387953e63ec4a89e2ee SHA1 2b524251ed0e39c6c9ad7011e2b371c231b2ee28 SHA256 a99dc95bad46d4ba2b945d1c40c9318f905c8d35c0e23ec1116ad2a386b9c83d
+MISC ChangeLog 3222 RMD160 1d4541b661dd5cfaf4b59d73ddf50df10d4bf26c SHA1 99ca89c330940873b1606a72662347a166413183 SHA256 039b955ceb3c85fbe4d71dee29f192f606cad3af9218704b0764bbe93d2af862
 MISC metadata.xml 258 RMD160 d69f173c38df217e8b8c64d342606128909b2433 SHA1 110cae98b08d0a06b3dad70a20eb65e5241e2045 SHA256 d4636852964bffbd83efcad1487004b8e877c6cb59b9991cf7c493c5be8790d9
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk42xyIACgkQVWmRsqeSphPe7ACeNr+XIXOfFPFv0OTY9whhC8LX
-lhIAnivgBXLOGsUfs6/iPIVZR8b5Ogu5
-=GFO4
+iEYEARECAAYFAk/MoKIACgkQVWmRsqeSphMMbgCcDB9saLoOqV/Dw/NbxHO/IXE8
+2JwAn0qgV7+jGphRddbWvqUiyeiQMoi9
+=1wJ7
 -----END PGP SIGNATURE-----
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-asneeded.patch b/net-analyzer/slurm/files/slurm-0.3.3-asneeded.patch
index 43a91176acea..e61687b37fe8 100644
--- a/net-analyzer/slurm/files/slurm-0.3.3-asneeded.patch
+++ b/net-analyzer/slurm/files/slurm-0.3.3-asneeded.patch
@@ -1,5 +1,5 @@
---- a/configure.in	2004-09-28 09:34:56.000000000 -0500
-+++ b/configure.in	2009-02-14 12:42:52.000000000 -0600
+--- a/configure.in
++++ b/configure.in
 @@ -40,41 +40,15 @@
  fi
  AC_DEFINE(OSTYPE, ["${OSTYPE}"], [The operating system to build for])
diff --git a/net-analyzer/slurm/files/slurm-0.3.3-overflow.patch b/net-analyzer/slurm/files/slurm-0.3.3-overflow.patch
index d2f787c827e8..f9adc1d9bf71 100644
--- a/net-analyzer/slurm/files/slurm-0.3.3-overflow.patch
+++ b/net-analyzer/slurm/files/slurm-0.3.3-overflow.patch
@@ -1,6 +1,6 @@
---- 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 @@
+--- a/src/linux.c
++++ b/src/linux.c
+@@ -68,11 +68,11 @@
  
      /* do not parse the first two lines as they only contain static garbage */
      fseek(proc_net_dev, 0, SEEK_SET);
@@ -10,4 +10,8 @@
 +    fgets(buffer, BUFSIZE-1, proc_net_dev);
  
      interfacefound = 0;
-     while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL)
+-    while (fgets(buffer, BUFSIZ-1, proc_net_dev) != NULL)
++    while (fgets(buffer, BUFSIZE-1, proc_net_dev) != NULL)
+     {
+         /* find the device name and substitute ':' with '\0' */
+         ptr = buffer;