Update patch per sandbox team, link to upstream tickets.

Package-Manager: portage-2.1.12.2/cvs/Linux x86_64
Manifest-Sign-Key: 0x4D7043C9

4 files changed, 19 insertions, 12 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 444501817fd6..65a6b8073e9e 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.119 2013/07/02 02:04:18 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.120 2013/07/02 22:53:00 jsbronder Exp $
+
+  02 Jul 2013; Justin Bronder <jsbronder@gentoo.org> openmpi-1.6.4-r1.ebuild,
+  files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch:
+  Update patch per sandbox team, link to upstream tickets.
 
 *openmpi-1.6.4-r1 (02 Jul 2013)
 
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 18159f8350ac..2fdeee07a6af 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,7 +1,7 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-AUX hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch 1604 SHA256 5f15d8d54e6dee3485114c86bcbdf395f54da3eff22fb5fe8e99462ec87c326e SHA512 6ddd2cc8ba5df2176abd6b714938e5f906bb455b66418d6f79f4fc4af1f29a5b6d11b820338787efc2f984d03b28bc992710b4e441c7562e00289bdacca30e39 WHIRLPOOL 00c40323b7cec6035271948c111e0be3fcbcf4552f99c51f22c9b8dc4a39e70ad14f9aa855e4485116bab94d3fb20d8988073d12e8ae771c696cedaa47f8f7a1
+AUX hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch 1602 SHA256 551d0aaab2d83bdb9d128fc1bdcbcc0bb4a9b8775defa5d9b4b065151ac1154b SHA512 7732a53f6074432a10bbe7dcca6b64e45bebadb797c214fca9c93d2ec5fd179832f69374c38d2bba5932089fcae6a7045990a1c7bbb048c3b5ab1397e9596c74 WHIRLPOOL 8aba8593a683b1f564a6aa2c4c3d76e1e0a48491c90faa447ce2505555ca74930adb46a5c374011f48d240f925b8f14afba19db9201179ec1df642ba7d1f4528
 AUX openmpi-1.4.1-r22513.patch 2460 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379 SHA512 96d986e7b10b340027872f92b24f62efee7be626a887d410163df956595afa932e002175265ead66d2c31a8bbf86246341671b388d13ef4bda7c16f2ebf23f37 WHIRLPOOL 293ba9c0b00ebfcdb439515448b130e5abe2ae73b5c492c66f130a781bd89ec0a953fe7945d293a5dbc59337a832cb3ed32ecec6173bb89bc4d4a535129e807b
 AUX openmpi-1.6-hostfile.patch 929 SHA256 4aca97b15207c633aaf70ee3aeadcb3b9034fa49780dafeacdb19cbdc765fe66 SHA512 2c229bbf938802570714224d479172da8f039eee82ac3906639d2cdd68aa0f0690a41f448d3dbb66ea2546f5a0e39043255dbe89c27ac4006f611dcaded0bf9f WHIRLPOOL c99ba9f3c69d7246d6c8aaebe0e4af85a30f02b906e5e8e2b75555a44180d68d89772d37df503c4b269cb9d31154d80087c8d31fa50f725e589a21b6b2fb438a
 AUX openmpi-r24328.patch 1707 SHA256 3149f47463057e3263a242b2df88b588074f07395d437b585c5ce37f84aadf83 SHA512 e376f60f4c7bca610873ac5de5a9e72afab459262acf6f6ad61d4e8aa7a7d33370c52d2dcf2279a992de159b47d7d2fe29257306cf3e11a82234668205b876bf WHIRLPOOL 732347d68ba261f32c1010bcfeff2c490bc436d45a01119741fe68ee6ef366a2021e8d37dfb8ae2ffd681997111951eab4d57b00ff430e09d6c6f929e26816f9
