adding missing patches

3 files changed, 104 insertions, 0 deletions

diff --git a/sys-cluster/pvm/Manifest b/sys-cluster/pvm/Manifest
index 8ca4d93dc259..2b1674cca873 100644
--- a/sys-cluster/pvm/Manifest
+++ b/sys-cluster/pvm/Manifest
@@ -4,5 +4,7 @@ MD5 66c7d8928accf5d72e0fa51aaa8bfdf7 ChangeLog 1401
 MD5 beb9efce81ae2c582a621528fc783095 metadata.xml 373
 MD5 726a6a69ba5fb9e140e8f7e1a85c9c9d files/pvm-3.4.4-gentoo.diff 608
 MD5 61db9ccafbe3d9f647e98823ba30fd55 files/pvm-3.4.4-amd64.patch 2188
+MD5 cb7593c1f1921b55cd0eee8447204ba8 files/pvm-3.4.4-s390.patch 886
+MD5 1f52ad91cea65624c2bed0e33db5f7b4 files/pvm-3.4.4-x86_64-segfault.patch 2478
 MD5 c6d622987f4e06f522dcbc72cff9127d files/digest-pvm-3.4.4-r1 57
 MD5 c6d622987f4e06f522dcbc72cff9127d files/digest-pvm-3.4.4-r2 57
diff --git a/sys-cluster/pvm/files/pvm-3.4.4-s390.patch b/sys-cluster/pvm/files/pvm-3.4.4-s390.patch
new file mode 100644
index 000000000000..495a5872a9cf
--- /dev/null
+++ b/sys-cluster/pvm/files/pvm-3.4.4-s390.patch
@@ -0,0 +1,21 @@
+--- pvm3/lib/pvmgetarch.orig	Thu Sep 27 17:24:04 2001
++++ pvm3/lib/pvmgetarch	Wed Feb 19 19:44:26 2003
+@@ -66,13 +66,16 @@
+ 	*,88k )                 ARCH=E88K ;;
+ 	*,mips )                ARCH=MIPS ;;
+ 	*,CRAY-2 )              ARCH=CRAY2 ;;
+-	Linux,i[3456]86 )       ARCH=LINUX ;;
+-	Linux,ia64 )            ARCH=LINUX64 ;;
++	Linux,i[3456]86 )       ARCH=LINUXI386 ;;
++	Linux,x86_64 )		ARCH=LINUXX86_64 ;;
++	Linux,ia64 )            ARCH=LINUXIA64 ;;
+ 	Linux,alpha )           ARCH=LINUXALPHA ;;
+ 	Linux,arm* )            ARCH=LINUXARM ;;
+ 	Linux,sparc* )          ARCH=LINUXSPARC ;;
+ 	Linux,hp_pa )           ARCH=LINUXHPPA ;;
+ 	Linux,ppc )             ARCH=LINUXPPC ;;
++	Linux,s390 )            ARCH=LINUXS390 ;;
++	Linux,s390x )           ARCH=LINUXS390X ;;
+ 	Linux,m68k )            ARCH=LINUXATARI ;;
+ 	BSD/OS,i[3456]86 )      ARCH=BSD386 ;;
+ 	FreeBSD,i[3456]86 )     ARCH=FREEBSD ;;
diff --git a/sys-cluster/pvm/files/pvm-3.4.4-x86_64-segfault.patch b/sys-cluster/pvm/files/pvm-3.4.4-x86_64-segfault.patch
new file mode 100644
index 000000000000..05524f7bb28b
--- /dev/null
+++ b/sys-cluster/pvm/files/pvm-3.4.4-x86_64-segfault.patch
@@ -0,0 +1,81 @@
+diff -r -U4 -N pvm-3.4.4-root/usr/share/pvm3/src/pvmd.c pvm-3.4.4-root-segfault/usr/share/pvm3/src/pvmd.c
+--- pvm-3.4.4-root/usr/share/pvm3/src/pvmd.c	2001-09-28 08:43:18.000000000 -0400
++++ pvm-3.4.4-root-segfault/usr/share/pvm3/src/pvmd.c	2003-11-18 10:34:30.000000000 -0500
+@@ -603,9 +603,9 @@
+ #ifdef WIN32
+ #include "pvmwin.h"
+ #include <time.h>
+ #else
+-#include <sys/time.h>
++#include <time.h>
+ #include <sys/wait.h>
+ #include <sys/socket.h>
+ #include <sys/signal.h>
+ #include <netinet/in.h>
+@@ -998,9 +998,9 @@
+ 		PVM_TIMET time_temp;
+ 		gettimeofday(&tnow, (struct timezone*)0);
+ 		pvmlogprintf("version %s ddpro %d tdpro %d sdpro %d\n",
+ 				PVM_VER, DDPROTOCOL, TDPROTOCOL, SDPROTOCOL);
+-		time_temp = (PVM_TIMET) tnow.tv_sec;
++		time_temp = tnow.tv_sec;
+ 		pvmlogprintf(ctime(&time_temp));
+ 		for (i = 0; i < argc; i++)
+ 			pvmlogprintf("argv[%d]=\"%s\"\n", i, argv[i]);
+ 		exit(0);
+@@ -1612,17 +1612,20 @@
+ #endif
+ 
+ 	gettimeofday(&tnow, (struct timezone*)0);
+ 	if (pvmdebmask || myhostpart) {
+-		PVM_TIMET time_temp;
++                char *my_time;
++                PVM_TIMET time_temp;	
+ 		pvmlogprintf("%s (%s) %s %s\n",
+ 				hosts->ht_hosts[hosts->ht_local]->hd_name,
+ 				inadport_decimal(&hosts->ht_hosts[hosts->ht_local]->hd_sad),
+ 				myarchname,
+ 				PVM_VER);
+ 		pvmlogprintf("ready ");
+-		time_temp = (PVM_TIMET) tnow.tv_sec;
+-		pvmlogprintf(ctime(&time_temp));
++		time_temp = tnow.tv_sec; 
++                my_time = ctime(&time_temp);
++                if(my_time != NULL)
++		   pvmlogprintf("%s\n",my_time);
+ 	}
+ 
+ 	/*
+ 	* check for default plug-in modules (& start them)
+diff -r -U4 -N pvm-3.4.4-root/usr/share/pvm3/src/pvmlog.c pvm-3.4.4-root-segfault/usr/share/pvm3/src/pvmlog.c
+--- pvm-3.4.4-root/usr/share/pvm3/src/pvmlog.c	2001-09-26 17:23:56.000000000 -0400
++++ pvm-3.4.4-root-segfault/usr/share/pvm3/src/pvmlog.c	2003-11-18 07:41:21.000000000 -0500
+@@ -153,9 +153,13 @@
+  * Revision 1.1  1993/08/30  23:26:51  manchek
+  * Initial revision
+  *
+  */
+-
++#if defined (__STDC__) || defined(IMA_WIN32_WATCOM)
++#include <stdarg.h>
++#else
++#include <varargs.h>
++#endif
+ #include <stdio.h>
+ #include <pvm3.h>
+ #include <errno.h>
+ #include <sys/types.h>
+@@ -167,13 +171,8 @@
+ #else
+ #include <strings.h>
+ #define	CINDEX(s,c)	index(s,c)
+ #endif
+-#if defined (__STDC__) || defined(IMA_WIN32_WATCOM)
+-#include <stdarg.h>
+-#else
+-#include <varargs.h>
+-#endif
+ 
+ #ifndef PVMDLOGMAX
+ #define PVMDLOGMAX 1000000			/* (approx) max chars to log to file */
+ #endif