Add compability patches for gcc-4.3 and glibc-2.8.

Package-Manager: portage-2.1.5.5

5 files changed, 85 insertions, 4 deletions

diff --git a/app-shells/pdsh/ChangeLog b/app-shells/pdsh/ChangeLog
index 696b01a0a532..d532199fc8ec 100644
--- a/app-shells/pdsh/ChangeLog
+++ b/app-shells/pdsh/ChangeLog
@@ -1,6 +1,11 @@
 # ChangeLog for app-shells/pdsh
 # Copyright 1999-2008 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/pdsh/ChangeLog,v 1.9 2008/03/14 12:18:01 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/pdsh/ChangeLog,v 1.10 2008/06/15 18:52:27 swegener Exp $
+
+  15 Jun 2008; Sven Wegener <swegener@gentoo.org>
+  +files/pdsh-2.14-gcc-4.3-unistd.h.patch,
+  +files/pdsh-2.14-glibc-2.8-ARG_MAX.patch, pdsh-2.14.ebuild:
+  Add compability patches for gcc-4.3 and glibc-2.8.
 
   14 Mar 2008; Caleb Tennis <caleb@gentoo.org> pdsh-2.14.ebuild:
   amd64 stable
diff --git a/app-shells/pdsh/Manifest b/app-shells/pdsh/Manifest
index fa3bc137e0d0..a9ee88703835 100644
--- a/app-shells/pdsh/Manifest
+++ b/app-shells/pdsh/Manifest
@@ -1,4 +1,16 @@
+-----BEGIN PGP SIGNED MESSAGE-----
+Hash: SHA1
+
+AUX pdsh-2.14-gcc-4.3-unistd.h.patch 315 RMD160 c64f1dc67a92849303cab83edc9d4453c7a2e698 SHA1 c8259923b7376855406d22277b17c5f22b93fa96 SHA256 791a91fda382aa41ecbdccc8528f283ae457740120e123b233cc393c57241164
+AUX pdsh-2.14-glibc-2.8-ARG_MAX.patch 998 RMD160 ccf884b7735bb9f78104b64946c69ced0a875158 SHA1 6dd73dd296d3ad5b67a523104a9278f0b02be500 SHA256 92b97b3e4b60d6f492d76568baf14713995eded46868aa8d46e891c82d1ab8d5
 DIST pdsh-2.14.tar.bz2 445693 RMD160 732fb8f0923ce5222dd88332766832621ad8a32c SHA1 f6e1f21c86f375408492b9eaadf7089c37531317 SHA256 7f08f4c78d5370683b27ae0db42817f72a21c3a2bb0db0c3ac8175f2f407a563
-EBUILD pdsh-2.14.ebuild 831 RMD160 ee02275ee9e41db47fb362944107dea508eac796 SHA1 b715ef72735c633c8a415818e5c02c6ba3a6d755 SHA256 b1b6a75d4067a5b8bc2e60f5d1150447ac34182cc1ce9070117fff8400e86a38
-MISC ChangeLog 1463 RMD160 727feb9edf4a3ddda0cb7922a31fa083a50b0133 SHA1 9f279ef5fb737dc0829c5361ac3d3e22033ba700 SHA256 ebeb1512dd4b4fefdf30d15d18ae186ef19e80def7aafb3db65ab60749b4e1cd
+EBUILD pdsh-2.14.ebuild 994 RMD160 b287f05fb79831066b3b963c6e0870e1fc42d045 SHA1 7df4fc4acdfd60524b24f651144f95f5641752b5 SHA256 b9ff7de7cfe9223924608070aa46f634c64d213aa67e27c9b057097e5a697eef
+MISC ChangeLog 1676 RMD160 30ec72b62fc846449d3279bf62f4c66b6bd3c4cf SHA1 46bbc83719c54580a7d68f138ead5a96e90a3da8 SHA256 8f80be2ebfa88abca81710ff185cf846d9149a8c9bb4670751e100b2e7bfdc60
 MISC metadata.xml 820 RMD160 c56c124e9f863c3be9671c0ccc0bdffa2255c4a0 SHA1 f0847ecae141f2ef6037101e3aec93199ec8bdd6 SHA256 e700ef8cadab69efe811a1a3546a6947e4e248acb7e678708ad5cf6043ff749d
