[Pkg-openmpi-commits] r297 - in /openmpi/trunk/debian: changelog patches/fix-fakeroot-execution.patch patches/series

[sylvestre at users.alioth.debian.org]

Author: sylvestre
Date: Sun Feb 19 15:06:12 2012
New Revision: 297

URL: http://svn.debian.org/wsvn/pkg-openmpi/?sc=1&rev=297
Log:
The checks for FAKEROOT introduced to fix this bug upstream are
preceded by a new check that calls stat re-producing the original bug.
Re-ordering the checks to ensure that FAKEROOT is detected first
appears to resolve this issue.
Closes: #658600.

Added:
    openmpi/trunk/debian/patches/fix-fakeroot-execution.patch
Modified:
    openmpi/trunk/debian/changelog
    openmpi/trunk/debian/patches/series

Modified: openmpi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/changelog?rev=297&op=diff
==============================================================================
--- openmpi/trunk/debian/changelog (original)
+++ openmpi/trunk/debian/changelog Sun Feb 19 15:06:12 2012
@@ -1,9 +1,17 @@
-openmpi (1.5.4-2~exp2) UNRELEASED; urgency=low
-
+openmpi (1.5.4-2~exp2) experimental; urgency=low
+
+  [ Manuel Prinz ]
   * Fixed dangling symlinks. Thanks to Roderich Schupp for the patch!
     Closes: #658594.
-
- -- Manuel Prinz <manuel at debian.org>  Fri, 10 Feb 2012 21:26:41 +0100
+  
+  [ James Pages ]
+  * The checks for FAKEROOT introduced to fix this bug upstream are
+     preceded by a new check that calls stat re-producing the original bug.
+     Re-ordering the checks to ensure that FAKEROOT is detected first
+     appears to resolve this issue.
+     Closes: #658600.
+
+ -- Sylvestre Ledru <sylvestre at debian.org>  Sun, 19 Feb 2012 15:42:41 +0100
 
 openmpi (1.5.4-2~exp1) experimental; urgency=low
 

Added: openmpi/trunk/debian/patches/fix-fakeroot-execution.patch
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/fix-fakeroot-execution.patch?rev=297&op=file
==============================================================================
--- openmpi/trunk/debian/patches/fix-fakeroot-execution.patch (added)
+++ openmpi/trunk/debian/patches/fix-fakeroot-execution.patch Sun Feb 19 15:06:12 2012
@@ -1,0 +1,43 @@
+Description: If running under Debian fakeroot then its important
+ that this hook is disabled; a new stat check was introduced in
+ 1.5.x which preceeds the FAKEROOT check resulting in a SEGFAULT.
+Author: James Page <james.page at ubuntu.com>
+Origin: https://svn.open-mpi.org/trac/ompi/changeset/21489
+
+Index: openmpi-1.5.4/opal/mca/memory/linux/hooks.c
+===================================================================
+--- openmpi-1.5.4.orig/opal/mca/memory/linux/hooks.c    2012-02-15 12:59:39.986314651 +0000
++++ openmpi-1.5.4/opal/mca/memory/linux/hooks.c 2012-02-15 13:14:57.744722517 +0000
+@@ -738,15 +738,6 @@
+     check_result_t r1, r2, lp, lpp;
+     bool want_rcache = false, found_driver = false;
+ 
+-    /* First, check if ummunotify is present on the system. If it is,
+-       then we don't need to do the following ptmalloc2 hacks.
+-       open/mmap on the device may fail during init, but if /dev/ummunotify
+-       exists, we assume that the user/administrator *wants* to use
+-       ummunotify. */
+-    if (stat("/dev/ummunotify", &st) == 0) {
+-        return;
+-    }
+-
+     /* Yes, checking for an MPI MCA parameter here is an abstraction
+        violation.  Cope.  Yes, even checking for *any* MCA parameter
+        here (without going through the MCA param API) is an
+@@ -769,6 +760,15 @@
+         return;
+     }
+ 
++    /* Next, check if ummunotify is present on the system. If it is,
++       then we don't need to do the following ptmalloc2 hacks.
++       open/mmap on the device may fail during init, but if /dev/ummunotify
++       exists, we assume that the user/administrator *wants* to use
++       ummunotify. */
++    if (stat("/dev/ummunotify", &st) == 0) {
++        return;
++    }
++
+     /* Look for sentinel files (directories) to see if various network
+        drivers are loaded (yes, I know, further abstraction
+        violations...).
+

Modified: openmpi/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-openmpi/openmpi/trunk/debian/patches/series?rev=297&op=diff
==============================================================================
--- openmpi/trunk/debian/patches/series (original)
+++ openmpi/trunk/debian/patches/series Sun Feb 19 15:06:12 2012
@@ -6,3 +6,5 @@
 # Link fix is obsolete, since we do not ship .la files anymore
 #openmpi-link-fix
 configure_arm_fix.patch
+# 658600: Regression of bug 531522
+fix-fakeroot-execution.patch