Update the patch for ganglia bug #223 , Gentoo bug #255593. Remove old ganglia-3.1.1-r1 and associated patch.

Package-Manager: portage-2.2_rc23/cvs/Linux x86_64

4 files changed, 28 insertions, 10 deletions

diff --git a/sys-cluster/ganglia/ChangeLog b/sys-cluster/ganglia/ChangeLog
index cf12f7009d0f..7b308af76498 100644
--- a/sys-cluster/ganglia/ChangeLog
+++ b/sys-cluster/ganglia/ChangeLog
@@ -1,6 +1,15 @@
 # ChangeLog for sys-cluster/ganglia
 # Copyright 2002-2009 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.21 2009/01/18 21:12:50 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ChangeLog,v 1.22 2009/01/20 16:42:26 jsbronder Exp $
+
+*ganglia-3.1.1-r2 (20 Jan 2009)
+
+  20 Jan 2009; Justin Bronder <jsbronder@gentoo.org>
+  -files/ganglia-3.1.1-process_path-overflow.patch,
+  +files/ganglia-3.1.1-process_path-overflow-r1.patch,
+  -ganglia-3.1.1-r1.ebuild, +ganglia-3.1.1-r2.ebuild:
+  Update the patch for ganglia bug #223 , Gentoo bug #255593. Remove old
+  ganglia-3.1.1-r1 and associated patch.
 
 *ganglia-3.1.1-r1 (18 Jan 2009)
 
diff --git a/sys-cluster/ganglia/Manifest b/sys-cluster/ganglia/Manifest
index 29cb7f030773..5ced5f48b5a3 100644
--- a/sys-cluster/ganglia/Manifest
+++ b/sys-cluster/ganglia/Manifest
@@ -5,7 +5,7 @@ AUX ganglia-3.1-gmond-python-tcpconn-concurrency.patch 1714 RMD160 fa0b5602420ff
 AUX ganglia-3.1.0-gmetad-hierarchical.patch 481 RMD160 a5293da532de60ca4d1c80538cffa1b0c435955f SHA1 6dd26d86eccc6798fd0f53eb1f29de1d6410022b SHA256 e87656c3e89fba7dd17920274aba0e3d19dae6c2d6b90fb49256e45b6ab93d0e
 AUX ganglia-3.1.1-ctype-c99.patch 437 RMD160 19083e2102e7ed73725f9800d73e655b84c58dd8 SHA1 bb56f766c475c5d6e23259673e85311887c39c5e SHA256 385397d0e6b3810f19fe420fbb7db70ab9978089fe8388eed2ea6a8d8deafcf8
 AUX ganglia-3.1.1-multidisk-group.patch 482 RMD160 d46699b88fed699c8864b10ebb4eca0a06965a0f SHA1 f942d0427469b9acb51e8eb38de18cdaf80f4b51 SHA256 fd4f3a3798cc99cd0bd93eb238d6c7f381b65c8329852b5a9fa07005c85a6639
-AUX ganglia-3.1.1-process_path-overflow.patch 1170 RMD160 af3b784bfefdd5a1132a199b81eed2fa18de29c9 SHA1 e3564545afa99ec2c09ac7531a10d7769946e2fc SHA256 ab73b4f47bb347ccfbfc6b8c2ab12c73da5d3683a08650bbe4c616452cb5f639
+AUX ganglia-3.1.1-process_path-overflow-r1.patch 1364 RMD160 0f04fa5f9cfeae7261352d3d4fab631b0b0283d0 SHA1 5f1a302d40c06ad8af199c09e9e16eda4354b996 SHA256 aedce482577f8a5941e54d8392e223b546c3c69790699b0ee0c9c2e4b5500c46
 AUX gmetad.rc 328 RMD160 bfe287d90db7f26cd13978c99eabc6f7783b7073 SHA1 73d49ca4f669d914c87e2cdd9a4ad74bf1a75eb5 SHA256 c25c3dac00012f83e45819d6d0fb79bcf4e1ec773ad705b38127aade7c2a08c7
 AUX gmond.rc 322 RMD160 98ac6011a603e3286ffe5c2368620ae0630a013f SHA1 d304b1849ea1abf14360915b3978e781b8e0cbed SHA256 ea3bd50fe4bfc18254fdfb69c81ec0bfad0c552a2f9a3d3aee4732f644695d7d
 DIST ganglia-3.0.6.tar.gz 2854746 RMD160 ef3b29af23bc3e30b58736e0e6c08f4047b6eb70 SHA1 5dd3cc3fe2eade8ae012bbafd65e40a7d29bc995 SHA256 590c0c5e1b7b7a27cc1234093cf8caaac6b000f8035d9985459aaa7dcf2c2cb5
@@ -13,14 +13,14 @@ DIST ganglia-3.1.0.tar.gz 1175129 RMD160 92fee8fc2ffe6d058be2dc73bba6697dc2a226d
 DIST ganglia-3.1.1.tar.gz 1152883 RMD160 c4047d61f42f56d5328d10f39d52d5193636f36b SHA1 1209af0f67ca594e071d791ed110833141013693 SHA256 cc6955f0b086f40dc646e3d0d9f152854d1dcd19dea81b9bff16b38f3819f75c
 EBUILD ganglia-3.0.6.ebuild 1670 RMD160 484bd6f1791715ed2a53cb3ba5a2573f5e8a914d SHA1 a451b6df6038a415b612beccfce8aec67e82478c SHA256 f1eb7f602202c3ab97c33f5349007aa2bbc3daa4f567221601a487ec5b346645
 EBUILD ganglia-3.1.0-r1.ebuild 3519 RMD160 33ec8b38d2dd32219f6e796ed2f2e0023146f19c SHA1 e2d75374b44dffb7410ec9deb06c511aebd46a4c SHA256 4490c3568a708f83277e9b5967f82947ca4dd4ec75771d7b03c6d5dba2e14873
