* [gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/files/, sys-cluster/openmpi/
@ 2011-05-02 1:23 Justin Bronder
0 siblings, 0 replies; 3+ messages in thread
From: Justin Bronder @ 2011-05-02 1:23 UTC (permalink / raw
To: gentoo-commits
commit: 15d2c6558b1bb9e8b9eeecaf93da55ab8d3e142f
Author: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
AuthorDate: Mon Mar 28 16:59:58 2011 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Mon May 2 01:22:57 2011 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=15d2c655
Fix hardened test failure (#360185) and cleanup.
(Portage version: 2.1.9.44/git/Linux x86_64, RepoMan options: --force, signed Manifest commit with key 4D7043C9)
---
sys-cluster/openmpi/ChangeLog | 5 ++
.../openmpi/files/openmpi-1.4.1-r22513.patch | 72 --------------------
sys-cluster/openmpi/files/openmpi-r24328.patch | 54 +++++++++++++++
sys-cluster/openmpi/openmpi-1.5.3.ebuild | 3 +
4 files changed, 62 insertions(+), 72 deletions(-)
diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index c8d9a51..1a5a8ff 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -2,6 +2,11 @@
# Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 28 Mar 2011; Justin Bronder <jsbronder@gentoo.org>
+ -files/openmpi-1.4.1-r22513.patch, +files/openmpi-r24328.patch,
+ openmpi-1.5.3.ebuild:
+ Fix hardened test failure (#360185) and cleanup.
+
22 Mar 2011; Justin Bronder <jsbronder@gentoo.org> openmpi-1.5.3.ebuild:
Remove libtool if it was installed by USE=vt, bug #359917.
diff --git a/sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch b/sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch
deleted file mode 100644
index 128443b..0000000
--- a/sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch
+++ /dev/null
@@ -1,72 +0,0 @@
-From 9657a0fc671dd0987b6954932a08b680c35f480f Mon Sep 17 00:00:00 2001
-From: Justin Bronder <jsbronder@gmail.com>
-Date: Wed, 3 Feb 2010 17:13:13 -0500
-Subject: [PATCH] Backport r22513
-
-Per #2201, move the user arguments up to be the first set of argv
-after the compiler argv tokens.
-
-Not closing #2201 yet; there's still discussion on that ticket about
-whether we want to do more or not.
-
-Refs #2201
-cmr:v1.4.2
-cmr:v1.5
-
-Author: jsquyres
----
- ompi/tools/wrappers/ompi_wrapper_script.in | 4 +++-
- opal/tools/wrappers/opal_wrapper.c | 9 +++++----
- 2 files changed, 8 insertions(+), 5 deletions(-)
-
-diff --git a/ompi/tools/wrappers/ompi_wrapper_script.in b/ompi/tools/wrappers/ompi_wrapper_script.in
-index 24726ad..87fd8a5 100644
---- a/ompi/tools/wrappers/ompi_wrapper_script.in
-+++ b/ompi/tools/wrappers/ompi_wrapper_script.in
-@@ -140,13 +140,15 @@ my @exec_argv = ();
-
- # assemble command
- push(@exec_argv, split(' ', $comp));
-+# Per https://svn.open-mpi.org/trac/ompi/ticket/2201, add all the user
-+# arguments before anything else.
-+push(@exec_argv, @appargs);
- if ($want_preproc == 1) {
- push(@exec_argv, split(' ', $preproc_flags));
- }
- if ($want_compile == 1) {
- push(@exec_argv, split(' ', $comp_flags));
- }
--push(@exec_argv, @appargs);
- if ($want_link == 1) {
- push(@exec_argv, split(' ', $linker_flags));
- push(@exec_argv, split(' ', $libs));
-diff --git a/opal/tools/wrappers/opal_wrapper.c b/opal/tools/wrappers/opal_wrapper.c
-index 86ece5b..1b80f53 100644
---- a/opal/tools/wrappers/opal_wrapper.c
-+++ b/opal/tools/wrappers/opal_wrapper.c
-@@ -712,6 +712,11 @@ main(int argc, char *argv[])
- exec_argc = 0;
- }
-
-+ /* Per https://svn.open-mpi.org/trac/ompi/ticket/2201, add all the
-+ user arguments before anything else. */
-+ opal_argv_insert(&exec_argv, exec_argc, user_argv);
-+ exec_argc = opal_argv_count(exec_argv);
-+
- /* preproc flags */
- if (flags & COMP_WANT_PREPROC) {
- opal_argv_insert(&exec_argv, exec_argc, options_data[user_data_idx].preproc_flags);
-@@ -732,10 +737,6 @@ main(int argc, char *argv[])
- exec_argc = opal_argv_count(exec_argv);
- }
-
-- /* add all the user arguments */
-- opal_argv_insert(&exec_argv, exec_argc, user_argv);
-- exec_argc = opal_argv_count(exec_argv);
--
- /* link flags and libs */
- if (flags & COMP_WANT_LINK) {
- opal_argv_insert(&exec_argv, exec_argc, options_data[user_data_idx].link_flags);
---
-1.6.4.4
-
diff --git a/sys-cluster/openmpi/files/openmpi-r24328.patch b/sys-cluster/openmpi/files/openmpi-r24328.patch
new file mode 100644
index 0000000..bbd689d
--- /dev/null
+++ b/sys-cluster/openmpi/files/openmpi-r24328.patch
@@ -0,0 +1,54 @@
+From cf054cd92dfac55f3920e805d01c11dcfc2cd4fa Mon Sep 17 00:00:00 2001
+From: jsquyres <jsquyres@cisco.com>
+Date: Mon, 28 Mar 2011 12:44:06 -0400
+Subject: [PATCH] Fix some fairly-important typos (!)
+
+Upstream commit r24328.
+---
+ test/datatype/ddt_lib.c | 2 +-
+ test/datatype/ddt_raw.c | 2 +-
+ test/datatype/opal_ddt_lib.c | 2 +-
+ 3 files changed, 3 insertions(+), 3 deletions(-)
+
+diff --git a/test/datatype/ddt_lib.c b/test/datatype/ddt_lib.c
+index 015419d..c349384 100644
+--- a/test/datatype/ddt_lib.c
++++ b/test/datatype/ddt_lib.c
+@@ -209,7 +209,7 @@ int mpich_typeub2( void )
+
+ int mpich_typeub3( void )
+ {
+- int blocklen[2], err = 0, idisp[3];
++ int blocklen[3], err = 0, idisp[3];
+ size_t sz;
+ MPI_Aint disp[3], lb, ub, ex;
+ ompi_datatype_t *types[3], *dt1, *dt2, *dt3, *dt4, *dt5;
+diff --git a/test/datatype/ddt_raw.c b/test/datatype/ddt_raw.c
+index eea9004..7effe65 100644
+--- a/test/datatype/ddt_raw.c
++++ b/test/datatype/ddt_raw.c
+@@ -45,7 +45,7 @@ static int test_upper( unsigned int length )
+ {
+ ompi_datatype_t *pdt;
+ opal_convertor_t * pConv;
+- int rc;
++ int rc = OMPI_SUCCESS;
+ unsigned int i, iov_count, split_chunk, total_length;
+ size_t max_data;
+ struct iovec iov[5];
+diff --git a/test/datatype/opal_ddt_lib.c b/test/datatype/opal_ddt_lib.c
+index e05bb06..dffd86c 100644
+--- a/test/datatype/opal_ddt_lib.c
++++ b/test/datatype/opal_ddt_lib.c
+@@ -759,7 +759,7 @@ int mpich_typeub2( void )
+
+ int mpich_typeub3( void )
+ {
+- int blocklen[2], err = 0, idisp[3];
++ int blocklen[3], err = 0, idisp[3];
+ size_t sz;
+ OPAL_PTRDIFF_TYPE disp[3], lb, ub, ex;
+ opal_datatype_t *types[3], *dt1, *dt2, *dt3, *dt4, *dt5;
+--
+1.7.3.4
+
diff --git a/sys-cluster/openmpi/openmpi-1.5.3.ebuild b/sys-cluster/openmpi/openmpi-1.5.3.ebuild
index 971c5a3..16643c4 100644
--- a/sys-cluster/openmpi/openmpi-1.5.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.5.3.ebuild
@@ -56,6 +56,9 @@ src_prepare() {
echo 'oob_tcp_listen_mode = listen_thread' \
>> opal/etc/openmpi-mca-params.conf
fi
+
+ # Gentoo bug 360185
+ epatch "${FILESDIR}"/openmpi-r24328.patch
}
src_configure() {
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/files/, sys-cluster/openmpi/
@ 2013-07-02 2:15 Justin Bronder
0 siblings, 0 replies; 3+ messages in thread
From: Justin Bronder @ 2013-07-02 2:15 UTC (permalink / raw
To: gentoo-commits
commit: 346d974b25441804e803c0cbb4c57935a3a203c3
Author: Justin Bronder <jbronder <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 02:14:17 2013 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 02:14:17 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=346d974b
Do not override malloc when in a sandbox environment. Resolves #462602.
Package-Manager: portage-2.1.12.2
---
sys-cluster/openmpi/ChangeLog | 8 +-
...le-malloc-override-inside-of-Gentoo-sandb.patch | 42 ++++++
sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild | 162 +++++++++++++++++++++
3 files changed, 211 insertions(+), 1 deletion(-)
diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 6957971..f457326 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -2,6 +2,13 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+*openmpi-1.6.4-r1 (02 Jul 2013)
+
+ 02 Jul 2013; Justin Bronder <jsbronder@gentoo.org>
+ +files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch,
+ +openmpi-1.6.4-r1.ebuild:
+ Do not override malloc when in a sandbox environment. Resolves #462602.
+
*openmpi-1.6.4 (09 Apr 2013)
09 Apr 2013; Justin Bronder <jsbronder@gentoo.org> -openmpi-1.6.3.ebuild,
@@ -137,4 +144,3 @@
20 Jan 2009; Alexey Shvetsov <alexxy@gentoo.org> +openmpi-1.3.ebuild:
Version bump
-
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 0000000..5683c81
--- /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-r1.ebuild b/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
new file mode 100644
index 0000000..1016b42
--- /dev/null
+++ b/sys-cluster/openmpi/openmpi-1.6.4-r1.ebuild
@@ -0,0 +1,162 @@
+# 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.2.4.ebuild,v 1.2 2007/12/13 22:39:53 jsbronder Exp $
+
+EAPI=5
+
+FORTRAN_NEEDED=fortran
+
+inherit eutils flag-o-matic fortran-2 multilib mpi toolchain-funcs versionator
+
+MY_P=${P/-mpi}
+S=${WORKDIR}/${MY_P}
+
+IUSE_OPENMPI_FABRICS="
+ openmpi_fabrics_dapl
+ openmpi_fabrics_ofed
+ openmpi_fabrics_knem
+ openmpi_fabrics_open-mx
+ openmpi_fabrics_psm
+ openmpi_fabrics_sctp"
+
+IUSE_OPENMPI_RM="
+ openmpi_rm_pbs
+ openmpi_rm_slurm"
+
+IUSE_OPENMPI_OFED_FEATURES="
+ openmpi_ofed_features_control-hdr-padding
+ openmpi_ofed_features_connectx-xrc
+ openmpi_ofed_features_rdmacm
+ openmpi_ofed_features_dynamic-sl
+ openmpi_ofed_features_failover"
+
+DESCRIPTION="A high-performance message passing library (MPI)"
+HOMEPAGE="http://www.open-mpi.org"
+SRC_URI="http://www.open-mpi.org/software/ompi/v$(get_version_component_range 1-2)/downloads/${MY_P}.tar.bz2"
+LICENSE="BSD"
+SLOT="0"
+KEYWORDS="~alpha ~amd64 ~ia64 ~ppc ~ppc64 ~sparc ~x86 ~amd64-fbsd ~x86-fbsd ~amd64-linux"
+IUSE="+cxx elibc_FreeBSD fortran heterogeneous ipv6 mpi-threads romio threads vt
+ ${IUSE_OPENMPI_FABRICS} ${IUSE_OPENMPI_RM} ${IUSE_OPENMPI_OFED_FEATURES}"
+
+REQUIRED_USE="openmpi_rm_slurm? ( !openmpi_rm_pbs )
+ openmpi_rm_pbs? ( !openmpi_rm_slurm )
+ openmpi_fabrics_psm? ( openmpi_fabrics_ofed )
+ openmpi_ofed_features_control-hdr-padding? ( openmpi_fabrics_ofed )
+ openmpi_ofed_features_connectx-xrc? ( openmpi_fabrics_ofed )
+ openmpi_ofed_features_rdmacm? ( openmpi_fabrics_ofed )
+ openmpi_ofed_features_dynamic-sl? ( openmpi_fabrics_ofed )
+ openmpi_ofed_features_failover? ( openmpi_fabrics_ofed )"
+
+MPI_UNCLASSED_DEP_STR="
+ vt? (
+ !dev-libs/libotf
+ !app-text/lcdf-typetools
+ )"
+
+RDEPEND="
+ >=sys-apps/hwloc-1.3
+ elibc_FreeBSD? ( dev-libs/libexecinfo )
+ openmpi_fabrics_dapl? ( sys-infiniband/dapl )
+ openmpi_fabrics_ofed? ( sys-infiniband/ofed )
+ openmpi_fabrics_knem? ( sys-cluster/knem )
+ openmpi_fabrics_open-mx? ( sys-cluster/open-mx )
+ openmpi_fabrics_psm? ( sys-infiniband/infinipath-psm )
+ openmpi_fabrics_sctp? ( net-misc/lksctp-tools )
+ openmpi_rm_pbs? ( sys-cluster/torque )
+ openmpi_rm_slurm? ( sys-cluster/slurm )
+ openmpi_ofed_features_rdmacm? ( sys-infiniband/librdmacm )
+ $(mpi_imp_deplist)"
+DEPEND="${RDEPEND}"
+
+pkg_setup() {
+ fortran-2_pkg_setup
+ MPI_ESELECT_FILE="eselect.mpi.openmpi"
+
+ if use mpi-threads; then
+ echo
+ ewarn "WARNING: use of MPI_THREAD_MULTIPLE is still disabled by"
+ ewarn "default and officially unsupported by upstream."
+ ewarn "You may stop now and set USE=-mpi-threads"
+ echo
+ fi
+
+ echo
+ elog "OpenMPI has an overwhelming count of configuration options."
+ elog "Don't forget the EXTRA_ECONF environment variable can let you"
+ elog "specify configure options if you find them necessary."
+ echo
+}
+
+src_prepare() {
+ # Necessary for scalibility, see
+ # http://www.open-mpi.org/community/lists/users/2008/09/6514.php
+ if use threads; then
+ echo 'oob_tcp_listen_mode = listen_thread' \
+ >> opal/etc/openmpi-mca-params.conf
+ fi
+
+ # 462602
+ epatch "${FILESDIR}"/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch
+}
+
+src_configure() {
+ local myconf=(
+ --sysconfdir="${EPREFIX}/etc/${PN}"
+ --enable-pretty-print-stacktrace
+ --enable-orterun-prefix-by-default
+ --with-hwloc="${EPREFIX}/usr"
+ )
+
+ if use mpi-threads; then
+ myconf+=(--enable-mpi-threads
+ --enable-opal-multi-threads)
+ fi
+
+ if use fortran; then
+ if [[ $(tc-getFC) =~ g77 ]]; then
+ myconf+=(--disable-mpi-f90)
+ elif [[ $(tc-getFC) =~ if ]]; then
+ # Enabled here as gfortran compile times are huge with this enabled.
+ myconf+=(--with-mpi-f90-size=medium)
+ fi
+ else
+ myconf+=(--disable-mpi-f90 --disable-mpi-f77)
+ fi
+
+ ! use vt && myconf+=(--enable-contrib-no-build=vt)
+
+ econf $(mpi_econf_args) "${myconf[@]}" \
+ $(use_enable cxx mpi-cxx) \
+ $(use_enable romio io-romio) \
+ $(use_enable heterogeneous) \
+ $(use_enable ipv6) \
+ $(use_with openmpi_fabrics_dapl udapl "${EPREFIX}"/usr) \
+ $(use_with openmpi_fabrics_ofed openib "${EPREFIX}"/usr) \
+ $(use_with openmpi_fabrics_knem knem "${EPREFIX}"/usr) \
+ $(use_with openmpi_fabrics_open-mx mx "${EPREFIX}"/usr) \
+ $(use_with openmpi_fabrics_psm psm "${EPREFIX}"/usr) \
+ $(use_enable openmpi_ofed_features_control-hdr-padding openib-control-hdr-padding) \
+ $(use_enable openmpi_ofed_features_connectx-xrc openib-connectx-xrc) \
+ $(use_enable openmpi_ofed_features_rdmacm openib-rdmacm) \
+ $(use_enable openmpi_ofed_features_dynamic-sl openib-dynamic-sl) \
+ $(use_enable openmpi_ofed_features_failover btl-openib-failover) \
+ $(use_with openmpi_fabrics_sctp sctp) \
+ $(use_with openmpi_rm_pbs tm) \
+ $(use_with openmpi_rm_slurm slurm)
+}
+
+src_install () {
+ emake DESTDIR="${D}" install || die "make install failed"
+ # From USE=vt see #359917
+ rm "${ED}"/$(mpi_root)/usr/share/libtool &> /dev/null
+ mpi_dodoc README AUTHORS NEWS VERSION || die
+ mpi_imp_add_eselect
+}
+
+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
+ emake -j1 check || die "emake check failed"
+}
^ permalink raw reply related [flat|nested] 3+ messages in thread
* [gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/files/, sys-cluster/openmpi/
@ 2013-07-02 22:59 Justin Bronder
0 siblings, 0 replies; 3+ messages in thread
From: Justin Bronder @ 2013-07-02 22:59 UTC (permalink / raw
To: gentoo-commits
commit: 7763eb10db6ac6942ccf59f741bc60ebb27581c6
Author: Justin Bronder <jbronder <AT> gentoo <DOT> org>
AuthorDate: Tue Jul 2 22:59:12 2013 +0000
Commit: Justin Bronder <jsbronder <AT> gentoo <DOT> org>
CommitDate: Tue Jul 2 22:59:18 2013 +0000
URL: http://git.overlays.gentoo.org/gitweb/?p=proj/sci.git;a=commit;h=7763eb10
Update patch per sandbox team, link to upstream tickets.
Package-Manager: portage-2.1.12.2
---
sys-cluster/openmpi/ChangeLog | 4 ++++
.../hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch | 8 ++++----
2 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 9b844ff..54e1caa 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -2,6 +2,10 @@
# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
# $Header: $
+ 02 Jul 2013; Justin Bronder <jsbronder@gentoo.org>
+ files/hooks-disable-malloc-override-inside-of-Gentoo-sandb.patch:
+ Update patch per sandbox team
+
02 Jul 2013; Justin Bronder <jsbronder@gentoo.org> -openmpi-1.6.4.ebuild:
Remove old
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 5683c81..197430a 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;
}
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2013-07-02 22:59 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2013-07-02 22:59 [gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/files/, sys-cluster/openmpi/ Justin Bronder
-- strict thread matches above, loose matches on Subject: below --
2013-07-02 2:15 Justin Bronder
2011-05-02 1:23 Justin Bronder
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox