Update arla to 0.34.1.

arla-0.34.1 contains a new `bos' program, improves handling of
write-back of mmaped pages after close, more stability, bug fixes,
and, most notably, contains updates to the *BSD code.

11 files changed, 48 insertions, 77 deletions

diff --git a/net/arla/Makefile b/net/arla/Makefile
index 28cbee12122..ccfb9065b08 100644
--- a/net/arla/Makefile
+++ b/net/arla/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.5 2000/08/02 13:08:32 wennmach Exp $
+# $NetBSD: Makefile,v 1.6 2000/08/15 16:08:23 wennmach Exp $
 #
 
-DISTNAME=		arla-0.33
+DISTNAME=		arla-0.34.1
 CATEGORIES=		net security
 MASTER_SITES=		ftp://ftp.stacken.kth.se/pub/arla/
 
@@ -11,6 +11,7 @@ HOMEPAGE=		http://www.stacken.kth.se/project/arla/
 DEPENDS+=		kth-krb4-1.0.1:../../security/kth-krb4
 
 GNU_CONFIGURE=		yes
+INFO_FILES=		arla.info
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/net/arla/files/md5 b/net/arla/files/md5
index 92d414d2547..a9e57a9f227 100644
--- a/net/arla/files/md5
+++ b/net/arla/files/md5
@@ -1,3 +1,3 @@
-$NetBSD: md5,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+$NetBSD: md5,v 1.2 2000/08/15 16:08:24 wennmach Exp $
 
-MD5 (arla-0.33.tar.gz) = 90fd5d2b1ecd13294a6721bcf37c4b8d
+MD5 (arla-0.34.1.tar.gz) = 1b2279515ee46a26118f51d4a9c5e7f3
diff --git a/net/arla/files/patch-sum b/net/arla/files/patch-sum
index 506ef30fbb9..a35ec066b95 100644
--- a/net/arla/files/patch-sum
+++ b/net/arla/files/patch-sum
@@ -1,14 +1,12 @@
-$NetBSD: patch-sum,v 1.5 2000/07/26 15:34:19 wennmach Exp $
+$NetBSD: patch-sum,v 1.6 2000/08/15 16:08:24 wennmach Exp $
 
 MD5 (patch-aa) = e96c11332180783528b4f549cb7884a4
 MD5 (patch-ab) = 380a7bf1be1293ef21eefdd8b6ca14bf
 MD5 (patch-ac) = 4e9b4470df7e95646c62d7f8fd25fed8
 MD5 (patch-ad) = c0ce62d0b18c7df1889002fd12577afe
-MD5 (patch-ae) = 632f0a681e1423bfc6a41707489d1f2a
-MD5 (patch-af) = d191babc47ad634383f607406efadd5e
+MD5 (patch-ae) = 314d5193f368a26322953f94f498849e
+MD5 (patch-af) = 981665519686a86a1e6cbaeb5f915836
 MD5 (patch-ag) = 75603787951f1d56abbbbdcca0ea92db
-MD5 (patch-ah) = 5e194c76b21e9076bd6968b2fca24629
-MD5 (patch-aj) = 0f9b4da8858d60fab0ac2b3de97a3795
+MD5 (patch-ah) = 8d39dc019cf603ebf3c3dd1792399d59
 MD5 (patch-ak) = 35638f7dc4dd55a5541dd3832afb40fc
-MD5 (patch-al) = b1ef314ec5e56e7ae27489dde32d6b2e
-MD5 (patch-am) = 4d38eb465e312c68840dbc03520184b0
+MD5 (patch-an) = 900bea40df1e484e7383400f11270f0f
diff --git a/net/arla/patches/patch-ae b/net/arla/patches/patch-ae
index 26038f9ba3c..13233b3f456 100644
--- a/net/arla/patches/patch-ae
+++ b/net/arla/patches/patch-ae
@@ -1,4 +1,4 @@
-$NetBSD: patch-ae,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+$NetBSD: patch-ae,v 1.2 2000/08/15 16:08:25 wennmach Exp $
 
 Do not install libutil.a and the header files bool.h, hash.h, heap.h, list.h,
 and log.h. There is a potential conflict with other libutils.
@@ -18,7 +18,7 @@ and log.h. There is a potential conflict with other libutils.
  uninstall:
 -	rm -f $(DESTDIR)$(libdir)/$(LIB)
 -	for i in $(HEADERS); do \
--	  rm $(DESTDIR)$(includedir)/$$i; \
+-	  rm -f $(DESTDIR)$(includedir)/$$i; \
 -	done
  
  libutil.a:	$(libutil_OBJS)
diff --git a/net/arla/patches/patch-af b/net/arla/patches/patch-af
index e4d0d1798c1..eb7e567fc23 100644
--- a/net/arla/patches/patch-af
+++ b/net/arla/patches/patch-af
@@ -1,4 +1,4 @@
-$NetBSD: patch-af,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+$NetBSD: patch-af,v 1.2 2000/08/15 16:08:25 wennmach Exp $
 
 Do not attempt to install CellServDB, ThisCell, arla.conf. Only install
 the default files and tell the user to customize them. This avoids PLIST
@@ -6,7 +6,7 @@ magic and assures that no customized files will be removed on pkg_delete.
 
 --- conf/Makefile.in.orig	Tue May 30 22:42:05 2000
 +++ conf/Makefile.in		Tue May 30 22:45:45 2000
-@@ -26,24 +26,13 @@
+@@ -26,19 +26,13 @@
  		for x in $$CONF_FILES; do \
  		  echo $(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(sysconfdir)/$$x.default; \
  		  $(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(sysconfdir)/$$x.default; \
@@ -17,12 +17,7 @@ magic and assures that no customized files will be removed on pkg_delete.
 -		    $(INSTALL_DATA) $(srcdir)/$$x $(DESTDIR)$(sysconfdir)/$$x; \
 -		  fi; \
  		done
--		if test -f $(DESTDIR)$(sysconfdir)/SuidCells; then \
--		  echo "$@ will not overwrite $(DESTDIR)$(sysconfdir)/SuidCells"; \
--	        else \
--		  > $(DESTDIR)$(sysconfdir)/SuidCells; \
--		fi
-+		> $(DESTDIR)$(sysconfdir)/SuidCells.default; \
++		> $(DESTDIR)$(sysconfdir)/SuidCells.default
  
  uninstall:
  		CONF_FILES='$(CONF_FILES)'; \
diff --git a/net/arla/patches/patch-ah b/net/arla/patches/patch-ah
index 6b21dc9d764..8a7ad9b1905 100644
--- a/net/arla/patches/patch-ah
+++ b/net/arla/patches/patch-ah
@@ -1,10 +1,10 @@
-$NetBSD: patch-ah,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+$NetBSD: patch-ah,v 1.2 2000/08/15 16:08:25 wennmach Exp $
 
 Install xfs_mod.o into $(lkmdir), not $(bindir).
 Do not strip xfs_mod.o while installing it.
 
---- xfs/bsd/Makefile.in.orig	Wed May 31 23:38:35 2000
-+++ xfs/bsd/Makefile.in		Sat Jun  3 12:33:29 2000
+--- xfs/bsd/Makefile.in.orig	Thu Jun 22 04:24:42 2000
++++ xfs/bsd/Makefile.in		Wed Aug  9 16:09:04 2000
 @@ -18,6 +18,7 @@
  
  INSTALL		= @INSTALL@
@@ -41,5 +41,5 @@ Do not strip xfs_mod.o while installing it.
 -		rm -f $(DESTDIR)$(bindir)/$$f; \
 +		rm -f $(DESTDIR)$(lkmdir)/$$f; \
  	done
- 	cd bin && $(MAKE) $(MFLAGS) uninstall
- 
+ 	for i in lkm subsys modules; do \
+ 		if test -d /$$i; then \
diff --git a/net/arla/patches/patch-aj b/net/arla/patches/patch-aj
deleted file mode 100644
index 1d9468926b3..00000000000
--- a/net/arla/patches/patch-aj
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-aj,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
-
-Also install rxgencon.h, since rx.h includes it.
-
---- rx/Makefile.in.orig	Sat Jun  3 12:59:05 2000
-+++ rx/Makefile.in	Sat Jun  3 12:59:28 2000
-@@ -29,7 +29,7 @@
- LIB		= librx.a
- include_HEADERS = rx.h rx_clock.h rx_event.h rx_globs.h rx_mach.h rx_misc.h \
- 		  rx_multi.h rx_null.h rx_pkt.h rx_queue.h rx_trace.h \
--		  rx_user.h
-+		  rx_user.h rxgencon.h
- 
- PROGS		= test_rx_clock
- 
diff --git a/net/arla/patches/patch-al b/net/arla/patches/patch-al
deleted file mode 100644
index 8d2b2c1553c..00000000000
--- a/net/arla/patches/patch-al
+++ /dev/null
@@ -1,18 +0,0 @@
-$NetBSD: patch-al,v 1.1 2000/06/18 13:01:36 assar Exp $
-
-The prototype for vfs_getnewfsid is defined in <sys/vnode.h>, so in order
-to successfully test for the number of arguments, make sure that this header
-file gets included. This patch is required to get arla to compile on
-NetBSD-1.4ZD.
-
---- configure.orig	Sun Jun 18 11:32:44 2000
-+++ configure		Sun Jun 18 11:40:40 2000
-@@ -9976,6 +9976,7 @@
- #ifdef HAVE_SYS_MODULE_H
- #include <sys/module.h>
- #endif
-+#include <sys/vnode.h>
- #include <sys/mount.h>
- 
- int main() {
-
diff --git a/net/arla/patches/patch-am b/net/arla/patches/patch-am
deleted file mode 100644
index 19d20ba664e..00000000000
--- a/net/arla/patches/patch-am
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-am,v 1.1 2000/07/26 15:33:24 wennmach Exp $
-
-NetBSD/pmax uses "mipsel" as host cpu description.
-So make make-process.o.sh grok "mipsel".
-
---- lwp/make-process.o.sh.in.orig	Wed Jul 26 14:58:46 2000
-+++ lwp/make-process.o.sh.in		Wed Jul 26 14:59:06 2000
-@@ -48,7 +48,7 @@
-     sparc*) PROCESS_S="process.sparc.S" ;;
-     i*86*)  PROCESS_S="process.i386.S" ;;
-     m68k)   PROCESS_S="process.m68k.S" ;;
--    mips)   PROCESS_S="process.mips.S" ;;
-+    mips*)   PROCESS_S="process.mips.S" ;;
-     alpha*)  PROCESS_S="process.alpha.S" ;;
-     hppa*)  PROCESS_S="process.hpux.S" ;;
-     powerpc)  PROCESS_S="process.ppc.S" ;;
diff --git a/net/arla/patches/patch-an b/net/arla/patches/patch-an
new file mode 100644
index 00000000000..2140c4580be
--- /dev/null
+++ b/net/arla/patches/patch-an
@@ -0,0 +1,16 @@
+$NetBSD: patch-an,v 1.1 2000/08/15 16:08:27 wennmach Exp $
+
+Do not add a path to the library search path (-L) to find libsl.a. This will
+find kth-krb4's sl library, which is the wrong one.
+
+--- appl/bos/Makefile.in.orig	Mon Jun  5 22:55:16 2000
++++ appl/bos/Makefile.in	Wed Aug  9 16:34:58 2000
+@@ -55,7 +55,7 @@
+ 		  -L../../rx -lrx \
+ 		  -L../../lwp -llwp @PLWP_LIB_FLAGS@ \
+ 		  -L../../lib/ko -lko -L../../util -lutil \
+-		  -L../../lib/sl -lsl \
++		  ../../lib/sl/libsl.a \
+ 		  -L../../lib/roken \
+ 		  $(READLINE_lib) \
+ 		  $(RXKAD_LIBS) \
diff --git a/net/arla/pkg/PLIST b/net/arla/pkg/PLIST
index f689db1a413..84f4719c319 100644
--- a/net/arla/pkg/PLIST
+++ b/net/arla/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2000/06/08 15:56:28 wennmach Exp $
+@comment $NetBSD: PLIST,v 1.2 2000/08/15 16:08:27 wennmach Exp $
 include/atypes.h
 include/fs_errors.h
 include/base64.h
@@ -11,7 +11,6 @@ include/arla-roken.h
 include/lock.h
 include/preempt.h
 include/timer.h
-include/lwp_asm.h
 include/rx/rx.h
 include/rx/rx_clock.h
 include/rx/rx_event.h
@@ -43,6 +42,9 @@ include/ubik.ss.h
 include/bos.cs.h
 include/cellconfig.h
 include/auth.h
+include/afs/cmd.h
+@dirrm include/afs
+include/lwp.h
 lib/libarla-roken.a
 lib/liblwp.a
 lib/librx.a
@@ -60,6 +62,7 @@ lib/libko.a
 lib/libbufdir.a
 lib/librxkad.a
 lib/libarlalib.a
+lib/libcmd.a
 lkm/xfs_mod.o
 @unexec /bin/rm -f %D/lkm/xfs_mod
 @dirrm lkm
@@ -77,7 +80,10 @@ bin/fs
 bin/pts
 bin/udebug
 bin/vos
+bin/rxdebug
+bin/bos
 sbin/arlad
+sbin/rxperf    
 etc/CellServDB.default
 etc/ThisCell.default
 etc/arla.conf.default
@@ -87,6 +93,10 @@ share/examples/arla/lkm.conf
 share/examples/arla/services
 share/examples/arla/fstab
 @dirrm share/examples/arla
+man/man3/cmd.3
+@unexec install-info --delete %D/info/arla.info %D/info/dir
+info/arla.info
+@exec install-info %D/info/arla.info %D/info/dir 
 @exec if [ ! -e @ARLA_CACHE@ ] ; then /bin/mkdir -p @ARLA_CACHE@; /bin/chmod 700 @ARLA_CACHE@; chown root @ARLA_CACHE@; fi
 @exec if [ ! -e /sbin/mount_xfs ]; then /bin/ln -s %D/bin/mount_xfs /sbin/mount_xfs; fi
 @exec if ! /usr/bin/grep xfs_mod /etc/lkm.conf 2>/dev/null 1>&2 ; then /bin/cat %D/share/examples/arla/lkm.conf >> /etc/lkm.conf; fi