30 files changed, 430 insertions, 673 deletions

diff --git a/etc/Makefile b/etc/Makefile
index cbd9136dc9a1..397d0578fb5e 100644
--- a/etc/Makefile
+++ b/etc/Makefile
@@ -1,15 +1,15 @@
 #	from: @(#)Makefile	5.11 (Berkeley) 5/21/91
-#	$Id: Makefile,v 1.117.4.5 1996/03/27 22:42:05 torstenb Exp $
+#	$Id: Makefile,v 1.117.4.6 1996/05/09 05:58:59 jkh Exp $
 
-# disktab may be wrong -- hcx9 is a tahoe, but gets its own.
 # -rw-r--r--
 BINOWN= root
 BINGRP= wheel
-BIN1=   aliases csh.cshrc csh.login csh.logout dm.conf \
+BIN1=   aliases amd.map csh.cshrc csh.login csh.logout dm.conf \
 	ftpusers gettytab group hosts host.conf hosts.equiv hosts.lpd \
-	inetd.conf login.access motd modems netstart \
-	networks pccard.conf.sample phones printcap profile protocols \
-	rc rc.local rc.pccard rc.serial etc.${MACHINE}/rc.${MACHINE} \
+	inetd.conf login.access motd modems netstart networks \
+	newsyslog.conf phones printcap profile protocols \
+	rc rc.firewall rc.local rc.serial \
+	etc.${MACHINE}/rc.${MACHINE} \
 	remote security services sysconfig shells \
 	syslog.conf ttys etc.${MACHINE}/disktab rpc make.conf \
 	${.CURDIR}/../gnu/usr.bin/man/manpath/manpath.config \
@@ -21,116 +21,17 @@ BIN2=	motd
 # -rwxr-xr-x root.wheel, for the new cron root.wheel
 BIN3=	daily weekly monthly pccard_ether
 
-CLEANFILES+=	*.c *.o *.lo
-CLEANFILES+=	filesystem filesystem.cache filesystem.mk
-CLEANFILES+=	kcopy kcopy.cache kcopy.mk
-
-MAKEDEVS=	(cd ${MOUNT}/dev; \
-		    sh ${DESTDIR}/dev/MAKEDEV std; \
-		    rm -rf fd; \
-		    sh ${DESTDIR}/dev/MAKEDEV fd0 fd1; \
-		    rm -rf fd0?* rfd0?* fd1?* rfd1?*; \
-		    sh ${DESTDIR}/dev/MAKEDEV wd0 wd1 sd0 sd1 cd0 mcd0 mcd1; \
-		    rm -rf *wd[01][ijklm] rmcd*)
-
-NEWFS=		newfs -b 4096 -c 80 -f 512 -m 0 -o space -u 0 -t 0
-ZIPNSPLIT=	gzip --no-name -9 -c | split -b 240640 -
-
 MTREE=	BSD.local.dist BSD.root.dist BSD.usr.dist BSD.var.dist
 NAMEDB=	PROTO.localhost.rev named.boot named.root make-localhost
 PPPCNF= ppp.conf.filter.sample ppp.conf.iij ppp.conf.sample \
 	ppp.linkup.sample ppp.secret.sample
-PCS=	pcs750.bin
-WCS1=	wcs fppwcs poc poc1 poc2 fppoc
-WCS2=	fpevent fppwcs fppwcs_dual hdcwcs load_diags start_fpp wcs wcs_dual
 
 # Special top level files for FreeBSD
 COPYRIGHT=	COPYRIGHT
 FREEBSD=
 FREEBSD+=	${COPYRIGHT}
