Upgrade arla to 0.35.9

Fixes two security holes: 'xdr'-bug (in vos, not in arlad), and
xfs failes to check for negative numbers in pioctl.

Additional changes: NetBSD/sparc64 now supported, 'themis' added,
local locking, bug fixes.

See http://www.stacken.kth.se/lists/arla-drinkers/2002-08/msg00019.html

19 files changed, 1030 insertions, 6 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 5d82aa3ea69..cd681eb185b 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.23 2002/08/07 08:30:50 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2002/08/20 17:47:40 wennmach Exp $
 #
 
-DISTNAME=		arla-0.35.8
+DISTNAME=		arla-0.35.9
 CATEGORIES=		net security
 MASTER_SITES=		ftp://ftp.stacken.kth.se/pub/arla/
 
diff --git a/net/arla/PLIST b/net/arla/PLIST
index 1bb82427c54..8678a7e4106 100644
--- a/net/arla/PLIST
+++ b/net/arla/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2002/08/07 08:30:50 jlam Exp $
+@comment $NetBSD: PLIST,v 1.8 2002/08/20 17:47:40 wennmach Exp $
 bin/aklog
 bin/amon
 bin/bos
@@ -7,6 +7,7 @@ bin/kalog
 bin/klog
 bin/pts
 bin/rxdebug
+bin/themis
 bin/tokens
 bin/udebug
 bin/unlog
@@ -86,6 +87,7 @@ man/man1/kalog.1
 man/man1/klog.1
 man/man1/pts.1
 man/man1/rxdebug.1
+man/man1/themis.1 
 man/man1/tokens.1
 man/man1/udebug.1   
 man/man1/unlog.1
diff --git a/net/arla/distinfo b/net/arla/distinfo
index 84250e652fe..7ae196b2934 100644
--- a/net/arla/distinfo
+++ b/net/arla/distinfo
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.5 2002/07/12 20:40:31 wiz Exp $
+$NetBSD: distinfo,v 1.6 2002/08/20 17:47:40 wennmach Exp $
 
-SHA1 (arla-0.35.8.tar.gz) = 6dbe39f0f35cf1d295440299d6cb4937af589040
-Size (arla-0.35.8.tar.gz) = 1315459 bytes
+SHA1 (arla-0.35.9.tar.gz) = e61f73dced5ec2951d7f0641bfdd6e1acb2cacaa
+Size (arla-0.35.9.tar.gz) = 1341786 bytes
 SHA1 (patch-ac) = a1d725edea6aaf3711c0d62a5ab5acd84d5fe4b7
 SHA1 (patch-ad) = c5c33c0daf8174b2f8f76119f97725cd61015bb6
 SHA1 (patch-ae) = f9255bc814f38cb8309380a44c1942d3d2cb233e
@@ -10,3 +10,19 @@ SHA1 (patch-ah) = 8386d4062aedbfe24c66cad84cfdcf3a2617848e
 SHA1 (patch-ak) = 2ff053009ac94ea23b24494462e79e7507c0c1cb
 SHA1 (patch-as) = 28d61906be25fc803882d4ccbe584f57e51dec63
 SHA1 (patch-at) = 190da9b9d9da90166845383856508187d9d1ca8f