-EBUILD ganglia-3.1.1-r1.ebuild 5344 RMD160 b79847895e848610d53f05cee0caa4140dce716e SHA1 fe7f5099ca6c6c1dbea495844ef24198570c3d79 SHA256 a252bea575b4c0f682751f75f061b4082caa9f45349e60fc789643a4a440e02a
+EBUILD ganglia-3.1.1-r2.ebuild 5347 RMD160 fcb71ef19c39fe03c954f4786b7d3cda68c72e86 SHA1 2ca7cd2b7b34e1b6ce6e7e1733b25dc99eea14db SHA256 235f27e091bf9e80839032d0dc5d87558f1718fd76ca635c355d9d751199e66c
 EBUILD ganglia-3.1.1.ebuild 5184 RMD160 255425aa44cc380876b0093f521a6b5f46208aa8 SHA1 61f86df52a3b7aa2288ba9d1d5248bd5cbd4f9dd SHA256 2707ceea40304ac02595348d8a37d97634e047df9c9c3a293c7a2356e64799cf
-MISC ChangeLog 5275 RMD160 4f87f819e7aa97402bd630fd1c3014b4df209035 SHA1 56053c2ca2d1c5e103312b388d4b17ea6a8b9a08 SHA256 090760a7b41647b618a092e1439808c3fdcc29a6955617916ac59e403e83b40a
+MISC ChangeLog 5637 RMD160 8ed989cc3b6b9366b595dc907b59d62d94416582 SHA1 5d673e3a4525afbc3faad34dd27289121c47b88a SHA256 19415364f7786d0d10d5d834b1e9970d37375e7edd281dee0692d4b11832eaf3
 MISC metadata.xml 163 RMD160 ea1530cd45b9e04e8693261b9a94b5988e4b09a1 SHA1 443b7a3d8fb76c8d20647b165032ad358bfa3b6a SHA256 5a03bf3074b07158dffe793af69f7b0cd1e5c785537574713f9a7978032363a3
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.9 (GNU/Linux)
 
-iEYEARECAAYFAklzm2AACgkQ4MrvBE1wQ8k90ACgkMCGOX6eeu5EbzzEubgD3pSb
-b0wAoIu/vk6zmlRBsc5g88NMPltfavEe
-=ApWG
+iEYEARECAAYFAkl1/vgACgkQ4MrvBE1wQ8kZAgCbB2UJLQStKGLtdPLZEfSS5OP7
+32IAoIdpCEsQ82ls5ifFBaI75xITpcal
+=OyJJ
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/ganglia/files/ganglia-3.1.1-process_path-overflow.patch b/sys-cluster/ganglia/files/ganglia-3.1.1-process_path-overflow-r1.patch
index 8b79511b2e56..c8858e81ad10 100644
--- a/sys-cluster/ganglia/files/ganglia-3.1.1-process_path-overflow.patch
+++ b/sys-cluster/ganglia/files/ganglia-3.1.1-process_path-overflow-r1.patch
@@ -1,6 +1,6 @@
 Index: gmetad/server.c
 ===================================================================
---- gmetad/server.c	(revision 1949)
+--- gmetad/server.c	(revision 1953)
 +++ gmetad/server.c	(working copy)
 @@ -370,14 +370,13 @@
     
@@ -37,3 +37,12 @@ Index: gmetad/server.c
        }
     if (rc) return 1;
  
+@@ -537,7 +540,7 @@
+    socklen_t len;
+    client_t client;
+    char remote_ip[16];
+-   char request[REQUESTLEN];
++   char request[REQUESTLEN + 1];
+    llist_entry *le;
+    datum_t rootdatum;
+ 
diff --git a/sys-cluster/ganglia/ganglia-3.1.1-r1.ebuild b/sys-cluster/ganglia/ganglia-3.1.1-r2.ebuild
index 4d6159199471..e1b14b039f9b 100644
--- a/sys-cluster/ganglia/ganglia-3.1.1-r1.ebuild
+++ b/sys-cluster/ganglia/ganglia-3.1.1-r2.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2009 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.1-r1.ebuild,v 1.1 2009/01/18 21:12:50 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/ganglia/ganglia-3.1.1-r2.ebuild,v 1.1 2009/01/20 16:42:26 jsbronder Exp $
 
 WEBAPP_OPTIONAL="yes"
 inherit multilib webapp depend.php python
@@ -43,7 +43,7 @@ src_unpack() {
 	epatch "${FILESDIR}"/${P}-multidisk-group.patch
 	# Shouldn't be needed for 3.1.2
 	# http://bugzilla.ganglia.info/cgi-bin/bugzilla/show_bug.cgi?id=223
-	epatch "${FILESDIR}"/${P}-process_path-overflow.patch
+	epatch "${FILESDIR}"/${P}-process_path-overflow-r1.patch
 }
 
 src_compile() {