@@ -14,13 +14,13 @@ EBUILD openmpi-1.4.3.ebuild 2667 SHA256 98ceb0016e20e41a3dd623e87876c9df68537a17
 EBUILD openmpi-1.4.4.ebuild 2673 SHA256 75625081dd78e08d9f40505a4b663406f4e8b83d60ea1a63c57c86b57c1231ce SHA512 bf5621ce8ffe276148b9056a53b0ba576a83226ff43ba7cb198511ee4eafb2137df652d8549740a6d57735cc5a04025fcf45ed824810dd54a2ad0d213216d42e WHIRLPOOL 7f76b18375cc7ee4aa7f328462244b0a9330d48050ffff5665ed7fe3b79ed16c32daa4b39245c1710313a4b907ec82aaf56813c540a7b0735593d2030a2cc88b
 EBUILD openmpi-1.4.5.ebuild 2675 SHA256 87a565481dc6949c94799a9b5ebadc8f7ccf7c60cbbb0aa92445ef6586ca4845 SHA512 9437c280fc1c001adaa47237d3b3f32ef146d6da8161a4d81f451ea505dcfafcd8f1802452e0239aee3c1bd1ed336c87dea7ec3020fba92964ca828bfd75cd9e WHIRLPOOL 1da6a183032926feade7110a8f56e1de21cadec5a7bc9d466dd41f815616a0425646afe6912f2a7b03045e0a504a5ba749a102da2381bef81c63a267ed03b566
 EBUILD openmpi-1.6.3.ebuild 5013 SHA256 e1aa9af47e06e3d54a58c4911e69e851a755516a214d468816c9c23cb6df79a3 SHA512 ec6eb6cb8e3044af7ca9291daad808f524c5c4f3ed485e3d36b43e37a60e0ddfec89dae495227522383ef29ef7a21f998210d0834877c9768239bd8094f6916c WHIRLPOOL 665f8e65945642543ca8130d009642bb1a631b535bf872fc40ee30049ac146e6af3fa3396037e433cfda5433f5d7bc772a770e4640540aed95557ccb336bd43c
-EBUILD openmpi-1.6.4-r1.ebuild 5097 SHA256 2dd6a1dc92b6711037ae4afbd39e955df52f32170e40d504db771f26ac01f4d3 SHA512 d4f3c96e1ff6443624c39f2a451b52bbe3a691a3866cc04814d54926cb7f052ac16e2244810afe768616c50851ae37d73fb6c8dcb16d16198eb0db556c8e6bab WHIRLPOOL 939ca7381385cb3225455c50331a0aa6c0660d1b824da6cf2e0db67d1a959c220d0bd65776af4baa5481ccc55c7a87ce668d85e39d6b30f332caadf5a2323b71
-MISC ChangeLog 18330 SHA256 e9eba535eaa3046d079f8e697affa9c97da627f5c2bba16ba0f68de3aed97253 SHA512 cddc4dcfd2a64a4f76d9187b12bbc87ed903c34cfb60005a4843fc1afa3a66f3f1767db53b6e83b39c63448d6d16883af413af320a5bc2a581b7e870c061dd54 WHIRLPOOL 2f3605ceb76e0ae5c98809a711a440398435435714a5bea8de0a8c4ba000f134b0c9893daacdf087b3ab5702c553f21b81c8b8c316063f06032166c10f4bc542
+EBUILD openmpi-1.6.4-r1.ebuild 5198 SHA256 b8095a161f251ea7a22bc561e8436c32b8c677677406907da392926c1289861b SHA512 4a04d7167de82bdaef497bc1fabe484264f5ef45d1293e2545f77114132768a4fc147d287437d94951ec06fce0bf3690e5339d97c1e16536b1b709a8c7ed8e1d WHIRLPOOL 0e95d64f041ead9ca36140421f395ced49de56490c46f518365444ca5622fda9303ff4b4fc8c0220c645f63d31aa57cddd422a1e3e9ca60b090ec43282bcbf44
+MISC ChangeLog 18536 SHA256 47bacac43396a74891e9d84b0f18b64fb063dc2f6e9020c0b497b555400eff33 SHA512 5610e33ebd2ae20d88f58465870dfb8ec530c8b3f60030114e7a7812a360b74cd3c9aae04ca9530e981c2ae2c0b64cd403cdec120b5dcff132dfb053fb1404f9 WHIRLPOOL 1830dde7939c40b7b08be9cbd0296b1d1bba137b1ade0bef199c219a63cfa9aac9d2546404c0462b79e84b3c90d677fafb96d4f53ea70f536c9e5ea34c0f9c61
 MISC metadata.xml 597 SHA256 d2f945feefe70edef93523edcfcfadb4347dd20ac74834573c586b2e1c129897 SHA512 f113fe8490de7d1f424caf024a81dd5cfda83ccd84399d9f93f84abdcdd6e51ce10406cbb3fa60ae1c64ef125b389c5c80bf5d03e4686a7fce9c8ae3897d6887 WHIRLPOOL 34f1acfaee950beb462fe7bc1a19b76dc3aea63623959aeb9f34037e31116c0add40cd9be447d0190e859039b1073e469f7fa552b25ff8eb7a583912af010561
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlHSNUUACgkQ4MrvBE1wQ8krvQCfU3JNvM9TP0O2yu6uHPt08Cwd
-RP8AniOOjhBOaUxB4TDyCRV70OOxX9+T
-=I07e
+iEYEAREIAAYFAlHTWtoACgkQ4MrvBE1wQ8l/bACgg2qcCRX+pYz5dpXBQPw5fZxq
+OisAoLIJzOQXZqi/v43di2DPDR7LgmST
+=39yp
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch b/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
index 5683c81b44c7..197430aee6f2 100644
--- a/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
+++ b/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
@@ -1,4 +1,4 @@
-From 094de74dc5e518a931c495692143ea3282553674 Mon Sep 17 00:00:00 2001
+From 3bd5897c7ca8ab61fb024957aeae891e204b3e3f Mon Sep 17 00:00:00 2001
 From: Justin Bronder <jsbronder@gmail.com>
 Date: Mon, 1 Jul 2013 20:37:17 -0400
 Subject: [PATCH] hooks:  disable malloc override inside of Gentoo sandbox
