Add the patches supplied by Gabriel Rosenkoetter in pkg/10412 and

pkg/10477.

4 files changed, 62 insertions, 18 deletions

diff --git a/parallel/glunix/files/patch-sum b/parallel/glunix/files/patch-sum
index 94b9b4b1a6c..c56b6bd2c09 100644
--- a/parallel/glunix/files/patch-sum
+++ b/parallel/glunix/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.3 2000/06/16 23:40:16 wiz Exp $
+$NetBSD: patch-sum,v 1.4 2000/07/10 23:54:22 wiz Exp $
 
 MD5 (patch-aa) = f07a5edea1b3986a994019f889db2e16
 MD5 (patch-ab) = a29f0a2b4373e5ae8992de12da412637
@@ -15,7 +15,7 @@ MD5 (patch-al) = c1123254c24e6c90d0c3343f44daf0ca
 MD5 (patch-am) = 4b00af8bc9621552081e5c51db9b7474
 MD5 (patch-an) = 2e54f806d1174ea42b0a0ad9ad27f1fe
 MD5 (patch-ao) = 52be376a850d74d469fd9de834ee1085
-MD5 (patch-ap) = 199fb7f64ec4e1d0721b312fc418d0b6
+MD5 (patch-ap) = 7093402988d0dc0d9ed2d1f7e6be8f47
 MD5 (patch-aq) = 08e2816178e3680e89a9fffb487c335f
 MD5 (patch-ar) = 45c481af0af1318e517335522c5bc627
 MD5 (patch-as) = 43a0155feb50562abc18be1ed5466424
@@ -32,8 +32,8 @@ MD5 (patch-bc) = 14fe9420c1ef4c6c55d1191b8b3a0664
 MD5 (patch-bd) = e8983f77078a10d76b85f8e3a9bd556d
 MD5 (patch-be) = c776554d9e12e40cf2bfb0d89b9099db
 MD5 (patch-bf) = 604051079dd49aabc0ed9131c602ecad
-MD5 (patch-bg) = ce823ccbaa15e7f4c3c2c75bde01f62d
-MD5 (patch-bh) = 1cedb1a8d84d546645ffe7596b749d6e
+MD5 (patch-bg) = 63db0361995e39f4392d53aeeabe16e5
+MD5 (patch-bh) = 2a375bba6979f938d7d991cba5f910be
 MD5 (patch-bi) = a26f1b6382f0b6f41228161e9a7dd8bf
 MD5 (patch-bj) = c185d584fabf8d8236c4c127ced77624
 MD5 (patch-bk) = d49926dd5b8b8bd163cc926248b1733b
diff --git a/parallel/glunix/patches/patch-ap b/parallel/glunix/patches/patch-ap
index 7570e040e63..4f2f68fd717 100644
--- a/parallel/glunix/patches/patch-ap
+++ b/parallel/glunix/patches/patch-ap
@@ -1,7 +1,7 @@
-$NetBSD: patch-ap,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-ap,v 1.2 2000/07/10 23:54:23 wiz Exp $
 
---- progs/Makefile.common.orig	Wed Nov  5 13:43:41 1997
-+++ progs/Makefile.common	Fri Mar 13 02:01:15 1998
+--- progs/Makefile.common.orig	Wed Nov  5 15:43:41 1997
++++ progs/Makefile.common	Wed Jun 21 15:54:25 2000
 @@ -3,50 +3,30 @@
  # There are configuration values that are used in this Makefile and are
  # used to do substitutions in the scripts.
@@ -60,7 +60,7 @@ $NetBSD: patch-ap,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
 +GLUNIX_DATA_DIR = $(NOW_ROOT)/data
 +INSTALL_DIR = $(NOW_ROOT)
 +HTTP_BASE = $(NOW_ROOT)/man/http
-+MASTER_HOSTNAME = `hostname`
++MASTER_HOSTNAME = $(shell /bin/hostname)
 +GLUNIX_ACCOUNT = 12345 # These don't matter, they're calculated at run-time
 +GLUNIX_GROUP = 12345 # These don't matter, they're calculated at run-time
 +PERL_LIB_DIR = $(GLUNIX_DIR)/lib/perl-lib
diff --git a/parallel/glunix/patches/patch-bg b/parallel/glunix/patches/patch-bg
index edab732da63..69412d1e4f8 100644
--- a/parallel/glunix/patches/patch-bg
+++ b/parallel/glunix/patches/patch-bg
@@ -1,7 +1,7 @@
-$NetBSD: patch-bg,v 1.2 2000/06/16 23:40:18 wiz Exp $
+$NetBSD: patch-bg,v 1.3 2000/07/10 23:54:23 wiz Exp $
 
 --- progs/glupart/glupart_script.pl.orig	Wed Nov  5 17:30:11 1997