+SHA1 (patch-bd) = b57dceb3e40b82c199c599152b5273cd2555dbe8
+SHA1 (patch-be) = 36c91dfa86c6c02a776719ce3dd82ec1f58bc115
+SHA1 (patch-bf) = 45bb388b29964bb32311253ac2d13d22b87a234a
+SHA1 (patch-bg) = dc9dcc97874b5bbc252c4e0003ac4e7b86c29023
+SHA1 (patch-bh) = 7985e6c49f40ca947213c47d37068792abdfb14f
+SHA1 (patch-bi) = 8c371c3ee33369df1b4dcf5418b5e5fba639d2cd
+SHA1 (patch-bj) = 2a2f499728ebd47c0c4550aee00d6334c497383e
+SHA1 (patch-bk) = 074fab7ad42a526568784efff4c0170c7c4960f3
+SHA1 (patch-bl) = 9d7c8b428a26301ae8c16c0c81d72401557b04db
+SHA1 (patch-bm) = 297fe31840acc356db084621a9dc9ee298ce1723
+SHA1 (patch-bn) = 1a38d4c64bf83496f8e93f19f2cb0d23f7df8a7f
+SHA1 (patch-bo) = 1043ac2eda88c7453036a69b79a2a68029f58470
+SHA1 (patch-bp) = 36da1e63e93c54be548c65a1ba79fd43f89c9df8
+SHA1 (patch-bq) = 1add9568dbe3fec36960bcaccba8329cb5988fb0
+SHA1 (patch-br) = 8862fc87d0aa5fa316f1c3a84dfc29e06cacb562
+SHA1 (patch-bs) = 93ecb3788f9d057ad7dd00864fcf049e222fd636
diff --git a/net/arla/patches/patch-bd b/net/arla/patches/patch-bd
new file mode 100644
index 00000000000..06ee5e4b5c0
--- /dev/null
+++ b/net/arla/patches/patch-bd
@@ -0,0 +1,23 @@
+# $NetBSD: patch-bd,v 1.1 2002/08/20 17:47:41 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- lib/sl/make_cmds.c.orig	Tue Aug 20 16:52:43 2002
++++ lib/sl/make_cmds.c	Tue Aug 20 16:58:20 2002
+@@ -213,7 +213,16 @@
+ {
+     int optind = 0;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__)
+     setprogname(argv[0]);
++#endif
+     if(getarg(args, sizeof(args)/sizeof(*args), argc, argv, &optind))
+ 	usage(1);
+     if(help_flag)
diff --git a/net/arla/patches/patch-be b/net/arla/patches/patch-be
new file mode 100644
index 00000000000..e0748a91dc5
--- /dev/null
+++ b/net/arla/patches/patch-be
@@ -0,0 +1,23 @@
+# $NetBSD: patch-be,v 1.1 2002/08/20 17:47:42 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- lib/cmd/testc.c.orig	Tue Aug 20 17:11:59 2002
++++ lib/cmd/testc.c	Tue Aug 20 17:12:37 2002
+@@ -103,7 +103,16 @@
+     struct cmd_syndesc *ts;
+     int ret;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__)   
+     setprogname (argv[0]);
++#endif
+ 
+     ts = cmd_CreateSyntax (NULL, MainProc, NULL, "foo");
+ 
diff --git a/net/arla/patches/patch-bf b/net/arla/patches/patch-bf
new file mode 100644
index 00000000000..baa514afa47
--- /dev/null
+++ b/net/arla/patches/patch-bf
@@ -0,0 +1,23 @@
+# $NetBSD#
+
+On NetBSD, comment out call to setgetprogname().
+
+--- lib/ko/gensysname.c.orig	Tue Aug 20 17:17:51 2002
++++ lib/ko/gensysname.c	Tue Aug 20 17:18:26 2002
+@@ -249,7 +249,16 @@
+     int found = 0;
+     int optind = 0;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (agetarg (args, argc, argv, &optind, AARG_GNUSTYLE)) 
+ 	usage();
diff --git a/net/arla/patches/patch-bg b/net/arla/patches/patch-bg
new file mode 100644
index 00000000000..c341228ba5f
--- /dev/null
+++ b/net/arla/patches/patch-bg
@@ -0,0 +1,28 @@
+# $NetBSD: patch-bg,v 1.1 2002/08/20 17:47:42 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname(). 
+
+--- lib/ko/kotest.c.orig	Tue Aug 20 17:23:43 2002
++++ lib/ko/kotest.c	Tue Aug 20 17:27:36 2002
+@@ -56,9 +56,20 @@
+     int ret = 0;
+     Log_method *method;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__) 
+     setprogname(argv[0]);
+-
+     method = log_open(getprogname(), "/dev/stderr");
++#else
++    method = log_open("kotest", "/dev/stderr");
++#endif  
++
+     if (method == NULL)
+ 	errx (1, "log_open failed");
+     cell_init(0, method);
diff --git a/net/arla/patches/patch-bh b/net/arla/patches/patch-bh
new file mode 100644
index 00000000000..decb75e96b1
--- /dev/null
+++ b/net/arla/patches/patch-bh
@@ -0,0 +1,23 @@
+# $NetBSD: patch-bh,v 1.1 2002/08/20 17:47:43 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- xfs/bsd/bin/mount_xfs.c.orig	Tue Aug 20 17:34:04 2002
++++ xfs/bsd/bin/mount_xfs.c	Tue Aug 20 17:34:52 2002
+@@ -62,7 +62,16 @@
+ #ifdef HAVE_OPTRESET
+     optreset = 1;
+ #endif
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__) 
+     setprogname(argv[0]);
++#endif
+     while ((ch = getopt(argc, argv, "o:F:")) != -1)
+ 	switch (ch) {
+ 	case 'o':
diff --git a/net/arla/patches/patch-bi b/net/arla/patches/patch-bi
new file mode 100644
index 00000000000..cd368632f79
--- /dev/null
+++ b/net/arla/patches/patch-bi
@@ -0,0 +1,23 @@
+# $NetBSD: patch-bi,v 1.1 2002/08/20 17:47:43 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- xfs/bsd/bin/umount_xfs.c.orig	Tue Aug 20 17:40:34 2002
++++ xfs/bsd/bin/umount_xfs.c	Tue Aug 20 17:41:20 2002
+@@ -47,7 +47,16 @@
+ {
+     int force = 0;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__) 
+     setprogname (argv[0]);
++#endif
+     if (argc != 2 && argc != 3)
+ 	usage();
+ 
diff --git a/net/arla/patches/patch-bj b/net/arla/patches/patch-bj
new file mode 100644
index 00000000000..4dc15193649
--- /dev/null
+++ b/net/arla/patches/patch-bj
@@ -0,0 +1,23 @@
+# $NetBSD: patch-bj,v 1.1 2002/08/20 17:47:43 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- arlad/arla-cli.c.orig	Tue Aug 20 17:48:16 2002
++++ arlad/arla-cli.c	Tue Aug 20 17:49:03 2002
+@@ -687,7 +687,16 @@
+     int optind = 0;
+     int ret;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__) 
+     setprogname (argv[0]);
++#endif
+ 
+     if (getarg (args, sizeof(args)/sizeof(*args), argc, argv, &optind))
+ 	usage (1);
diff --git a/net/arla/patches/patch-bk b/net/arla/patches/patch-bk
new file mode 100644
index 00000000000..fc235112761
--- /dev/null
+++ b/net/arla/patches/patch-bk
@@ -0,0 +1,23 @@
+# $NetBSD: patch-bk,v 1.1 2002/08/20 17:47:43 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- arlad/arlad.c.orig	Tue Aug 20 17:56:40 2002
++++ arlad/arlad.c	Tue Aug 20 17:57:08 2002
+@@ -240,7 +240,16 @@
+     int optind = 0;
+     int ret;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (getarg (args, sizeof(args)/sizeof(*args), argc, argv, &optind))
+ 	usage (1);
diff --git a/net/arla/patches/patch-bl b/net/arla/patches/patch-bl
new file mode 100644
index 00000000000..2750e3c387c
--- /dev/null
+++ b/net/arla/patches/patch-bl
@@ -0,0 +1,31 @@
+# $NetBSD: patch-bl,v 1.1 2002/08/20 17:47:44 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- appl/afsutils/aklog.c.orig	Tue Aug 20 18:03:35 2002
++++ appl/afsutils/aklog.c	Tue Aug 20 18:06:19 2002
+@@ -286,10 +286,24 @@
+     int optind = 0;
+     int rc;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__) 
+     setprogname(argv[0]);
++#endif
+ 
+     ports_init();
++
++#if !defined(__NetBSD__)
+     method = log_open (getprogname(), "/dev/stderr:notime");
++#else
++    method = log_open ("aklog", "/dev/stderr:notime");
++#endif
+     if (method == NULL)
+ 	errx (1, "log_open failed");
+     cell_init(0, method);
diff --git a/net/arla/patches/patch-bm b/net/arla/patches/patch-bm
new file mode 100644
index 00000000000..7767781e3c0
--- /dev/null
+++ b/net/arla/patches/patch-bm
@@ -0,0 +1,27 @@
+# $NetBSD: patch-bm,v 1.1 2002/08/20 17:47:44 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- appl/afsutils/klog.c.orig	Tue Aug 20 18:07:46 2002
++++ appl/afsutils/klog.c	Tue Aug 20 18:09:32 2002
+@@ -498,9 +498,19 @@
+ 
+     char pwbuf[PASSWD_MAX];
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__) 
+     setprogname (argv[0]);
+-
+     method = log_open (getprogname(), "/dev/stderr:notime");
++#else
++    method = log_open ("klog", "/dev/stderr:notime");
++#endif
+     if (method == NULL)
+ 	errx (1, "log_open failed");
+     cell_init(0, method);
diff --git a/net/arla/patches/patch-bn b/net/arla/patches/patch-bn
new file mode 100644
index 00000000000..9c760843369
--- /dev/null
+++ b/net/arla/patches/patch-bn
@@ -0,0 +1,39 @@
+# $NetBSD: patch-bn,v 1.1 2002/08/20 17:47:44 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+ 
+--- appl/kalog/kalog.c.orig	Tue Aug 20 18:17:04 2002
++++ appl/kalog/kalog.c	Tue Aug 20 18:20:52 2002
+@@ -88,9 +88,19 @@
+     const char *cellname;
+     const char *user;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */                     
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
+-
+     method = log_open (getprogname(), "/dev/stderr:notime");
++#else
++    method = log_open ("kalog", "/dev/stderr:notime");
++#endif
+     if (method == NULL)
+ 	errx (1, "log_open failed");
+     cell_init(0, method);
+@@ -104,7 +114,11 @@
+ 	parse_user (argv[1], &user, &cellname);
+     else {
+ 	fprintf (stderr, "usage: %s [username[@cell]]\n",
++#if !defined(__NetBSD__)
+ 		 getprogname());
++#else
++		"kalog");
++#endif
+ 	exit (1);
+     }
+ 
diff --git a/net/arla/patches/patch-bo b/net/arla/patches/patch-bo
new file mode 100644
index 00000000000..52dff9b3f31
--- /dev/null
+++ b/net/arla/patches/patch-bo
@@ -0,0 +1,27 @@
+# $NetBSD: patch-bo,v 1.1 2002/08/20 17:47:45 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- appl/bos/bos.c.orig	Tue Aug 20 18:23:16 2002
++++ appl/bos/bos.c	Tue Aug 20 18:24:24 2002
+@@ -145,9 +145,19 @@
+     Log_method *method;
+     int ret = 0;
+     
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__) 
+     setprogname(argv[0]);
+-
+     method = log_open (getprogname(), "/dev/stderr:notime");
++#else
++    method = log_open ("bos", "/dev/stderr:notime");
++#endif
+     if (method == NULL)
+ 	errx (1, "log_open failed");
+     cell_init(0, method);
diff --git a/net/arla/patches/patch-bp b/net/arla/patches/patch-bp
new file mode 100644
index 00000000000..e05fb7fe397
--- /dev/null
+++ b/net/arla/patches/patch-bp
@@ -0,0 +1,30 @@
+# $NetBSD: patch-bp,v 1.1 2002/08/20 17:47:45 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- appl/pts/pts.c.orig	Tue Aug 20 18:25:47 2002
++++ appl/pts/pts.c	Tue Aug 20 18:26:56 2002
+@@ -1525,10 +1525,23 @@
+     int pos = 0;
+     int i;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__)
+     setprogname(argv[0]);
++#endif
+     tzset();
+ 
++#if !defined(__NetBSD__)
+     method = log_open (getprogname(), "/dev/stderr:notime");
++#else
++    method = log_open ("pts", "/dev/stderr:notime");
++#endif
+     if (method == NULL)
+ 	errx (1, "log_open failed");
+     cell_init(0, method);
diff --git a/net/arla/patches/patch-bq b/net/arla/patches/patch-bq
new file mode 100644
index 00000000000..a217cc15460
--- /dev/null
+++ b/net/arla/patches/patch-bq
@@ -0,0 +1,23 @@
+# $NetBSD: patch-bq,v 1.1 2002/08/20 17:47:45 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- appl/themis/themis.c.orig	Tue Aug 20 18:28:42 2002
++++ appl/themis/themis.c	Tue Aug 20 18:29:14 2002
+@@ -2285,7 +2285,16 @@
+     char *file;
+     int optind = 0;
+ 
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__) 
+     setprogname(argv[0]);
++#endif
+ 
+     if (getarg (args, sizeof(args)/sizeof(*args), argc, argv, &optind))
+ 	usage (1);
diff --git a/net/arla/patches/patch-br b/net/arla/patches/patch-br
new file mode 100644
index 00000000000..fc17ab7155e
--- /dev/null
+++ b/net/arla/patches/patch-br
@@ -0,0 +1,30 @@
+# $NetBSD: patch-br,v 1.1 2002/08/20 17:47:45 wennmach Exp $
+
+On NetBSD, comment out call to setgetprogname().
+
+--- appl/vos/vos.c.orig	Tue Aug 20 18:30:28 2002
++++ appl/vos/vos.c	Tue Aug 20 18:31:24 2002
+@@ -147,10 +147,23 @@
+     Log_method *method;
+     int ret = 0;
+     
++/*
++ * The setprogname(3) function was introduced in NetBSD 1.6.
++ * It is a function provided for compatibility, and in NetBSD,
++ * calling setprogname() from main() has no effect.
++ * In order to for this to work on older NetBSD systems,
++ * we just comment the call to setprogname() out.
++ */
++#if !defined(__NetBSD__)
+     setprogname(argv[0]);
++#endif
+     tzset();
+ 
++#if !defined(__NetBSD__)
+     method = log_open (getprogname(), "/dev/stderr:notime");
++#else
++    method = log_open ("vos", "/dev/stderr:notime");
++#endif
+     if (method == NULL)
+ 	errx (1, "log_open failed");
+     cell_init(0, method);
diff --git a/net/arla/patches/patch-bs b/net/arla/patches/patch-bs
new file mode 100644
index 00000000000..8d5f4554d7f
--- /dev/null
+++ b/net/arla/patches/patch-bs
@@ -0,0 +1,610 @@
+# $NetBSD
+
+Eradicate setprogname() on NetBSD.
+Kill me for doing this for many programs in one patch, but I've got
+RSI now in both hands, dammit.
+
+--- tests/append-over-page.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/append-over-page.c	Tue Aug 20 18:45:32 2002
+@@ -971,7 +971,9 @@
+ {
+     const char *file = "blaha";
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+     if (argc != 1 && argc != 2)
+ 	errx (1, "usage: %s [file]", argv[0]);
+     if (argc == 2)
+--- tests/apwd.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/apwd.c	Tue Aug 20 18:45:55 2002
+@@ -432,7 +432,9 @@
+     int ret = 0;
+     int optind = 0;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     verbose_flag = getenv ("VERBOSE") != NULL;
+ 
+--- tests/create-dirs.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/create-dirs.c	Tue Aug 20 18:46:15 2002
+@@ -82,7 +82,9 @@
+     char *ptr;
+     int count;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 2)
+ 	usage (1);
+--- tests/create-files.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/create-files.c	Tue Aug 20 18:46:29 2002
+@@ -101,7 +101,9 @@
+     int count;
+     long size;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 3)
+ 	usage (1);
+--- tests/create-remove.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/create-remove.c	Tue Aug 20 18:46:45 2002
+@@ -118,7 +118,9 @@
+     char *ptr;
+     int count;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 3)
+ 	usage (1);
+--- tests/create-stat.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/create-stat.c	Tue Aug 20 18:58:18 2002
+@@ -79,7 +79,9 @@
+     char *filename;
+     ino_t afsfileid;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (!k_hasafs())
+ 	errx (1, "!k_hasafs");
+@@ -161,7 +163,9 @@
+ int
+ main (int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     errx (1, "no kafs");
+ }
+--- tests/create-symlinks.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/create-symlinks.c	Tue Aug 20 18:47:13 2002
+@@ -115,7 +115,9 @@
+     char *ptr;
+     int count;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 2)
+ 	usage (1);
+--- tests/dup2-and-unlog.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/dup2-and-unlog.c	Tue Aug 20 18:59:01 2002
+@@ -18,7 +18,9 @@
+ {
+     int fd;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (!k_hasafs())
+ 	errx (1, "no afs");
+@@ -45,7 +47,9 @@
+ int
+ main (int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     errx (1, "no kafs");
+ }
+--- tests/exit-wo-close.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/exit-wo-close.c	Tue Aug 20 18:47:40 2002
+@@ -119,7 +119,9 @@
+ {
+     const char *file = "foo";
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 2 && argc != 1)
+ 	errx (1, "usage: %s [file]", argv[0]);
+--- tests/fchmod.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/fchmod.c	Tue Aug 20 18:47:50 2002
+@@ -52,7 +52,9 @@
+     int fd, ret;
+     struct stat sb;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     fd = open ("deps", O_WRONLY|O_CREAT|O_TRUNC, 0666);
+     if (fd < 0)
+--- tests/fhbench.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/fhbench.c	Tue Aug 20 18:48:00 2002
+@@ -327,7 +327,9 @@
+     int i;
+     struct fhb_handle *handles;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (agetarg (args, argc, argv, &optind, AARG_GNUSTYLE))
+ 	usage (1);
+--- tests/ga-test.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/ga-test.c	Tue Aug 20 18:48:10 2002
+@@ -316,7 +316,9 @@
+ int
+ main (int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     test_simple_string();
+     test_simple_strings();
+--- tests/hardlink1.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/hardlink1.c	Tue Aug 20 18:48:21 2002
+@@ -55,7 +55,9 @@
+     int ret;
+     struct stat sb1, sb2;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     fd1 = open("foo", O_RDWR|O_CREAT, 0666);
+     if (fd1 < 0)
+--- tests/hardlink2.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/hardlink2.c	Tue Aug 20 18:48:30 2002
+@@ -55,7 +55,9 @@
+     int ret;
+     struct stat sb1;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     ret = mkdir ("1", 0777);
+     if (ret < 0)
+--- tests/invalidate-file.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/invalidate-file.c	Tue Aug 20 18:48:40 2002
+@@ -167,7 +167,9 @@
+ {
+     char *filename = "foo";
+     
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (!k_hasafs())
+ 	exit (1);
+--- tests/kill-softer.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/kill-softer.c	Tue Aug 20 18:48:53 2002
+@@ -177,7 +177,9 @@
+ int
+ main(int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     verbose = fdopen (4, "w");
+     if (verbose == NULL) {
+--- tests/kill-softly.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/kill-softly.c	Tue Aug 20 18:49:03 2002
+@@ -154,7 +154,9 @@
+ int
+ main(int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 2)
+ 	errx (1, "usage: %s directory", argv[0]);
+--- tests/large-dir.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/large-dir.c	Tue Aug 20 18:49:16 2002
+@@ -146,7 +146,9 @@
+     char *ptr;
+     int count;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 3)
+ 	usage (1);
+--- tests/large-dir2.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/large-dir2.c	Tue Aug 20 18:49:42 2002
+@@ -125,7 +125,9 @@
+     char *ptr;
+     int count;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 3)
+ 	usage (1);
+--- tests/large-dir3.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/large-dir3.c	Tue Aug 20 18:49:53 2002
+@@ -113,7 +113,9 @@
+     char *ptr;
+     int count;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 3)
+ 	usage (1);
+--- tests/mkdir2.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/mkdir2.c	Tue Aug 20 18:50:09 2002
+@@ -54,7 +54,9 @@
+     int ret;
+     struct stat dot_sb, sb;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     ret = mkdir ("foo", 0777);
+     if (ret < 0)
+--- tests/mmap-and-read.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/mmap-and-read.c	Tue Aug 20 18:50:20 2002
+@@ -150,7 +150,9 @@
+ main (int argc, char **argv)
+ {
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     srand (time(NULL));
+ 
+--- tests/mmap-cat.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/mmap-cat.c	Tue Aug 20 18:50:30 2002
+@@ -134,7 +134,9 @@
+ {
+     int optind = 0;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (agetarg (args, argc, argv, &optind, AARG_AFSSTYLE))
+ 	usage (1);
+--- tests/mmap-shared-write.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/mmap-shared-write.c	Tue Aug 20 18:50:39 2002
+@@ -91,7 +91,9 @@
+ {
+     const char *filename = "foo";
+ 
++#if !defined(__NetBSD__)
+     setprogname(argv[0]);
++#endif
+ 
+     if (argc != 1 && argc != 2)
+ 	usage ();
+--- tests/mmap-vs-read.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/mmap-vs-read.c	Tue Aug 20 18:50:50 2002
+@@ -154,7 +154,9 @@
+ int
+ main (int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 1)
+ 	debug = 1;
+--- tests/mmap-vs-read2.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/mmap-vs-read2.c	Tue Aug 20 18:50:59 2002
+@@ -154,7 +154,9 @@
+ int
+ main (int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 1)
+ 	debug = 1;
+--- tests/pine.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/pine.c	Tue Aug 20 18:51:08 2002
+@@ -57,7 +57,9 @@
+     char unique[1024];
+     int retrycount = 0;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     snprintf (unique, sizeof(unique), LOCK ".%d.%d",
+ 	      getpid(), (int)time(NULL));
+--- tests/read-vs-mmap.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/read-vs-mmap.c	Tue Aug 20 18:51:17 2002
+@@ -154,7 +154,9 @@
+ int
+ main (int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 1)
+ 	debug = 1;
+--- tests/read-vs-mmap2.c.orig	Tue Aug 20 18:44:47 2002
++++ tests/read-vs-mmap2.c	Tue Aug 20 18:51:26 2002
+@@ -113,7 +113,9 @@
+     void *mmap_buf;
+     int fd;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     srand (time(NULL));
+ 
+--- tests/read-write.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/read-write.c	Tue Aug 20 18:51:38 2002
+@@ -116,7 +116,9 @@
+     char *read_buf2;
+     int fd;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     srand (time(NULL));
+ 
+--- tests/readdir-vs-lstat.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/readdir-vs-lstat.c	Tue Aug 20 18:51:51 2002
+@@ -92,7 +92,9 @@
+ {
+     char *name = ".";
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc > 2)
+ 	usage (1);
+--- tests/rename-under-feet.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/rename-under-feet.c	Tue Aug 20 18:52:04 2002
+@@ -129,7 +129,9 @@
+     char buf[1];
+     int status;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     emkdir ("one", 0777);
+     emkdir ("two", 0777);
+--- tests/rename5.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/rename5.c	Tue Aug 20 18:52:15 2002
+@@ -87,7 +87,9 @@
+     int ret;
+     struct stat old_sb, new_sb, dot_sb;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+     emkdir ("old_parent", 0777);
+     emkdir ("new_parent", 0777);
+     emkdir ("old_parent/victim", 0777);
+--- tests/rm-rf.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/rm-rf.c	Tue Aug 20 18:52:25 2002
+@@ -128,7 +128,9 @@
+ int
+ main(int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+ #ifdef KERBEROS
+     has_afs = k_hasafs();
+--- tests/still-there-p.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/still-there-p.c	Tue Aug 20 18:52:36 2002
+@@ -61,7 +61,9 @@
+     char buf[TEST_BUFFER_SZ];
+     int fd;
+ 	
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     fd = open (file, O_RDWR|O_TRUNC|O_CREAT, 0644);
+     if (fd < 0)
+--- tests/strange-characters-c.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/strange-characters-c.c	Tue Aug 20 18:52:45 2002
+@@ -84,7 +84,9 @@
+ {
+     char *file = "едц";
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 1)
+ 	usage (1);
+--- tests/symlink.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/symlink.c	Tue Aug 20 18:52:54 2002
+@@ -57,7 +57,9 @@
+     int ret;
+     struct stat sb;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     ret = symlink ("foo", "bar");
+     if (ret < 0)
+--- tests/test-parallel1.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/test-parallel1.c	Tue Aug 20 18:53:02 2002
+@@ -80,7 +80,9 @@
+ {
+     int i, ret;
+     
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     for (i = 0; i < NUM_WORKER ; i++) {
+ 	int ret;
+--- tests/test-parallel2.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/test-parallel2.c	Tue Aug 20 18:53:11 2002
+@@ -162,7 +162,9 @@
+ {
+     int i, ret;
+     
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     for (i = 0; i < NUM_WORKER ; i++) {
+ 	int ret;
+--- tests/test-setgroups.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/test-setgroups.c	Tue Aug 20 18:53:40 2002
+@@ -80,7 +80,9 @@
+     int ngroups;
+     gid_t pag0, pag1, pag2;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 2)
+ 	errx (1, "Usage: %s user", argv[0]);
+@@ -138,7 +140,9 @@
+ int
+ main (int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     errx (1, "no kafs");
+ }
+--- tests/test-setpag.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/test-setpag.c	Tue Aug 20 18:54:04 2002
+@@ -79,7 +79,9 @@
+     gid_t pag1, pag2;
+     pid_t pid;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (argc != 1)
+ 	errx (1, "Usage: %s", argv[0]);
+@@ -131,7 +133,9 @@
+ int
+ main (int argc, char **argv)
+ {
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     errx (1, "no kafs");
+ }
+--- tests/truncate.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/truncate.c	Tue Aug 20 18:54:16 2002
+@@ -82,7 +82,9 @@
+ {
+     int ret;
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     create_and_write ("foo", "hej\n");
+ 
+--- tests/utime-dir.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/utime-dir.c	Tue Aug 20 18:54:27 2002
+@@ -71,7 +71,9 @@
+ {
+     const char *file = "blaha";
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+     if (argc != 1 && argc != 2)
+ 	errx (1, "usage: %s [file]", argv[0]);
+     if (argc == 2)
+--- tests/write-closed.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/write-closed.c	Tue Aug 20 18:54:41 2002
+@@ -89,7 +89,9 @@
+ {
+     const char *file = "foo";
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+     if (argc != 1 && argc != 2)
+ 	errx (1, "usage: %s [file]", argv[0]);
+     if (argc == 2)
+--- tests/write-closed2.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/write-closed2.c	Tue Aug 20 18:55:00 2002
+@@ -120,7 +120,9 @@
+ {
+     const char *file = "foo";
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+ 
+     if (!k_hasafs())
+ 	errx (1, "!k_hasafs");
+--- tests/write-ro-file.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/write-ro-file.c	Tue Aug 20 18:55:13 2002
+@@ -52,7 +52,9 @@
+   int fd;
+   int ret;
+ 
++#if !defined(__NetBSD__)
+   setprogname (argv[0]);
++#endif
+ 
+   fd = open("foo", O_RDWR|O_CREAT, 0);
+   if (fd < 0)
+--- tests/write-ucc.c.orig	Tue Aug 20 18:44:48 2002
++++ tests/write-ucc.c	Tue Aug 20 18:55:22 2002
+@@ -95,7 +95,9 @@
+ {
+     const char *file = "blaha";
+ 
++#if !defined(__NetBSD__)
+     setprogname (argv[0]);
++#endif
+     if (argc != 1 && argc != 2)
+ 	errx (1, "usage: %s [file]", argv[0]);
+     if (argc == 2)