@@ -15,7 +15,7 @@ See https://bugs.gentoo.org/show_bug.cgi?id=462602
  1 file changed, 9 insertions(+), 2 deletions(-)
 
 diff --git a/opal/mca/memory/linux/hooks.c b/opal/mca/memory/linux/hooks.c
-index 6a1646f..ce91e76 100644
+index 6a1646f..5ded08c 100644
 --- a/opal/mca/memory/linux/hooks.c
 +++ b/opal/mca/memory/linux/hooks.c
 @@ -747,9 +747,16 @@ static void opal_memory_linux_malloc_init_hook(void)
@@ -27,13 +27,13 @@ index 6a1646f..ce91e76 100644
 +
 +       This is also an issue when using Gentoo's version of 'fakeroot',
 +       sandbox v2.5.  Sandbox environments can also be detected fairly
-+       easily by looking for SANDBOX_PID.
++       easily by looking for SANDBOX_ON.
 +    */
 +
      if (getenv("FAKEROOTKEY") != NULL ||
 -        getenv("FAKED_MODE") != NULL) {
 +        getenv("FAKED_MODE") != NULL ||
-+        getenv("SANDBOX_PID") != NULL ) {
++        getenv("SANDBOX_ON") != NULL ) {
          return;
      }
  
diff --git a/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
index aa6503360b18..b03b0d15911f 100644
--- a/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2013 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild,v 1.1 2013/07/02 02:04:18 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild,v 1.2 2013/07/02 22:53:00 jsbronder Exp $
 
 EAPI=5
 
@@ -96,6 +96,9 @@ src_prepare() {
 		echo 'oob_tcp_listen_mode = listen_thread' \
 			>> opal/etc/openmpi-mca-params.conf
 	fi
+
+	# https://svn.open-mpi.org/trac/ompi/ticket/3649
+	# https://svn.open-mpi.org/trac/ompi/ticket/3648
 	epatch "${FILESDIR}"/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
 }