-+++ progs/glupart/glupart_script.pl	Tue Jun 13 13:13:12 2000
++++ progs/glupart/glupart_script.pl	Thu Jun 29 15:48:34 2000
 @@ -75,3 +75,3 @@
  my $gl_tmpFile = "$gl_dataDir/.__glupart$$-tmp";
 -my $gl_emailAdmin = "glunix-admin\@now.CS.Berkeley.EDU";
@@ -27,8 +27,24 @@ $NetBSD: patch-bg,v 1.2 2000/06/16 23:40:18 wiz Exp $
  	    print "Created file $f\n";
 +	    system("/usr/sbin/chown glunix:glunix $f");
  	}
-@@ -1995,3 +1997,3 @@
+@@ -1995,3 +1997,5 @@
  if ($command eq "install") {
 -    if ($> != 0) {
++    my $tid = $>;
++
 +    if ($< != 0) {
  	print STDERR "You must be root to do \"glupart install\"\n";
+@@ -1999,2 +2003,5 @@
+     }
++    if ($< == 0 && $> != 0) {
++        $> = $<;
++    }
+     &my_mkdir($gl_dataDir);
+@@ -2002,2 +2009,7 @@
+ 	      $gl_reservationFile, $gl_lockFile, $gl_logFile);
++
++    if ($> != $tid) {
++        $> = $tid;
++    }
++
+     exit(0);
diff --git a/parallel/glunix/patches/patch-bh b/parallel/glunix/patches/patch-bh
index 8d7b56c9404..eaa7d07ae90 100644
--- a/parallel/glunix/patches/patch-bh
+++ b/parallel/glunix/patches/patch-bh
@@ -1,13 +1,26 @@
-$NetBSD: patch-bh,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bh,v 1.2 2000/07/10 23:54:24 wiz Exp $
 
---- progs/tools/run_glunix_script.pl.orig	Wed Nov  5 13:44:28 1997
-+++ progs/tools/run_glunix_script.pl	Thu Apr  2 21:40:47 1998
-@@ -15,3 +15,3 @@
+--- progs/tools/run_glunix_script.pl.orig	Wed Nov  5 15:44:28 1997
++++ progs/tools/run_glunix_script.pl	Thu Jun 22 00:31:41 2000
+@@ -6,20 +6,21 @@
+ # These machines have to be able to do a root rsh to all other machines in
+ # the cluster.
+ @ok_hostnames = ("%%MASTER_HOSTNAME%%");
+-@ok_people = ("ghorm", "glunix", "root");    # These people are allowed to
+-                                             # modify the production cluster
+-@dont_notify_people = ("ghorm", "jcoates");  # Don't send mail if these people
+-                                             # do things.
++@ok_people = ("glunix", "root");	# These people are allowed to
++					# modify the production cluster
++@dont_notify_people = ();		# Don't send mail if these people
++					# do things.
+ 
+ $root_dir = "%%GLUNIX_DIR%%";
  $data_dir = "%%GLUNIX_DATA_DIR%%";
 -$release_dir = "$root_dir/release";
 +$release_dir = "$root_dir";
  $devel_dir = "$root_dir/devel";
-@@ -19,5 +19,6 @@
+ $perl_lib = "%%PERL_LIB_DIR%%";
  $run_glunix_agent = "%%INSTALL_DIR%%/bin/run_glunix_agent";
 -$command_master = "u";    # The preferred location of the master
 +# The preferred location of the master
@@ -16,10 +29,25 @@ $NetBSD: patch-bh,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
 -$admin_email = "glunix-admin\@now.cs";
 +$admin_email = "root";
  $questions_email = "glunix\@now.cs.berkeley.edu";
-@@ -550,4 +551,4 @@
+ $glunix_platform = "%%GLUNIX_PLATFORM%%";
+ $rsh_command = "%%RSH_PATH%%";
+@@ -548,8 +549,8 @@
+ 	    next;
+ 	}
  	$full_hostname = &expand_hostname($host);
 -	$ping_str = `/usr/sbin/ping -v $full_hostname 2`;
 -	if ($ping_str =~ m/$full_hostname.* is alive/) {
 +	$ping_str = `/sbin/ping -o $full_hostname`;
-+	if ($ping_str =~ m/1 packets transmitted, 1 packets received, 0% packet loss/) {
++	if ($ping_str =~ m/1 packets transmitted, 1 packets received/) {
  	    push(@alive, $host);
+ 	    print "$host ";
+ 	} else {
+@@ -1097,7 +1098,7 @@
+ 
+     foreach $pid (keys %children) {
+ 	kill(2, $pid);
+-	print STDERR &expand_hostname(${children{$pid}}), ".CS.Berkeley.EDU: timed out\n";
++	print STDERR &expand_hostname(${children{$pid}}), ": timed out\n";
+     }
+ }
+