-#
-# Floppy drive name, mount point, type and parameters for building Floppies
-FLOPPY?=	fd0
-MOUNT?=		/mnt
-FLOPPY_TYPE?=	fd1440
-FLOPPY_BS?=	18b
-FLOPPY_TRACKS?=	160
-#
-MDEC=		usr/mdec/bootfd usr/mdec/fdboot
-MDEC+=		usr/mdec/bootsd usr/mdec/sdboot
-MDEC+=		usr/mdec/bootwd usr/mdec/wdboot
-#
-KC_DIRS=	bin dev mnt sbin etc
-KC_FILES=	${COPYRIGHT}
-KC_LINKS=	bin/[ bin/cp bin/echo bin/sh bin/test
-KC_LINKS+=	sbin/fsck sbin/halt sbin/init
-KC_LINKS+=	sbin/mount sbin/mount_cd9660
-KC_LINKS+=	sbin/umount
-#
-CD_DIRS=	etc usr
-#
-FILESYSTEM_DIRS=	bin dev etc mnt proc sbin usr usr/bin usr/mdec usr/sbin
-FILESYSTEM_TREES=	dev
-FILESYSTEM_FILES=	${COPYRIGHT}
-FILESYSTEM_FILES+=	dev/MAKEDEV
-FILESYSTEM_FILES+=	etc/group
-FILESYSTEM_FILES+=	etc/master.passwd etc/passwd etc/pwd.db
-FILESYSTEM_FILES+=	${MDEC}
-FILESYSTEM_LINKS=	bin/[ bin/expr bin/ls bin/mkdir bin/rm
-FILESYSTEM_LINKS+=	bin/sh bin/sync bin/test
-FILESYSTEM_LINKS+=	sbin/disklabel sbin/fdisk sbin/halt sbin/init
-FILESYSTEM_LINKS+=	sbin/mount
-FILESYSTEM_LINKS+=	sbin/newfs
-FILESYSTEM_LINKS+=	sbin/umount
-FILESYSTEM_LINKS+=	usr/bin/cpio
-FILESYSTEM_LINKS+=	usr/bin/gunzip usr/bin/gzcat usr/bin/gzip usr/bin/zcat
-FILESYSTEM_LINKS+=	usr/sbin/bad144
-FILESYSTEM_CPIO=	.profile
-FILESYSTEM_CPIO+=	root/.profile
-FILESYSTEM_CPIO+=	bin/[
-FILESYSTEM_CPIO+=	bin/chmod bin/cat bin/cp bin/df bin/expr bin/ls
-FILESYSTEM_CPIO+=	bin/ln bin/mkdir bin/mv bin/rm bin/sync
-FILESYSTEM_CPIO+=	bin/test
-FILESYSTEM_CPIO+=	etc/spwd.db
-FILESYSTEM_CPIO+=	sbin/disklabel sbin/fdisk sbin/halt sbin/init
-FILESYSTEM_CPIO+=	sbin/mount
-FILESYSTEM_CPIO+=	sbin/newfs
-FILESYSTEM_CPIO+=	sbin/umount
-FILESYSTEM_CPIO_DIRS=	root
-
-CPIO_FILES=	${COPYRIGHT}
-CPIO_CPIO=	bin/dd bin/ps bin/pwd bin/stty
-CPIO_CPIO+=	etc/protocols etc/remote etc/services
-CPIO_CPIO+=	etc/termcap
-CPIO_CPIO+=	sbin/dmesg
-CPIO_CPIO+=	sbin/ifconfig sbin/fsck sbin/mknod sbin/mount_cd9660
-CPIO_CPIO+=	sbin/mount_procfs
-CPIO_CPIO+=	sbin/reboot sbin/route sbin/slattach
-CPIO_CPIO+=	usr/bin/awk usr/bin/chgrp usr/bin/cpio usr/bin/ex usr/bin/ftp
-CPIO_CPIO+=	usr/bin/gunzip usr/bin/gzcat usr/bin/gzip
-CPIO_CPIO+=	usr/bin/more usr/bin/tar usr/bin/tip
-CPIO_CPIO+=	usr/bin/vi usr/bin/view usr/bin/zcat
-CPIO_CPIO+=	usr/lib/libc.so.*
-CPIO_CPIO+=	usr/lib/libcurses.so.*
-CPIO_CPIO+=	usr/lib/libgcc.so.*
-CPIO_CPIO+=	usr/lib/libm.so.*
-CPIO_CPIO+=	usr/lib/libtermcap.so.*
-CPIO_CPIO+=	usr/lib/libutil.so.*
-CPIO_CPIO+=	usr/libexec/ld.so
-CPIO_CPIO+=	usr/sbin/bad144 usr/sbin/chown
-CPIO_CPIO+=	usr/share/misc/termcap
-CPIO_CPIO_DIRS=		tmp usr/lib usr/libexec usr/share usr/share/misc
-CPIO_CPIO_DIRS+=	var var/tmp var/run var/spool var/spool/lock
-
-SCRYPT_LIB=	lib/libcrypt
-DESCRYPT_LIB=	secure/lib/libcrypt
-CRYPT_SRCS=	bin/ed bin/rcp
-CRYPT_SRCS+=	sbin/init
-.if !defined(NOCRYPT)
-CRYPT_SRCS+=	secure
-.endif
-CRYPT_DIRS=	bin sbin usr usr/bin usr/lib
 
+# Compatibility stuff, remove those links
 LATIN1LINKS = \
 	da_DK de_AT de_CH de_DE en_AU en_CA en_GB en_US es_ES fi_FI \
 	fr_BE fr_CA fr_CH fr_FR is_IS it_CH it_IT nl_BE nl_NL no_NO \
@@ -138,24 +39,6 @@ LATIN1LINKS = \
 
 all depend etc install lint:
 
-scrypt:
-	rm -f ${LIBCRYPT};
-	(cd ${.CURDIR}/../${SCRYPT_LIB}; \
-		${MAKE} cleandir obj depend all install)
-	for i in ${CRYPT_SRCS}; do \
-		cd ${.CURDIR}/../$$i; \
-		${MAKE} cleandir obj depend all; \
-	done
-
-descrypt:
-	rm -f ${LIBCRYPT};
-	(cd ${.CURDIR}/../${DESCRYPT_LIB}; \
-		${MAKE} cleandir obj depend all install)
-	for i in ${CRYPT_SRCS}; do \
-		cd ${.CURDIR}/../$$i; \
-		${MAKE} cleandir obj depend all; \
-	done
-
 distribute:
 	cd ${.CURDIR} ; ${MAKE} distribution DESTDIR=${DISTDIR}/bin
 
@@ -174,6 +57,12 @@ distribution:
 	     MAKEDEV.local etc.${MACHINE}/MAKEDEV ${DESTDIR}/dev )
 	(cd ${DESTDIR}/dev; sh MAKEDEV all) ;
 	(cd ${.CURDIR}/root; \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.fvwmrc \
+		    ${DESTDIR}/root/.fvwmrc; \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.Xdefaults \
+		    ${DESTDIR}/root/.Xdefaults; \
+		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.xsession \
+		    ${DESTDIR}/root/.xsession; \
 		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.cshrc \
 		    ${DESTDIR}/root/.cshrc; \
 		${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 dot.klogin \
@@ -203,6 +92,8 @@ distribution:
 	    ${DESTDIR}/var/log/lastlog
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/log/messages
+	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 600 /dev/null \
+	    ${DESTDIR}/var/log/slip.log
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
 	    ${DESTDIR}/var/log/wtmp
 	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 664 /dev/null \
@@ -215,7 +106,7 @@ distribution:
 	    ${MAKE} install; \
 	 cd ../cf/cf; \
 	    ${MAKE} obj; \
-	    ${MAKE} freefall.cf; \
+	    ${MAKE} freebsd.cf; \
 	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 644 obj/freebsd.cf \
 		${DESTDIR}/etc/sendmail.cf)
 	(cd ${.CURDIR}/..; \
@@ -223,223 +114,19 @@ distribution:
 		${DESTDIR}/)
 	(cd ${.CURDIR}/../share/man; ${MAKE} makedb; )
 
-crunch:
-	crunchgen ${.CURDIR}/../usr.sbin/crunch/examples/kcopy.conf
-	${MAKE} -f kcopy.mk objs exe
-	crunchgen ${.CURDIR}/../usr.sbin/crunch/examples/filesystem.conf
-	${MAKE} -f filesystem.mk objs exe
-
-extract:
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
-	    ${.CURDIR}/etc.i386/EXTRACT_bin.sh \
-	    ${RELEASEDIR}/tarballs/bin/EXTRACT.sh
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
-	    ${.CURDIR}/etc.i386/EXTRACT_src.sh \
-	    ${RELEASEDIR}/tarballs/bin/EXTRACT.sh
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 555 \
-	    ${.CURDIR}/etc.i386/EXTRACT_secr.sh \
-	    ${RELEASEDIR}/tarballs/bin/EXTRACT.sh
-
-hcx9-distribution:
-	(cd ${.CURDIR}/etc.tahoe; ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} \
-	    -m 444 ${WCS2} ${DESTDIR}/)
-
-kcopy-kernels: ${.CURDIR}/../sys/i386/conf/GENERIC
-	(cd ${.CURDIR}/../sys/compile; rm -rf GENERIC)
-	(cd ${.CURDIR}/../sys/i386/conf; config GENERIC)
-	(cd ${.CURDIR}/../sys/compile/GENERIC; ${MAKE} depend; ${MAKE} all; \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 kernel \
-	        ${DESTDIR}/kernel.GENERIC)
-
-kcopy-floppy:
-	echo y | fdformat ${FLOPPY}
-	disklabel -w -r -B -b ${DESTDIR}/usr/mdec/fdboot \
-		-s ${DESTDIR}/usr/mdec/bootfd ${FLOPPY} ${FLOPPY_TYPE}
-	${NEWFS} -i 8192 r${FLOPPY} ${FLOPPY_TYPE}
-	mount /dev/${FLOPPY} ${MOUNT}
-	chown ${BINOWN}.${BINGRP} ${MOUNT}/.
-	chmod 755 ${MOUNT}/.
-	(cd ${DESTDIR}/; \
-	    ls -d ${KC_DIRS} | cpio -pdamuv ${MOUNT})
-	${MAKEDEVS}
-	(cd ${DESTDIR}/; \
-	    ls ${KC_FILES} | cpio -pdamuv ${MOUNT})
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    ${.CURDIR}/etc.i386/kc.profile ${MOUNT}/etc/rc
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    kcopy ${MOUNT}/bin/kcopy
-	(cd ${MOUNT}/; \
-	    for i in ${KC_LINKS}; do \
-		ln bin/kcopy $$i; \
-	    done)
-
-kcopy.flp:
-	(cd ${.CURDIR}; ${MAKE} kcopy-floppy)
-	(cd ${.CURDIR}/../sys/compile/GENERIC; \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 kernel ${MOUNT}/)
-	df -ik ${MOUNT}
-	# XXX umount is returning 1 for some reason :-(
-	-umount /dev/${FLOPPY}
-	fsck /dev/r${FLOPPY}
-	dd if=/dev/r${FLOPPY} of=${RELEASEDIR}/floppies/kcopy.flp \
-		bs=${FLOPPY_BS} count=${FLOPPY_TRACKS}
-	gzip --no-name -9 -c ${RELEASEDIR}/floppies/kcopy.flp \
-		>${RELEASEDIR}/floppies/kcopy.flp.gz &
-
-cdins-floppy:
-	(cd ${.CURDIR}; ${MAKE} kcopy-floppy)
-	(cd ${DESTDIR}/; \
-	    ls -d ${CD_DIRS} | cpio -pdamuv ${MOUNT})
-	(cd ${MOUNT}/usr; \
-	    ln -s /cdrom/filesys/usr/libexec libexec; \
-	    ln -s /cdrom/filesys/usr/lib lib)
-	mkdir ${MOUNT}/cdrom
-	chown ${BINOWN}.${BINGRP} ${MOUNT}/cdrom
-	chmod 755 ${MOUNT}/cdrom
-	#${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	#    ${.CURDIR}/etc.i386/cdinst1.profile ${MOUNT}/.profile
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    ${.CURDIR}/etc.i386/cdinst1.install ${MOUNT}/install
-	ln ${MOUNT}/install ${MOUNT}/etc/rc
-
-cdins.flp:
-	(cd ${.CURDIR}; ${MAKE} kcopy-floppy)
-	(cd ${.CURDIR}/../sys/compile/GENERIC; \
-	    ${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 kernel ${MOUNT}/)
-	df -ik ${MOUNT}
-	# XXX umount is returning 1 for some reason :-(
-	-umount /dev/${FLOPPY}
-	fsck /dev/r${FLOPPY}
-	dd if=/dev/r${FLOPPY} of=${RELEASEDIR}/floppies/cdins.flp \
-		bs=${FLOPPY_BS} count=${FLOPPY_TRACKS}
-	gzip --no-name -9 -c ${RELEASEDIR}/floppies/cdins.flp \
-		>${RELEASEDIR}/floppies/cdins.flp.gz &
-
-filesyst.flp:
-	echo y | fdformat ${FLOPPY}
-	disklabel -w -r -B -b ${DESTDIR}/usr/mdec/fdboot \
-		-s ${DESTDIR}/usr/mdec/bootfd ${FLOPPY} ${FLOPPY_TYPE}
-	${NEWFS} -i 10240 r${FLOPPY}  ${FLOPPY_TYPE}
-	mount /dev/${FLOPPY}  ${MOUNT}
-	chown ${BINOWN}.${BINGRP} ${MOUNT}/.
-	chmod 755 ${MOUNT}/.
-	(cd ${DESTDIR}/; \
-	    ls -d ${FILESYSTEM_DIRS} | cpio -pdamuv ${MOUNT})
-	${MAKEDEVS}
-	(cd ${DESTDIR}/; \
-	    ls ${FILESYSTEM_FILES} | cpio -pdamuv ${MOUNT}; \
-	    (find ${FILESYSTEM_CPIO}; ls -d ${FILESYSTEM_CPIO_DIRS}) | \
-		cpio -H newc --block-size=16 -oav | \
-		gzip -9 >${MOUNT}/inst1.cpio.gz)
-	#${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	#    ${.CURDIR}/etc.i386/inst1.profile ${MOUNT}/.profile
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    ${.CURDIR}/etc.i386/inst1.install ${MOUNT}/install
-	ln ${MOUNT}/install ${MOUNT}/etc/rc
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    filesystem ${MOUNT}/bin/filesystem
-	(cd ${MOUNT}/; \
-	    for i in ${FILESYSTEM_LINKS}; do \
-		ln bin/filesystem $$i; \
-	    done)
-	(cd ${MOUNT}/; \
-	    ls ${FILESYSTEM_FILES} >/tmp/filelist; \
-	    ls ${FILESYSTEM_LINKS} >>/tmp/filelist; \
-	    ls -d ${FILESYSTEM_DIRS} >>/tmp/filelist; \
-	    find ${FILESYSTEM_TREES} >>/tmp/filelist; \
-	    sort -u -r /tmp/filelist >filelist; \
-	    rm /tmp/filelist)
-	df -ik ${MOUNT}
-	# XXX umount is returning 1 for some reason :-(
-	-umount /dev/${FLOPPY}
-	fsck /dev/r${FLOPPY}
-	dd if=/dev/r${FLOPPY} of=${RELEASEDIR}/floppies/filesyst.flp \
-		bs=${FLOPPY_BS} count=${FLOPPY_TRACKS}
-	gzip --no-name -9 -c ${RELEASEDIR}/floppies/filesyst.flp \
-		>${RELEASEDIR}/floppies/filesyst.flp.gz &
-
-cpio.flp:
-	echo y | fdformat ${FLOPPY}
-	disklabel -w -r -B -b ${DESTDIR}/usr/mdec/fdboot \
-		-s ${DESTDIR}/usr/mdec/bootfd ${FLOPPY} ${FLOPPY_TYPE}
-	${NEWFS} -i 65536 r${FLOPPY}  ${FLOPPY_TYPE}
-	mount /dev/${FLOPPY} ${MOUNT}
-	chown ${BINOWN}.${BINGRP} ${MOUNT}/.
-	chmod 755 ${MOUNT}/.
-	(cd ${DESTDIR}/; \
-		ls ${CPIO_FILES} | cpio -pdamuv ${MOUNT})
-	#
-	# XXX This ugliness is because the default termcap file is simply too
-	# big and we don't need such a hugh one for the initial installation,
-	# yet we want the symlink in /etc to point to the right place so we
-	# need to install the smaller one in the same location.
-	#
-	mv ${DESTDIR}/usr/share/misc/termcap ${DESTDIR}/usr/share/misc/otermcap
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    ${.CURDIR}/termcap.small ${DESTDIR}/usr/share/misc/termcap
-	(cd ${DESTDIR}/; \
-	    (find ${CPIO_CPIO}; ls -d ${CPIO_CPIO_DIRS}) | \
-		cpio -H newc --block-size=16 -oav | \
-		gzip -9 >${MOUNT}/inst2.cpio.gz)
-	# XXX cpio is done, put everything back in shape for the bindist.
-	mv ${DESTDIR}/usr/share/misc/otermcap ${DESTDIR}/usr/share/misc/termcap
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    ${.CURDIR}/etc.i386/cpio.rc ${MOUNT}/rc
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    ${.CURDIR}/etc.i386/cpio.install ${MOUNT}/install
-	${INSTALL} -c -o ${BINOWN} -g ${BINGRP} -m 755 \
-	    ${.CURDIR}/etc.i386/cpio.magic ${MOUNT}/magic
-	df -ik ${MOUNT}
-	# XXX umount is returning 1 for some reason :-(
-	-umount /dev/${FLOPPY}
-	fsck /dev/r${FLOPPY}
-	dd if=/dev/r${FLOPPY} of=${RELEASEDIR}/floppies/cpio.flp \
-		bs=${FLOPPY_BS} count=${FLOPPY_TRACKS}
-	gzip --no-name -9 -c ${RELEASEDIR}/floppies/cpio.flp \
-		>${RELEASEDIR}/floppies/cpio.flp.gz &
-
-bin-tarball:
-	(cd ${DESTDIR}; \
-		mkdir -p ${RELEASEDIR}/tarballs/bin; \
-		tar cf - . | \
-		${ZIPNSPLIT} ${RELEASEDIR}/tarballs/bin/bin.)
-
-des-tarball:
-	rm -rf ${RELEASEDIR}/tmpdes
-	mkdir ${RELEASEDIR}/tmpdes
-	for i in ${CRYPT_DIRS}; do \
-		cd ${RELEASEDIR}/tmpdes; \
-		mkdir $$i; \
-		chown ${BINOWN}.${GRPOWN} $$i; \
-		chmod 755 $$i; \
-	done
-	# This is ugly, it force installs a /usr/lib/libcrypt.a so
-	# that the other makes will be built with des.
-	#
-	(set -x ; cd ${.CURDIR}/../${DESCRYPT_LIB}; \
-		NOCRYPT=; \
-		unset NOCRYPT; \
-		DESTDIR=; export DESTDIR; \
-		${MAKE} cleandir obj depend all install; \
-		NOMAN=noman; export NOMAN; \
-		DESTDIR=${RELEASEDIR}/tmpdes; export DESTDIR; \
-		${MAKE} cleandir obj depend all install)
-	for i in ${CRYPT_SRCS}; do \
-		NOCRYPT=; \
-		unset NOCRYPT; \
-		DESTDIR=${RELEASEDIR}/tmpdes; export DESTDIR; \
-		NOMAN=noman; export NOMAN; \
-		cd ${.CURDIR}/../$$i; \
-		${MAKE} cleandir obj depend all install; \
-	done
-	(cd ${RELEASEDIR}/tmpdes; \
-		tar cf - . | \
-			${ZIPNSPLIT} ${RELEASEDIR}/tarballs/des/des_tgz.)
-	rm -rf ${RELEASEDIR}/tmpdes
-
 distrib-dirs:
 	mtree -deU -f ${.CURDIR}/mtree/BSD.root.dist -p ${DESTDIR}/
 	mtree -deU -f ${.CURDIR}/mtree/BSD.var.dist -p ${DESTDIR}/var
+# Compatibility stuff, remove obsoleted links, if exists
+	if [ -d	${DESTDIR}/usr/share/locale ] ;	\
+	then \
+		cd ${DESTDIR}/usr/share/locale;	\
+		for l in ${LATIN1LINKS}	; do \
+			if [ -h $$l.ISO_8859-1 ]; then \
+				rm $$l.ISO_8859-1; \
+			fi ; \
+		done; \
+	fi
 	mtree -deU -f ${.CURDIR}/mtree/BSD.usr.dist -p ${DESTDIR}/usr
 	mtree -deU -f ${.CURDIR}/mtree/BSD.include.dist \
 		-p ${DESTDIR}/usr/include
@@ -448,19 +135,34 @@ distrib-dirs:
 .endif
 	cd ${DESTDIR}/; rm -f ${DESTDIR}/sys; ln -s usr/src/sys sys
 	cd ${DESTDIR}/usr/share/locale; \
-	for l in ${LATIN1LINKS} ; do \
-		rm -rf $$l.ISO_8859-1; \
-		ln -s lt_LN.ISO_8859-1 $$l.ISO_8859-1; \
+	set - `cat ${.CURDIR}/locale.alias`; \
+	while [ $$# -gt 0 ] ; \
+	do \
+		rm -rf "$$1"; \
+		ln -s "$$2" "$$1"; \
+		shift; shift; \
 	done
-
-floppies:	kcopy.flp filesyst.flp cpio.flp cdins.flp
-
-release:	release-dirs distribution crunch extract kcopy-kernels \
-		floppies bin-tarball des-tarball clean
-
-release-dirs:
-	chflags -R noschg ${RELEASEDIR}/
-	rm -rf ${RELEASEDIR}/*
-	mtree -d -U -f ${.CURDIR}/mtree/BSD.release.dist -p ${RELEASEDIR}
+	cd ${DESTDIR}/usr/share/nls; \
+	set - `cat ${.CURDIR}/locale.alias`; \
+	while [ $$# -gt 0 ] ; \
+	do \
+		rm -rf "$$1"; \
+		ln -s "$$2" "$$1"; \
+		shift; shift; \
+	done; \
+	rm -rf POSIX; \
+	ln -s C POSIX
+.if defined(MAKE_LOCAL)
+	cd ${DESTDIR}/usr/local/share/nls; \
+	set - `cat ${.CURDIR}/locale.alias`; \
+	while [ $$# -gt 0 ] ; \
+	do \
+		rm -rf "$$1"; \
+		ln -s "$$2" "$$1"; \
+		shift; shift; \
+	done; \
+	rm -rf POSIX; \
+	ln -s C POSIX
+.endif
 
 .include <bsd.prog.mk>
diff --git a/etc/aliases b/etc/aliases
index 0b5ed72c7e30..6f7172b52dff 100644
--- a/etc/aliases
+++ b/etc/aliases
@@ -28,3 +28,6 @@ uucp:	root
 # manager:
 # dumper:
 # operator:
+
+# msgs: "| /usr/bin/msgs -s"
+
diff --git a/etc/crontab b/etc/crontab
index 9ef7abd8114f..bb7a6378a81e 100644
--- a/etc/crontab
+++ b/etc/crontab
@@ -1,6 +1,6 @@
 # /etc/crontab - root's crontab for FreeBSD
 #
-# $Id: crontab,v 1.9 1994/11/02 09:50:11 ache Exp $
+# $Id: crontab,v 1.10 1995/05/27 01:55:21 ache Exp $
 # From: Id: crontab,v 1.6 1993/05/31 02:03:57 cgd Exp
 #
 SHELL=/bin/sh
@@ -12,7 +12,7 @@ HOME=/var/log
 */5     *       *       *       *       root	/usr/libexec/atrun
 #
 # rotate log files every hour, if necessary
-#0	*	*	*	*	root	/usr/bin/newsyslog
+0	*	*	*	*	root	/usr/sbin/newsyslog
 #
 # do daily/weekly/monthly maintenance
 0       2       *       *       *       root    /etc/daily 2>&1 | sendmail root
diff --git a/etc/csh.login b/etc/csh.login
index 178e35143f2b..e0954fb1af86 100644
--- a/etc/csh.login
+++ b/etc/csh.login
@@ -2,12 +2,10 @@
 # Uncomment this to give you the default 4.2 behavior, where disk 
 # information is shown in K-Blocks
 # setenv BLOCKSIZE	K
-# Uncomment next line if you want to setup your 8-bit locale at program
-# startup automatically
-# See also rc and profile
-# setenv ENABLE_STARTUP_LOCALE
-# Uncomment this line to activate russian locale
+# Uncomment this line to activate Russian locale
 # setenv LANG ru_SU.KOI8-R
-# Uncomment this line to activate italian locale
+# Uncomment this line to activate Italian locale
 # setenv LANG it_IT.ISO_8859-1
 # For full locales list check /usr/share/locale/*
+# Read system messages
+# msgs -f
diff --git a/etc/daily b/etc/daily
index 01be2a03fea8..423063e5c29c 100644
--- a/etc/daily
+++ b/etc/daily
@@ -30,37 +30,54 @@ cd /tmp
 #	   -o -name '*.CKP' -o -name '.emacs_[0-9]*' \) \
 #		-a -atime +3 -exec rm -f -- {} \;
 #
+
+# remove system	messages older than 21 days
 msgs -c
+
 if [ -f /etc/news.expire ]; then
 	/etc/news.expire
 fi
 
-if [ -d /var/account ] ; then
+if [ -f /var/account/acct ] ; then
 	echo ""
-	echo "Purging accounting records:"
+	echo "Gathering accounting statistics:"
 	cd /var/account
 	if [ -f acct.2 ] ; then mv -f acct.2 acct.3 ; fi
 	if [ -f acct.1 ] ; then mv -f acct.1 acct.2 ; fi
 	if [ -f acct.0 ] ; then mv -f acct.0 acct.1 ; fi
-	if [ -f acct ] ; then
-		cp -pf acct acct.0
-		sa -s > /dev/null
-	fi
+	cp -pf acct acct.0
+	sa -s > /dev/null
 fi
 
 echo ""
 echo "Backup passwd and group files:"
+if [ ! -f $bak/master.passwd.bak ] ; then
+	echo "no $bak/master.passwd.bak"
+	cp -p /etc/master.passwd $bak/master.passwd.bak
+fi
 if cmp -s $bak/master.passwd.bak /etc/master.passwd; then :; else
 	echo "$host passwd diffs:"
 	diff $bak/master.passwd.bak /etc/master.passwd
 	mv $bak/master.passwd.bak $bak/master.passwd.bak2
 	cp -p /etc/master.passwd $bak/master.passwd.bak
 fi
+if [ ! -f $bak/group.bak ] ; then
+	echo "no $bak/group.bak"
+	cp -p /etc/group $bak/group.bak
+fi
 if cmp -s $bak/group.bak /etc/group; then :; else
+	echo "$host group diffs:"
+	diff $bak/group.bak /etc/group
 	mv $bak/group.bak $bak/group.bak2
 	cp -p /etc/group $bak/group.bak
 fi
+if [ ! -f $bak/aliases.bak ] ; then
+	echo "no $bak/aliases.bak"
+	cp -p /etc/aliases $bak/aliases.bak
+fi
 if cmp -s $bak/aliases.bak /etc/aliases; then :; else
+	echo "$host aliases diffs:"
+	diff $bak/aliases.bak /etc/aliases
 	mv $bak/aliases.bak $bak/aliases.bak2
 	cp -p /etc/aliases $bak/aliases.bak
 fi
@@ -75,23 +92,6 @@ echo ""
 echo "Running calendar:"
 calendar -a
 
-echo ""
-echo "Rotating mail log:"
-cd /var/log
-rm -f maillog.7
-if [ -f maillog.6 ]; then mv -f maillog.6  maillog.7; fi
-if [ -f maillog.5 ]; then mv -f maillog.5  maillog.6; fi
-if [ -f maillog.4 ]; then mv -f maillog.4  maillog.5; fi
-if [ -f maillog.3 ]; then mv -f maillog.3  maillog.4; fi
-if [ -f maillog.2 ]; then mv -f maillog.2  maillog.3; fi
-if [ -f maillog.1 ]; then mv -f maillog.1  maillog.2; fi
-if [ -f maillog.0 ]; then mv -f maillog.0  maillog.1; fi
-mv -f maillog maillog.0
-cp /dev/null maillog
-chmod 644    maillog
-kill -1 `cat /var/run/syslog.pid`
-cd /
-
 if [ -d /var/spool/uucp -a -f /etc/uuclean.daily ]; then
 	echo ""
 	echo "Cleaning up UUCP:"
@@ -123,7 +123,9 @@ echo ""
 echo "network:"
 netstat -i
 echo ""
-ruptime
+if [ -d /var/rwho ] ; then
+	ruptime
+fi
 
 echo ""
 if [ -f /etc/Distfile ]; then
diff --git a/etc/etc.i386/MAKEDEV b/etc/etc.i386/MAKEDEV
index c2fb329d2951..fdba56c0d89d 100644
--- a/etc/etc.i386/MAKEDEV
+++ b/etc/etc.i386/MAKEDEV
@@ -36,14 +36,14 @@
 #		via the floppy disk controller)
 #
 # Disks:
-#	wd*	"winchester" disk drives (ST506,IDE,ESDI,RLL,...)
+#	wd*	"Winchester" disk drives (ST506,IDE,ESDI,RLL,...)
 #	fd*	"floppy" disk drives (3 1/2", 5 1/4")
-#	sd*	"scsi disks"
-#	cd*	"scsi cdrom disks"
-#	mcd*	"mitsumi cdrom disks"
-#	scd*	"sony cdrom disks"
-#	matcd*	"Matsushita (panasonic) cdrom disks"
-#	wcd*	"IDE cdrom disks"
+#	sd*	"SCSI disks"
+#	cd*	"SCSI CD-ROM disks"
+#	mcd*	"Mitsumi CD-ROM disks"
+#	scd*	"Sony CD-ROM disks"
+#	matcd*	"Matsushita (Panasonic) CD-ROM disks"
+#	wcd*	"IDE CD-ROM disks"
 #	vn*	"vnode disks"
 #	od*	"optical disks"
 #
@@ -77,27 +77,29 @@
 #	worm*	WORM driver
 #	pt*	Processor Type (HP scanner, as one example)
 #
+# PC-CARD (previously called PCMCIA) support
+#	card*	PC-CARD slots
+#
 # Special purpose devices:
+#	apm	Advanced Power Management BIOS
 #	bpf*	packet filter
 #	speaker	pc speaker
 #	tw*	xten power controller
-#	snd*	various sound cards (generic entries)
-#	gusmax	A GUS MAX sound card (does various snd* entries)
-#	pas16	A ProAudio Spectrum 16 card (does various snd* entries)
-#	sb	A sound blaster card (any type)
+#	snd*	various sound cards
 #	pcaudio PCM audio driver
 #	socksys iBCS2 socket system driver
 #	vat	VAT compatibility audio driver (requires snd*)
 #	gsc	Genius GS-4500 hand scanner
 #	joy	pc joystick
 #	tun	Tunneling IP device
-#	spigot	Video Spigot video aquisition card
-#	meteor*	Matrox Meteor video aquisition card (pci)
-#	qcam*	Connectix QuickCam parallel port camera
+#	spigot	Video Spigot video acquisition card
+#	meteor*	Matrox Meteor video acquisition card (pci)
+#	qcam*	Connectix QuickCam(tm) parallel port camera
 #	isdn*	ISDN devices
 #	labpc*	National Instrument's Lab-PC and LAB-PC+
+#	perfmon	CPU performance-monitoring counters
 #
-#	$Id: MAKEDEV,v 1.95.4.10 1996/05/03 06:02:41 asami Exp $
+#	$Id: MAKEDEV,v 1.95.4.11 1996/05/04 07:18:45 pst Exp $
 #
 
 PATH=/sbin:/bin/:/usr/bin:/usr/sbin:
@@ -158,6 +160,10 @@ dkrawslice=1
 # Control bit for SCSI
 scsictl=536870912
 
+# Standard umasks
+disk_umask=037			# allow group operator to read disks
+tape_umask=017			# allow group operator to read/write tapes
+
 for i
 do
 case $i in
@@ -165,26 +171,28 @@ case $i in
 all)
 	sh MAKEDEV std						# standard
 	sh MAKEDEV wd0 wd1 wd2 wd3 fd0 fd1 sd0 sd1 sd2 sd3	# bdev, disk
-	sh MAKEDEV cd0 mcd0 scd0 matcd0	wcd0			# bdev, cdrom
+	sh MAKEDEV cd0 mcd0 scd0 matcd0 wcd0			# bdev, cdrom
 	sh MAKEDEV ft0 wt0 st0					# bdev, tape
 	sh MAKEDEV ttyd0 ttyd1 ttyd2 ttyd3			# cdev, serial
 	sh MAKEDEV cuaa0 cuaa1 cuaa2 cuaa3			# cdev, serial
 	sh MAKEDEV lpt0 lpt1 lpt2				# cdev, printer
 	sh MAKEDEV pty0 ch0 tw0 bpf0				# cdev
-	sh MAKEDEV speaker pcaudio psm0 mse0			# cdev
+	sh MAKEDEV perfmon speaker pcaudio psm0 mse0		# cdev
 	sh MAKEDEV vty4						# cdev
 	sh MAKEDEV tun0						# cdev
 	;;
 std)
-	rm -f console drum mem kmem null zero io tty klog stdin stdout stderr
-	rm -f lkm
+	rm -f console drum mem kmem null random urandom zero io tty klog
+	rm -f stdin stdout stderr lkm
 	mknod console	c 0 0;	chmod 600 console;	chown root.wheel console
 	mknod drum	c 4 0;	chmod 640 drum;		chown root.kmem drum
 	mknod kmem	c 2 1;	chmod 640 kmem;		chown root.kmem kmem
 	mknod mem	c 2 0;	chmod 640 mem;		chown root.kmem mem
 	mknod null	c 2 2;	chmod 666 null;		chown root.wheel null
+	mknod random	c 2 3;	chmod 644 random;	chown root.wheel random
+	mknod urandom	c 2 4;	chmod 644 urandom;	chown root.wheel urandom
 	mknod zero	c 2 12;	chmod 666 zero;		chown root.wheel zero
-	mknod io	c 2 14;	chmod 640 io;		chown root.kmem io
+	mknod io	c 2 14;	chmod 600 io;		chown root.wheel io
 	mknod tty	c 1 0;	chmod 666 tty;		chown root.wheel tty
 	mknod klog	c 7 0;	chmod 600 klog;		chown root.wheel klog
 	mknod stdin	c 22 0; chmod 666 stdin;	chown root.wheel stdin
@@ -211,7 +219,7 @@ mach-4)
 
 # Create device files for new Archive/Wangtek QIC-02 tape driver (vak)
 wt*)
