Update ClusterIt to 2.5.

Major enhancements:
A new program, dtop, allows the user to run top across multiple machines
and collate the results in real-time. The default remote commands have
been changed over to ssh from rsh. A test option has been added to all
commands to check if SSH is up and running before attempting an SSH
connection that might otherwise hang. A flag has been added to dsh
allowing the user to copy, execute, and delete a script on all machines
in one step. There are many other small bugfixes and enhancements.

8 files changed, 40 insertions, 43 deletions

diff --git a/parallel/clusterit/Makefile b/parallel/clusterit/Makefile
index 8a6d859bd82..b0866b3446f 100644
--- a/parallel/clusterit/Makefile
+++ b/parallel/clusterit/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.17 2007/02/02 00:34:13 joerg Exp $
+# $NetBSD: Makefile,v 1.18 2008/02/27 21:52:16 garbled Exp $
 
-DISTNAME=		clusterit-2.4
-PKGREVISION=		1
+DISTNAME=		clusterit-2.5
+#PKGREVISION=		1
 CATEGORIES=		parallel
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=clusterit/}
 
diff --git a/parallel/clusterit/PLIST b/parallel/clusterit/PLIST
index ea43fa655bd..1292696ffdf 100644
--- a/parallel/clusterit/PLIST
+++ b/parallel/clusterit/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2005/06/02 20:48:12 garbled Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/02/27 21:52:16 garbled Exp $
 bin/barrier
 bin/barrierd
 bin/rseq
 bin/run
 bin/dsh
+bin/dtop
 bin/pcp
 bin/pdf
 bin/prm
@@ -18,6 +19,7 @@ man/man1/barrierd.1
 man/man1/rseq.1
 man/man1/run.1
 man/man1/dsh.1
+man/man1/dtop.1
 man/man1/pcp.1
 man/man1/pdf.1
 man/man1/prm.1
diff --git a/parallel/clusterit/distinfo b/parallel/clusterit/distinfo
index 7c0ec1e05ad..3b115ff4da3 100644
--- a/parallel/clusterit/distinfo
+++ b/parallel/clusterit/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.12 2006/03/03 18:57:25 kristerw Exp $
+$NetBSD: distinfo,v 1.13 2008/02/27 21:52:16 garbled Exp $
 
-SHA1 (clusterit-2.4.tar.gz) = 60ac72f9e40e3930a3be41a5dfea2b68ab261d67
-RMD160 (clusterit-2.4.tar.gz) = b90d63dfd4a32b547bbf63838a1b896dea181a76
-Size (clusterit-2.4.tar.gz) = 286448 bytes
-SHA1 (patch-aa) = d75943ef99095a5e9352197fc00d1f6734127885
-SHA1 (patch-ab) = 4db34b93ebc1ef52f7911f19d2721a072fba6e0a
-SHA1 (patch-ac) = 925754f24413182bb66f6d81f6fa026ce2635390
-SHA1 (patch-ad) = 22cc3d33288ac377f24172f9c8097de84e18fc0b
-SHA1 (patch-ae) = 49bb2d730ecd4ecc06b5f2d1b2383cc88bf3e0e5
+SHA1 (clusterit-2.5.tar.gz) = 65d36116665179dd16029ac53182fde92d868020
+RMD160 (clusterit-2.5.tar.gz) = b08f7903bc90375e45a733ef843df3e9bf216bb7
+Size (clusterit-2.5.tar.gz) = 295347 bytes
+SHA1 (patch-aa) = 15b4db813a8cb91b2c2ac277297fe4394637e804
+SHA1 (patch-ab) = 32a8efdbf45226a7ec1a7a190ff7fae9e2bfe2ae
+SHA1 (patch-ac) = d3c66a9f8e48fbc0e3471de71d91b7601400f74b
+SHA1 (patch-ad) = 01935f2e2e2d308a148c26186e04912ad6c8d88d
+SHA1 (patch-ae) = d3cb2da90a7b4ee9d027c4ccd63d549cdbe48a73
diff --git a/parallel/clusterit/patches/patch-aa b/parallel/clusterit/patches/patch-aa
index d01ca33650d..aa0aaeb3683 100644
--- a/parallel/clusterit/patches/patch-aa
+++ b/parallel/clusterit/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.7 2006/03/03 18:57:25 kristerw Exp $
+$NetBSD: patch-aa,v 1.8 2008/02/27 21:52:16 garbled Exp $
 
---- common/common.c.orig	2006-02-16 20:23:31.000000000 +0000
-+++ common/common.c
-@@ -122,7 +122,6 @@ parse_cluster(char **exclude)
+--- common/common.c.orig	2008-02-27 14:35:30.000000000 -0700
++++ common/common.c	2008-02-27 14:37:18.000000000 -0700
+@@ -186,7 +186,6 @@
      char *clusterfile, *p, *nodename, *q;
      int i, j, g, fail, gfail, lumping, n, ging;
      char buf[MAXBUF];
