Fix hardened test failure (#360185).

Package-Manager: portage-2.1.9.44/cvs/Linux x86_64

4 files changed, 69 insertions, 8 deletions

diff --git a/sys-cluster/openmpi/ChangeLog b/sys-cluster/openmpi/ChangeLog
index 87a2673b5561..9d3530e39f59 100644
--- a/sys-cluster/openmpi/ChangeLog
+++ b/sys-cluster/openmpi/ChangeLog
@@ -1,6 +1,10 @@
 # ChangeLog for sys-cluster/openmpi
 # Copyright 1999-2011 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.81 2011/03/22 19:28:29 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/ChangeLog,v 1.82 2011/03/28 18:14:43 jsbronder Exp $
+
+  28 Mar 2011; Justin Bronder <jsbronder@gentoo.org>
+  +files/openmpi-r24328.patch, openmpi-1.5.3.ebuild:
+  Fix hardened test failure (#360185).
 
   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/Manifest b/sys-cluster/openmpi/Manifest
index a22d523fd267..6519d456a73b 100644
--- a/sys-cluster/openmpi/Manifest
+++ b/sys-cluster/openmpi/Manifest
@@ -2,18 +2,19 @@
 Hash: SHA1
 
 AUX openmpi-1.4.1-r22513.patch 2460 RMD160 94c6ca7c7d869039e73f1dbd5402ccd0d5949f11 SHA1 a924c63a94546f25a25beb15328ff2ee18c388e8 SHA256 083528f3ccdda8e1654accd5a6d3c79231d7d727cbd1f05293d7850a32503379
+AUX openmpi-r24328.patch 1707 RMD160 4db5f60d692268e1e42ebbc5379cec245b14daa5 SHA1 25a3ac77307b4681e3f917e61ff88daa58dab508 SHA256 3149f47463057e3263a242b2df88b588074f07395d437b585c5ce37f84aadf83
 DIST openmpi-1.4.2.tar.bz2 6630550 RMD160 2c9fbcc8f77e7fa28e2bd062875d484548cc0b79 SHA1 3e85092433d0e399cc7a51c018f9d13562f78b80 SHA256 19129e3d51860ad0a7497ede11563908ba99c76b3a51a4d0b8801f7e2db6cd80
 DIST openmpi-1.4.3.tar.bz2 6626909 RMD160 087532de57244c03941421162caa9e5537b4eba1 SHA1 9d24b6969d73605904855eb32d40d6b07e231932 SHA256 220b72b1c7ee35469ff74b4cfdbec457158ac6894635143a33e9178aa3981015
 DIST openmpi-1.5.3.tar.bz2 7589097 RMD160 c1d0950c9a5c53c8543838adadf6a7477abe3989 SHA1 669565c708deab82ad4069d82675b2020eb0e0c6 SHA256 70745806cdbe9b945d47d9fa058f99e072328e41e40c0ced6dd75220885c5263
 EBUILD openmpi-1.4.2.ebuild 2683 RMD160 1fa28fcc29d206863e53afbeb94361fb83bae838 SHA1 09667c585460b3c24e8c7ad3528974a4d9570d55 SHA256 ee2cbd0f9a06a4b2a8cca69688bdb0ed2227db37338298c5503e19afc338c501
 EBUILD openmpi-1.4.3.ebuild 2665 RMD160 76459948b7b66a5eba9ac01525c14f5ce17e1fa2 SHA1 6c88fb292784d793af1203102542bb306cd1521b SHA256 507ee632b0dd5d7274d41912a55dd070daccb1c1d78012abf5daa366b2461361
-EBUILD openmpi-1.5.3.ebuild 2753 RMD160 9512d71aa97be01b81ab46ae596ca5df44375dac SHA1 d4a262f01374c49aedc4de532500ae814c0af5ac SHA256 2b0f3d5b02b384e6720d48fea37234ccd6214d28a4aa1a3ae3186d49aa79f37a
-MISC ChangeLog 12338 RMD160 a43e621ed8c086cb18332f28ae658c742273db43 SHA1 01246ad02b150216b84ce531db91a26268e1ea87 SHA256 6646278ab76ebab307dc5a94ce4b450ea31cc1c724a22dcb2aa0b91ab32e4e1e
+EBUILD openmpi-1.5.3.ebuild 2797 RMD160 d17249368eae6ae2be65859fdaf050a9d7b185ab SHA1 f0a541fb1698da2f793e7865506f3d5ce2542a63 SHA256 e204a22f540a3c6523232548785bc1915a9e28cfce3ddc9666ea9fc1c75ff9ca
+MISC ChangeLog 12484 RMD160 0748339882e85947a2a1ef7fc2a8e5cf5dcefa2f SHA1 351976d45db371aca0320399f694d3638b83060a SHA256 c54231eada5160126c6e737a3741ab5a042e4eedef50253af1010eb9c9709f59
 MISC metadata.xml 597 RMD160 460d07513dd43e74dcb1b8654d7952e8ce02f9ca SHA1 49f72060bb7b3e35020affbe574c09251c896b7f SHA256 a366b9394dfb038cf8913c7710395ea5d38609b268361320cb64346ca413e18a
 -----BEGIN PGP SIGNATURE-----
-Version: GnuPG v2.0.16 (GNU/Linux)
+Version: GnuPG v2.0.17 (GNU/Linux)
 
-iEYEARECAAYFAk2I+GMACgkQ4MrvBE1wQ8nKpACdHkyueJbOYiY52ERpOhXPl3ID
-mTAAn0fNbXSEBXGyvto5bnSJP/yCR+dl
-=/9vu
+iEYEARECAAYFAk2Q0BgACgkQ4MrvBE1wQ8kD8ACgqZ7BBsbw+BYmm0BnGYjeERIh
+VVcAmgMiESLpn9cmnL4w0ndSBIkV31TL
+=vFVE
 -----END PGP SIGNATURE-----
diff --git a/sys-cluster/openmpi/files/openmpi-r24328.patch b/sys-cluster/openmpi/files/openmpi-r24328.patch
new file mode 100644
index 000000000000..bbd689d3ae0d
--- /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 161aaa9c8f87..baf6cb0383f0 100644
--- a/sys-cluster/openmpi/openmpi-1.5.3.ebuild
+++ b/sys-cluster/openmpi/openmpi-1.5.3.ebuild
@@ -1,6 +1,6 @@
 # Copyright 1999-2011 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.3.ebuild,v 1.2 2011/03/22 19:28:29 jsbronder Exp $
+# $Header: /var/cvsroot/gentoo-x86/sys-cluster/openmpi/openmpi-1.5.3.ebuild,v 1.3 2011/03/28 18:14:43 jsbronder Exp $
 
 EAPI=3
 inherit eutils multilib flag-o-matic toolchain-funcs
@@ -51,6 +51,8 @@ src_prepare() {
 		echo 'oob_tcp_listen_mode = listen_thread' \
 			>> opal/etc/openmpi-mca-params.conf
 	fi
+
+	epatch "${FILESDIR}"/openmpi-r24328.patch
 }
 
 src_configure() {