-	umask 7
+	umask $tape_umask
 	u=`expr $i : '..\(.*\)'`
 	if [ x$u = x ]; then u=0; fi
 	rm -f r[Ww]t$u nr[Ww]t$u r[Ww]t$u[a-f] nr[Ww]t$u[a-f]
@@ -234,13 +242,13 @@ wt*)
 	;;
 
 # Individual slices.
-sd*s*|vn*s*|wd*s*|od*s*)
-	umask 37
+od*s*|sd*s*|vn*s*|wd*s*)
+	umask $disk_umask
 	case $i in
+	od*s*) name=od; blk=20; chr=70;;
 	sd*s*) name=sd; blk=4;  chr=13;;
 	wd*s*) name=wd; blk=0;  chr=3;;
 	vn*s*) name=vn; blk=15; chr=43;;
-	od*s*) name=od; blk=20; chr=70;;
 	esac
 	unit=`expr $i : '..\([0-9]*\)s'`
 	slice=`expr $i : '..[0-9]*s\([0-9]*\)'`
@@ -293,7 +301,7 @@ sd*s*|vn*s*|wd*s*|od*s*)
 	;;
 
 fd*)
-	umask 2
+	umask $disk_umask
 	unit=`expr $i : '..\(.*\)'`
 	name=fd; blk=2; chr=9
 	rm -f $name$unit* r$name$unit*
