Apply patches provided in pkg/10355 by Gabriel Rosenkoetter

<gr@sirius.eclipsed.net>. Also fix compilation on -current machines
after removal of vm/vm_swap.h, and silence a compile time warning.

5 files changed, 47 insertions, 31 deletions

diff --git a/parallel/glunix/files/patch-sum b/parallel/glunix/files/patch-sum
index 970179fbc55..94b9b4b1a6c 100644
--- a/parallel/glunix/files/patch-sum
+++ b/parallel/glunix/files/patch-sum
@@ -1,4 +1,4 @@
-$NetBSD: patch-sum,v 1.2 2000/05/27 09:53:37 wiz Exp $
+$NetBSD: patch-sum,v 1.3 2000/06/16 23:40:16 wiz Exp $
 
 MD5 (patch-aa) = f07a5edea1b3986a994019f889db2e16
 MD5 (patch-ab) = a29f0a2b4373e5ae8992de12da412637
@@ -9,7 +9,7 @@ MD5 (patch-af) = 98bff8429752d701b71807ec7c523642
 MD5 (patch-ag) = 8a7f82c2b368977f3a7cc244d07406d5
 MD5 (patch-ah) = 4f20a20d71cbd6e9ad2f432f140e3b65
 MD5 (patch-ai) = 7af8388fd2e559b6c0a7b631a23be862
-MD5 (patch-aj) = 34f22fcb33900554aaf854e4e210379a
+MD5 (patch-aj) = 219535bf02e2c60f9b137ae467745425
 MD5 (patch-ak) = 7301cf519dff38dc1af803ede30c9b2a
 MD5 (patch-al) = c1123254c24e6c90d0c3343f44daf0ca
 MD5 (patch-am) = 4b00af8bc9621552081e5c51db9b7474
@@ -32,7 +32,7 @@ MD5 (patch-bc) = 14fe9420c1ef4c6c55d1191b8b3a0664
 MD5 (patch-bd) = e8983f77078a10d76b85f8e3a9bd556d
 MD5 (patch-be) = c776554d9e12e40cf2bfb0d89b9099db
 MD5 (patch-bf) = 604051079dd49aabc0ed9131c602ecad
-MD5 (patch-bg) = 0dca4c14aee14010f638abfee955e52f
+MD5 (patch-bg) = ce823ccbaa15e7f4c3c2c75bde01f62d
 MD5 (patch-bh) = 1cedb1a8d84d546645ffe7596b749d6e
 MD5 (patch-bi) = a26f1b6382f0b6f41228161e9a7dd8bf
 MD5 (patch-bj) = c185d584fabf8d8236c4c127ced77624
@@ -40,7 +40,7 @@ MD5 (patch-bk) = d49926dd5b8b8bd163cc926248b1733b
 MD5 (patch-bl) = 2f6d5c1dd63f4cad716897486642157e
 MD5 (patch-bm) = 3a858ff75d4462bfaaaaa40ed154ead0
 MD5 (patch-bn) = a9f6530aac5464a555e5f5d168244677
-MD5 (patch-bo) = 84807c1d5cd00f71e5519efe714fea62
+MD5 (patch-bo) = 0af0763a2442c8493fc11313bab80309
 MD5 (patch-bp) = e441a589a1395575966e3166f667d1df
 MD5 (patch-bq) = c481e461f7c01f1ee1b9af5a4d08bde2
 MD5 (patch-br) = 9f70ba7d032226d170d521aabb085efc
@@ -57,3 +57,4 @@ MD5 (patch-cb) = a12d38c019989340f3b8ca6827ea2a08
 MD5 (patch-cc) = ed34b21d01010e6d110731067c3e6001
 MD5 (patch-cd) = 7bf43d3b9981139957e530971b7f747d
 MD5 (patch-ce) = 0325fe083c42fa08139012eb7d8996c5
+MD5 (patch-cf) = 02cf69bae0e04d31a684f63c41e3005e
diff --git a/parallel/glunix/patches/patch-aj b/parallel/glunix/patches/patch-aj
index 6b8780009d4..3f6a0cafa9c 100644
--- a/parallel/glunix/patches/patch-aj
+++ b/parallel/glunix/patches/patch-aj
@@ -1,8 +1,8 @@
-$NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
+$NetBSD: patch-aj,v 1.3 2000/06/16 23:40:17 wiz Exp $
 
 --- glunix/src/idle/didle_sysinfo.cc.orig	Thu Sep 18 21:04:55 1997
