[gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/files/, sys-cluster/openmpi/

[Justin Bronder]

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@g.o>
+  -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@g.o> 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@×××××.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@×××××.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() {