@@ -368,7 +376,6 @@ fd*)
 		# ln r${name}${unit}.360 r${name}${unit}48ds9
 
 		chgrp operator ${name}${unit}* r${name}${unit}*
-		chmod 640 ${name}${unit}* r${name}${unit}*
 		;;
 	*)
 		echo bad unit for disk in: $i
@@ -377,9 +384,8 @@ fd*)
 	umask 77
 	;;
 
-
 ft*)
-	umask 2
+	umask $tape_umask
 	unit=`expr $i : '..\(.*\)'`
 	name=ft; blk=2; chr=9
 	rm -f $name$unit* r$name$unit*
@@ -390,7 +396,6 @@ ft*)
 		ln ${name}${unit} ${name}${unit}a
 		ln r${name}${unit} r${name}${unit}a
 		chgrp operator ${name}${unit}* r${name}${unit}*
-		chmod 640 ${name}${unit}* r${name}${unit}*
 		;;
 	*)
 		echo bad unit for tape in: $i
@@ -399,13 +404,13 @@ ft*)
 	umask 77
 	;;
 
-sd*|vn*|wd*|od*)
-	umask 37
+od*|sd*|vn*|wd*)
+	umask $disk_umask
 	case $i in
+	od*) name=od; blk=20; chr=70;;
 	sd*) name=sd; blk=4;  chr=13;;
-	wd*) name=wd; blk=0;  chr=3;;
 	vn*) name=vn; blk=15; chr=43;;
-	od*) name=od; blk=20; chr=70;;
+	wd*) name=wd; blk=0;  chr=3;;
 	esac
 	unit=`expr $i : '..\(.*\)'`
 	case $unit in
@@ -415,7 +420,7 @@ sd*|vn*|wd*|od*)
 			sh MAKEDEV $name$unit$slicepartname
 		done
 		case $name in
-		sd|od)
+		od|sd)
 			rm -f r${name}${unit}.ctl
 			mknod r${name}${unit}.ctl c $chr `expr $unit '*' 8 + $scsictl `
 			chmod 600 r${name}${unit}.ctl
@@ -473,7 +478,6 @@ worm*)
 	mknod r${name}${unit} c $chr ${unit}
 	rm -f r${name}${unit}.ctl
 	mknod r${name}${unit}.ctl c $chr `expr $unit + $scsictl `
-	chmod 600 r${name}${unit}.ctl
 	;;
 
 # SCSI processor type driver
@@ -489,7 +493,6 @@ pt[0-9]*)
 	mknod ${name}${unit} c $chr $unit
 	rm -f ${name}${unit}.ctl
 	mknod ${name}${unit}.ctl c $chr `expr $unit + $scsictl `
-	chmod 600 ${name}${unit}.ctl
 	;;
 
 pty*)
@@ -529,7 +532,7 @@ pty*)
 	;;
 
 st*)
-	umask 2
+	umask $tape_umask
 	unit=`expr $i : '..\(.*\)'`
 	chr=14
 
@@ -553,10 +556,7 @@ st*)
 					nrst${unit}.${mode} \
 					erst${unit}.${mode} \
 					st${unit}ctl.${mode}
-			chmod 640	rst${unit}.${mode}\
-					nrst${unit}.${mode} \
-					erst${unit}.${mode}
-			chmod 660	st${unit}ctl.${mode}
+			chmod 600	st${unit}ctl.${mode}
 		done
 		rm -f rst${unit}.ctl
 		mknod rst${unit}.ctl c $chr `expr $unit '*' 16 + $scsictl `
@@ -574,7 +574,7 @@ st*)
 	;;
 
 ch*)
-	umask 2
+	umask 37
 	unit=`expr $i : '..\(.*\)'`
 	case $i in
 	ch*) name=ch;  chr=17;;
@@ -584,7 +584,6 @@ ch*)
 	0|1|2|3|4|5|6)
 		mknod ${name}${unit}	c $chr `expr $unit '*' 16 + 0`
 		chgrp operator ${name}${unit}
-		chmod 640 ${name}${unit}
 		rm -f r${name}${unit}.ctl
 		mknod r${name}${unit}.ctl c $chr `expr $unit '*' 16 + $scsictl `
 		chmod 600 r${name}${unit}.ctl
@@ -597,7 +596,7 @@ ch*)
 	;;
 
 cd*|mcd*|scd*)
-	umask 2
+	umask $disk_umask
 	case $i in
 	cd*) unit=`expr $i : '..\(.*\)'`; name=cd; blk=6; chr=15;;
 	mcd*) unit=`expr $i : '...\(.*\)'`; name=mcd; blk=7; chr=29;;
@@ -611,7 +610,6 @@ cd*|mcd*|scd*)
 		mknod r${name}${unit}a	c $chr `expr $unit '*' 8 + 0`
 		mknod r${name}${unit}c	c $chr `expr $unit '*' 8 + 2`
 		chgrp operator ${name}${unit}[a-h] r${name}${unit}[a-h]
-		chmod 640 ${name}${unit}[a-h] r${name}${unit}[a-h]
 		case $name in
 		cd)
 			rm -f r${name}${unit}.ctl
@@ -892,7 +890,8 @@ mouse*)
 	if [ ! -c $name ]; then
 		$0 $name			# make the appropriate device
 	fi
-	ln -fs $name mouse
+	rm -f mouse
+	ln -s $name mouse
 	;;
 
 pcaudio)
@@ -914,7 +913,7 @@ socksys)
 snd*)
 #
 # changes from Linux voxware
-# minor		linux			freebsd
+# minor		Linux			FreeBSD
 # 8		sequencer2 (aka music0)	music0
 # 17		patmgr0			sequencer1
 # 33		patmgr1			sequencer2
@@ -928,13 +927,13 @@ snd*)
 	umask $snd_security_hole
 
 	if [ $unit = "0" ] ; then
-		ln -fs mixer$unit mixer
-		ln -fs sequencer$unit sequencer
-		ln -fs dsp$unit dsp
-		ln -fs audio$unit audio
-		ln -fs dspW$unit dspW
-		ln -fs music$unit music
-		ln -fs pss$unit pss
+		rm -f mixer     ; ln -s mixer$unit mixer
+		rm -f sequencer ; ln -s sequencer$unit sequencer
+		rm -f dsp       ; ln -s dsp$unit dsp
+		rm -f audio     ; ln -s audio$unit audio
+		rm -f dspW      ; ln -s dspW$unit dspW
+		rm -f music	; ln -s music$unit music
+		rm -f pss       ; ln -s pss$unit pss
 	fi
 
 	rm -f mixer$unit	# Mixer	[ Control ]
@@ -970,18 +969,6 @@ snd*)
 	umask 77
 	;;
 
-# More specialized cases of snd driver.
-gusmax)
-	sh /dev/MAKEDEV snd0 snd1 snd2
-	ln -fs /dev/dsp2 /dev/dsp
-	;;
-pas16)
-	sh /dev/MAKEDEV snd0 snd1
-	;;
-sb)
-	sh /dev/MAKEDEV snd0
-	;;
-
 vat)
 	rm -f vatio
 	mknod vatio c 25 128
@@ -1036,7 +1023,6 @@ cronyx)
 	;;
 
 joy)
-	umask 2
 	rm -f joy0 joy1
 	mknod joy0 c 51 0
 	mknod joy1 c 51 1
@@ -1061,6 +1047,7 @@ meteor?)
 	unit=`expr $i : 'meteor\(.*\)'`
 	rm -f meteor$unit
 	mknod meteor$unit c 67 $unit
+	chown root.wheel meteor$unit
 	chmod 444 meteor$unit
 	;;
 
@@ -1177,6 +1164,10 @@ labpc*)
 	umask 77
 	;;
 
+perfmon)
+	mknod perfmon	c 2 32;	chmod 640 perfmon;	chown root.kmem perfmon
+	;;
+
 local)
 	umask 0			# XXX should be elsewhere
 	sh MAKEDEV.local