+-----BEGIN PGP SIGNATURE-----
+Version: GnuPG v2.0.7 (GNU/Linux)
+
+iD8DBQFIVWTwI1lqEGTUzyQRAgNMAKDP36FHrFelpgQmxsqRTJWZ5VAuXgCgoSck
+AN3KHNw1x1PkOF+1PwpmW1o=
+=RFP9
+-----END PGP SIGNATURE-----
diff --git a/app-shells/pdsh/files/pdsh-2.14-gcc-4.3-unistd.h.patch b/app-shells/pdsh/files/pdsh-2.14-gcc-4.3-unistd.h.patch
new file mode 100644
index 000000000000..03e568e7290d
--- /dev/null
+++ b/app-shells/pdsh/files/pdsh-2.14-gcc-4.3-unistd.h.patch
@@ -0,0 +1,13 @@
+gcc-4.3 no longer includes this by default, needed to get the ssize_t type.
+
+--- pdsh-2.14/src/modules/machines.c
++++ pdsh-2.14/src/modules/machines.c
+@@ -28,6 +28,8 @@
+ #  include "config.h"
+ #endif
+ 
++#include <unistd.h>
++
+ #include "src/pdsh/wcoll.h"
+ #include "src/pdsh/mod.h"
+ #include "src/common/hostlist.h"
diff --git a/app-shells/pdsh/files/pdsh-2.14-glibc-2.8-ARG_MAX.patch b/app-shells/pdsh/files/pdsh-2.14-glibc-2.8-ARG_MAX.patch
new file mode 100644
index 000000000000..8b0de0ac138c
--- /dev/null
+++ b/app-shells/pdsh/files/pdsh-2.14-glibc-2.8-ARG_MAX.patch
@@ -0,0 +1,41 @@
+glibc-2.8 no longer provides the ARG_MAX macro.
+
+--- pdsh-2.14/src/pdsh/xpopen.c
++++ pdsh-2.14/src/pdsh/xpopen.c
+@@ -84,10 +84,17 @@
+     struct pid *cur;
+     int fds[2], read, fd;
+     pid_t pid;
+-    char *av[ARG_MAX + 1];
+     int maxfd = sysconf(_SC_OPEN_MAX);
++    long arg_max;
++    char **av;
++
++    arg_max = sysconf(_SC_ARG_MAX);
++    if (arg_max < 0)
++        errx("%p: unable to get _SC_OPEN_MAX (%m)\n");
++
++    av = Malloc(sizeof(char *) * (arg_max + 1));
+     
+-    _parse_command_with_quotes(av, ARG_MAX, cmd);
++    _parse_command_with_quotes(av, arg_max, cmd);
+ 
+     if ((*mode != 'r' && *mode != 'w') || mode[1] != '\0') {
+         errno = EINVAL;
+@@ -101,6 +106,7 @@
+     if (pipe(fds) < 0) {
+         close(fds[0]);
+         close(fds[1]);
++        Free((void **) &av);
+         Free((void **) &cur);
+         errx("%p: unable to dup stdout\n");
+     }
+@@ -143,6 +149,8 @@
+     cur->next = pidlist;
+     pidlist = cur;
+ 
++    Free((void **) &av);
++
+     return (cur->fp);
+ 
+ }
diff --git a/app-shells/pdsh/pdsh-2.14.ebuild b/app-shells/pdsh/pdsh-2.14.ebuild
index 9e5aa904e98c..502280d5c338 100644
--- a/app-shells/pdsh/pdsh-2.14.ebuild
+++ b/app-shells/pdsh/pdsh-2.14.ebuild
@@ -1,6 +1,8 @@
 # Copyright 1999-2008 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/app-shells/pdsh/pdsh-2.14.ebuild,v 1.4 2008/03/14 12:18:01 caleb Exp $
+# $Header: /var/cvsroot/gentoo-x86/app-shells/pdsh/pdsh-2.14.ebuild,v 1.5 2008/06/15 18:52:27 swegener Exp $
+
+inherit eutils
 
 DESCRIPTION="A high-performance, parallel remote shell utility."
 HOMEPAGE="https://computing.llnl.gov/linux/pdsh.html"
@@ -14,6 +16,14 @@ RDEPEND="crypt? ( net-misc/openssh )
 	readline? ( sys-libs/readline )"
 DEPEND="${RDEPEND}"
 
+src_unpack() {
+	unpack ${A}
+	cd "${S}"
+
+	epatch "${FILESDIR}"/${P}-gcc-4.3-unistd.h.patch
+	epatch "${FILESDIR}"/${P}-glibc-2.8-ARG_MAX.patch
+}
+
 src_compile() {
 	econf \
 		--with-machines \