*BSD News Article 82567


Return to BSD News archive

Newsgroups: comp.bugs.2bsd
Path: euryale.cc.adfa.oz.au!newshost.carno.net.au!harbinger.cc.monash.edu.au!news.mira.net.au!inquo!news.uoregon.edu!news-peer.gsl.net!news.gsl.net!news.mathworks.com!uunet!in2.uu.net!news.new-york.net!wlbr!moe.2bsd.com!sms
From: sms@moe.2bsd.com (Steven M. Schultz)
Subject: The Grand Reorganization Begins (#342 - 8 of 8)
Organization: 2BSD, Simi Valley CA USA
Message-ID: <E0LGKt.M74@moe.2bsd.com>
Date: Sat, 9 Nov 1996 08:22:05 GMT
Lines: 2130

Subject: The Grand Reorganization Begins (#342 - 8 of 8)
Index:	MANY/<MANY> 2.11BSD

Description:
	The directory organization has never been brought up to date.

	UNIX systems for some time now have ceased using /usr/lib and
	/etc as dumping grounds for everything from fonts to print spoolers.

	For some time systems have used /sbin, /usr/sbin, /usr/libexec, 
	/usr/share, and so on rather than dumping everything into /usr/lib 
	or /etc.

Repeat-By:
	By observation and/or having to admin a mixture of 2.11BSD systems
	and systems which use the post 1989/90 directory hierarchy.

	Alternatively you may have, over the years, been one of the folks
	who has asked me "when is the directory layout going to be updated to
	reflect current 'standards'?"

Fix:
	This is #342 (part 8 of 8).  Please see #335 (part 1) for the
	installation instructions.

	Updates #335 thru #342 comprise the 8 part kit which moves everything
	that is not a library out of /usr/lib.  The relocation of misplaced
	items in /etc is not, with one exception, done at this time but will
	be forthcoming soon.

	The good news is that the update can be done "in place" - it will not
	be necessary to dump and reload the system.  The "bad news" is that
	a "make world" (recompile of the system from sources) is necessary.

	The manifest is as follows:

	Part    Patch#	Contents
	----	-----	--------
	1	335	Manifest of files.  Introduction/tour.  Instructions. 
			Shell scripts to perform pre- and post- processing of
			the system.  Suggested changes to configuration files
			in /etc.  A 'shar' file containing new files to be
			added to the system (Makefiles mostly).

	2-8	336-342	Patch files.  Broken into ~64kb pieces.

--------------------------cut here, save as /usr/tmp/342--------------------
*** /usr/src/usr.bin/uucp/acucntrl.8c.old	Mon Feb 16 16:21:37 1987
--- /usr/src/usr.bin/uucp/acucntrl.8c	Thu Oct 24 11:14:03 1996
***************
*** 5,11 ****
  .SH NAME
  acucntrl \- turn around tty line between dialin and dialout
  .SH SYNOPSIS
! .B /usr/lib/uucp/acucntrl
  keyword ttyline
  .SH DESCRIPTION
  .PP
--- 5,11 ----
  .SH NAME
  acucntrl \- turn around tty line between dialin and dialout
  .SH SYNOPSIS
! .B /usr/libexec/acucntrl
  keyword ttyline
  .SH DESCRIPTION
  .PP
*** /usr/src/usr.bin/uucp/uucp.h.old	Thu Dec 22 21:30:50 1994
--- /usr/src/usr.bin/uucp/uucp.h	Thu Oct 24 11:17:02 1996
***************
*** 1,4 ****
! /*	uucp.h	5.11.3	94/12/22 */
  
  #include <stdio.h>
  #include <paths.h>
--- 1,4 ----
! /*	uucp.h	5.11.4	96/10/24 */
  
  #include <stdio.h>
  #include <paths.h>
***************
*** 158,164 ****
   *	If you want to use the same modem for dialing in and out define
   *	DIALINOUT to be the localtion of the acucntrl program
   */
! /* #define DIALINOUT	"/usr/lib/uucp/acucntrl" /**/
  
  /*
   *	If you want all ACU lines to be DIALINOUT, define ALLACUINOUT
--- 158,164 ----
   *	If you want to use the same modem for dialing in and out define
   *	DIALINOUT to be the localtion of the acucntrl program
   */
! /* #define DIALINOUT	"/usr/libexec/acucntrl" /**/
  
  /*
   *	If you want all ACU lines to be DIALINOUT, define ALLACUINOUT
***************
*** 219,234 ****
  /*#define LOGBYSITE	"/usr/spool/uucp/LOG" /**/
  
  #define XQTDIR		"/usr/spool/uucp/XTMP"
! #define SQFILE		"/usr/lib/uucp/SQFILE"
! #define SQTMP		"/usr/lib/uucp/SQTMP"
  #define SLCKTIME	5400	/* system/device timeout (LCK.. files) */
! #define SEQFILE		"/usr/lib/uucp/SEQF"
! #define SYSFILE		"/usr/lib/uucp/L.sys"
! #define DEVFILE		"/usr/lib/uucp/L-devices"
! #define DIALFILE	"/usr/lib/uucp/L-dialcodes"
! #define USERFILE	"/usr/lib/uucp/USERFILE"
! #define	CMDFILE		"/usr/lib/uucp/L.cmds"
! #define	ALIASFILE	"/usr/lib/uucp/L.aliases"
  
  #define SPOOL		"/usr/spool/uucp"
  #define SYSLOG		"/usr/spool/uucp/SYSLOG"
--- 219,234 ----
  /*#define LOGBYSITE	"/usr/spool/uucp/LOG" /**/
  
  #define XQTDIR		"/usr/spool/uucp/XTMP"
! #define SQFILE		"/etc/uucp/SQFILE"
! #define SQTMP		"/etc/uucp/SQTMP"
  #define SLCKTIME	5400	/* system/device timeout (LCK.. files) */
! #define SEQFILE		"/etc/uucp/SEQF"
! #define SYSFILE		"/etc/uucp/L.sys"
! #define DEVFILE		"/etc/uucp/L-devices"
! #define DIALFILE	"/etc/uucp/L-dialcodes"
! #define USERFILE	"/etc/uucp/USERFILE"
! #define	CMDFILE		"/etc/uucp/L.cmds"
! #define	ALIASFILE	"/etc/uucp/L.aliases"
  
  #define SPOOL		"/usr/spool/uucp"
  #define SYSLOG		"/usr/spool/uucp/SYSLOG"
***************
*** 281,288 ****
  
  	/*  commands  */
  #define SHELL		"/bin/sh"
! #define UUCICO		"/usr/lib/uucp/uucico"
! #define UUXQT		"/usr/lib/uucp/uuxqt"
  #define UUCP		"uucp"
  
  	/*  call connect fail stuff  */
--- 281,288 ----
  
  	/*  commands  */
  #define SHELL		"/bin/sh"
! #define UUCICO		"/usr/sbin/uucico"
! #define UUXQT		"/usr/libexec/uuxqt"
  #define UUCP		"uucp"
  
  	/*  call connect fail stuff  */
*** /usr/src/usr.bin/uucp/uusend.c.old	Mon Feb 16 16:21:48 1987
--- /usr/src/usr.bin/uucp/uusend.c	Thu Oct 24 11:18:27 1996
***************
*** 1,5 ****
! #ifndef lint
! static char sccsid[] = "@(#)uusend.c	5.2 (Berkeley) 1/22/85";
  #endif
  
  /*
--- 1,5 ----
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)uusend.c	5.2.1 (2.11BSD) 1996/10/24";
  #endif
  
  /*
***************
*** 14,20 ****
   * "-r" switch added.  Has same effect as "-r" in uux. 11/82  CCW
   *
   * Error recovery (a la uucp) added & ifdefs for ruusend (as in rmail).
!  * Checks for illegal access to /usr/lib/uucp.
   *				February 1983  Christopher Woodbury
   * Fixed mode set[ug]id loophole. 4/8/83  CCW
   *
--- 14,20 ----
   * "-r" switch added.  Has same effect as "-r" in uux. 11/82  CCW
   *
   * Error recovery (a la uucp) added & ifdefs for ruusend (as in rmail).
!  * Checks for illegal access to /etc/uucp.
   *				February 1983  Christopher Woodbury
   * Fixed mode set[ug]id loophole. 4/8/83  CCW
   *
***************
*** 60,66 ****
  char	*sl;		/* location of first / in destname */
  char	*sourcename;	/* argv[1] */
  char	*destname;	/* argv[2] */
! char	*UULIB = "/usr/lib/uucp";	  /* UUCP lib directory */
  
  #ifdef	RECOVER
  char	*UUPUB = "/usr/spool/uucppublic/";  /* public UUCP directory */
--- 60,66 ----
  char	*sl;		/* location of first / in destname */
  char	*sourcename;	/* argv[1] */
  char	*destname;	/* argv[2] */
! char	*UULIB = "/etc/uucp";	  /* UUCP lib directory */
  
  #ifdef	RECOVER
  char	*UUPUB = "/usr/spool/uucppublic/";  /* public UUCP directory */
*** /usr/src/usr.bin/yacc/Makefile.old	Mon Jan 18 09:37:25 1993
--- /usr/src/usr.bin/yacc/Makefile	Thu Oct 24 11:33:58 1996
***************
*** 1,5 ****
  #
! #	@(#)Makefile	4.2	(Berkeley)	83/02/11
  #
  DESTDIR=
  SEPFLAG= -i
--- 1,5 ----
  #
! #	@(#)Makefile	4.2.1	(2.11BSD)	1996/10/24
  #
  DESTDIR=
  SEPFLAG= -i
***************
*** 15,21 ****
  y1.o y2.o y3.o y4.o: dextern files
  install: yacc yaccpar
  	install -s yacc $(DESTDIR)/usr/bin
! 	install -c yaccpar $(DESTDIR)/usr/lib
  clean :
  	-rm -f *.o yacc
  
--- 15,21 ----
  y1.o y2.o y3.o y4.o: dextern files
  install: yacc yaccpar
  	install -s yacc $(DESTDIR)/usr/bin
! 	install -c yaccpar $(DESTDIR)/usr/share/misc
  clean :
  	-rm -f *.o yacc
  
*** /usr/src/usr.bin/yacc/files.old	Mon Feb 16 19:02:25 1987
--- /usr/src/usr.bin/yacc/files	Thu Oct 24 11:34:22 1996
***************
*** 1,5 ****
  /*
!  *	@(#)files	4.1	(Berkeley)	83/02/11
   */
  	/* this file has the location of the parser, and the size of the progam desired */
  	/* It may also contain definitions to override various defaults: for example,
--- 1,5 ----
  /*
!  *	@(#)files	4.1.1	(2.11BSD)	1996/10/24
   */
  	/* this file has the location of the parser, and the size of the progam desired */
  	/* It may also contain definitions to override various defaults: for example,
***************
*** 13,19 ****
   * #endif
   */
  	/* location of the parser text file */
! # define PARSER "/usr/lib/yaccpar"
  
  	/* basic size of the Yacc implementation */
  /* # define HUGE */
--- 13,19 ----
   * #endif
   */
  	/* location of the parser text file */
! # define PARSER "/usr/share/misc/yaccpar"
  
  	/* basic size of the Yacc implementation */
  /* # define HUGE */
*** /usr/src/usr.lib/MANIFEST.old	Sun Dec 25 22:53:57 1988
--- /usr/src/usr.lib/MANIFEST	Thu Oct 24 14:22:30 1996
***************
*** 1,8 ****
  Application	Version
  -----------	-------
- getNAME.c	4.3
- learn/		4.3+
- lib.b		4.3
  lib2648/	4.3
  libF77/		4.3
  libI77/		4.3
--- 1,5 ----
***************
*** 18,29 ****
  libplot/	4.3
  libtermlib/	4.3 
  liby/		4.3
- lpr/		4.3
- makekey.c	4.3
- makewhatis.sh	4.3
- man/		4.3
- me/		4.3
- sendmail/	4.3
  
  Notes
  -----
--- 15,20 ----
***************
*** 31,39 ****
  		the PDP-11 yet (if it's even possible).  If anyone does it for
  		us, PLEASE #ifdef your changes on "pdp11".  A PDP support
  		subdirectory would be nice too ...  In any case, till that
! 		happens (sic), 2.10BSD uses libom and hides that fact from
  		applications by linking libm.a to libom.a in /usr/lib.
  
  The directorie PORT is somewhat special.  It contains source from the 4.3
! that should probably be ported to 2.10 as soon as someone has the time
  and inclination to do so.
--- 22,30 ----
  		the PDP-11 yet (if it's even possible).  If anyone does it for
  		us, PLEASE #ifdef your changes on "pdp11".  A PDP support
  		subdirectory would be nice too ...  In any case, till that
! 		happens (sic), 2.11BSD uses libom and hides that fact from
  		applications by linking libm.a to libom.a in /usr/lib.
  
  The directorie PORT is somewhat special.  It contains source from the 4.3
! that should probably be ported to 2.11 as soon as someone has the time
  and inclination to do so.
*** /usr/src/usr.lib/Makefile.old	Fri Jul 12 21:25:46 1996
--- /usr/src/usr.lib/Makefile	Sat Oct 26 12:14:15 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.12.1 (2.11BSD GTE) 1996/7/11
  #
  DESTDIR=
  CFLAGS=	-O
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.12.2 (2.11BSD GTE) 1996/10/24
  #
  DESTDIR=
  CFLAGS=	-O
***************
*** 22,67 ****
  # 2.11BSD XXX - Libpc isn't important till someone - if ever - ports
  # the 4.3BSD version of ucb/pascal.
  #
! SUBDIR=	learn lib2648 libF77 libI77 libU77 libcurses libdbm libln \
! 	libom libmp libplot libtermlib liby lpr me sendmail libutil libvmf \
  	liberrlst libstubs
  
  # Shell scripts that need only be installed and are never removed.
  #
- SCRIPT=	makewhatis
  
! # C programs that live in the current directory and do not need
! # explicit make lines.
! #
! STD=	getNAME makekey
  
! # C programs that live in the current directory and need explicit make lines.
! #
! NSTD=	
  
- all:	${SUBDIR} ${STD} ${NSTD}
- 
- SEPFLAG:
- 	@echo select SEPFLAG=-i or SEPFLAG=-n
- 	@false
- SEPFLAG-i SEPFLAG-n:
- 
- ${SUBDIR}: SEPFLAG${SEPFLAG} FRC
- 	cd $@; make ${MFLAGS}
- 
  FRC:
  
! ${STD}: SEPFLAG${SEPFLAG}
! 	cc ${CFLAGS} ${SEPFLAG} -o $@ $@.c
! 
! install: ${STD} ${NSTD} lib.b
  	-for i in ${SUBDIR}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
- 	-for i in ${SCRIPT}; do (install -c $$i.sh ${DESTDIR}/usr/lib/$$i); done
  	rm -f ${DESTDIR}/usr/lib/libm.a
  	ln ${DESTDIR}/usr/lib/libom.a ${DESTDIR}/usr/lib/libm.a
- 	install -s ${STD} ${NSTD} ${DESTDIR}/usr/lib
- 	install -c lib.b ${DESTDIR}/usr/lib/lib.b
  
  tags:
  	-for i in ${TAGSDIR}; do \
--- 22,46 ----
  # 2.11BSD XXX - Libpc isn't important till someone - if ever - ports
  # the 4.3BSD version of ucb/pascal.
  #
! SUBDIR=	lib2648 libF77 libI77 libU77 libcurses libdbm libln \
! 	libom libmp libplot libtermlib liby libutil libvmf \
  	liberrlst libstubs
  
  # Shell scripts that need only be installed and are never removed.
  #
  
! all:	${SUBDIR}
  
! ${SUBDIR}: FRC
! 	cd $@; make ${MFLAGS} SEPFLAG=${SEPFLAG}
  
  FRC:
  
! install: FRC
  	-for i in ${SUBDIR}; do \
  		(cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
  	rm -f ${DESTDIR}/usr/lib/libm.a
  	ln ${DESTDIR}/usr/lib/libom.a ${DESTDIR}/usr/lib/libm.a
  
  tags:
  	-for i in ${TAGSDIR}; do \
***************
*** 71,102 ****
  clean:
  	rm -f a.out core *.s *.o tags
  	-for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
- 	rm -f ${STD} ${NSTD}
  
  depend:
- 	for i in ${STD} ${NSTD}; do \
- 	    cc -M ${INCPATH} $$i.c | sed 's/\.o//' | \
- 	    awk ' { if ($$1 != prev) \
- 		{ if (rec != "") print rec; rec = $$0; prev = $$1; } \
- 		else { if (length(rec $$2) > 78) { print rec; rec = $$0; } \
- 		else rec = rec " " $$2 } } \
- 		END { print rec } ' >> makedep; done
- 	echo '/^# DO NOT DELETE THIS LINE/+2,$$d' >eddep
- 	echo '$$r makedep' >>eddep
- 	echo 'w' >>eddep
- 	cp Makefile Makefile.bak
- 	ed - Makefile < eddep
- 	rm eddep makedep
- 	echo '# DEPENDENCIES MUST END AT END OF FILE' >> Makefile
- 	echo '# IF YOU PUT STUFF HERE IT WILL GO AWAY' >> Makefile
- 	echo '# see make depend above' >> Makefile
- 
- # Files listed in ${NSTD} have explicit make lines given below.
- 
- # DO NOT DELETE THIS LINE -- make depend uses it
- 
- getNAME: getNAME.c /usr/include/strings.h /usr/include/stdio.h
- makekey: makekey.c
- # DEPENDENCIES MUST END AT END OF FILE
- # IF YOU PUT STUFF HERE IT WILL GO AWAY
- # see make depend above
--- 50,54 ----
*** /usr/src/usr.sbin/lpr/Makefile.old	Mon Sep  7 05:59:45 1987
--- /usr/src/usr.sbin/lpr/Makefile	Thu Oct 24 14:37:18 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.3 (Berkeley) 5/7/86
  #
  # makefile for line printer spooling system
  #
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.3.1 (2.11BSD) 1996/10/24
  #
  # makefile for line printer spooling system
  #
***************
*** 14,21 ****
  #
  CFLAGS=-O
  SEPFLAG=-i
! LIBDIR=/usr/lib
! BINDIR=/usr/ucb
  SPOOLDIR=/usr/spool/lpd
  CXREF=/usr/ucb/ctags -x
  ROOT=root
--- 14,21 ----
  #
  CFLAGS=-O
  SEPFLAG=-i
! SBINDIR=/usr/sbin
! BINDIR=/usr/bin
  SPOOLDIR=/usr/spool/lpd
  CXREF=/usr/ucb/ctags -x
  ROOT=root
***************
*** 64,76 ****
  	cd filters; make ${MFLAGS}
  
  install: all
! 	install -s -o ${ROOT} -g ${SPGRP} -m 6711 lpd ${DESTDIR}/${LIBDIR}/lpd
  	install -s -o ${ROOT} -g ${SPGRP} -m 6711 lpr ${DESTDIR}/${BINDIR}/lpr
  	install -s -o ${ROOT} -g ${SPGRP} -m 6711 lpq ${DESTDIR}/${BINDIR}/lpq
  	install -s -o ${ROOT} -g ${SPGRP} -m 6711 lprm ${DESTDIR}/${BINDIR}/lprm
! 	install -s -g ${SPGRP} -m 2711 lpc ${DESTDIR}/etc/lpc
! 	install -s lptest ${DESTDIR}/${BINDIR}/lptest
! 	install -s pac ${DESTDIR}/etc/pac
  	/etc/chown ${DAEMON} ${DESTDIR}/${SPOOLDIR}
  	chgrp ${SPGRP} ${DESTDIR}/${SPOOLDIR}
  	chmod 775 ${DESTDIR}/${SPOOLDIR}
--- 64,76 ----
  	cd filters; make ${MFLAGS}
  
  install: all
! 	install -s -o ${ROOT} -g ${SPGRP} -m 6711 lpd ${DESTDIR}/${SBINDIR}/lpd
  	install -s -o ${ROOT} -g ${SPGRP} -m 6711 lpr ${DESTDIR}/${BINDIR}/lpr
  	install -s -o ${ROOT} -g ${SPGRP} -m 6711 lpq ${DESTDIR}/${BINDIR}/lpq
  	install -s -o ${ROOT} -g ${SPGRP} -m 6711 lprm ${DESTDIR}/${BINDIR}/lprm
! 	install -s -g ${SPGRP} -m 2711 lpc ${DESTDIR}/${SBINDIR}/lpc
! 	install -s lptest ${DESTDIR}/${SBINDIR}/lptest
! 	install -s pac ${DESTDIR}/${SBINDIR}/pac
  	/etc/chown ${DAEMON} ${DESTDIR}/${SPOOLDIR}
  	chgrp ${SPGRP} ${DESTDIR}/${SPOOLDIR}
  	chmod 775 ${DESTDIR}/${SPOOLDIR}
*** /usr/src/usr.sbin/lpr/etc.printcap.old	Wed Feb 18 01:10:48 1987
--- /usr/src/usr.sbin/lpr/etc.printcap	Thu Oct 24 14:38:53 1996
***************
*** 3,27 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)etc.printcap	5.1 (Berkeley) 6/7/85
  #
  # This is a sample of printcap entries used by various printers/plotters
  #
  # DecWriter over a tty line.
  lp|ap|arpa|ucbarpa|LA-180 DecWriter III:\
! 	:br#1200:fs#06320:tr=\f:of=/usr/lib/lpf:lf=/usr/adm/lpd-errs:
  # typical remote printer entry
  ucbvax|vax|vx|ucbvax line printer:\
  	:lp=:rm=ucbvax:sd=/usr/spool/vaxlpd:lf=/usr/adm/lpd-errs:
  varian|va|Benson Varian:\
  	:lp=/dev/va0:sd=/usr/spool/vad:mx#2000:pl#58:px#2112:py#1700:tr=\f:\
! 	:of=/usr/lib/vpf:if=/usr/lib/vpf:tf=/usr/lib/rvcat:cf=/usr/lib/vdmp:\
! 	:gf=/usr/lib/vplotf:df=/usr/local/dvif:\
! 	:vf=/usr/lib/vpltdmp:lf=/usr/adm/lpd-errs:
  versatec|vp|Versatec plotter:\
  	:lp=/dev/vp0:sd=/usr/spool/vpd:sb:sf:mx#0:pw#106:pl#86:px#7040:py#2400:\
! 	:of=/usr/lib/vpfW:if=/usr/lib/vpsf:tf=/usr/lib/vcat:cf=/usr/lib/vdmp:\
! 	:gf=/usr/lib/vplotf:vf=/usr/lib/vpltdmp:lf=/usr/adm/lpd-errs:\
  	:tr=\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\
  \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\
  \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n:
--- 3,27 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)etc.printcap	5.1.1 (2.11BSD) 1996/10/24
  #
  # This is a sample of printcap entries used by various printers/plotters
  #
  # DecWriter over a tty line.
  lp|ap|arpa|ucbarpa|LA-180 DecWriter III:\
! 	:br#1200:fs#06320:tr=\f:of=/usr/libexec/lpr/lpf:lf=/usr/adm/lpd-errs:
  # typical remote printer entry
  ucbvax|vax|vx|ucbvax line printer:\
  	:lp=:rm=ucbvax:sd=/usr/spool/vaxlpd:lf=/usr/adm/lpd-errs:
  varian|va|Benson Varian:\
  	:lp=/dev/va0:sd=/usr/spool/vad:mx#2000:pl#58:px#2112:py#1700:tr=\f:\
! 	:of=/usr/libexec/lpr/vpf:if=/usr/libexec/lpr/vpf:tf=/usr/libexec/lpr/rvcat:cf=/usr/libexec/lpr/vdmp:\
! 	:gf=/usr/libexec/lpr/vplotf:df=/usr/local/dvif:\
! 	:vf=/usr/libexec/lpr/vpltdmp:lf=/usr/adm/lpd-errs:
  versatec|vp|Versatec plotter:\
  	:lp=/dev/vp0:sd=/usr/spool/vpd:sb:sf:mx#0:pw#106:pl#86:px#7040:py#2400:\
! 	:of=/usr/libexec/lpr/vpfW:if=/usr/libexec/lpr/vpsf:tf=/usr/libexec/lpr/vcat:cf=/usr/libexec/lpr/vdmp:\
! 	:gf=/usr/libexec/lpr/vplotf:vf=/usr/libexec/lpr/vpltdmp:lf=/usr/adm/lpd-errs:\
  	:tr=\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\
  \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\
  \n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n\n:
*** /usr/src/usr.sbin/lpr/filters/Makefile.old	Sun Dec 25 23:53:49 1988
--- /usr/src/usr.sbin/lpr/filters/Makefile	Sun Oct 27 19:47:33 1996
***************
*** 3,9 ****
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.1 (Berkeley) 5/15/85
  #
  #
  # makefile for line printer filters and associated programs
--- 3,9 ----
  # All rights reserved.  The Berkeley software License Agreement
  # specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile	5.1.1 (2.11BSD) 1996/10/24
  #
  #
  # makefile for line printer filters and associated programs
***************
*** 12,18 ****
  DESTDIR=
  CFLAGS=	-O
  SEPFLAG=-i
! LIBDIR=	/usr/lib
  CXREF=	/usr/ucb/ctags -x
  #
  # vpsf, fcvt and vdmp were excluded on the PDP because they require more than
--- 12,18 ----
  DESTDIR=
  CFLAGS=	-O
  SEPFLAG=-i
! LIBEXECDIR=	/usr/libexec/lpr
  CXREF=	/usr/ucb/ctags -x
  #
  # vpsf, fcvt and vdmp were excluded on the PDP because they require more than
***************
*** 83,109 ****
  	${CC} -o rotprt ${CFLAGS} ${SEPFLAG} rotprt.c
  
  install: printer
! 	install -s lpf ${DESTDIR}/${LIBDIR}/lpf
! 	install -s necf ${DESTDIR}/${LIBDIR}/necf
  
  installv: varian
! 	install -s vfontinfo ${DESTDIR}/${LIBDIR}/vfontinfo
! 	install -s vwidth ${DESTDIR}/${LIBDIR}/vwidth
! 	install -s vfw ${DESTDIR}/${LIBDIR}/vfw
! 	install -s rotate ${DESTDIR}/${LIBDIR}/rotate
! 	install -s rotprt ${DESTDIR}/${LIBDIR}/rotprt
! 	install -s rvsort ${DESTDIR}/${LIBDIR}/rvsort
! 	install -s rvcat ${DESTDIR}/${LIBDIR}/rvcat
! 	install -s vsort ${DESTDIR}/${LIBDIR}/vsort
! 	install -s vcat ${DESTDIR}/${LIBDIR}/vcat
! 	install -s vpf ${DESTDIR}/${LIBDIR}/vpf
! 	ln ${DESTDIR}/${LIBDIR}/vpf ${DESTDIR}/${LIBDIR}/vpfW
! 	install -s vdmp ${DESTDIR}/${LIBDIR}/vdmp
! 	install -s vpltdmp ${DESTDIR}/${LIBDIR}/vpltdmp
! 	install -s vplotf ${DESTDIR}/${LIBDIR}/vplotf
  
! #	install -s fcvt ${DESTDIR}/${LIBDIR}/fcvt
! #	install -s vpsf ${DESTDIR}/${LIBDIR}/vpsf
  
  clean:
  	rm -f ${PRINTER} ${VARIAN} *.o
--- 83,111 ----
  	${CC} -o rotprt ${CFLAGS} ${SEPFLAG} rotprt.c
  
  install: printer
! 	-mkdir -p ${DESTDIR}/${LIBEXECDIR}
! 	install -s lpf ${DESTDIR}/${LIBEXECDIR}/lpf
! 	install -s necf ${DESTDIR}/${LIBEXECDIR}/necf
  
  installv: varian
! 	-mkdir -p ${DESTDIR}/${LIBEXECDIR}
! 	install -s vfontinfo ${DESTDIR}/${LIBEXECDIR}/vfontinfo
! 	install -s vwidth ${DESTDIR}/${LIBEXECDIR}/vwidth
! 	install -s vfw ${DESTDIR}/${LIBEXECDIR}/vfw
! 	install -s rotate ${DESTDIR}/${LIBEXECDIR}/rotate
! 	install -s rotprt ${DESTDIR}/${LIBEXECDIR}/rotprt
! 	install -s rvsort ${DESTDIR}/${LIBEXECDIR}/rvsort
! 	install -s rvcat ${DESTDIR}/${LIBEXECDIR}/rvcat
! 	install -s vsort ${DESTDIR}/${LIBEXECDIR}/vsort
! 	install -s vcat ${DESTDIR}/${LIBEXECDIR}/vcat
! 	install -s vpf ${DESTDIR}/${LIBEXECDIR}/vpf
! 	ln ${DESTDIR}/${LIBEXECDIR}/vpf ${DESTDIR}/${LIBEXECDIR}/vpfW
! 	install -s vdmp ${DESTDIR}/${LIBEXECDIR}/vdmp
! 	install -s vpltdmp ${DESTDIR}/${LIBEXECDIR}/vpltdmp
! 	install -s vplotf ${DESTDIR}/${LIBEXECDIR}/vplotf
  
! #	install -s fcvt ${DESTDIR}/${LIBEXECDIR}/fcvt
! #	install -s vpsf ${DESTDIR}/${LIBEXECDIR}/vpsf
  
  clean:
  	rm -f ${PRINTER} ${VARIAN} *.o
*** /usr/src/usr.sbin/lpr/filters/railmag.c.old	Wed Feb 18 01:10:39 1987
--- /usr/src/usr.sbin/lpr/filters/railmag.c	Thu Oct 24 14:43:44 1996
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
! static char sccsid[] = "@(#)railmag.c	5.1 (Berkeley) 5/15/85";
! #endif not lint
  
  /*
   * tell vcat which fonts are loaded on the "typesetter"
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)railmag.c	5.1.1 (2.11BSD) 1996/10/24";
! #endif
  
  /*
   * tell vcat which fonts are loaded on the "typesetter"
***************
*** 13,19 ****
   */
  
  #define MAGIC_NUMBER 0436
! #define RAILMAG_FILE "/usr/lib/vfont/railmag"
  
  char	*concat();
  int	rmfd;
--- 13,19 ----
   */
  
  #define MAGIC_NUMBER 0436
! #define RAILMAG_FILE "/usr/share/vfont/railmag"
  
  char	*concat();
  int	rmfd;
***************
*** 41,47 ****
  		if (argv[1][0] == '/')
  			rm[fnum-1] = argv[1];
  		else
! 			rm[fnum-1] = concat(cbuf[fnum-1], "/usr/lib/vfont/", argv[1]);
  		argv++;	argc--;
  	}
  	writerm();
--- 41,47 ----
  		if (argv[1][0] == '/')
  			rm[fnum-1] = argv[1];
  		else
! 			rm[fnum-1] = concat(cbuf[fnum-1], "/usr/share/vfont/", argv[1]);
  		argv++;	argc--;
  	}
  	writerm();
***************
*** 65,71 ****
  	short word;
  
  	if ((fd = open(concat(cbuf, file, ".10"), 0)) < 0)
! 		if ((fd = open(concat(cbuf2, "/usr/lib/vfont/", cbuf), 0)) < 0)
  			error("cant open font");
  	if (read(fd, &word, 2) != 2)
  		error("cant read font");
--- 65,71 ----
  	short word;
  
  	if ((fd = open(concat(cbuf, file, ".10"), 0)) < 0)
! 		if ((fd = open(concat(cbuf2, "/usr/share/vfont/", cbuf), 0)) < 0)
  			error("cant open font");
  	if (read(fd, &word, 2) != 2)
  		error("cant read font");
*** /usr/src/usr.sbin/lpr/filters/rvcat.c.old	Sun Feb 22 04:01:12 1987
--- /usr/src/usr.sbin/lpr/filters/rvcat.c	Thu Oct 24 14:45:21 1996
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
! static char sccsid[] = "@(#)rvcat.c	5.1 (Berkeley) 5/15/85";
! #endif not lint
  
  /*
   * Cat Simulator for Versatec and Varian
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)rvcat.c	5.1.1 (2.11BSD) 1996/10/24;
! #endif
  
  /*
   * Cat Simulator for Versatec and Varian
***************
*** 32,38 ****
  #define MAXF			4
  
  #define LOCAL_RAILMAG		".railmag"
! #define GLOBAL_RAILMAG		"/usr/lib/vfont/railmag"
  
  /*
   * Here we make up for the fact that we only have 2112
--- 32,38 ----
  #define MAXF			4
  
  #define LOCAL_RAILMAG		".railmag"
! #define GLOBAL_RAILMAG		"/usr/share/vfont/railmag"
  
  /*
   * Here we make up for the fact that we only have 2112
*** /usr/src/usr.sbin/lpr/filters/vcat.c.old	Sun Feb 22 04:05:03 1987
--- /usr/src/usr.sbin/lpr/filters/vcat.c	Thu Oct 24 14:46:08 1996
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
! static char sccsid[] = "@(#)vcat.c	5.1 (Berkeley) 5/15/85";
! #endif not lint
  
  /*
   * Cat Simulator for Versatec and Varian
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)vcat.c	5.1.1 (2.11BSD) 1996/10/24";
! #endif
  
  /*
   * Cat Simulator for Versatec and Varian
***************
*** 27,33 ****
  #define MAXF			4
  
  #define LOCAL_RAILMAG		".railmag"
! #define GLOBAL_RAILMAG		"/usr/lib/vfont/railmag"
  
  #define CONVERT(n)		(n*(200./432.))
  #define RECONVERT(n)		(n*(432./200.))
--- 27,33 ----
  #define MAXF			4
  
  #define LOCAL_RAILMAG		".railmag"
! #define GLOBAL_RAILMAG		"/usr/share/vfont/railmag"
  
  #define CONVERT(n)		(n*(200./432.))
  #define RECONVERT(n)		(n*(432./200.))
*** /usr/src/usr.sbin/lpr/filters/vfontinfo.c.old	Wed Feb 18 01:10:40 1987
--- /usr/src/usr.sbin/lpr/filters/vfontinfo.c	Thu Oct 24 14:46:55 1996
***************
*** 4,12 ****
   * specifies the terms and conditions for redistribution.
   */
  
! #ifndef lint
! static char sccsid[] = "@(#)vfontinfo.c	5.1 (Berkeley) 5/15/85";
! #endif not lint
  
  /* Font Information for VCat-style fonts
   *      Andy Hertzfeld  4/79
--- 4,12 ----
   * specifies the terms and conditions for redistribution.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)vfontinfo.c	5.1.1 (2.11BSD) 1996/10/24";
! #endif
  
  /* Font Information for VCat-style fonts
   *      Andy Hertzfeld  4/79
***************
*** 76,82 ****
  	if (argc >= 3)
  		charswanted = argv[2];
  
! 	sprintf(IName,"/usr/lib/vfont/%s",argv[1]);
  	if ((FID = open(argv[1],0)) < 0)
  		if ((FID = open(IName,0)) < 0) { 
  			printf("Can't find %s\n",argv[1]);
--- 76,82 ----
  	if (argc >= 3)
  		charswanted = argv[2];
  
! 	sprintf(IName,"/usr/share/vfont/%s",argv[1]);
  	if ((FID = open(argv[1],0)) < 0)
  		if ((FID = open(IName,0)) < 0) { 
  			printf("Can't find %s\n",argv[1]);
*** /usr/src/usr.sbin/lpr/filters/vplotf.c.old	Sat Feb  5 20:31:35 1994
--- /usr/src/usr.sbin/lpr/filters/vplotf.c	Thu Oct 24 14:47:28 1996
***************
*** 5,11 ****
   */
  
  #if	defined(DOSCCS) && !defined(lint)
! static char sccsid[] = "@(#)vplotf.c	5.2.1 (2.11BSD GTE) 1/1/94";
  #endif
  
  /*
--- 5,11 ----
   */
  
  #if	defined(DOSCCS) && !defined(lint)
! static char sccsid[] = "@(#)vplotf.c	5.2.2 (2.11BSD GTE) 1996/10/24";
  #endif
  
  /*
***************
*** 65,71 ****
  struct	header header;
  struct	dispatch dispatch[256];
  char	*bits;
! char	*fontFile = "/usr/lib/vfont/R.8";
  
  main(argc, argv)
  	int argc;
--- 65,71 ----
  struct	header header;
  struct	dispatch dispatch[256];
  char	*bits;
! char	*fontFile = "/usr/share/vfont/R.8";
  
  main(argc, argv)
  	int argc;
*** /usr/src/usr.sbin/lpr/lp.local.h.old	Sat Jun 11 18:20:55 1994
--- /usr/src/usr.sbin/lpr/lp.local.h	Thu Oct 24 14:54:45 1996
***************
*** 3,9 ****
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)lp.local.h	5.1.1 (2.11BSD GTE) 6/11/94
   */
  
  /*
--- 3,9 ----
   * All rights reserved.  The Berkeley software License Agreement
   * specifies the terms and conditions for redistribution.
   *
!  *	@(#)lp.local.h	5.1.2 (2.11BSD GTE) 1996/10/24
   */
  
  /*
***************
*** 35,45 ****
  #define DEFLOCK		"lock"
  #define DEFSTAT		"status"
  #define	DEFSPOOL	"/usr/spool/lpd"
! #define	DEFDAEMON	"/usr/lib/lpd"
  #define	DEFLOGF		"/dev/console"
  #define	DEFDEVLP	"/dev/lp"
- #define DEFRLPR		"/usr/lib/rlpr"
- #define DEFBINDIR	"/usr/ucb"
  #define	DEFMX		1000
  #define DEFMAXCOPIES	0
  #define DEFFF		"\f"
--- 35,43 ----
  #define DEFLOCK		"lock"
  #define DEFSTAT		"status"
  #define	DEFSPOOL	"/usr/spool/lpd"
! #define	DEFDAEMON	"/usr/sbin/lpd"
  #define	DEFLOGF		"/dev/console"
  #define	DEFDEVLP	"/dev/lp"
  #define	DEFMX		1000
  #define DEFMAXCOPIES	0
  #define DEFFF		"\f"
*** /usr/src/usr.sbin/lpr/printjob.c.old	Sat Jun 11 18:22:24 1994
--- /usr/src/usr.sbin/lpr/printjob.c	Thu Oct 24 14:53:26 1996
***************
*** 5,11 ****
   */
  
  #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)printjob.c	5.2.1 (2.11BSD GTE) 6/11/94";
  #endif
  
  /*
--- 5,11 ----
   */
  
  #if	!defined(lint) && defined(DOSCCS)
! static char sccsid[] = "@(#)printjob.c	5.2.2 (2.11BSD GTE) 1996/10/24";
  #endif
  
  /*
***************
*** 208,217 ****
  char	fonts[4][50];	/* fonts for troff */
  
  char ifonts[4][18] = {
! 	"/usr/lib/vfont/R",
! 	"/usr/lib/vfont/I",
! 	"/usr/lib/vfont/B",
! 	"/usr/lib/vfont/S"
  };
  
  /*
--- 208,217 ----
  char	fonts[4][50];	/* fonts for troff */
  
  char ifonts[4][18] = {
! 	"/usr/share/vfont/R",
! 	"/usr/share/vfont/I",
! 	"/usr/share/vfont/B",
! 	"/usr/share/vfont/S"
  };
  
  /*
***************
*** 507,513 ****
  		} else {
  			for (n = 0; n < 4; n++) {
  				if (fonts[n][0] != '/')
! 					(void) write(fo, "/usr/lib/vfont/", 15);
  				(void) write(fo, fonts[n], strlen(fonts[n]));
  				(void) write(fo, "\n", 1);
  			}
--- 507,513 ----
  		} else {
  			for (n = 0; n < 4; n++) {
  				if (fonts[n][0] != '/')
! 					(void)write(fo, "/usr/share/vfont/",17);
  				(void) write(fo, fonts[n], strlen(fonts[n]));
  				(void) write(fo, "\n", 1);
  			}
*** /usr/src/usr.sbin/sendmail.MX/aux/mailstats.c.old	Thu Apr 21 17:17:20 1988
--- /usr/src/usr.sbin/sendmail.MX/aux/mailstats.c	Thu Oct 24 20:09:25 1996
***************
*** 14,28 ****
   *  Berkeley, California
   */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1988 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif /* not lint */
  
! #ifndef lint
! static char sccsid[] = "@(#)mailstats.c	5.4 (Berkeley) 4/21/88";
! #endif /* not lint */
  
  #include <sys/file.h>
  #include <sendmail.h>
--- 14,26 ----
   *  Berkeley, California
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1988 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)mailstats.c	5.4.1 (2.11BSD) 1996/10/24";
! #endif
  
  #include <sys/file.h>
  #include <sendmail.h>