diff --git a/etc/etc.i386/disktab b/etc/etc.i386/disktab
index b915c552d583..cf6105a1b346 100644
--- a/etc/etc.i386/disktab
+++ b/etc/etc.i386/disktab
@@ -183,3 +183,9 @@ sony650|Sony 650 MB MOD|\
 	:ty=removable:dt=SCSI:se#512:nt#1:ns#31:nc#18600:ts#1:rm#4800:\
 	:pc#576600:oc#0:\
 	:pa#576600:oa#0:ta=4.2BSD:ba#8192:fa#1024:
+
+mta3230|mo230|IBM MTA-3230 230 Meg 3.5inch Magneto-Optical:\
+	:ty=removeable:dt=SCSI:rm#3600:\
+	:se#512:nt#64:ns#32:nc#216:sc#2048:su#444384:\
+	:pa#444384:oa#0:ba#4096:fa#0:ta=4.2BSD:\
+	:pc#444384:oc#0:
diff --git a/etc/etc.i386/rc.i386 b/etc/etc.i386/rc.i386
index 05300419a482..0b98a9a71360 100644
--- a/etc/etc.i386/rc.i386
+++ b/etc/etc.i386/rc.i386
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: rc.i386,v 1.9.4.1 1995/07/27 14:07:03 rgrimes Exp $
+#	$Id: rc.i386,v 1.9.4.2 1996/01/29 14:47:03 gpalmer Exp $
 #	Do i386 specific processing
 #
 
@@ -9,19 +9,21 @@ echo -n 'enabling FreeBSD/i386 options:'
 # Start the SCO binary emulation if requested.
 if [ "X${ibcs2}" = X"YES" ]; then
 	echo -n ' ';		ibcs2
-	# XXX BOUGS - ibcs2 script shouldn't make any output on success
+	# XXX BOGUS - ibcs2 script shouldn't make any output on success
 fi
 
 # Start the Linux binary emulation if requested.
 if [ "X${linux}" = X"YES" ]; then
-	echo -n ' ';            linux
-	# XXX BOGUS - linux script shouldn't make any output on success
+	echo -n ' ';		linux
+	# XXX BOGUS - Linux script shouldn't make any output on success
 fi
 
 if [ "X${xtend}" != X"NO" -a -x /usr/libexec/xtend ]; then
  	echo -n ' xtend';	/usr/libexec/xtend
 fi
 
+echo '.'
+
 ##########################################################################
 ####### Syscons section						  ########
 ##########################################################################
@@ -30,20 +32,7 @@ fi
 kbddev=/dev/ttyv0
 viddev=/dev/ttyv0
 
-# don't change these, they're modified below
-kbdadjust=NO
-vidadjust=NO
-
-[ "X${keymap}" != X"NO" -o "X${keyrate}" != X"NO" \
-	-o "X${keychange}" != X"NO" ] && kbdadjust=YES
-[ "X${scrnmap}" != X"NO" -o "X${font8x16}" != X"NO" -o \
-	"X${font8x14}" != X"NO" -o "X${font8x8}" != X"NO" -o \
-	"X${blanktime}" != X"NO" -o "X${cursor}" != X"NO" ] && vidadjust=YES
-
-[ "X${kbdadjust}" != X"NO" -o "X${vidadjust}" != X"NO" -o \
-	"X${saver}" != X"NO" ] && { echo; echo "configuring syscons:"; }
-
-[ "X${kbdadjust}" != X"NO" ] && echo -n ' [kbdcontrol:'
+echo -n "configuring syscons:"
 
 # keymap
 if [ "X${keymap}" != X"NO" ]; then
@@ -66,11 +55,6 @@ if [ "X${keychange}" != X"NO" ]; then
 	done
 fi
 
-[ "X${kbdadjust}" != X"NO" ] && echo ']'
-
-
-[ "X${vidadjust}" != X"NO" ] && echo -n ' [vidcontrol:'
-
 # cursor type
 if [ "X${cursor}" != X"NO" ]; then
 	echo -n ' cursor';	vidcontrol <${viddev} -c ${cursor}
@@ -101,13 +85,20 @@ if [ "X${blanktime}" != X"NO" ]; then
 	echo -n ' blank_time';	vidcontrol <${viddev} -t ${blanktime}
 fi
 
-[ "X${vidadjust}" != X"NO" ] && echo ']'
-
 # screen saver
 if [ "X${saver}" != X"NO" ] ; then
-	echo -n ' screensaver: '
-	modstat | grep _saver || modload -u -o /tmp/saver_mod -e \
-				 saver_init -q /lkm/${saver}_saver_mod.o
+	echo -n ' screensaver'
+	modstat | grep _saver || \
+		modload -u -o /tmp/saver_mod -q /lkm/${saver}_saver_mod.o
 fi
 
 echo '.'
+
+# interrupts for /dev/random device
+if [ "X${rand_irqs}" != X"NO" ] ; then
+	echo -n 'entropy source: '
+	rndcontrol ${rand_irqs}
+fi
+
+echo '.' # probably bogus
+
diff --git a/etc/hosts b/etc/hosts
index eb61507e5335..9ce3df033a6e 100644
--- a/etc/hosts
+++ b/etc/hosts
@@ -1,4 +1,4 @@
-# $Id: hosts,v 1.5 1995/04/09 09:54:39 rgrimes Exp $
+# $Id: hosts,v 1.5.4.1 1995/11/19 17:53:28 jkh Exp $
 #
 # Host Database
 # This file should contain the addresses and aliases
@@ -8,14 +8,12 @@
 #
 #
 127.0.0.1		localhost localhost.my.domain
-# for the no-configured-network case.
-127.0.0.1		myname.my.domain
 #
 # Imaginary network.
 #10.0.0.2		myname.my.domain myname
 #10.0.0.3		myfriend.my.domain myfriend
 #
-# According to RFC 1597, you can use the following IP networks for
+# According to RFC 1918, you can use the following IP networks for
 # private nets which will never be connected to the Internet:
 #
 #	10.0.0.0	-   10.255.255.255
diff --git a/etc/inetd.conf b/etc/inetd.conf
index 7460512f09d3..58486f0acc19 100644
--- a/etc/inetd.conf
+++ b/etc/inetd.conf
@@ -42,6 +42,8 @@ rkinit	stream	tcp	nowait	root	/usr/libexec/rkinitd	rkinitd
 #rusersd/1-2	dgram	rpc/udp	wait	root	/usr/libexec/rpc.rusersd	rpc.rusersd
 #walld/1	dgram	rpc/udp	wait	root	/usr/libexec/rpc.rwalld	rpc.rwalld
 #pcnfsd/1-2	dgram	rpc/udp	wait	root	/usr/libexec/rpc.pcnfsd	rpc.pcnfsd	
+#rquotad/1	dgram	rpc/udp	wait	root	/usr/libexec/rpc.rquotad rpc.rquotad
+#sprayd/1	dgram	rpc/udp	wait	root	/usr/libexec/rpc.sprayd	rpc.sprayd
 #
 # example entry for the pop3 server
 #pop3	stream	tcp	nowait	root	/usr/local/libexec/popper	popper
diff --git a/etc/make.conf b/etc/make.conf
index b284f8abdaa1..63ac814e588d 100644
--- a/etc/make.conf
+++ b/etc/make.conf
@@ -1,4 +1,4 @@
-# $Id: make.conf,v 1.23 1995/09/30 17:20:27 ache Exp $
+# $Id: make.conf,v 1.17.4.3 1995/10/26 02:39:24 jfieber Exp $
 #
 # This file, if present, will be read by make (see /usr/share/mk/sys.mk).
 # It allows you to override macro definitions to make without changing
@@ -11,7 +11,7 @@
 #
 # One, and probably the most common, use could be:
 #
-#CFLAGS= -O2 -m486 -pipe -fno-strength-reduce
+#CFLAGS= -O2 -m486 -pipe
 #
 # Another useful entry is
 #
@@ -39,26 +39,45 @@
 #NOMANCOMPRESS=	true
 #
 #
+# If you do not want additional documentation (some of which are
+# a few hundred KB's) for ports to be installed:
+#
+#NOPORTDOCS=	true
+#
+#
 # Default format for system documentation, depends on your printer.
 # Set this to "ascii" for simple printers or screen
 #
 #PRINTER=	ps
 #
 #
-# How many times to check if a key has been pressed before giving up and
-# booting the default kernel. 0 actually means check once, but saves the
-# loop overhead. This value is approximately in milliseconds.
+# How long to wait for a console keypress before booting the default kernel.
+# This value is approximately in milliseconds. Keypresses are accepted by the
+# BIOS before booting from disk, making it possible to give custom boot
+# parameters even when this is set to 0.
 #
 #BOOTWAIT=0
 #BOOTWAIT=30000
 #
 #
 # By default, this points to /usr/X11R6 for XFree86 releases 3.0 or earlier.
-# If you have a XFree86 from before 3.0 you want to uncomment this.
+# If you have a XFree86 from before 3.0 that has the X distribution in
+# /usr/X386, you want to uncomment this.
 #
 #X11BASE=	/usr/X386
 #
 #
+# If you have Motif on your system, uncomment this.
+#
+#HAVE_MOTIF=	yes
+#
+# If the default location of the Motif library (specified below) is NOT
+# appropriate for you, uncomment this and change it to the correct value.
+# If your motif is in ${X11BASE}/lib, you don't need to touch this line.
+#
+#MOTIFLIB=	-L${X11BASE}/lib -lXm
+#
+#
 # Build `cc' using a dynamic internals library, rather than the default
 # (static) one.  This makes the compilers run slower (10-15%), but saves 
 # quite some diskspace.
diff --git a/etc/monthly b/etc/monthly
index 477d0ce91768..b96bb38a780c 100644
--- a/etc/monthly
+++ b/etc/monthly
@@ -7,22 +7,6 @@ PATH=/bin:/usr/bin:/sbin:/usr/sbin
 host=`hostname -s`
 echo "Subject: $host monthly run output"
 
-# echo ""
-# echo "Doing login accounting:"
-# ac -p | sort -nr +1
-
-echo ""
-echo -n "Rotating log files:"
-cd /var/log
-for i in kerberos.log lpd-errs wtmp; do
-	echo -n " $i"
-	if [ -f $i.5 ]; then mv -f $i.5 $i.6; fi
-	if [ -f $i.4 ]; then mv -f $i.4 $i.5; fi
-	if [ -f $i.3 ]; then mv -f $i.3 $i.4; fi
-	if [ -f $i.2 ]; then mv -f $i.2 $i.3; fi
-	if [ -f $i.1 ]; then mv -f $i.1 $i.2; fi
-	if [ -f $i.0 ]; then mv -f $i.0 $i.1; fi
-	if [ -f $i ]; then mv -f $i $i.0; fi
-	>$i
-done
 echo ""
+echo "Doing login accounting:"
+ac -p | sort -nr +1
diff --git a/etc/motd b/etc/motd
index 776706f36207..585acad8ec89 100644
--- a/etc/motd
+++ b/etc/motd
@@ -2,3 +2,9 @@ FreeBSD ?.?.?  (UNKNOWN)
 
 Welcome to FreeBSD!
 
+If the info distribution has been loaded on this machine, the FreeBSD
+Handbook will be in file:/usr/share/doc/handbook and the FAQ in
+file:/usr/share/doc/FAQ 
+
+Type /stand/sysinstall to re-enter the installation and configuration utility.
+
diff --git a/etc/mtree/BSD.include.dist b/etc/mtree/BSD.include.dist
index 227f89f4147c..c0a20e28e5d5 100644
--- a/etc/mtree/BSD.include.dist
+++ b/etc/mtree/BSD.include.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.include.dist,v 1.1 1995/03/18 07:02:10 rgrimes Exp $
+#	$Id: BSD.include.dist,v 1.2 1995/05/17 09:31:03 rgrimes Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
@@ -13,14 +13,8 @@
     ..
     net
     ..
-    netccitt
-    ..
     netinet
     ..
-    netiso
-    ..
-    netns
-    ..
     nfs
     ..
     objc