@@ -10,11 +10,12 @@ $NetBSD: patch-aa,v 1.7 2006/03/03 18:57:25 kristerw Exp $
      group_t *grouptemp;
      node_t *nodeptr;
      char **lumptemp;
-@@ -397,7 +396,6 @@ int test_node_connection(int rshport, in
+@@ -633,8 +632,6 @@
  void
  _bailout(int line, char *file)
  {
 -    extern int errno;
- 	
+-	
      (void)fprintf(stderr, "%s: Failed in %s line %d: %s %d\n",
  		  progname, file, line, strerror(errno), errno);
+     _exit(EXIT_FAILURE);
diff --git a/parallel/clusterit/patches/patch-ab b/parallel/clusterit/patches/patch-ab
index 09f03010fe8..79bc6093117 100644
--- a/parallel/clusterit/patches/patch-ab
+++ b/parallel/clusterit/patches/patch-ab
@@ -1,12 +1,12 @@
-$NetBSD: patch-ab,v 1.2 2006/02/16 20:43:41 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2008/02/27 21:52:16 garbled Exp $
 
---- dsh/rseq.c.orig	2006-02-16 20:24:57.000000000 +0000
-+++ dsh/rseq.c
-@@ -45,7 +45,4 @@ __RCSID("$Id: rseq.c,v 1.19 2006/01/24 1
+--- dsh/rseq.c.orig	2008-02-27 14:35:38.000000000 -0700
++++ dsh/rseq.c	2008-02-27 14:37:28.000000000 -0700
+@@ -48,7 +48,6 @@
  #endif
  
--/* externs */
+ /* externs */
 -extern int errno;
--
+ 
  void do_command(char **argv, int allrun, char *username);
  node_t *check_seq(void);
diff --git a/parallel/clusterit/patches/patch-ac b/parallel/clusterit/patches/patch-ac
index cc3b91a70f7..b67325fb6dd 100644
--- a/parallel/clusterit/patches/patch-ac
+++ b/parallel/clusterit/patches/patch-ac
@@ -1,11 +1,8 @@
-$NetBSD: patch-ac,v 1.1 2006/01/02 22:51:45 joerg Exp $
-
---- dsh/run.c.orig	2006-01-02 22:44:29.000000000 +0000
-+++ dsh/run.c
-@@ -45,6 +45,4 @@ __RCSID("$Id: run.c,v 1.13 2005/06/02 17
+--- dsh/run.c.orig	2008-02-27 12:29:38.000000000 -0700
++++ dsh/run.c	2008-02-27 14:49:30.000000000 -0700
+@@ -48,5 +48,4 @@
  #endif
  
 -extern int errno;
--
+ 
  void do_command(char **argv, int allrun, char *username);
- node_t *check_rand(void);
diff --git a/parallel/clusterit/patches/patch-ad b/parallel/clusterit/patches/patch-ad
index c2a46fc9599..ba6ae19bb0d 100644
--- a/parallel/clusterit/patches/patch-ad
+++ b/parallel/clusterit/patches/patch-ad
@@ -1,11 +1,8 @@
-$NetBSD: patch-ad,v 1.1 2006/01/02 22:51:45 joerg Exp $
-
---- pcp/pcp.c.orig	2006-01-02 22:45:27.000000000 +0000
-+++ pcp/pcp.c
-@@ -47,6 +47,4 @@ __RCSID("$Id: pcp.c,v 1.14 2005/06/02 17
+--- pcp/pcp.c.orig	2008-02-27 12:29:47.000000000 -0700
++++ pcp/pcp.c	2008-02-27 14:49:30.000000000 -0700
+@@ -51,5 +51,4 @@
  #endif
  
 -extern int errno;
--
+ 
  void do_copy(char **argv, int recurse, int preserve, char *username);
- void paralell_copy(char *rcp, char *args, char *username, char *source_file,
diff --git a/parallel/clusterit/patches/patch-ae b/parallel/clusterit/patches/patch-ae
index 2186f54f4ed..d57e0a6dd8c 100644
--- a/parallel/clusterit/patches/patch-ae
+++ b/parallel/clusterit/patches/patch-ae
@@ -1,8 +1,8 @@
-$NetBSD: patch-ae,v 1.1 2006/01/02 22:51:45 joerg Exp $
+$NetBSD: patch-ae,v 1.2 2008/02/27 21:52:16 garbled Exp $
 
---- rvt/command.c.orig	2006-01-02 22:47:41.000000000 +0000
-+++ rvt/command.c
-@@ -453,7 +453,6 @@ int flags;
+--- rvt/command.c.orig	2008-02-27 14:35:55.000000000 -0700
++++ rvt/command.c	2008-02-27 14:37:56.000000000 -0700
+@@ -453,7 +453,6 @@
  	unsigned char *s;
  	int count, sv;
  	unsigned char mask = is_eightbit() ? 0xff : 0x7f;