***************
*** 39,45 ****
  	int ch, fd;
  	char *sfile, *ctime();
  
! 	sfile = "/usr/lib/sendmail.st";
  	while ((ch = getopt(argc, argv, "f:")) != EOF)
  		switch((char)ch) {
  		case 'f':
--- 37,43 ----
  	int ch, fd;
  	char *sfile, *ctime();
  
! 	sfile = "/var/log/sendmail.st";
  	while ((ch = getopt(argc, argv, "f:")) != EOF)
  		switch((char)ch) {
  		case 'f':
*** /usr/src/usr.sbin/sendmail.MX/aux/newaliases.c.old	Fri Jun  7 15:59:26 1985
--- /usr/src/usr.sbin/sendmail.MX/aux/newaliases.c	Thu Oct 24 20:10:45 1996
***************
*** 8,29 ****
  **  specifies the terms and conditions for redistribution.
  */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif not lint
  
! #ifndef lint
! static char	SccsId[] = "@(#)newaliases.c	5.1 (Berkeley) 6/7/85";
! #endif not lint
  
  # include <stdio.h>
  # include <ctype.h>
  # include "sendmail.h"
  
- static	char SccsId[] = "@(#)newaliases.c	5.1	6/7/85";
- 
  typedef struct { char *dptr; int dsize; } datum;
  char *aliases = ALIASFILE;
  char dirbuf[100];
--- 8,25 ----
  **  specifies the terms and conditions for redistribution.
  */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char	SccsId[] = "@(#)newaliases.c	5.1.1 (2.11BSD) 1996/10/24";
! #endif
  
  # include <stdio.h>
  # include <ctype.h>
  # include "sendmail.h"
  
  typedef struct { char *dptr; int dsize; } datum;
  char *aliases = ALIASFILE;
  char dirbuf[100];
***************
*** 55,61 ****
  	extern char *prescan();
  	extern ADDRESS *parse();
  	bool contin;
! 	char *cffile = "/usr/lib/sendmail.cf";
  
  # ifdef DEBUG
  	if (argc > 1 && strcmp(argv[1], "-T") == 0)
--- 51,57 ----
  	extern char *prescan();
  	extern ADDRESS *parse();
  	bool contin;
! 	char *cffile = "/etc/sendmail.cf";
  
  # ifdef DEBUG
  	if (argc > 1 && strcmp(argv[1], "-T") == 0)
*** /usr/src/usr.sbin/sendmail.MX/aux/praliases.c.old	Thu Apr 21 17:02:03 1988
--- /usr/src/usr.sbin/sendmail.MX/aux/praliases.c	Thu Oct 24 20:13:44 1996
***************
*** 10,24 ****
   * is provided ``as is'' without express or implied warranty.
   */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1988 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif /* not lint */
  
! #ifndef lint
! static char sccsid[] = "@(#)praliases.c	5.3 (Berkeley) 4/21/88";
! #endif /* not lint */
  
  #include <sendmail.h>
  
--- 10,22 ----
   * is provided ``as is'' without express or implied warranty.
   */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1988 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)praliases.c	5.3.1 (2.11BSD) 1996/10/24";
! #endif
  
  #include <sendmail.h>
  
***************
*** 33,39 ****
  {
  	extern char *optarg;
  	extern int optind;
! 	static char *filename = "/usr/lib/aliases";
  	datum content, key, firstkey(), nextkey(), fetch();
  	int ch;
  
--- 31,37 ----
  {
  	extern char *optarg;
  	extern int optind;
! 	static char *filename = "/etc/aliases";
  	datum content, key, firstkey(), nextkey(), fetch();
  	int ch;
  
*** /usr/src/usr.sbin/sendmail.MX/cf.hosttable/NEW/base.m4.old	Sun Mar 18 16:57:30 1984
--- /usr/src/usr.sbin/sendmail.MX/cf.hosttable/NEW/base.m4	Thu Oct 24 20:15:08 1996
***************
*** 38,44 ****
  ###################
  
  # location of alias file
! OA/usr/lib/aliases
  # default delivery mode (deliver in background)
  Odbackground
  # (don't) connect to "expensive" mailers
--- 38,44 ----
  ###################
  
  # location of alias file
! OA/etc/aliases
  # default delivery mode (deliver in background)
  Odbackground
  # (don't) connect to "expensive" mailers
***************
*** 48,54 ****
  # default GID
  Og1
  # location of help file
! OH/usr/lib/sendmail.hf
  # log level
  OL9
  # default messages to old style
--- 48,54 ----
  # default GID
  Og1
  # location of help file
! OH/usr/share/misc/sendmail.hf
  # log level
  OL9
  # default messages to old style
***************
*** 58,64 ****
  # read timeout -- violates protocols
  Or2h
  # status file
! OS/usr/lib/sendmail.st
  # queue up everything before starting transmission
  Os
  # default timeout interval
--- 58,64 ----
  # read timeout -- violates protocols
  Or2h
  # status file
! OS/var/log/sendmail.st
  # queue up everything before starting transmission
  Os
  # default timeout interval
*** /usr/src/usr.sbin/sendmail.MX/cf.hosttable/base.m4.old	Mon Oct 21 13:04:50 1985
--- /usr/src/usr.sbin/sendmail.MX/cf.hosttable/base.m4	Thu Oct 24 20:16:01 1996
***************
*** 8,14 ****
  #  All rights reserved.  The Berkeley software License Agreement
  #  specifies the terms and conditions for redistribution.
  #
! #	@(#)base.m4	5.7 (Berkeley) 10/21/85
  #
  divert(0)
  ############################################################
--- 8,14 ----
  #  All rights reserved.  The Berkeley software License Agreement
  #  specifies the terms and conditions for redistribution.
  #
! #	@(#)base.m4	5.7.1 (2.11BSD) 1996/10/24
  #
  divert(0)
  ############################################################
***************
*** 49,55 ****
  ###################
  
  # location of alias file
! OA/usr/lib/aliases
  # wait up to ten minutes for alias file rebuild
  Oa10
  # substitution for space (blank) characters
--- 49,55 ----
  ###################
  
  # location of alias file
! OA/etc/aliases
  # wait up to ten minutes for alias file rebuild
  Oa10
  # substitution for space (blank) characters
***************
*** 63,69 ****
  # default GID
  Og1
  # location of help file
! OH/usr/lib/sendmail.hf
  # log level
  OL9
  # default network name
--- 63,69 ----
  # default GID
  Og1
  # location of help file
! OH/usr/share/misc/sendmail.hf
  # log level
  OL9
  # default network name
***************
*** 75,81 ****
  # read timeout -- violates protocols
  Or2h
  # status file
! OS/usr/lib/sendmail.st
  # queue up everything before starting transmission
  Os
  # default timeout interval
--- 75,81 ----
  # read timeout -- violates protocols
  Or2h
  # status file
! OS/var/log/sendmail.st
  # queue up everything before starting transmission
  Os
  # default timeout interval
*** /usr/src/usr.sbin/sendmail.MX/lib/Makefile.old	Mon Jan 18 09:38:57 1993
--- /usr/src/usr.sbin/sendmail.MX/lib/Makefile	Thu Oct 24 20:20:02 1996
***************
*** 9,15 ****
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	@(#)Makefile	5.1 (Berkeley) 5/8/88
  #
  ALL=	sendmail.hf
  SRCS=	sendmail.hf
--- 9,15 ----
  # software without specific prior written permission. This software
  # is provided ``as is'' without express or implied warranty.
  #
! #	@(#)Makefile	5.1.1 (2.11BSD) 1996/10/24
  #
  ALL=	sendmail.hf
  SRCS=	sendmail.hf
***************
*** 19,25 ****
  depend: FRC
  
  install: sendmail.hf
! 	install -c -o bin -m 444 sendmail.hf ${DESTDIR}/usr/lib/sendmail.hf
  
  FRC:
- 
--- 19,24 ----
  depend: FRC
  
  install: sendmail.hf
! 	install -c -o bin -m 444 sendmail.hf ${DESTDIR}/usr/share/misc/sendmail.hf
  
  FRC:
*** /usr/src/usr.sbin/sendmail.MX/src/Makefile.old	Mon Jan 18 09:38:58 1993
--- /usr/src/usr.sbin/sendmail.MX/src/Makefile	Thu Oct 24 20:26:47 1996
***************
*** 59,74 ****
  	size sendmail; ls -l sendmail; ${WHAT} < Version.o
  
  install: sendmail 
! 	install -c -s -o root -g kmem -m 6755 sendmail ${DESTDIR}/usr/lib
! 	install -c -o bin -m 644 /dev/null ${DESTDIR}/usr/lib/sendmail.fc
! 	install -c -o bin -m 666 /dev/null ${DESTDIR}/usr/lib/sendmail.st
! 	rm -f ${DESTDIR}/usr/ucb/newaliases
! 	ln -s ${DESTDIR}/usr/lib/sendmail ${DESTDIR}/usr/ucb/newaliases
! 	rm -f ${DESTDIR}/usr/ucb/mailq
! 	ln -s ${DESTDIR}/usr/lib/sendmail ${DESTDIR}/usr/ucb/mailq
  	-if [ -s sendmail.sr ]; then \
  		install -c -o bin -m 644 sendmail.sr \
! 			$(DESTDIR)/usr/lib/sendmail.sr; \
  	fi
  
  version: newversion ${OBJS} Version.c
--- 59,74 ----
  	size sendmail; ls -l sendmail; ${WHAT} < Version.o
  
  install: sendmail 
! 	install -c -s -o root -g kmem -m 6755 sendmail ${DESTDIR}/usr/sbin
! 	install -c -o bin -m 644 /dev/null ${DESTDIR}/etc/sendmail.fc
! 	install -c -o bin -m 666 /dev/null ${DESTDIR}/var/log/sendmail.st
! 	rm -f ${DESTDIR}/usr/bin/newaliases
! 	ln -s ${DESTDIR}/usr/sbin/sendmail ${DESTDIR}/usr/bin/newaliases
! 	rm -f ${DESTDIR}/usr/bin/mailq
! 	ln -s ${DESTDIR}/usr/sbin/sendmail ${DESTDIR}/usr/bin/mailq
  	-if [ -s sendmail.sr ]; then \
  		install -c -o bin -m 644 sendmail.sr \
! 			$(DESTDIR)/usr/share/misc/sendmail.sr; \
  	fi
  
  version: newversion ${OBJS} Version.c
*** /usr/src/usr.sbin/sendmail.MX/src/conf.c.old	Wed Jan 18 20:07:55 1995
--- /usr/src/usr.sbin/sendmail.MX/src/conf.c	Thu Oct 24 20:27:52 1996
***************
*** 15,21 ****
   */
  
  #if !defined(lint) && !defined(NOSCCS)
! static char sccsid[] = "@(#)conf.c	5.16.2 (2.11BSD) 1/18/95";
  #endif /* not lint */
  
  # include <pwd.h>
--- 15,21 ----
   */
  
  #if !defined(lint) && !defined(NOSCCS)
! static char sccsid[] = "@(#)conf.c	5.16.3 (2.11BSD) 1996/10/24";
  #endif /* not lint */
  
  # include <pwd.h>
***************
*** 113,120 ****
  **  Location of system files/databases/etc.
  */
  
! char	*ConfFile =	"/usr/lib/sendmail.cf";	/* runtime configuration */
! char	*FreezeFile =	"/usr/lib/sendmail.fc";	/* frozen version of above */
  
  
  
--- 113,120 ----
  **  Location of system files/databases/etc.
  */
  
! char	*ConfFile =	"/etc/sendmail.cf";	/* runtime configuration */
! char	*FreezeFile =	"/etc/sendmail.fc";	/* frozen version of above */
  
  
  
*** /usr/src/usr.sbin/sendmail.MX/src/extract.c.old	Wed Apr 13 21:35:55 1994
--- /usr/src/usr.sbin/sendmail.MX/src/extract.c	Thu Oct 24 20:28:36 1996
***************
*** 4,10 ****
  #include "sendmail.h"
  #include <varargs.h>
  
! char	*StringFile =	"/usr/lib/sendmail.sr";	/* extracted string storage */
  static int strfile = -1, ourpid = 0;
  
  errprep(offset, buf)
--- 4,10 ----
  #include "sendmail.h"
  #include <varargs.h>
  
! char	*StringFile =	"/usr/share/misc/sendmail.sr";	/* extracted string storage */
  static int strfile = -1, ourpid = 0;
  
  errprep(offset, buf)
*** /usr/src/usr.sbin/sendmail.MX/src/main.c.old	Wed Sep 14 06:23:35 1988
--- /usr/src/usr.sbin/sendmail.MX/src/main.c	Thu Oct 24 20:29:50 1996
***************
*** 18,28 ****
  char copyright[] =
  "@(#) Copyright (c) 1988 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif /* not lint */
  
! #if !defined(lint) && !defined(NOSCCS)
! static char sccsid[] = "@(#)main.c	5.17 (Berkeley) 4/19/88";
! #endif /* not lint */
  
  #define	_DEFINE
  
--- 18,26 ----
  char copyright[] =
  "@(#) Copyright (c) 1988 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char sccsid[] = "@(#)main.c	5.17.1 (2.11BSD) 1996/10/24";
! #endif
  
  #define	_DEFINE
  
***************
*** 44,50 ****
  **	turn calls a bunch of mail servers that do the real work of
  **	delivering the mail.
  **
! **	Sendmail is driven by tables read in from /usr/lib/sendmail.cf
  **	(read by readcf.c).  Some more static configuration info,
  **	including some code that you may want to tailor for your
  **	installation, is in conf.c.  You may also want to touch
--- 42,48 ----
  **	turn calls a bunch of mail servers that do the real work of
  **	delivering the mail.
  **
! **	Sendmail is driven by tables read in from /etc/sendmail.cf
  **	(read by readcf.c).  Some more static configuration info,
  **	including some code that you may want to tailor for your
  **	installation, is in conf.c.  You may also want to touch
***************
*** 53,59 ****
  **	server mechanism).
  **
  **	Usage:
! **		/usr/lib/sendmail [flags] addr ...
  **
  **		See the associated documentation for details.
  **
--- 51,57 ----
  **	server mechanism).
  **
  **	Usage:
! **		/usr/sbin/sendmail [flags] addr ...
  **
  **		See the associated documentation for details.
  **
*** /usr/src/usr.sbin/sendmail/Makefile.old	Sun May  6 21:42:10 1990
--- /usr/src/usr.sbin/sendmail/Makefile	Mon Oct 28 23:13:35 1996
***************
*** 1,26 ****
  #
  #	Makefile for sendmail base directory
  #
! #		@(#)Makefile	4.9		5/30/86
  #
  
! ALL=	src/sendmail src/ctimed
  DIRS=	$(DESTDIR)/usr/spool/mqueue
- SRCDIR=	$(DESTDIR)/usr/src/usr.lib/sendmail
  #
- #ALLDIRS=include adm src aux md cf lib doc adb test
- # cf temporarily removed
  ALLDIRS=include adm src aux md lib doc adb test
! BACKUP=	calder
! SENDMAIL=$(DESTDIR)/usr/lib/sendmail
! CTIMED=$(DESTDIR)/usr/lib/ctimed
  SYSLOG=	/usr/spool/mqueue/syslog
! HOST=	`hostname | sed -e 's/ucb//' -e 's/\..*//'`
  
  # When hardlinks are used, the references to LN below will need changes
  # for DESTDIR != /
  LN=	ln -s
- CP=	cp
  
  SEPFLAG= -i
  
--- 1,23 ----
  #
  #	Makefile for sendmail base directory
  #
! #		@(#)Makefile	4.9.1	(2.11BSD) 1996/10/24
  #
  
! ALL=	src/sendmail
  DIRS=	$(DESTDIR)/usr/spool/mqueue
  #
  ALLDIRS=include adm src aux md lib doc adb test
! SENDMAIL=$(DESTDIR)/usr/sbin/sendmail
  SYSLOG=	/usr/spool/mqueue/syslog
! HELPFILE=$(DESTDIR)/usr/share/misc/sendmail.hf
! STATUSFILE=$(DESTDIR)/var/log/sendmail.st
! STRINGFILE=${DESTDIR}/usr/share/misc/sendmail.sr
! FROZENFILE=${DESTDIR}/etc/sendmail.fc
  
  # When hardlinks are used, the references to LN below will need changes
  # for DESTDIR != /
  LN=	ln -s
  
  SEPFLAG= -i
  
***************
*** 28,65 ****
  	cd lib; make ${MFLAGS} SEPFLAG=${SEPFLAG}
  	cd src; m4 Makefile.m4 > Makefile; make ${MFLAGS} SEPFLAG=${SEPFLAG} all
  	-cd aux; m4 Makefile.m4 > Makefile; make ${MFLAGS} SEPFLAG=${SEPFLAG}
- #	cd cf;  make ${MFLAGS}
- #	cd doc; make ${MFLAGS}
  
  install: $(ALL) $(DIRS)
  	install -s -o root -m 4755	src/sendmail	$(SENDMAIL)
! 	install -s -o root -m 0755	src/ctimed	$(CTIMED)
! 	chgrp kmem $(SENDMAIL)
! 	install -c -o root -m 644	lib/sendmail.hf	$(SENDMAIL).hf
! 	install -c -o root -m 666	/dev/null	$(SENDMAIL).st
! 	install -c -o root -m 644	/dev/null	$(SENDMAIL).fc
! 	rm -f					$(DESTDIR)/usr/ucb/newaliases
! 	$(LN)			/usr/lib/sendmail  $(DESTDIR)/usr/ucb/newaliases
! 	rm -f					$(DESTDIR)/usr/ucb/mailq
! 	$(LN)			/usr/lib/sendmail  $(DESTDIR)/usr/ucb/mailq
! #	install -c -o root -m 644	cf/$(HOST).cf	$(SENDMAIL).cf
! #	install -o 1		aux/syslog	$(DESTDIR)/etc/syslog
! #	install -c -o 1 -m 644	aux/syslog.conf	$(DESTDIR)/etc/syslog.conf
! #	install -c -o 1 -m 644	/dev/null	$(DESTDIR)/etc/syslog.pid
! #	install -c -o 1 -m 644	/dev/null	$(DESTDIR)$(SYSLOG)
! #	for i in 0 1 2 3 4 5 6 7; do install -c -o 1 -m 644 /dev/null $(DESTDIR)$(SYSLOG).$$i; done
! #	install -c -o 1		lib/newsyslog.sh $(DESTDIR)/usr/adm/newsyslog
! #	echo	'5 4 * * * sh /usr/adm/newsyslog' >> $(DESTDIR)/usr/lib/crontab
  
- installcf:
- 	install -c -o root -m 644	cf/$(HOST).cf	$(SENDMAIL).cf
- 
  src/sendmail:
  	cd src; make ${MFLAGS} sendmail
  
- src/ctimed:
- 	cd src; make ${MFLAGS} ctimed
- 
  aux/syslog:
  	-cd aux; make ${MFLAGS} syslog
  
--- 25,45 ----
  	cd lib; make ${MFLAGS} SEPFLAG=${SEPFLAG}
  	cd src; m4 Makefile.m4 > Makefile; make ${MFLAGS} SEPFLAG=${SEPFLAG} all
  	-cd aux; m4 Makefile.m4 > Makefile; make ${MFLAGS} SEPFLAG=${SEPFLAG}
  
  install: $(ALL) $(DIRS)
  	install -s -o root -m 4755	src/sendmail	$(SENDMAIL)
! 	install -c -o root -m 644	src/sendmail.sr	$(STRINGFILE)
! 	install -c -o root -m 644	lib/sendmail.hf	$(HELPFILE)
! 	install -c -o root -m 666	/dev/null	$(STATUSFILE)
! 	install -c -o root -m 644	/dev/null	$(FROZENFILE)
! 	rm -f					$(DESTDIR)/usr/bin/newaliases
! 	$(LN)			/usr/sbin/sendmail $(DESTDIR)/usr/bin/newaliases
! 	rm -f					$(DESTDIR)/usr/bin/mailq
! 	$(LN)			/usr/sbin/sendmail  $(DESTDIR)/usr/bin/mailq
  
  src/sendmail:
  	cd src; make ${MFLAGS} sendmail
  
  aux/syslog:
  	-cd aux; make ${MFLAGS} syslog
  
***************
*** 73,91 ****
  	-cd aux; make ${MFLAGS} clean
  	-cd lib; make ${MFLAGS} clean
  	-cd doc; make ${MFLAGS} clean
- 
- dirs:
- 	mkdir $(SRCROOT)
- 	cd $(SRCROOT); mkdir $(ALLDIRS)
- 
- rcp:
- 	rsh $(BACKUP) mkdir sendmail
- 	rsh $(BACKUP) 'cd sendmail; mkdir $(ALLDIRS)'
- 	for i in `cat FILES`; do rcp $$i $(BACKUP):sendmail/$$i; done
- 
- srcinstall:
- 	for i in `cat FILES`; do rm -f $(SRCDIR)/$$i; cp $$i $(SRCDIR)/$$i; done
- 
- tar:
- 	rm -f sendmail.tar
- 	tar rcfh sendmail.tar `cat FILES`
--- 53,55 ----
*** /usr/src/usr.sbin/sendmail/aux/mailstats.c.old	Wed Feb 18 01:11:12 1987
--- /usr/src/usr.sbin/sendmail/aux/mailstats.c	Thu Oct 24 20:50:45 1996
***************
*** 8,22 ****
  **  specifies the terms and conditions for redistribution.
  */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif not lint
  
! #ifndef lint
! static char	SccsId[] = "@(#)mailstats.c	5.3 (Berkeley) 5/2/86";
! #endif not lint
  
  # include "../src/sendmail.h"
  # include "../src/mailstats.h"
--- 8,20 ----
  **  specifies the terms and conditions for redistribution.
  */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char	SccsId[] = "@(#)mailstats.c	5.3.1 (2.11BSD) 1996/10/24";
! #endif
  
  # include "../src/sendmail.h"
  # include "../src/mailstats.h"
***************
*** 36,42 ****
  {
  	register int fd;
  	struct statistics stat;
! 	char *sfile = "/usr/lib/sendmail.st";
  	register int i;
  	extern char *ctime();
  
--- 34,40 ----
  {
  	register int fd;
  	struct statistics stat;
! 	char *sfile = "/var/log/sendmail.st";
  	register int i;
  	extern char *ctime();
  
*** /usr/src/usr.sbin/sendmail/aux/newaliases.c.old	Wed Feb 18 01:11:11 1987
--- /usr/src/usr.sbin/sendmail/aux/newaliases.c	Thu Oct 24 20:51:57 1996
***************
*** 8,29 ****
  **  specifies the terms and conditions for redistribution.
  */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif not lint
  
! #ifndef lint
! static char	SccsId[] = "@(#)newaliases.c	5.1 (Berkeley) 6/7/85";
! #endif not lint
  
  # include <stdio.h>
  # include <ctype.h>
  # include "sendmail.h"
  
- static	char SccsId[] = "@(#)newaliases.c	5.1	6/7/85";
- 
  typedef struct { char *dptr; int dsize; } datum;
  char *aliases = ALIASFILE;
  char dirbuf[100];
--- 8,25 ----
  **  specifies the terms and conditions for redistribution.
  */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char	SccsId[] = "@(#)newaliases.c	5.1.1 (2.11BSD) 1996/10/24";
! #endif
  
  # include <stdio.h>
  # include <ctype.h>
  # include "sendmail.h"
  
  typedef struct { char *dptr; int dsize; } datum;
  char *aliases = ALIASFILE;
  char dirbuf[100];
***************
*** 55,61 ****
  	extern char *prescan();
  	extern ADDRESS *parse();
  	bool contin;
! 	char *cffile = "/usr/lib/sendmail.cf";
  
  # ifdef DEBUG
  	if (argc > 1 && strcmp(argv[1], "-T") == 0)
--- 51,57 ----
  	extern char *prescan();
  	extern ADDRESS *parse();
  	bool contin;
! 	char *cffile = "/etc/sendmail.cf";
  
  # ifdef DEBUG
  	if (argc > 1 && strcmp(argv[1], "-T") == 0)
*** /usr/src/usr.sbin/sendmail/aux/rmail.c.old	Wed Feb 18 01:11:12 1987
--- /usr/src/usr.sbin/sendmail/aux/rmail.c	Thu Oct 24 20:54:10 1996
***************
*** 8,22 ****
  **  specifies the terms and conditions for redistribution.
  */
  
! #ifndef lint
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
- #endif not lint
  
! #ifndef lint
! static char	SccsId[] = "@(#)rmail.c	5.1 (Berkeley) 6/7/85";
! #endif not lint
  
  /*
  **  RMAIL -- UUCP mail server.
--- 8,20 ----
  **  specifies the terms and conditions for redistribution.
  */
  
! #if	!defined(lint) && defined(DOSCCS)
  char copyright[] =
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char	SccsId[] = "@(#)rmail.c	5.1.1 (2.11BSD) 1996/10/24";
! #endif
  
  /*
  **  RMAIL -- UUCP mail server.
***************
*** 27,47 ****
  **	lines.
  */
  
! # include <stdio.h>
! # include <sysexits.h>
  
  typedef char	bool;
  #define TRUE	1
  #define FALSE	0
  
- extern FILE	*popen();
- extern char	*index();
- extern char	*rindex();
- 
  bool	Debug;
  
- # define MAILER	"/usr/lib/sendmail"
- 
  main(argc, argv)
  	char **argv;
  {
--- 25,41 ----
  **	lines.
  */
  
! #include <stdio.h>
! #include <paths.h>
! #include <sysexits.h>
! #include <string.h>
  
  typedef char	bool;
  #define TRUE	1
  #define FALSE	0
  
  bool	Debug;
  
  main(argc, argv)
  	char **argv;
  {
***************
*** 116,122 ****
  	}
  	(void) strcat(from, uf);
  
! 	(void) sprintf(cmd, "%s -ee -f%s", MAILER, from);
  	while (*++argv != NULL)
  	{
  		(void) strcat(cmd, " '");
--- 110,116 ----
  	}
  	(void) strcat(from, uf);
  
! 	(void) sprintf(cmd, "%s -ee -f%s", _PATH_SENDMAIL, from);
  	while (*++argv != NULL)
  	{
  		(void) strcat(cmd, " '");
*** /usr/src/usr.sbin/sendmail/cf.hosttable/base.m4.old	Wed Feb 18 01:11:18 1987
--- /usr/src/usr.sbin/sendmail/cf.hosttable/base.m4	Thu Oct 24 20:57:25 1996
***************
*** 8,14 ****
  #  All rights reserved.  The Berkeley software License Agreement
  #  specifies the terms and conditions for redistribution.
  #
! #	@(#)base.m4	5.7 (Berkeley) 10/21/85
  #
  divert(0)
  ############################################################
--- 8,14 ----
  #  All rights reserved.  The Berkeley software License Agreement
  #  specifies the terms and conditions for redistribution.
  #
! #	@(#)base.m4	5.7.1 (2.11BSD) 1996/10/24
  #
  divert(0)
  ############################################################
***************
*** 49,55 ****
  ###################
  
  # location of alias file
! OA/usr/lib/aliases
  # wait up to ten minutes for alias file rebuild
  Oa10
  # substitution for space (blank) characters
--- 49,55 ----
  ###################
  
  # location of alias file
! OA/etc/aliases
  # wait up to ten minutes for alias file rebuild
  Oa10
  # substitution for space (blank) characters
***************
*** 63,69 ****
  # default GID
  Og1
  # location of help file
! OH/usr/lib/sendmail.hf
  # log level
  OL9
  # default network name
--- 63,69 ----
  # default GID
  Og1
  # location of help file
! OH/usr/share/misc/sendmail.hf
  # log level
  OL9
  # default network name
***************
*** 75,81 ****
  # read timeout -- violates protocols
  Or2h
  # status file
! OS/usr/lib/sendmail.st
  # queue up everything before starting transmission
  Os
  # default timeout interval
--- 75,81 ----
  # read timeout -- violates protocols
  Or2h
  # status file
! OS/var/log/sendmail.st
  # queue up everything before starting transmission
  Os
  # default timeout interval
***************
*** 87,95 ****
  # wizard's password
  OW*
  # load average at which we just queue messages
! Ox8
  # load average at which we refuse connections
! OX12
  
  ###############################
  ###   Message precedences   ###
--- 87,95 ----
  # wizard's password
  OW*
  # load average at which we just queue messages
! Ox3
  # load average at which we refuse connections
! OX6
  
  ###############################
  ###   Message precedences   ###
*** /usr/src/usr.sbin/sendmail/cf.named/boilerplate.m4.old	Wed Feb 18 01:11:23 1987
--- /usr/src/usr.sbin/sendmail/cf.named/boilerplate.m4	Thu Oct 24 20:59:09 1996
***************
*** 8,14 ****
  #  All rights reserved.  The Berkeley software License Agreement
  #  specifies the terms and conditions for redistribution.
  #
! #	@(#)boilerplate.m4	1.1 (Berkeley) 8/8/85
  #
  divert(0)
  ######################
--- 8,14 ----
  #  All rights reserved.  The Berkeley software License Agreement
  #  specifies the terms and conditions for redistribution.
  #
! #	@(#)boilerplate.m4	1.1.1 (2.11BSD) 1996/10/24
  #
  divert(0)
  ######################
***************
*** 34,40 ****
  ###############
  
  # location of alias file
! OA/usr/lib/aliases
  # wait up to ten minutes for alias file rebuild
  Oa10
  # substitution for space (blank) characters
--- 34,40 ----
  ###############
  
  # location of alias file
! OA/etc/aliases
  # wait up to ten minutes for alias file rebuild
  Oa10
  # substitution for space (blank) characters
***************
*** 48,54 ****
  # default GID
  Og1
  # location of help file
! OH/usr/lib/sendmail.hf
  # log level
  OL9
  # default network name
--- 48,54 ----
  # default GID
  Og1
  # location of help file
! OH/usr/share/misc/sendmail.hf
  # log level
  OL9
  # default network name
***************
*** 60,66 ****
  # read timeout -- violates protocols
  Or2h
  # status file
! OS/usr/lib/sendmail.st
  # queue up everything before starting transmission
  Os
  # default timeout interval
--- 60,66 ----
  # read timeout -- violates protocols
  Or2h
  # status file
! OS/var/log/sendmail.st
  # queue up everything before starting transmission
  Os
  # default timeout interval
*** /usr/src/usr.sbin/sendmail/src/Makefile.m4.old	Tue Jun 25 21:00:41 1996
--- /usr/src/usr.sbin/sendmail/src/Makefile.m4	Thu Oct 24 21:01:27 1996
***************
*** 7,13 ****
  #  All rights reserved.  The Berkeley software License Agreement
  #  specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile.m4	5.10.5 (2.11BSD GTE) 1996/6/25
  #
  #
  #  SENDMAIL Makefile.
--- 7,13 ----
  #  All rights reserved.  The Berkeley software License Agreement
  #  specifies the terms and conditions for redistribution.
  #
! #	@(#)Makefile.m4	5.10.6 (2.11BSD GTE) 1996/10/24
  #
  #
  #  SENDMAIL Makefile.
***************
*** 72,82 ****
  	size sendmail; ls -l sendmail
  
  install: all
! 	$(INSTALL) -m 4755 -o root sendmail $(DESTDIR)/usr/lib
! 	cp /dev/null $(DESTDIR)/usr/lib/sendmail.fc
  	-if [ -s sendmail.sr ]; then \
  		install -c -o bin -m 644 sendmail.sr \
! 			$(DESTDIR)/usr/lib/sendmail.sr; \
  	fi
  
  tags: FRC
--- 72,82 ----
  	size sendmail; ls -l sendmail
  
  install: all
! 	$(INSTALL) -m 4755 -o root sendmail $(DESTDIR)/usr/sbin
! 	cp /dev/null $(DESTDIR)/etc/sendmail.fc
  	-if [ -s sendmail.sr ]; then \
  		install -c -o bin -m 644 sendmail.sr \
! 			$(DESTDIR)/usr/share/misc/sendmail.sr; \
  	fi
  
  tags: FRC
*** /usr/src/usr.sbin/sendmail/src/conf.c.old	Wed Jan 18 20:06:44 1995
--- /usr/src/usr.sbin/sendmail/src/conf.c	Thu Oct 24 21:08:11 1996
***************
*** 9,15 ****
  */
  
  #if !defined(lint) && !defined(NOSCCS)
! static char	SccsId[] = "@(#)conf.c	5.14.3 (2.11BSD GTE) 1/18/95";
  #endif
  
  # include <pwd.h>
--- 9,15 ----
  */
  
  #if !defined(lint) && !defined(NOSCCS)
! static char	SccsId[] = "@(#)conf.c	5.14.4 (2.11BSD GTE) 1996/10/24";
  #endif
  
  # include <pwd.h>
***************
*** 112,119 ****
  **  Location of system files/databases/etc.
  */
  
! char	*ConfFile =	"/usr/lib/sendmail.cf";	/* runtime configuration */
! char	*FreezeFile =	"/usr/lib/sendmail.fc";	/* frozen version of above */
  
  
  
--- 112,119 ----
  **  Location of system files/databases/etc.
  */
  
! char	*ConfFile =	"/etc/sendmail.cf";	/* runtime configuration */
! char	*FreezeFile =	"/etc/sendmail.fc";	/* frozen version of above */
  
  
  
*** /usr/src/usr.sbin/sendmail/src/extract.c.old	Thu Jul 14 15:06:00 1994
--- /usr/src/usr.sbin/sendmail/src/extract.c	Thu Oct 24 21:09:16 1996
***************
*** 4,10 ****
  #include "sendmail.h"
  #include <varargs.h>
  
! char	*StringFile =	"/usr/lib/sendmail.sr";	/* extracted string storage */
  static int strfile = -1, ourpid = 0;
  
  errprep(offset, buf)
--- 4,10 ----
  #include "sendmail.h"
  #include <varargs.h>
  
! char	*StringFile =	"/usr/share/misc/sendmail.sr";
  static int strfile = -1, ourpid = 0;
  
  errprep(offset, buf)
*** /usr/src/usr.sbin/sendmail/src/main.c.old	Mon Mar  6 23:02:31 1995
--- /usr/src/usr.sbin/sendmail/src/main.c	Thu Oct 24 21:10:16 1996
***************
*** 13,19 ****
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char	SccsId[] = "@(#)main.c	5.11.2 (2.11BSD GTE) 3/6/95";
  #endif
  
  # define  _DEFINE
--- 13,19 ----
  "@(#) Copyright (c) 1980 Regents of the University of California.\n\
   All rights reserved.\n";
  
! static char	SccsId[] = "@(#)main.c	5.11.3 (2.11BSD GTE) 1996/10/24";
  #endif
  
  # define  _DEFINE
***************
*** 33,39 ****
  **	turn calls a bunch of mail servers that do the real work of
  **	delivering the mail.
  **
! **	Sendmail is driven by tables read in from /usr/lib/sendmail.cf
  **	(read by readcf.c).  Some more static configuration info,
  **	including some code that you may want to tailor for your
  **	installation, is in conf.c.  You may also want to touch
--- 33,39 ----
  **	turn calls a bunch of mail servers that do the real work of
  **	delivering the mail.
  **
! **	Sendmail is driven by tables read in from /etc/sendmail.cf
  **	(read by readcf.c).  Some more static configuration info,
  **	including some code that you may want to tailor for your
  **	installation, is in conf.c.  You may also want to touch
***************
*** 42,48 ****
  **	server mechanism).
  **
  **	Usage:
! **		/usr/lib/sendmail [flags] addr ...
  **
  **		See the associated documentation for details.
  **
--- 42,48 ----
  **	server mechanism).
  **
  **	Usage:
! **		/usr/sbin/sendmail [flags] addr ...
  **
  **		See the associated documentation for details.
  **
*** /VERSION.old	Sun Oct 27 16:58:47 1996
--- /VERSION	Sun Nov  3 17:00:54 1996
***************
*** 1,4 ****
! Current Patch Level: 334
  
  2.11 BSD
  ============
--- 1,4 ----
! Current Patch Level: 342
  
  2.11 BSD
  ============