diff --git a/etc/mtree/BSD.local.dist b/etc/mtree/BSD.local.dist
index 789c5b8ba205..98f61d736ec5 100644
--- a/etc/mtree/BSD.local.dist
+++ b/etc/mtree/BSD.local.dist
@@ -1,4 +1,4 @@
-#     $Id: BSD.local.dist,v 1.11 1995/05/17 09:31:07 rgrimes Exp $
+#     $Id: BSD.local.dist,v 1.11.4.1 1995/10/05 09:31:35 davidg Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
@@ -32,6 +32,8 @@
         ..
         cat8            uname=man
         ..
+        cat9            uname=man
+        ..
         catl            uname=man
         ..
         man1
@@ -50,14 +52,16 @@
         ..
         man8
         ..
-        manl
+        man9
         ..
-        skel
+        manl
         ..
     ..
     sbin
     ..
     share
+        doc
+        ..
         nls
 	    C
 	    ..
@@ -112,5 +116,7 @@
 	    sv_SE.ISO_8859-1
             ..
         ..
+        skel
+        ..
     ..
 ..
diff --git a/etc/mtree/BSD.usr.dist b/etc/mtree/BSD.usr.dist
index ffbde141e510..6cbdbd88ea63 100644
--- a/etc/mtree/BSD.usr.dist
+++ b/etc/mtree/BSD.usr.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.usr.dist,v 1.40.4.6 1996/05/07 15:34:50 nate Exp $
+#	$Id: BSD.usr.dist,v 1.40.4.7 1996/05/07 20:15:49 jkh Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
@@ -43,6 +43,8 @@
 		..
 		hr_HR.ISO_8859-2
 		..
+		ru_SU.KOI8-R
+		..
         ..
         dict
         ..
@@ -179,8 +181,6 @@
             ..
             sup
             ..
-            syscons
-            ..
         ..
 /set type=dir uname=games gname=bin mode=0755
         games           uname=bin
diff --git a/etc/mtree/BSD.var.dist b/etc/mtree/BSD.var.dist
index 1e4409228b84..95065ccdc045 100644
--- a/etc/mtree/BSD.var.dist
+++ b/etc/mtree/BSD.var.dist
@@ -1,4 +1,4 @@
-#	$Id: BSD.var.dist,v 1.22 1995/04/12 03:02:01 ache Exp $
+#	$Id: BSD.var.dist,v 1.23 1995/05/17 09:31:17 rgrimes Exp $
 #
 
 /set type=dir uname=bin gname=bin mode=0755
@@ -34,7 +34,7 @@
     ..
     mail            uname=bin
     ..
-    msgs            uname=bin
+    msgs            uname=daemon
     ..
     preserve        uname=bin
     ..
diff --git a/etc/netstart b/etc/netstart
index c837bce1edc4..d0ad128e4c22 100755
--- a/etc/netstart
+++ b/etc/netstart
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$Id: netstart,v 1.32.4.2 1995/08/23 07:18:05 jkh Exp $
+#	$Id: netstart,v 1.32.4.3 1995/08/25 07:21:46 davidg Exp $
 #	From: @(#)netstart	5.9 (Berkeley) 3/30/91
 
 # Note that almost all the user-configurable behavior is no longer in
@@ -23,9 +23,14 @@ if [ -n "$defaultdomainname" -a "x$defaultdomainname" != "xNO" ] ; then
 	domainname $defaultdomainname
 fi
 
+# If IP filtering
+if [ -n "$firewall" -a "x$firewall" != "xNO" -a -f /etc/rc.firewall ] ; then
+	sh /etc/rc.firewall
+fi
+
 #
 # XXX This is known to cause an error if /usr is nfs mounted since it
-# will not be avaliable until after the network is up :-(.  Once the
+# will not be available until after the network is up :-(.  Once the
 # relocation of sysctl to /sbin is done that problem will go away.
 #
 if [ -n "$tcp_extensions" -a "x$tcp_extensions" = "xNO" ] ; then
@@ -49,28 +54,20 @@ if [ -n "$defaultrouter" -a "x$defaultrouter" != "xNO" ] ; then
 fi
 
 # Set up any static routes.  This should be done before router discovery.
-for i in ${static_routes}; do
-	eval route_args=\$route_${i}
-	route add ${route_args}
-done
+if [ "x${static_routes}" != "x" ]; then
+	for i in ${static_routes}; do
+		eval route_args=\$route_${i}
+		route add ${route_args}
+	done
+fi
 
 if [ "x$gateway" != "xNO" ]; then
 	echo 'configuring host as a gateway.'
-	sysctl -w net.inet.ip.forwarding=1
+	sysctl -w net.inet.ip.forwarding=1 >/dev/null 2>&1
 fi
 
-if [ "x$gated" != "xNO" -o "x$routedflags" != "xNO" ] ; then
-	echo -n starting routing daemons:
-
-	# $gated and $routedflags are imported from /etc/sysconfig.
-	# If $gated == YES, gated is used; otherwise routed.
-	# If $routedflags == NO, routed isn't run.
-
-	if [ "X${gated}" = X"YES" -a -r /etc/gated.conf ]; then
-		echo -n	' gated';	/usr/local/sbin/gated $gatedflags
-	elif [ "X${routedflags}" != X"NO" ]; then
-		echo -n ' routed';	routed $routedflags
-	fi
-
+if [ "x$router" != "xNO" ] ; then
+	echo -n starting routing daemon:
+	echo -n " ${router}";	${router} ${routerflags}
 	echo '.'
 fi
diff --git a/etc/ppp/ppp.conf.iij b/etc/ppp/ppp.conf.iij
index 940898cb9ede..6c15bc9b20c3 100644
--- a/etc/ppp/ppp.conf.iij
+++ b/etc/ppp/ppp.conf.iij
@@ -2,7 +2,7 @@
 #
 #  Examples to connect to IIJ Dialup PPP service
 #
-#	1) On IIJ servive, both user side and server side address can
+#	1) On IIJ service, both user side and server side address can
 #	   not be predicted by a customer. In this circumstance, you need
 #	   some trick to use on-demand dialup. See iij-demand for example.
 #
@@ -10,7 +10,7 @@
 #	   In all cases, you can use same username and password assigned
 #	   from IIJ.
 #
-#  $Id:$
+#  $Id: ppp.conf.iij,v 1.1.1.1 1995/01/31 06:24:33 amurai Exp $
 #
 #############################################################################
 #
@@ -27,7 +27,7 @@ iij:
  set timeout 0
  dial
 #
-#  If you prefer to use PAP authentification, use this one.
+#  If you prefer to use PAP authentication, use this one.
 #
 #	% ppp iij-pap
 #
@@ -41,7 +41,7 @@ iij-pap:
  set openmode active
  dial
 #
-#  Use "% ppp iij-chap" for CHAP authentification
+#  Use "% ppp iij-chap" for CHAP authentication
 #
 iij-chap:
  set phone 0332425701
diff --git a/etc/ppp/ppp.conf.sample b/etc/ppp/ppp.conf.sample
index 20180228a7b8..0da1cf9db987 100644
--- a/etc/ppp/ppp.conf.sample
+++ b/etc/ppp/ppp.conf.sample
@@ -4,14 +4,14 @@
 #
 #	  Written by Toshiharu OHNO
 #
-# $Id: ppp.conf.sample,v 1.2 1995/02/26 12:16:36 amurai Exp $
+# $Id: ppp.conf.sample,v 1.3 1995/04/22 17:14:21 amurai Exp $
 #
 #################################################################
 #
 # Default setup. Executed always when PPP is invoked.
 #
 default:
- set device /dev/cua01
+ set device /dev/cuaa1
  set speed 38400
  disable lqr
  deny lqr
@@ -36,9 +36,15 @@ simplesite:
  set login "TIMEOUT 5 login:-\\r-login: ppp word: ppp"
  set timeout 120
 #
-# If peer reqires to use CHAP, don't forget to supply authname and authkey.
+# Multi-phone example
 #
-# If you'd like to use CHAP to authentificate peer, comment out the line
+multiphone:
+ set phone 12345678:12345679:12345670:12345671
+ set login "TIMEOUT 5 login:-\\r-login: ppp word: ppp"
+#
+# If peer requires to use CHAP, don't forget to supply authname and authkey.
+#
+# If you'd like to use CHAP to authentication peer, comment out the line
 # ``enable chap'' below. You also need to prepare /etc/ppp.secret.
 #
 # If remote system sends its system name within CHAP packet and it is
@@ -54,7 +60,7 @@ chapsite:
  set authname MySystemName
  set authkey  OurSecretKey
 #
-# To speak PAP is just smilar to CHAP
+# To speak PAP is just similar to CHAP
 #
 papsite:
  set phone 12345678
@@ -76,8 +82,8 @@ ondemand:
  set phone 1234567
  set login "TIMEOUT 5 login:-\\r-login: ppp word: ppp"
  set timeout 120
- set ifaddr 192.244.185.226 192.244.176.44
- add 0 255.255.255.0 192.244.176.44
+ set ifaddr 192.244.185.226 192.244.176.44 255.255.255.0
+ add 0 0 192.244.176.44
 #
 # Another on demand example
 #  If peer assign some IP address for us, and we can't predict it
@@ -87,8 +93,8 @@ pmdemend:
  set phone 1234567
  set login "TIMEOUT 5 login:-\\r-login: ppp word: ppp"
  set timeout 120
- set ifaddr 0 192.244.176.44
- add 0 255.255.255.0 192.244.176.44
+ set ifaddr 0 192.244.176.44 255.255.255.0
+ add 0 0 192.244.176.44
 #
 # Example to validate incoming user with CHAP
 #  Invod as ``ppp -direct users'' from login script. User's system name
@@ -106,8 +112,8 @@ users:
 # Example of Callback Request
 #
 #  Here, we assume that peer will hangup the line and initiates a callback
-#  after successful authentification. We simply use chat script capabiluty
-#  and wait for a "NO CARRIRER" response from our modem.
+#  after successful authentication. We simply use chat script capability
+#  and wait for a "NO CARRIER" response from our modem.
 #
 #  % ppp callback
 #
diff --git a/etc/ppp/ppp.linkup.sample b/etc/ppp/ppp.linkup.sample
index afe58a79ed17..2328317d6fc1 100644
--- a/etc/ppp/ppp.linkup.sample
+++ b/etc/ppp/ppp.linkup.sample
@@ -4,17 +4,17 @@
 #
 #
 #  This file is checked when PPP establishes network level connection.
-#  PPP command seaches label in this file in following way and order.
+#  PPP command searches label in this file in following way and order.
 #
-#  1) At first, IP address assigned into our side is serched and execute
+#  1) At first, IP address assigned into our side is searched and execute
 #     associated command.
 #
 #  2) If it didn't found, then label name specified at startup time is
 #     searched.
 #
-#  3) If given label name is not found, then label MYADDR is serched.
+#  3) If given label name is not found, then label MYADDR is searched.
 #
-# $Id:$
+# $Id: ppp.linkup.sample,v 1.1.1.1 1995/01/31 06:24:33 amurai Exp $
 #
 #########################################################################
 #
@@ -22,16 +22,16 @@
 # to 192.244.176.0 network.
 #
 #192.244.176.32:
-# add 192.244.176.0 255.255.255.0 HISADDR
+# add 192.244.176.0 0 HISADDR
 #
-# If we are invked with an argument ``iij-demand'', then
+# If we are invoked with an argument ``iij-demand'', then
 # delete existing route entry and add peer as default gateway.
 #
 iij-demand:
  delete ALL
  add 0 0 HISADDR
 #
-# Otherwide, simply add peer as default gateway.
+# Otherwise, simply add peer as default gateway.
 #
 MYADDR:
  add 0 0 HISADDR
diff --git a/etc/profile b/etc/profile
index 69b96d1069df..e868673d976e 100644
--- a/etc/profile
+++ b/etc/profile
@@ -2,12 +2,10 @@
 # Uncomment this to give you the default 4.2 behavior, where disk 
 # information is shown in K-Blocks
 # BLOCKSIZE=K; export BLOCKSIZE
-# Uncomment next line if you want to setup your 8-bit locale at program
-# startup automatically
-# See also rc and csh.login
-# ENABLE_STARTUP_LOCALE=; export ENABLE_STARTUP_LOCALE
-# Uncomment next line to activate russian locale
+# Uncomment next line to activate Russian locale
 # LANG=ru_SU.KOI8-R; export LANG
