From mboxrd@z Thu Jan 1 00:00:00 1970
Received: from pigeon.gentoo.org ([208.92.234.80] helo=lists.gentoo.org)
by finch.gentoo.org with esmtp (Exim 4.60)
(envelope-from <gentoo-commits+bounces-341103-garchives=archives.gentoo.org@lists.gentoo.org>)
id 1QGhqy-0001Qm-H0
for garchives@archives.gentoo.org; Mon, 02 May 2011 01:23:13 +0000
Received: from pigeon.gentoo.org (localhost [127.0.0.1])
by pigeon.gentoo.org (Postfix) with SMTP id 922C41C0E7;
Mon, 2 May 2011 01:23:05 +0000 (UTC)
Received: from smtp.gentoo.org (smtp.gentoo.org [140.211.166.183])
by pigeon.gentoo.org (Postfix) with ESMTP id 546191C0E7
for <gentoo-commits@lists.gentoo.org>; Mon, 2 May 2011 01:23:05 +0000 (UTC)
Received: from pelican.gentoo.org (unknown [66.219.59.40])
(using TLSv1 with cipher ADH-CAMELLIA256-SHA (256/256 bits))
(No client certificate requested)
by smtp.gentoo.org (Postfix) with ESMTPS id AFF7E1B4059
for <gentoo-commits@lists.gentoo.org>; Mon, 2 May 2011 01:23:04 +0000 (UTC)
Received: from localhost.localdomain (localhost [127.0.0.1])
by pelican.gentoo.org (Postfix) with ESMTP id 9179F80505
for <gentoo-commits@lists.gentoo.org>; Mon, 2 May 2011 01:23:02 +0000 (UTC)
From: "Justin Bronder" <jsbronder@gentoo.org>
To: gentoo-commits@lists.gentoo.org
Content-type: text/plain; charset=UTF-8
Reply-To: gentoo-dev@lists.gentoo.org, "Justin Bronder" <jsbronder@gentoo.org>
Message-ID: <15d2c6558b1bb9e8b9eeecaf93da55ab8d3e142f.jsbronder@gentoo>
Subject: [gentoo-commits] proj/sci:master commit in: sys-cluster/openmpi/files/, sys-cluster/openmpi/
X-VCS-Repository: proj/sci
X-VCS-Files: sys-cluster/openmpi/ChangeLog sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch sys-cluster/openmpi/files/openmpi-r24328.patch sys-cluster/openmpi/openmpi-1.5.3.ebuild
X-VCS-Directories: sys-cluster/openmpi/files/ sys-cluster/openmpi/
X-VCS-Committer: jsbronder
X-VCS-Committer-Name: Justin Bronder
X-VCS-Revision: 15d2c6558b1bb9e8b9eeecaf93da55ab8d3e142f
Date: Mon, 2 May 2011 01:23:02 +0000 (UTC)
Precedence: bulk
List-Post: <mailto:gentoo-commits@lists.gentoo.org>
List-Help: <mailto:gentoo-commits+help@lists.gentoo.org>
List-Unsubscribe: <mailto:gentoo-commits+unsubscribe@lists.gentoo.org>
List-Subscribe: <mailto:gentoo-commits+subscribe@lists.gentoo.org>
List-Id: Gentoo Linux mail <gentoo-commits.gentoo.org>
X-BeenThere: gentoo-commits@lists.gentoo.org
Content-Transfer-Encoding: quoted-printable
X-Archives-Salt:
X-Archives-Hash: 0d0cf127de444a5e93a3d9d9d831ee75
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=3Dproj/sci.git;a=3Dc=
ommit;h=3D15d2c655
Fix hardened test failure (#360185) and cleanup.
(Portage version: 2.1.9.44/git/Linux x86_64, RepoMan options: --force, si=
gned 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/ChangeLo=
g
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: $
=20
+ 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.ebuil=
d:
Remove libtool if it was installed by USE=3Dvt, bug #359917.
=20
diff --git a/sys-cluster/openmpi/files/openmpi-1.4.1-r22513.patch b/sys-c=
luster/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/wra=
ppers/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 =3D ();
-=20
- # 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 =3D=3D 1) {
- push(@exec_argv, split(' ', $preproc_flags));
- }
- if ($want_compile =3D=3D 1) {
- push(@exec_argv, split(' ', $comp_flags));
- }
--push(@exec_argv, @appargs);
- if ($want_link =3D=3D 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/op=
al_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 =3D 0;
- }
-=20
-+ /* 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 =3D 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 =3D opal_argv_count(exec_argv);
- }
-=20
-- /* add all the user arguments */
-- opal_argv_insert(&exec_argv, exec_argc, user_argv);
-- exec_argc =3D 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);
---=20
-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 )
+=20
+ int mpich_typeub3( void )
+ {
+- int blocklen[2], err =3D 0, idisp[3];
++ int blocklen[3], err =3D 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 =3D 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 )
+=20
+ int mpich_typeub3( void )
+ {
+- int blocklen[2], err =3D 0, idisp[3];
++ int blocklen[3], err =3D 0, idisp[3];
+ size_t sz;
+ OPAL_PTRDIFF_TYPE disp[3], lb, ub, ex;
+ opal_datatype_t *types[3], *dt1, *dt2, *dt3, *dt4, *dt5;
+--=20
+1.7.3.4
+
diff --git a/sys-cluster/openmpi/openmpi-1.5.3.ebuild b/sys-cluster/openm=
pi/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 =3D listen_thread' \
>> opal/etc/openmpi-mca-params.conf
fi
+
+ # Gentoo bug 360185
+ epatch "${FILESDIR}"/openmpi-r24328.patch
}
=20
src_configure() {