-+++ glunix/src/idle/didle_sysinfo.cc	Fri May 26 14:44:45 2000
-@@ -95,14 +95,29 @@
++++ glunix/src/idle/didle_sysinfo.cc	Sat Jun 17 01:07:46 2000
+@@ -95,14 +95,33 @@
  #include <kvm.h>
  #include <nlist.h>
  #include <stdio.h>
@@ -13,7 +13,11 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
 +#include <sys/param.h>
 +#include <sys/proc.h>
 +#include <miscfs/procfs/procfs.h>
++#if __NetBSD_Version__ < 104000200
 +#include <vm/vm_swap.h>
++#else /* moved to sys in 1.4.2 */
++#include <sys/swap.h>
++#endif
 +#include <sys/sysctl.h>
 +#else
  #include <sys/proc.h>
@@ -32,7 +36,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
  
  #include "clist.h"
  #include "cidle.h"
-@@ -120,12 +135,51 @@
+@@ -120,12 +139,51 @@
  
  #define LOADDOUBLE(la) ((double)(la) / FSCALE)
  #define HASH(x) ((x) >> 1)
@@ -85,7 +89,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
  /* definitions for indices in the nlist array */
  #define X_AVENRUN		 0
  #define X_MPID			 1
-@@ -165,11 +219,11 @@
+@@ -165,11 +223,11 @@
  
  // These are offsets into kmem for the stats we need
  static ulong avenrunOffset, availrmemOffset, anoninfoOffset, swapfsOffset;
@@ -99,7 +103,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
  static int cpuStates[NUM_CPUSTATES];
  static int memoryStats[5];
  static char *cpuStateNames[] =
-@@ -237,6 +291,45 @@
+@@ -237,6 +295,45 @@
   *
   * Side effects:
   *****************************************************************************/
@@ -145,7 +149,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
  Bool
  Idle_InitializeSysinfo(void)
  {
-@@ -301,7 +394,7 @@
+@@ -301,7 +398,7 @@
  
      return True;
  }
@@ -154,7 +158,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
  /******************************************************************************
   * Idle_CleanupSysinfo --
   *    Description of purpose and function of the procedure
-@@ -333,18 +426,30 @@
+@@ -333,18 +430,30 @@
   *
   * Side effects:
   *****************************************************************************/
@@ -186,7 +190,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
  	    /* Has this pid been recycled?  Are we hitting a very old process?
  	       If so, then reset the entry */
  	    if (usage < candidate->cpuUsage) {
-@@ -353,7 +458,11 @@
+@@ -353,7 +462,11 @@
  	    return candidate;
  	}
  	if (candidate->pid == -1) {
@@ -198,7 +202,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
  	    candidate->cpuUsage = 0;
  	    return candidate;
  	}
-@@ -379,10 +488,17 @@
+@@ -379,10 +492,17 @@
   *
   * Side effects:
   *****************************************************************************/
@@ -216,7 +220,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
      ASSERT(entry != NULL);
      entry->cpuUsage = usage;
  }
