Do not override malloc when in a sandbox environment. Resolves #462602.

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

4 files changed, 59 insertions, 11 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 9f65aeec11d3..444501817fd6 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,13 @@
 # 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.118 2013/04/05 18:11:44 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.119 2013/07/02 02:04:18 jsbronder Exp $
+
+*openmpi-1.6.4-r1 (02 Jul 2013)
+
+  02 Jul 2013; Justin Bronder <jsbronder@gentoo.org> -openmpi-1.6.4.ebuild,
+  +openmpi-1.6.4-r1.ebuild,
+  +files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch:
+  Do not override malloc when in a sandbox environment. Resolves #462602.
 
   05 Apr 2013; Justin Bronder <jsbronder@gentoo.org> openmpi-1.6.4.ebuild:
   Export FAKEROOTKEY in src_test to workaround hang in sandbox. See #462602.
diff --git a/sys-cluster/openmpi/Manifest b/sys-cluster/openmpi/Manifest
index 7262aa4a1d15..18159f8350ac 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -1,6 +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 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
@@ -13,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.ebuild 5098 SHA256 daf58c1f9ecb1da0d42b58a50f37f3a645ca747cb3e87f60f83b7b8048ca2e42 SHA512 253af62ddd8e5ddf33cb71d53cb2bd77c1b4805d19a0cfdd275f0ccb5c36b84062775e6d9d1680792b6518d2c8479ab9ac234469ecf0ea1676260ab33ef26932 WHIRLPOOL 44f6a3848a4951123407f7cd724646e41a7a7ff619cc3c677284211922d9ee24350890fa539f878839d6787f5ad0f19f3f3bb8f25933ac782f84ebd88c5b34af
-MISC ChangeLog 18049 SHA256 36a6ee94b51d958e8fe9ec1f5260f60d502e5b9851df0ac21b88da46036687d6 SHA512 a4f997739237474624a6ee55a8b67700296cec59d817d6a16819148a5e12f6fe12e3c66df3c768dd24485b84caf01e94a3b7b4fe8d49f9bd012d5905c17d04da WHIRLPOOL 1022f7f22045cb820f85e16d782c191555dcf0f290915e17bd8da55e414ceffda0814066d450a100a33669320673bb8d473583e7094483b26411a1034ea1b570
+EBUILD openmpi-1.6.4-r1.ebuild 5097 SHA256 2dd6a1dc92b6711037ae4afbd39e955df52f32170e40d504db771f26ac01f4d3 SHA512 d4f3c96e1ff6443624c39f2a451b52bbe3a691a3866cc04814d54926cb7f052ac16e2244810afe768616c50851ae37d73fb6c8dcb16d16198eb0db556c8e6bab WHIRLPOOL 939ca7381385cb3225455c50331a0aa6c0660d1b824da6cf2e0db67d1a959c220d0bd65776af4baa5481ccc55c7a87ce668d85e39d6b30f332caadf5a2323b71
+MISC ChangeLog 18330 SHA256 e9eba535eaa3046d079f8e697affa9c97da627f5c2bba16ba0f68de3aed97253 SHA512 cddc4dcfd2a64a4f76d9187b12bbc87ed903c34cfb60005a4843fc1afa3a66f3f1767db53b6e83b39c63448d6d16883af413af320a5bc2a581b7e870c061dd54 WHIRLPOOL 2f3605ceb76e0ae5c98809a711a440398435435714a5bea8de0a8c4ba000f134b0c9893daacdf087b3ab5702c553f21b81c8b8c316063f06032166c10f4bc542
 MISC metadata.xml 597 SHA256 d2f945feefe70edef93523edcfcfadb4347dd20ac74834573c586b2e1c129897 SHA512 f113fe8490de7d1f424caf024a81dd5cfda83ccd84399d9f93f84abdcdd6e51ce10406cbb3fa60ae1c64ef125b389c5c80bf5d03e4686a7fce9c8ae3897d6887 WHIRLPOOL 34f1acfaee950beb462fe7bc1a19b76dc3aea63623959aeb9f34037e31116c0add40cd9be447d0190e859039b1073e469f7fa552b25ff8eb7a583912af010561
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.17 (GNU/Linux)
+Version: GnuPG v2.0.19 (GNU/Linux)
 
-iEYEAREIAAYFAlFfE+YACgkQ4MrvBE1wQ8mYJACeKf2Uvchzqjlyg0OITvMb/JPJ
-8z8An2gcoIpljGA0mi9b0AfxYIHCTqxx
-=EsOm
+iEYEAREIAAYFAlHSNUUACgkQ4MrvBE1wQ8krvQCfU3JNvM9TP0O2yu6uHPt08Cwd
+RP8AniOOjhBOaUxB4TDyCRV70OOxX9+T
+=I07e
 -----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
new file mode 100644
index 000000000000..5683c81b44c7
--- /dev/null
+++ b/sys-cluster/openmpi/files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
@@ -0,0 +1,42 @@
+From 094de74dc5e518a931c495692143ea3282553674 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
+
+As described in the comments in the source, Gentoo's own version of
+fakeroot, sandbox, also runs into hangs when malloc is overridden.
+Sandbox environments can easily be detected by looking for SANDBOX_PID
+in the environment.  When detected, employ the same fix used for
+fakeroot.
+
+See https://bugs.gentoo.org/show_bug.cgi?id=462602
+---
+ opal/mca/memory/linux/hooks.c | 11 +++++++++--
+ 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
+--- 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)
+        "fakeroot" build environment that allocates memory during
+        stat() (see http://bugs.debian.org/531522).  It may not be
+        necessary any more since we're using access(), not stat().  But
+-       we'll leave the check, anyway. */
++       we'll leave the check, anyway.
++
++       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.
++    */
++
+     if (getenv("FAKEROOTKEY") != NULL ||
+-        getenv("FAKED_MODE") != NULL) {
++        getenv("FAKED_MODE") != NULL ||
++        getenv("SANDBOX_PID") != NULL ) {
+         return;
+     }
+ 
+-- 
+1.8.1.5
+
diff --git a/sys-cluster/openmpi/openmpi-1.6.4.ebuild b/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
index 52e6815eb895..aa6503360b18 100644
--- a/sys-cluster/openmpi/openmpi-1.6.4.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.ebuild,v 1.2 2013/04/05 18:11:44 jsbronder Exp $
+# $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 $
 
 EAPI=5
 
@@ -96,6 +96,7 @@ src_prepare() {
 		echo 'oob_tcp_listen_mode = listen_thread' \
 			>> opal/etc/openmpi-mca-params.conf
 	fi
+	epatch "${FILESDIR}"/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
 }
 
 src_configure() {
@@ -155,8 +156,5 @@ src_install () {
 
 src_test() {
 	# Doesn't work with the default src_test as the dry run (-n) fails.
-
-	# Do not override malloc during build.  Works around #462602
-	export FAKEROOTKEY=1
 	emake -j1 check || die "emake check failed"
 }