-# Uncomment next line to activate italian locale
+# Uncomment next line to activate Italian locale
 # LANG=it_IT.ISO_8859-1; export LANG
 # For full locales list check /usr/share/locale/*
+# Read system messages
+# msgs -f
diff --git a/etc/rc b/etc/rc
index d73a8ac9f1e1..2a2c98d6f7d9 100644
--- a/etc/rc
+++ b/etc/rc
@@ -1,5 +1,5 @@
 #!/bin/sh
-#	$Id: rc,v 1.66.4.9 1996/03/22 17:26:47 nate Exp $
+#	$Id: rc,v 1.66.4.10 1996/05/03 06:02:34 asami Exp $
 #	From: @(#)rc	5.27 (Berkeley) 6/5/91
 
 # System startup script run by init on autoboot
@@ -84,10 +84,6 @@ if [ $? != 0 ]; then
 	exit 1
 fi
 
-# If the machine runs wall CMOS clock (compatible with MSDOS),
-# activate following line by creating empty file /etc/wall_cmos_clock
-# If this file not exist, following line does nothing (assumed
-# the machine runs UTC CMOS clock). See adjkerntz(8) for details.
 adjkerntz -i
 
 # If there is a global system configuration file, suck it in.
@@ -120,7 +116,7 @@ rm -f /etc/nologin
 rm -f /var/spool/lock/*
 rm -rf /var/spool/uucp/.Temp/*
 rm -f /dev/log
-(cd /var/run && { rm -rf -- *; cp /dev/null utmp; chmod 644 utmp; })
+(cd /var/run && { cp /dev/null utmp; chmod 644 utmp; })
 
 echo clearing /tmp
 
@@ -201,7 +197,7 @@ if [ "X${nis_serverflags}" != X"NO" ]; then
 	echo -n ' ypserv'; ypserv ${nis_serverflags}
 
 	if [ "X${yppasswddflags}" != X"NO" ]; then
-		echo -n ' yppasswdd'; yppasswdd ${yppasswddflags}
+		echo -n ' yppasswdd'; rpc.yppasswdd ${yppasswddflags}
 	fi
 fi
 
@@ -221,7 +217,7 @@ fi
 
 if [ "X${nfs_server}" = X"YES" -a -r /etc/exports ]; then
 	echo -n ' mountd'
-	if [ "X${pcnfsd}" = X"YES" ]; then
+	if [ "X${weak_mountd_authentication}" = X"YES" ]; then
 		mountd -n
 	else
 		mountd
@@ -234,26 +230,18 @@ if [ "X${nfs_client}" = X"YES" ]; then
 fi
 
 if [ "X${amdflags}" != X"NO" ]; then
-	echo -n ' amd';			amd ${amdflags}
-fi
-
-# These should go elsewhere but netstart is too early and I don't
-# want to touch rc.local, so...
-if [ "X${pcnfsd}" = X"YES" -a -x /usr/local/libexec/rpc.pcnfsd ]; then
-	echo -n ' rpc.pcnfsd'; /usr/local/libexec/rpc.pcnfsd &
-fi
-
-if [ "X${apache_httpd}" = X"YES" -a -x /usr/local/sbin/httpd ]; then
-	echo -n ' apache httpd'; /usr/local/sbin/httpd &
+	echo -n ' amd'
+	amd ${amdflags} > /var/run/amd.pid
 fi
 
 # Kerberos runs ONLY on the Kerberos server machine
 if [ "X${kerberos_server}" = X"YES" ]; then
 	echo -n ' kerberos';	kerberos >> /var/log/kerberos.log &
 	echo -n ' kadmind'; \
-		(sleep 20; /usr/sbin/kadmind -n >/dev/null 2>&1 &) &
+		(sleep 20; kadmind -n >/dev/null 2>&1 &) &
 fi
 
+# IP multicast routing daemon
 if [ "X${mrouted}" != X"NO" -a -x /usr/sbin/mrouted ]; then
 	echo -n ' mrouted'; mrouted ${mrouted}
 fi
@@ -282,13 +270,18 @@ if [ "$virecovery" != '/var/tmp/vi.recover/recover.*' ]; then
 fi
 
 if [ "X${accounting}" = X"YES" -a -d /var/account ]; then
-	echo 'turning on accounting';	accton /var/account/acct
+	echo 'turning on accounting'
+	if [ ! -e /var/account/acct ]; then
+		touch /var/account/acct
+	fi
+	accton /var/account/acct
 fi
 
 # Now start up miscellaneous daemons that don't belong anywhere else
 #
 echo -n standard daemons:
 echo -n ' cron';		cron
+
 if [ "X${lpd}" != X"NO" -a -x /usr/sbin/lpd ]; then
 	echo -n ' printer';		lpd
 fi
@@ -296,7 +289,7 @@ fi
 # $sendmail_flags is imported from /etc/sysconfig;
 # if $sendmail_flags is something other than NO, sendmail is run.
 if [ "X${sendmail_flags}" != X"NO" -a -r /etc/sendmail.cf ]; then
-	echo -n ' sendmail';		sendmail ${sendmail_flags} 
+	echo -n ' sendmail';            /usr/sbin/sendmail ${sendmail_flags}
 fi
 
 echo '.'
@@ -308,7 +301,6 @@ if [ -x /sbin/ldconfig ]; then
 	if [ -d /usr/X11R6/lib ]; then _LDC="${_LDC} /usr/X11R6/lib" ; fi
 	if [ -d /usr/X386/lib ]; then _LDC="${_LDC} /usr/X386/lib" ; fi
 	if [ -d /usr/local/lib ]; then _LDC="${_LDC} /usr/local/lib" ; fi
-	if [ -d /usr/gnu/lib ]; then _LDC="${_LDC} /usr/gnu/lib" ; fi
 	echo 'setting ldconfig path:' ${_LDC}
 	ldconfig ${_LDC}
 fi
@@ -319,6 +311,15 @@ if [ -f /etc/rc.${arch} ]; then
 	. /etc/rc.${arch}
 fi
 
+# for each valid dir in $local_startup, search for init scripts matching *.sh
+if [ "X${local_startup}" != X"NO" ]; then
+	for dir in ${local_startup}; do
+		[ -d ${dir} ] && for script in ${dir}/*.sh; do
+			[ -x ${script} ] && ${script} start
+		done
+	done
+fi
+
 # Do traditional (but rather obsolete) rc.local file if it exists.
 [ -f /etc/rc.local ] && sh /etc/rc.local
 
diff --git a/etc/rc.serial b/etc/rc.serial
index f9671e2e9cbe..580e505846f8 100644
--- a/etc/rc.serial
+++ b/etc/rc.serial
@@ -1,4 +1,7 @@
-# Change some defauls for serial devices.
+#!/bin/sh
+# $Id$
+
+# Change some defaults for serial devices.
 # Standard defaults are:
 #	dtrwait 300 drainwait 0
 #	initial cflag from <sys/ttydefaults.h> = cread cs8 hupcl
@@ -11,57 +14,73 @@
 
 default() {
 	# Reset everything changed by the other functions to initial defaults.
+
+	ci=$1; shift	# call in device identifier
+	co=$1; shift	# call out device identifier
+
 	for i in $*
 	do
-		comcontrol /dev/ttyd$i dtrwait 300 drainwait 0
-		stty </dev/ttyid$i -clocal  crtscts  hupcl 9600 reprint ^R
-		stty </dev/ttyld$i -clocal -crtscts -hupcl 0
-		stty </dev/cuaia$i -clocal  crtscts  hupcl 9600 reprint ^R
-		stty </dev/cuala$i -clocal -crtscts -hupcl 0
+		comcontrol /dev/tty$ci$i dtrwait 300 drainwait 0
+		stty </dev/ttyi$ci$i -clocal  crtscts  hupcl 9600 reprint ^R
+		stty </dev/ttyl$ci$i -clocal -crtscts -hupcl 0
+		stty </dev/cuai$co$i -clocal  crtscts  hupcl 9600 reprint ^R
+		stty </dev/cual$co$i -clocal -crtscts -hupcl 0
 	done
 }
 
 maybe() {
 	# Special settings.
+
+	ci=$1; shift
+	co=$1; shift
+
 	for i in $*
 	do
 		# Don't use ^R; it breaks bash's ^R when typed ahead.
-		stty </dev/ttyid$i reprint undef
-		stty </dev/cuaia$i reprint undef
+		stty </dev/ttyi$ci$i reprint undef
+		stty </dev/cuai$co$i reprint undef
 		# Lock clocal off on dialin device for security.
-		stty </dev/ttyld$i clocal
+		stty </dev/ttyl$ci$i clocal
 		# Lock the speeds to use old binaries that don't support them.
 		# Any legal speed works to lock the initial speed.
-		stty </dev/ttyld$i 300
-		stty </dev/cuala$i 300
+		stty </dev/ttyl$ci$i 300
+		stty </dev/cual$co$i 300
 	done
 }
 
 modem() {
 	# Modem that supports CTS and perhaps RTS handshaking.
+
+	ci=$1; shift
+	co=$1; shift
+
 	for i in $*
 	do
 		# may depend on modem
-		comcontrol /dev/ttyd$i dtrwait 100 drainwait 180
+		comcontrol /dev/tty$ci$i dtrwait 100 drainwait 180
 		# Lock crtscts on.
 		# Speed reasonable for V42bis.
-		stty </dev/ttyid$i crtscts 57600
-		stty </dev/ttyld$i crtscts
-		stty </dev/cuaia$i crtscts 57600
-		stty </dev/cuala$i crtscts
+		stty </dev/ttyi$ci$i crtscts 57600
+		stty </dev/ttyl$ci$i crtscts
+		stty </dev/cuai$co$i crtscts 57600
+		stty </dev/cual$co$i crtscts
 	done
 }
 
 mouse() {
 	# Mouse on either callin or callout port.
+
+	ci=$1; shift
+	co=$1; shift
+
 	for i in $*
 	do
 		# Lock clocal on, hupcl off.
 		# Standard speed for Microsoft mouse.
-		stty </dev/ttyid$i clocal -hupcl 1200
-		stty </dev/ttyld$i clocal  hupcl
-		stty </dev/cuaia$i clocal -hupcl 1200
-		stty </dev/cuala$i clocal  hupcl
+		stty </dev/ttyi$ci$i clocal -hupcl 1200
+		stty </dev/ttyl$ci$i clocal  hupcl
+		stty </dev/cuai$co$i clocal -hupcl 1200
+		stty </dev/cual$co$i clocal  hupcl
 	done
 }
 
@@ -72,21 +91,37 @@ terminal() {
 	# Also works for bidirectional communications to another pc
 	# provided at most one side runs getty.
 	# Same as modem() except we want a faster speed and no dtrwait.
-	modem $*
+
+	ci=$1; shift
+	co=$1; shift
+
+	modem $ci $co $*
 	for i in $*
 	do
-		comcontrol /dev/ttyd$i dtrwait 0
-		stty </dev/ttyid$i 115200
-		stty </dev/cuaia$i 115200
+		comcontrol /dev/tty$ci$i dtrwait 0
+		stty </dev/ttyi$ci$i 115200
+		stty </dev/cuai$co$i 115200
 	done
 }
 
 # Don't use anything from this file unless you have some buggy programs
 # that require it.
-#
+
 # Edit the functions and the examples to suit your system.
-#
-# maybe		0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v
-# mouse		    2
-# modem		  1
-# terminal	0
+# $1 is the call in device identifier, $2 is the call out device identifier
+# and the remainder of the line lists the device numbers.
+
+# Initialize assorted 8250-16550 (sio) ports.
+# maybe    d a  0 1 2 3 4 5 6 7 8 9 a b c d e f g h i j k l m n o p q r s t u v
+# mouse    d a      2
+# modem    d a    1
+# terminal d a  0
+
+# Initialize all ports on a Cyclades-8yo.
+# modem    c c  0 1 2 3 4 5 6 7
+
+# Initialize all ports on a Cyclades-16ye.
+# modem    c c  0 1 2 3 4 5 6 7 8 9 a b c d e f 
+
+# Initialize all ports on a Digiboard 8.
+# modem    D D  0 1 2 3 4 5 6 7
diff --git a/etc/security b/etc/security
index 19d1bcb525a9..7cf84ab35b7c 100644
--- a/etc/security
+++ b/etc/security
@@ -1,9 +1,10 @@
 #!/bin/sh -
 #
 #	@(#)security	5.3 (Berkeley) 5/28/91
-#	$Id: security,v 1.7 1995/01/14 13:23:50 ats Exp $
+#	$Id: security,v 1.8 1995/05/27 01:37:44 ache Exp $
 #
 PATH=/sbin:/bin:/usr/bin
+LC_ALL=C; export LC_ALL
 
 host=`hostname -s`
 echo "Subject: $host security check output"
@@ -24,11 +25,17 @@ set $MP
 while test $# -ge 1; do
 	mount=$1
 	shift
-	find $mount -xdev \( -perm -u+s -or -perm -g+s \) | sort
+	find -X $mount -xdev -type f \
+		\( -perm -u+x -or -perm -g+x -or -perm -o+x \) \
+		\( -perm -u+s -or -perm -g+s \) | sort
 done | xargs -n 20 ls -lgTd > $TMP
 
+if [ ! -f $LOG/setuid.today ] ; then
+	echo "no $LOG/setuid.today"
+	cp $TMP $LOG/setuid.today
+fi
 if cmp $LOG/setuid.today $TMP >/dev/null; then :; else
-	echo "$host setuid/device diffs:"
+	echo "$host setuid diffs:"
 	diff -b $LOG/setuid.today $TMP
 	mv $LOG/setuid.today $LOG/setuid.yesterday
 	mv $TMP $LOG/setuid.today
diff --git a/etc/services b/etc/services
index bc2b8f1e2f40..20877b1e0292 100644
--- a/etc/services
+++ b/etc/services
@@ -9,7 +9,7 @@
 # Kerberos services are for Kerberos v4, and are unofficial.  Sites running
 # v5 should uncomment v5 entries and comment v4 entries.
 #
-#	$Id: services,v 1.11.4.3 1996/03/16 13:50:14 markm Exp $
+#	$Id: services,v 1.11.4.4 1996/04/07 01:17:26 joerg Exp $
 #	From: @(#)services	5.8 (Berkeley) 5/9/91
 #
 # WELL KNOWN PORT NUMBERS
@@ -900,6 +900,7 @@ nfsd-keepalive	1110/udp   #Client status info
 supfiledbg	1127/tcp		# for SUP
 nfa		1155/tcp   #Network File Access		       
 nfa		1155/udp   #Network File Access		       
+phone		1167/udp   #conference calling
 lupa		1212/tcp
 lupa		1212/udp
 nerv		1222/tcp   #SNI R&D network		     
diff --git a/etc/sysconfig b/etc/sysconfig
index 2b826ddcae26..808bcd754557 100644
--- a/etc/sysconfig
+++ b/etc/sysconfig
@@ -4,7 +4,14 @@
 # This is sysconfig - a file full of useful variables that you can set 
 # to change the default startup behavior of your system.
 #
-#	$Id: sysconfig,v 1.14.4.7 1996/03/06 08:54:01 rgrimes Exp $
+#	$Id: sysconfig,v 1.14.4.8 1996/03/22 17:26:48 nate Exp $
+
+######################### Start Of Local Configuration Section ###########
+
+# Location of local startup directories.
+local_startup="/usr/local/etc/rc.d /usr/X11R6/etc/rc.d"
+
+######################### End Of Local Configuration Section #############
 
 ######################### Start Of Syscons Section #######################
 
@@ -39,7 +46,7 @@ blanktime=NO
 # Set to screen saver desired: blank, green, snake, star (or NO for none)
 saver=NO
 
-# General russian setup for example:
+# General Russian setup for example:
 # (koi8-r keyboard with cp866 screen font mapped to koi8-r)
 #
 # keymap=ru.koi8-r
@@ -70,31 +77,47 @@ defaultdomainname=NO
 #
 tcp_extensions=YES
 
+# If you're running PCNFSD or anything else which requires mountd to allow
+# non-root requests for NFS mounts, set this to YES.
+weak_mountd_authentication=NO
+
 #
 # Set to the list of network devices on this host.  You must have an
 # ifconfig_${network_interface} line for each interface listed here.
 # for example:
 #
 #	network_interfaces="ed0 sl0 lo0"
+#
 #	ifconfig_ed0="inet 10.0.0.1 netmask 0xffffff00"
 #	ifconfig_sl0="inet 10.0.1.0 netmask 0xffffff00"
+#	ifconfig_lo0="inet localhost"
 #
 network_interfaces="lo0"
+
 ifconfig_lo0="inet localhost"
 
 #
 # Set to the list of route add lines for this host.  You must have a
-# route_${static_routes} line for each static route listed here.
+# route_${static_routes} line for each static route listed here (unless
+# static_routes is set to "" - do NOT use ``NO'' to denote a lack of static
+# routes!).
 #
-static_routes="multicast loopback"
-route_multicast="224.0.0.0 -netmask 0xf0000000 -interface ${hostname}"
-route_loopback="${hostname} localhost"
+#static_routes="foo multicast"
+#route_foo="woofo woofo-gw"
+#route_multicast="224.0.0.0 -netmask 0xf0000000 -interface 10.0.0.1"
+static_routes=""
 
 # Set to the host you'd like set as your default router, or NO for none.
+# This is the same as adding a ``default'' entry to static_routes.
 defaultrouter=NO
 
+# This is the routing daemon you want to use.  Possible options are
+# currently NO (for none), `routed' and `gated'.  Also see `routerflags'
+# for startup flags.
+router=routed
+
 # These are the flags you'd like to start the routing daemon with
-routedflags=-q
+routerflags=-q
 
 # mrouted flags, or NO if you don't want to start mrouted. Needs kernel
 # options enabled before it will work.
@@ -109,7 +132,7 @@ xntpdflags="NO"
 # this is inoperative unless xntpd is enabled; NO to disable
 tickadjflags="-Aq"
 
-# Set to the site you'd like to syncronize your clock from (gatekeeper.dec.com,
+# Set to the site you'd like to synchronize your clock from (gatekeeper.dec.com,
 # for example) or NO for no such site.
 ntpdate="NO"
 
@@ -123,8 +146,11 @@ lpd=YES
 # time in minutes.  If set to NO, don't start sendmail at all.
 sendmail_flags="-bd -q30m"
 
-# Set to appropriate flags if you want to use AMD
+# Set to appropriate flags if you want to use AMD.  The commented-out entry
+# provides a reasonable default, using the sample amd.map config file from the
+# /usr/src/etc directory.
 amdflags="NO"
+#amdflags="-a /net -c 1800 -k i386 -d my.domain -l syslog /host /etc/amd.map"
 
 # Set to YES if this machine will be an NFS client
 nfs_client=NO
@@ -135,14 +161,14 @@ nfs_server=NO
 # Set to appropriate flags if you want to start NIS for a client
 nis_clientflags="NO"
 
-# Set to host to ypset to if you need to do that
+# Name of host to ypset to, if no YP server on this wire
 nis_ypsetflags="NO"
 
 # Set to appropriate flags if you want to start NIS for a server
 nis_serverflags="NO"
 
-# Set to appropriate flags for yppasswdd, if you wish to run it.
-# Typical flags might be "-m /var/yp/master.passwd -s -f"
+# Set to appropriate flags for rpc.yppasswdd, if you wish to run it.
+# Typical flags might be "-t /var/yp/master.passwd -s -f"
 yppasswddflags="NO"
 
 # Set to appropriate flags for named, if you have a full-time
@@ -177,15 +203,13 @@ kerberos_server=NO
 # If you want this host to be a gateway, set to YES.
 gateway=NO
 
-# Set to YES if you want to run gated
-gated=NO
+# If you want this host to be a firewall or otherwise filter IP, set to YES.
+firewall=NO
 
-# Set to YES if you wish to check quotas.  NOTE:  For now this probably
-# doesn't work and should be left disabled.
+# Set to YES if you wish to check quotas.
 check_quotas=NO
 
-# Set to YES to turn on accounting.  NOTE: For now this probably
-# doesn't work and should be left disabled.
+# Set to YES to turn on accounting.
 accounting=NO
 
 ######################### End Of Netconfig Section #######################
diff --git a/etc/syslog.conf b/etc/syslog.conf
index 73d56b70a784..c907ec7107e9 100644
--- a/etc/syslog.conf
+++ b/etc/syslog.conf
@@ -7,3 +7,5 @@ cron.*						/var/cron/log
 *.notice;auth.debug				root
 *.alert						root
 *.emerg						*
+!startslip
+*.*						/var/log/slip.log
diff --git a/etc/termcap.small b/etc/termcap.small
index 400d1962f236..7a31985aaa83 100644
--- a/etc/termcap.small
+++ b/etc/termcap.small
@@ -55,7 +55,7 @@ cons50|ansil|ansi80x50:\
 	:li#50:tc=cons25:
 cons50-m|ansil-mono|ansi80x50-mono:\
 	:li#50:tc=cons25-m:
-# Syscons console with koi8-r russian code table.
+# Syscons console with koi8-r Russian code table.
 cons25r|pc3r|ibmpc3r|cons25-koi8-r:\
 	:ac=q\200x\201m\204v\211j\205t\206n\212u\207l\202w\210k\203y\230z\231f\234~\225a\220h\221`^D.^Y-^XI^U0\215:\
 	:tc=cons25w:
diff --git a/etc/weekly b/etc/weekly
index 125a98668f3e..8d75322d3b49 100644
--- a/etc/weekly
+++ b/etc/weekly
@@ -1,7 +1,7 @@
 #!/bin/sh -
 #
 #	@(#)weekly	5.14 (Berkeley) 6/23/91
-#
+#	$Id$
 
 PATH=/bin:/sbin:/usr/sbin:/usr/bin:/usr/libexec
 export PATH
@@ -36,33 +36,11 @@ echo "Subject: $host weekly run output"
 #	rm -rf $TDIR
 #fi
 
-if [ -f /usr/lib/uucp/clean.weekly ]; then
+if [ -f /usr/libexec/uucp/clean.weekly ]; then
 	echo ""
 	echo "Cleaning up UUCP:"
-	echo /usr/lib/uucp/clean.weekly | su daemon
+	echo /usr/libexec/uucp/clean.weekly | su daemon
 fi
-echo ""
-
-echo "Rotating messages:"
-cd /var/log
-if [ -f messages.2 ]; then mv -f messages.2 messages.3; fi
-if [ -f messages.1 ]; then mv -f messages.1 messages.2; fi
-if [ -f messages.0 ]; then mv -f messages.0 messages.1; fi
-mv -f messages messages.0
-cp /dev/null messages
-chmod 644 messages
-kill -1 `cat /var/run/syslog.pid`
-cd /
-
-echo "Rotating cron log:"
-cd /var/cron
-if [ -f log.2 ]; then mv -f log.2 log.3; fi
-if [ -f log.1 ]; then mv -f log.1 log.2; fi
-if [ -f log.0 ]; then mv -f log.0 log.1; fi
-mv -f log log.0
-cp /dev/null log
-chmod 600 log
-cd /
 
 echo ""
 echo "Rebuilding locate database:"
@@ -76,8 +54,14 @@ echo ""
 echo "Rebuilding whatis database:"
 MANPATH=${MANPATH:-/usr/share/man:/usr/X11R6/man:/usr/local/man}
 
-makewhatis "${MANPATH}"
+makewhatis.local "${MANPATH}"
 
 #echo ""
 #echo "Reformatting manual pages:"
-#echo catman "${MANPATH}" | su man
+#echo catman.local "${MANPATH}" | su -fm man
+
+echo ""
+echo "Cleaning up kernel database files:"
+kernel=`sysctl -n kern.bootfile`
+kernel=kvm_`basename ${kernel}`.db
+find /var/db -name "kvm_*.db" -a ! -name ${kernel} -a -atime +7 -exec rm -f -- {} \;