-@@ -408,12 +524,24 @@
+@@ -408,12 +528,24 @@
  void
  Idle_GetSysInfo(Idle_Load *total, Idle_Load *seq, List_List *glunixProcs)
  {
@@ -241,7 +245,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
      static struct timeval  lastTime = {0, 0};
      struct timeval         currTime;
      double                 alpha, beta;
-@@ -459,6 +587,33 @@
+@@ -459,6 +591,33 @@
      vmInUse[TOTAL] = 0; vmInUse[SEQUENTIAL] = 0;
      cpuUsage[TOTAL] = 0; cpuUsage[SEQUENTIAL] = 0;
      numProcs = 0;
@@ -275,7 +279,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
      rewinddir(procdir);
      
      while ((direntp = readdir(procdir)) != 0) {
-@@ -493,6 +648,7 @@
+@@ -493,6 +652,7 @@
  	(void) close(fd);
  	numProcs++;
      }
@@ -283,7 +287,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
      total->mem = activeMemory[TOTAL];
      total->cpu = cpuUsage[TOTAL];
      seq->mem = activeMemory[SEQUENTIAL];
-@@ -503,10 +659,21 @@
+@@ -503,10 +663,21 @@
  void
  Idle_GetSystemInfo(Idle_SystemLoad *sysLoad)
  {
@@ -307,7 +311,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
  
      if (kd == NULL) {
  	sysLoad->loadAvg[0] = 0;
-@@ -515,7 +682,48 @@
+@@ -515,7 +686,48 @@
  	sysLoad->memory = 0;
  	return;
      }
@@ -356,7 +360,7 @@ $NetBSD: patch-aj,v 1.2 2000/05/27 09:53:37 wiz Exp $
      /* get load average array */
      ReadKernelData(avenrunOffset, (char *) avenrun, sizeof (avenrun));
      //
-@@ -539,6 +747,7 @@
+@@ -539,6 +751,7 @@
      sysLoad->memory = PAGETOK(MAX(ani_max - ani_resv, 0) +
  			      availrmem - swapfs_minfree);
  
diff --git a/parallel/glunix/patches/patch-bg b/parallel/glunix/patches/patch-bg
index f19b938918d..edab732da63 100644
--- a/parallel/glunix/patches/patch-bg
+++ b/parallel/glunix/patches/patch-bg
@@ -1,7 +1,7 @@
-$NetBSD: patch-bg,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bg,v 1.2 2000/06/16 23:40:18 wiz Exp $
 
---- progs/glupart/glupart_script.pl.orig	Wed Nov  5 15:30:11 1997
-+++ progs/glupart/glupart_script.pl	Thu Apr  2 21:55:30 1998
+--- 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
 @@ -75,3 +75,3 @@
  my $gl_tmpFile = "$gl_dataDir/.__glupart$$-tmp";
 -my $gl_emailAdmin = "glunix-admin\@now.CS.Berkeley.EDU";
@@ -27,10 +27,8 @@ $NetBSD: patch-bg,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
  	    print "Created file $f\n";
 +	    system("/usr/sbin/chown glunix:glunix $f");
  	}
-@@ -1995,3 +1997,5 @@
+@@ -1995,3 +1997,3 @@
  if ($command eq "install") {
 -    if ($> != 0) {
-+    if ($> != 0 && $< == 0) {
-+	($<,$>) = ($>,$<);
-+    } else {
++    if ($< != 0) {
  	print STDERR "You must be root to do \"glupart install\"\n";
diff --git a/parallel/glunix/patches/patch-bo b/parallel/glunix/patches/patch-bo
index 455614df8e7..d3c284e5082 100644
--- a/parallel/glunix/patches/patch-bo
+++ b/parallel/glunix/patches/patch-bo
@@ -1,7 +1,7 @@
-$NetBSD: patch-bo,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
+$NetBSD: patch-bo,v 1.2 2000/06/16 23:40:18 wiz Exp $
 
---- progs/glupart/glupart.c.orig	Thu Sep 18 14:01:35 1997
-+++ progs/glupart/glupart.c	Thu Apr  9 11:37:35 1998
+--- progs/glupart/glupart.c.orig	Thu Sep 18 17:01:35 1997
++++ progs/glupart/glupart.c	Tue Jun 13 14:44:12 2000
 @@ -1,18 +1,40 @@
  #include <stdio.h>
  #include <sys/types.h>
@@ -24,7 +24,7 @@ $NetBSD: patch-bo,v 1.1.1.1 1998/10/21 19:59:30 garbled Exp $
 +#endif
  
 -#define progPath     "/usr/now/bin/glupart_script"
-+#define progPath     "%%%NOW_ROOT%%%/now/bin/glupart_script"
++#define progPath     "%%%NOW_ROOT%%%/bin/glupart_script"
  
  int
  main(int argc, char **argv) {
diff --git a/parallel/glunix/patches/patch-cf b/parallel/glunix/patches/patch-cf
new file mode 100644
index 00000000000..a770597f35c
--- /dev/null
+++ b/parallel/glunix/patches/patch-cf
@@ -0,0 +1,13 @@
+$NetBSD: patch-cf,v 1.1 2000/06/16 23:40:18 wiz Exp $
+
+--- glunix/src/perf/cperf_collector.h.orig	Fri Sep  5 21:30:06 1997
++++ glunix/src/perf/cperf_collector.h	Sat Jun 17 01:13:40 2000
+@@ -87,7 +87,7 @@
+ 		   int numExpected);
+     ~Perf_Collector(void);
+ 
+-    CollectTicket(timeval *endTime);
++    int CollectTicket(timeval *endTime);
+ 
+ private:
+     Bool         enabled;