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.mel.connect.com.au!munnari.OZ.AU!spool.mu.edu!newspump.sol.net!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 (#335 - 1 of 8)
Organization: 2BSD, Simi Valley CA USA
Message-ID: <E0LGCn.LpM@moe.2bsd.com>
Date: Sat, 9 Nov 1996 08:17:11 GMT
Lines: 1147
Subject: The Grand Reorganization Begins (#335 - 1 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 #335 (part 1 of 8).
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.
Parts 2 thru 8 will not have the following introductory material
included.
Introduction (a mini-tour/summary)
============
[The impatient can skip directly to 'Instructions' below]
1. What gets moved where? Lots of stuff ;)
The guide used for where to move things was the 4.4-Lite2 CDrom.
In some cases such as the 'adb' scripts and programs which don't
exist in 4.4 (learn, style, diction) I tried to make a logical
guess where to put them.
Since hundreds of files/directories get renamed or moved
I'll not list them all here. Some of the key ones are:
The sendmail config files (including the aliases database) go to
/etc. The sendmail executable goes into /usr/sbin.
The UUCP config files go to /etc/uucp while the executables (uucico,
uuxqt, etc) go to /usr/libexec or /usr/sbin
Lpd goes to /usr/sbin while the print filters go to /usr/libexec/lpr.
Various programs such as 'diction', 'style', 'lint', 'pascal' which
had either multiple files or programs in /usr/lib had subdirectories
created for them in /usr/libexec or /usr/share.
Many of the subdirectories in /usr/lib ('adb', 'find', 'lint',
'tmac', ...) are moved to /usr/share.
It was noted along the way that many of the files in /usr/lib were
never "installed" - i.e. they had no counterparts in /usr/src. This
felt sufficiently wrong that it was corrected. Everything that is
installed in /usr/share/... has a 'src' file and a Makefile now.
Thus all the [nt]roff macros (tmac, man, ms, me) and so on have
corresponding /usr/src/share/* directories and Makefiles.
2. What scripts and helpful hints are provided to move all these files
around?
Included in part 1 is a shar file containing 2 scripts, 1 'diff'
of files that will need manual attention and 1 shar file of new
files:
usr.share.mk
usrlib.rm
old00.diffs
NEW.shar
usr.share.mk is a script run *before* applying any patches or
installing any new files. 'usr.share.mk' creates all the necessary
subdirectories, renames/moves existing src directories to their
new homes and copies files which currently lack 'src' directories
from /usr/lib into the newly created 'src' hierarchy.
NEW.shar is a shar archive of new files that must be installed
before the system is recompiled.
usrlib.rm is a script to be run only *after* the system has been
recompiled and installed.
old00.diffs is a diff listing of changes to files in /etc that
will require manual attention *after* the system has been recompiled
but before the system is rebooted. These are files that differ
from system to system. The diffs are provided to give examples of
the changes that will need to be made.
Things that should be looked for are "/usr/lib/sendmail",
"/usr/lib/atrun", "/etc/uucpd", "/usr/lib/aliases" and so on.
These pathnames need to be changed to "/usr/sbin/sendmail",
"/usr/libexec/atrun", "/usr/libexec/uucpd", "/etc/aliases", etc.
passwd - highly unlikely that any diff between my old and new
passwd files will be directly applicable on your
system. Use 'vipw' to change the appropriate lines
in your password file.
crontab - (moved to /etc). Again, your crontab file could be
quite different.
inetd.conf - ditto.
printcap - ditto
rc.local - probably possible to use the diff provided unless
local changes have been made.
sendmail.cf - (in /etc now). The pathnames of the 'sendmail.st'
and 'sendmail.hf' files are different.
daily,weekly - (still in /usr/adm). Might be possible to use
the patch as is unless local changes have been
made to these files.
/.login,.profile,.cshrc - need to add '/sbin', and '/usr/sbin'
to root's search path.
Additional detail on using these scripts and diff file will be
provided later on.
Instructions
============
You probably can't wait to get started. Ok - here's the simple
step by step (but some of them are *long* 18-20 hour steps ;-))
directions.
Make sure that all 8 parts (updates #335 thru 342 inclusive) have been
gathered. Save them in a convenient directory (I'll use /usr/tmp/335,
/usr/tmp/336, etc below in the examples).
Printing out these instructions on hardcopy is optional but probably
not a bad idea.
Cut off the headers (using the convenient 'cut here' label ;)) on
all the parts.
It is suggested, unless you're real trusting, to at least read thru
quickly the 'usr.share.mk' script before running it. It makes *many*
changes to the system. Some are easily reversed or harmless to do
twice (copying a file) but others are mostly one-way (mv'ing a directory
from /usr/src/usr.lib to /usr/src/usr.sbin).
A good idea is to run the entire patching session under a 'script'
session. This way a log is created that can be examined for errors
if something does not work right.
script /usr/tmp/jumbo_logfile
cd /usr/tmp
sh 335
sh usr.share.mk
sh NEW.shar
patch -p0 < 336
patch -p0 < 337
patch -p0 < 338
patch -p0 < 339
patch -p0 < 340
patch -p0 < 341
patch -p0 < 342
exit
The 'exit' above closes the 'logfile' from the script session. It is
highly recommended that you scan for patches with failed hunks.
Next the system is recompiled. This is a very good time to revisit
the "hosts file" vs. "named resolver routines" decision for the C
library (libc.a).
In /usr/src/lib/libc/Makefile look for the 'HOSTLOOKUP=' lines.
Make sure the host lookup mechanism you want is selected (there are
instructions present in the Makefile).
cd /usr/src
make clean
make build
make install
This is the long method (which compiles the C library and compiler
and then repeats those steps to make sure the compiler is built with
the latest C libary) and takes about 22 hours on a 11/73 with a
fast SCSI disk. On a 11/44 with RA81s it will take almost the same
amount of time but faster disks (Fuji Eagles) will cut a couple hours
off.
After doing the 'make install' it will be necessary to update the
files mentioned in the diff file "old00.diffs". The diffs are likely
not correct for your system so old00.diffs was not included as part
of the patching.
What you are looking for are any pathnames that begin with "/usr/lib".
Those need to be changed to "/usr/sbin" or "/sbin". The directories
/sbin and /usr/sbin need to be added to root's searth path in several
places (/.login, etc).
NOTE: If you have any local programs which refer to /usr/lib/sendmail
(or other items moved out of /usr/lib) it will be necessary to
update those programs. Replacing explicit strings of the form
"/usr/lib/sendmail" with "_PATH_SENDMAIL" (from <paths.h>) is
a very good idea!
Make sure that /etc/sendmail.cf is correct and then run:
/usr/sbin/sendmail -bz
to recreate the frozen configuration file.
At this point you reboot the system.
After the system reboots check that everything is working right. Try
printing a file if you have a printer attached, or send a mail item
to see if mail is working. If you're running 'uucp' try that, and so
on.
Once you are happy with the system operation it is time to clean up
/usr/lib (and a couple other directories) by removing the old
executables:
cd /usr/tmp
sh /usrlib.rm
With the scope of the changes being so large there are probably a few
things which got overlooked or an incorrect pathname change was made.
If you find and/or fix any of these please let me know.
The next phase of "The Grand Reorganization" will be far less
disruptive. At least that is the current plan. Moving daemon
executables out of /etc and into /usr/libexec involves less recompiling
of programs than it does simply editing /etc/inetd.conf.
Perhaps around Christmas or New Years the next update will be ready.
As always these, and all previous updates to 2.11BSD, are available
via anonymous FTP to either FTP.IIPO.GTEGSC.COM or MOE.2BSD.COM in
the directory /pub/2.11BSD.
--------------------------cut here, save as /usr/tmp/335--------------------
#! /bin/sh
# This is a shell archive, meaning:
# 1. Remove everything above the #! /bin/sh line.
# 2. Save the resulting text in a file.
# 3. Execute the file with /bin/sh (not csh) to create:
# usr.share.mk
# usrlib.rm
# old00.diffs
# NEW.shar
# This archive created: Tue Nov 5 17:12:51 1996
export PATH; PATH=/bin:/usr/bin:$PATH
if test -f 'usr.share.mk'
then
echo shar: "will not over-write existing file 'usr.share.mk'"
else
sed 's/^Z//' << \SHAR_EOF > 'usr.share.mk'
Z#!/bin/sh
Z
Zumask 22
Z
Zcp -p /usr/lib/sendmail.cf /etc/sendmail.cf
Zcp -p /usr/lib/crontab /etc/crontab
Zcp -p /usr/lib/aliases* /etc
Zcp -p /usr/lib/Mail.rc /etc
Z
Zmkdir -p /usr/src/share /usr/src/share/ms /usr/src/share/me
Zmkdir -p /usr/src/share/tmac /usr/src/share/misc /usr/src/share/adb
Zmkdir -p /usr/src/share/fontinfo /usr/src/share/font /usr/src/share/lint
Zmkdir -p /usr/src/usr.sbin /usr/src/sbin /var/log /var/db
Ztouch /var/db/find.codes
Zchown nobody /var/db/find.codes
Zchmod 644 /var/db/find.codes
Z
Zmkdir -p /usr/src/libexec/getNAME /usr/src/libexec/makekey
Zmkdir -p /usr/src/usr.sbin/makewhatis
Z
Zmkdir -p /usr/share/me /usr/share/ms /usr/share/tmac /usr/share/misc
Zmkdir -p /usr/share/tabset /usr/share/learn /usr/share/adb
Zmkdir -p /usr/share/lint /usr/share/font
Zmkdir -p /usr/share/pascal /usr/share/term /usr/share/fontinfo
Z
Zmkdir -p /usr/sbin /sbin
Zmkdir -p /usr/libexec/lint /usr/libexec/refer /usr/libexec/struct
Zmkdir -p /usr/libexec/diction /usr/libexec/find /usr/libexec/lpr
Z
Zmkdir -p /etc/uucp
Zchown uucp.daemon /etc/uucp
Zchmod 755 /etc/uucp
Z(cd /usr/lib/uucp; tar -cf - .) | (cd /etc/uucp; tar -xpf -)
Zchmod 600 /etc/uucp/L.sys
Zrm -f /etc/uucp/uucico /etc/uucp/acucntrl /etc/uucp/uuxqt /etc/uucp/uuclean
Z(cd /usr/src/usr.bin/uucp; tar -cf vms.tar vms; rm -fr vms; compress vms.tar)
Z
Zcp -p /usr/src/usr.lib/me/* /usr/src/share/me
Zcp -p /usr/lib/ms/* /usr/src/share/ms
Zcp -p /usr/src/usr.lib/man/* /usr/src/share/tmac
Zcp -p /usr/lib/fontinfo/* /usr/src/share/fontinfo
Zcp -p /usr/lib/font/* /usr/src/share/font
Z
Zcp -p /usr/lib/lint/llib-lc /usr/src/share/lint
Zcp -p /usr/lib/lint/llib-lcurses /usr/src/share/lint
Zcp -p /usr/lib/lint/llib-ldbm /usr/src/share/lint
Zcp -p /usr/lib/lint/llib-lm /usr/src/share/lint
Zcp -p /usr/lib/lint/llib-lmp /usr/src/share/lint
Zcp -p /usr/lib/lint/llib-lplot /usr/src/share/lint
Zcp -p /usr/lib/lint/llib-ltermcap /usr/src/share/lint
Zcp -p /usr/lib/lint/llib-port /usr/src/share/lint
Z
Zcp -p /usr/lib/tmac/tmac.a /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.ayday /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.bib /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.cp /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.imagen /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.os /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.r /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.s /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.scover /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.sdisp /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.skeep /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.srefs /usr/src/share/tmac
Zcp -p /usr/lib/tmac/tmac.vcat /usr/src/share/tmac
Z
Zcp -p /usr/lib/Mail.rc /usr/src/ucb/Mail/Mail.rc
Zcp -p /usr/lib/Mail.help /usr/src/share/misc/Mail.help
Zcp -p /usr/lib/Mail.tildehelp /usr/src/share/misc/Mail.tildehelp
Zcp -p /usr/lib/eign /usr/src/share/misc/eign
Zcp -p /usr/lib/gprof.callg /usr/src/share/misc/gprof.callg
Zcp -p /usr/lib/gprof.flat /usr/src/share/misc/gprof.flat
Zcp -p /usr/lib/vlpmacs /usr/src/share/misc/vlpmacs
Z
Z(cd /usr/lib/adb; tar -cf - .) | (cd /usr/src/share/adb; tar -xpf -)
Z
Zmv /usr/src/etc/termcap /usr/src/share/termcap
Zmv /usr/src/usr.bin/units.lib /usr/src/share/misc/units
Zmv /usr/src/man/man1/pc.1 /usr/src/ucb/PORT/pc.1
Zmv /usr/src/man/man1/sysline.1 /usr/src/ucb/PORT/sysline.1
Zrm -f /usr/man/cat1/sysline.0 /usr/man/cat1/pc.0
Z
Z# Move a number of items from the old dumping ground (/usr/src/usr.lib) into
Z# their new homes.
Z
Zmv /usr/src/usr.lib/learn /usr/src/share/learn
Zmv /usr/src/usr.lib/lpr /usr/src/usr.sbin/lpr
Zmv /usr/src/usr.lib/sendmail /usr/src/usr.sbin/sendmail
Zmv /usr/src/usr.lib/sendmail.MX /usr/src/usr.sbin/sendmail.MX
Zmv /usr/src/usr.lib/getNAME.c /usr/src/libexec/getNAME/
Zmv /usr/src/usr.lib/makekey.c /usr/src/libexec/makekey/
Zmv /usr/src/usr.lib/lib.b /usr/src/share/misc/lib.b
Z
Z# Move the 'makewhatis' script into its new home and then install it. The
Z# script is installed now because the "make install" may need it before
Z# usr.sbin has been processed.
Z
Zmv /usr/src/usr.lib/makewhatis.sh /usr/src/usr.sbin/makewhatis/
Zcp /usr/src/usr.sbin/makewhatis/makewhatis.sh /usr/sbin/makewhatis
Zchmod 755 /usr/sbin/makewhatis
Z
Z# Put something not used (as far as I know) into /usr/src/sbin so that the
Z# Makefile isn't empty. More stuff will be moved out of 'etc' in the future.
Z
Zmv /usr/src/etc/XNSrouted /usr/src/sbin/XNSrouted
Z
Z# Toss away junk and cruft left over from eons gone by.
Z
Zrm -r /usr/src/usr.sbin/sendmail.MX/cf.hosttable/junk
Zrm -f /usr/src/usr.sbin/sendmail.MX/cf.hosttable/lanleaf.cf
Zrm -f /usr/src/usr.sbin/sendmail.MX/cf.hosttable/lanroot.cf
Z
Z# Remove the Makefile because 'm4' must be used to generate a new one
Z# after the patching has been done.
Zrm -f /usr/src/usr.sbin/sendmail/src/Makefile
Z
Z# The vpr stuff hasn't compiled/run in years and contains many references
Z# to /usr/lib. Tar and compress it so that the files are not picked up
Z# during 'find ... | grep /usr/lib/' runs.
Z(cd /usr/src/old; tar -cf vpr.tar vpr; compress vpr.tar; rm -fr vpr)
SHAR_EOF
fi
if test -f 'usrlib.rm'
then
echo shar: "will not over-write existing file 'usrlib.rm'"
else
sed 's/^Z//' << \SHAR_EOF > 'usrlib.rm'
Z#!/bin/sh
Z
Z# Remove the old copies of programs and files which were installed in the
Z# correct places.
Z
Zrm -f /lib/f77pass1 /lib/f77_strings
Z
Zrm -f /usr/ucb/mailq /usr/ucb/newaliases /usr/ucb/lptest /usr/ucb/lprm
Zrm -f /usr/ucb/lpq /usr/ucb/lpr
Z
Zrm -f /usr/lib/sendmail.st /usr/lib/sendmail.fc /usr/lib/sendmail
Zrm -f /usr/lib/sendmail.sr /usr/lib/sendmail.cf /usr/lib/sendmail.hf
Zrm -fr /usr/lib/lint
Zrm -fr /usr/lib/font /usr/lib/fontinfo
Zrm -fr /usr/src/sys/vaxdist
Zrm -fr /usr/src/usr.lib/me /usr/src/usr.lib/man
Zrm -f /usr/lib/vfontedpr
Zrm -fr /usr/lib/tabset
Zrm -f /usr/lib/nslookup.help /usr/lib/units /usr/lib/yaccpar
Zrm -fr /usr/lib/uucp /usr/lib/struct /usr/lib/spell
Zrm -fr /usr/lib/term /usr/lib/tmac /usr/lib/refer /usr/lib/lex
Zrm -fr /usr/lib/find
Zrm -f /usr/lib/diff3 /usr/lib/explain.d /usr/lib/dict.d /usr/lib/dprog
Zrm -f /usr/lib/style1 /usr/lib/style2 /usr/lib/style3 /usr/lib/calendar
Zrm -f /usr/lib/atrun /usr/lib/vgrindefs /usr/lib/vfontedpr
Zrm -f /usr/lib/bugformat /usr/lib/unixtomh /usr/lib/bugfiler
Zrm -f /usr/lib/how_pxp /usr/lib/gather /usr/lib/npx_header
Zrm -f /usr/lib/how_pix /usr/lib/how_pi /usr/lib/pi1.2strings
Zrm -f /usr/lib/more.help /usr/lib/ex3.7preserve /usr/lib/ex3.7recover
Zrm -f /usr/lib/ex3.7strings
Zrm -f /usr/lib/diffh /usr/lib/lib.b /usr/lib/getNAME /usr/lib/makekey
Zrm -f /usr/lib/makewhatis
Zrm -fr /usr/lib/me
Zrm -f /usr/lib/necf /usr/lib/lpf /usr/lib/lpd
Zrm -fr /usr/lib/learn
Zrm -f /usr/lib/aliases /usr/lib/aliases.pag /usr/lib/aliases.dir
Zrm -fr /usr/lib/ms
Zrm -fr /usr/lib/adb
Z
Zrm -f /usr/lib/crontab /usr/lib/Mail.tildehelp /usr/lib/Mail.rc
Zrm -f /usr/lib/Mail.help
Zrm -f /usr/lib/vlpmacs /usr/lib/gprof.callg /usr/lib/gprof.flat
Zrm -f /usr/lib/eign
Z
Zrm -f /etc/uucpd
Zrm -f /etc/pac
Zrm -f /etc/lpc
Zrm -f /etc/XNSrouted
SHAR_EOF
fi
if test -f 'old00.diffs'
then
echo shar: "will not over-write existing file 'old00.diffs'"
else
sed 's/^Z//' << \SHAR_EOF > 'old00.diffs'
Z*** /etc/crontab.old Fri Oct 25 21:29:04 1996
Z--- /etc/crontab Mon Oct 21 19:51:57 1996
Z***************
Z*** 1,4 ****
Z! 0,15,30,45 * * * * root /usr/lib/atrun
Z 5 0 * * * root /bin/sh /usr/adm/daily 2>&1 | mail root
Z 15 0 * * 7 root /bin/sh /usr/adm/weekly 2>&1 | mail root
Z 35 0 1 * * root /bin/sh /usr/adm/monthly 2>&1 | mail root
Z--- 1,4 ----
Z! 0,15,30,45 * * * * root /usr/libexec/atrun
Z 5 0 * * * root /bin/sh /usr/adm/daily 2>&1 | mail root
Z 15 0 * * 7 root /bin/sh /usr/adm/weekly 2>&1 | mail root
Z 35 0 1 * * root /bin/sh /usr/adm/monthly 2>&1 | mail root
Z*** /etc/inetd.conf.old Mon Apr 10 23:07:24 1995
Z--- /etc/inetd.conf Fri Nov 1 19:11:45 1996
Z***************
Z*** 6,12 ****
Z shell stream tcp nowait root /etc/tcpd rshd
Z login stream tcp nowait root /etc/tcpd rlogind
Z #exec stream tcp nowait root /etc/rexecd rexecd
Z! uucpd stream tcp nowait root /etc/uucpd uucpd
Z #nntp stream tcp nowait usenet /etc/nntpd nntpd
Z finger stream tcp nowait nobody /etc/fingerd fingerd -s -l
Z tftp dgram udp wait nobody /etc/tcpd tftpd
Z--- 6,12 ----
Z shell stream tcp nowait root /etc/tcpd rshd
Z login stream tcp nowait root /etc/tcpd rlogind
Z #exec stream tcp nowait root /etc/rexecd rexecd
Z! uucpd stream tcp nowait root /usr/libexec/uucpd uucpd
Z #nntp stream tcp nowait usenet /etc/nntpd nntpd
Z finger stream tcp nowait nobody /etc/fingerd fingerd -s -l
Z tftp dgram udp wait nobody /etc/tcpd tftpd
Z*** /etc/passwd.old Thu Mar 21 19:41:38 1996
Z--- /etc/passwd Fri Oct 25 20:09:39 1996
Z***************
Z*** 3,10 ****
Z operator:*:2:5:System &:/usr/guest/operator:/bin/csh
Z bin:*:3:20:Binaries Commands and Source:/:/bin/csh
Z nobody:*:32767:31:Nobody:/nonexistent:/bin/sh
Z! uucp:*:66:1:UNIX-to-UNIX Copy:/usr/spool/uucppublic:/usr/lib/uucp/uucico
Z sms1:*:10:10:Steven M. Schultz,,,:/user/sms1:/bin/csh
Z ingres:*:39:74:INGRES Owner:/usr/ingres:/bin/csh
Z unify:*:40:40:Unify Owner,,,:/unify:/bin/sh
Z! umoe:*:97:1:Moe-uucp:/usr/spool/uucppublic:/usr/lib/uucp/uucico
Z--- 3,10 ----
Z operator:*:2:5:System &:/usr/guest/operator:/bin/csh
Z bin:*:3:20:Binaries Commands and Source:/:/bin/csh
Z nobody:*:32767:31:Nobody:/nonexistent:/bin/sh
Z! uucp:*:66:1:UNIX-to-UNIX Copy:/usr/spool/uucppublic:/usr/sbin/uucico
Z sms1:*:10:10:Steven M. Schultz,,,:/user/sms1:/bin/csh
Z ingres:*:39:74:INGRES Owner:/usr/ingres:/bin/csh
Z unify:*:40:40:Unify Owner,,,:/unify:/bin/sh
Z! umoe:*:97:1:Moe-uucp:/usr/spool/uucppublic:/usr/sbin/uucico
Z*** /etc/printcap.old Fri Oct 25 18:34:25 1996
Z--- /etc/printcap Fri Oct 25 21:22:43 1996
Z***************
Z*** 3,9 ****
Z # All rights reserved. The Berkeley software License Agreement
Z # specifies the terms and conditions for redistribution.
Z #
Z! # @(#)etc.printcap 5.1 (Berkeley) 6/7/85
Z #
Z # This is a sample of printcap entries used by various printers/plotters
Z #
Z--- 3,9 ----
Z # All rights reserved. The Berkeley software License Agreement
Z # specifies the terms and conditions for redistribution.
Z #
Z! # @(#)etc.printcap 5.1.1 (2.11BSD) 1996/10/25
Z #
Z # This is a sample of printcap entries used by various printers/plotters
Z #
Z***************
Z*** 13,20 ****
Z :sd=/usr/spool/lpd:\
Z :lf=/usr/spool/lpd/errs:\
Z :af=/usr/spool/lpd/acct:\
Z! :of=/usr/lib/lpf:\
Z! :if=/usr/lib/lpf:\
Z :br#9600:xc#0:xs#040040:fc#077777:fs#06320:\
Z :pw#132:\
Z :pl#66
Z--- 13,20 ----
Z :sd=/usr/spool/lpd:\
Z :lf=/usr/spool/lpd/errs:\
Z :af=/usr/spool/lpd/acct:\
Z! :of=/usr/libexec/lpr/lpf:\
Z! :if=/usr/libexec/lpr/lpf:\
Z :br#9600:xc#0:xs#040040:fc#077777:fs#06320:\
Z :pw#132:\
Z :pl#66
Z*** /etc/rc.local.old Sun Jan 28 01:56:39 1996
Z--- /etc/rc.local Mon Oct 21 19:41:03 1996
Z***************
Z*** 10,21 ****
Z #if [ $INET = YES -a -f /etc/timed ]; then
Z # timed & echo -n ' timed' >/dev/console 2>&1
Z #fi
Z! if [ -f /usr/lib/sendmail ]; then
Z (cd /usr/spool/mqueue; rm -f lf*)
Z if [ $INET = YES ]; then
Z! /usr/lib/sendmail -bd -q1h; echo -n ' sendmail'>/dev/console 2>&1
Z else
Z! /usr/lib/sendmail -q1h; echo -n ' sendmail' >/dev/console 2>&1
Z fi
Z fi
Z echo '.' >/dev/console 2>&1
Z--- 10,21 ----
Z #if [ $INET = YES -a -f /etc/timed ]; then
Z # timed & echo -n ' timed' >/dev/console 2>&1
Z #fi
Z! if [ -f /usr/sbin/sendmail ]; then
Z (cd /usr/spool/mqueue; rm -f lf*)
Z if [ $INET = YES ]; then
Z! /usr/sbin/sendmail -bd -q1h; echo -n ' sendmail'>/dev/console 2>&1
Z else
Z! /usr/sbin/sendmail -q1h; echo -n ' sendmail' >/dev/console 2>&1
Z fi
Z fi
Z echo '.' >/dev/console 2>&1
Z*** /etc/sendmail.cf.old Thu Jan 18 21:43:50 1996
Z--- /etc/sendmail.cf Mon Oct 21 19:53:57 1996
Z***************
Z*** 68,74 ****
Z ###############
Z
Z # location of alias file
Z! OA/usr/lib/aliases
Z # wait up to ten minutes for alias file rebuild
Z Oa10
Z # substitution for space (blank) characters
Z--- 68,74 ----
Z ###############
Z
Z # location of alias file
Z! OA/etc/aliases
Z # wait up to ten minutes for alias file rebuild
Z Oa10
Z # substitution for space (blank) characters
Z***************
Z*** 82,88 ****
Z # default GID
Z Og1
Z # location of help file
Z! OH/usr/lib/sendmail.hf
Z # log level
Z OL9
Z # default network name
Z--- 82,88 ----
Z # default GID
Z Og1
Z # location of help file
Z! OH/usr/share/misc/sendmail.hf
Z # log level
Z OL9
Z # default network name
Z***************
Z*** 94,100 ****
Z # read timeout -- violates protocols
Z Or2h
Z # status file
Z! OS/usr/lib/sendmail.st
Z # queue up everything before starting transmission
Z Os
Z # default timeout interval
Z--- 94,100 ----
Z # read timeout -- violates protocols
Z Or2h
Z # status file
Z! OS/var/log/sendmail.st
Z # queue up everything before starting transmission
Z Os
Z # default timeout interval
Z*** /usr/adm/daily.old Wed Mar 7 08:26:37 1990
Z--- /usr/adm/daily Fri Oct 25 21:23:44 1996
Z***************
Z*** 63,69 ****
Z echo ""
Z echo "Cleaning up UUCP:"
Z su uucp << EOF
Z! /usr/lib/uucp/clean.daily
Z EOF
Z
Z echo ""
Z--- 63,69 ----
Z echo ""
Z echo "Cleaning up UUCP:"
Z su uucp << EOF
Z! /etc/uucp/clean.daily
Z EOF
Z
Z echo ""
Z*** /usr/adm/weekly.old Wed Mar 18 23:02:39 1987
Z--- /usr/adm/weekly Fri Oct 25 21:24:16 1996
Z***************
Z*** 9,15 ****
Z echo ""
Z echo "Cleaning up UUCP:"
Z su uucp << EOF
Z! sh /usr/lib/uucp/clean.weekly
Z EOF
Z
Z echo ""
Z--- 9,15 ----
Z echo ""
Z echo "Cleaning up UUCP:"
Z su uucp << EOF
Z! sh /etc/uucp/clean.weekly
Z EOF
Z
Z echo ""
Z***************
Z*** 31,35 ****
Z echo ""
Z echo "Rebuilding find database:"
Z su nobody << EOF
Z! /usr/lib/find/updatedb
Z EOF
Z--- 31,35 ----
Z echo ""
Z echo "Rebuilding find database:"
Z su nobody << EOF
Z! /usr/libexec/find/updatedb
Z EOF
Z*** /.login.old Mon Oct 8 13:38:49 1990
Z--- .login Tue Oct 29 22:08:50 1996
Z***************
Z*** 1,5 ****
Z unset noglob
Z! set path=(/etc /usr/ucb /bin /usr/bin /usr/local /usr/new)
Z umask 26
Z stty dec erase ^H kill ^U eof ^D
Z set prompt="[\!] root--> "
Z--- 1,5 ----
Z unset noglob
Z! set path=(/bin /etc /sbin /usr/sbin /usr/ucb /usr/bin /usr/local /usr/new)
Z umask 26
Z stty dec erase ^H kill ^U eof ^D
Z set prompt="[\!] root--> "
Z*** /.profile.old Sun Jul 10 20:29:22 1994
Z--- .profile Tue Oct 29 22:09:22 1996
Z***************
Z*** 1,7 ****
Z echo 'erase, kill ^U, intr ^C'
Z stty dec
Z stty erase
Z! PATH=/etc:/usr/ucb:/bin:/usr/bin:/usr/new
Z export PATH
Z HOME=/
Z export HOME
Z--- 1,7 ----
Z echo 'erase, kill ^U, intr ^C'
Z stty dec
Z stty erase
Z! PATH=/bin:/sbin:/usr/sbin:/etc:/usr/ucb:/usr/bin:/usr/new
Z export PATH
Z HOME=/
Z export HOME
Z*** /.cshrc.old Wed May 17 21:48:40 1995
Z--- .cshrc Tue Oct 29 22:08:07 1996
Z***************
Z*** 1,5 ****
Z set history=30
Z! set path=(/etc /usr/ucb /bin /usr/bin /usr/new /usr/local)
Z if ($?prompt) then
Z set prompt="\!% "
Z endif
Z--- 1,5 ----
Z set history=30
Z! set path=(/bin /sbin /etc /usr/sbin /usr/ucb /usr/bin /usr/new /usr/local)
Z if ($?prompt) then
Z set prompt="\!% "
Z endif
SHAR_EOF
fi
if test -f 'NEW.shar'
then
echo shar: "will not over-write existing file 'NEW.shar'"
else
sed 's/^Z//' << \SHAR_EOF > 'NEW.shar'
Z#! /bin/sh
Z# This is a shell archive, meaning:
Z# 1. Remove everything above the #! /bin/sh line.
Z# 2. Save the resulting text in a file.
Z# 3. Execute the file with /bin/sh (not csh) to create:
Z# /usr/src/libexec/getNAME/Makefile
Z# /usr/src/libexec/makekey/Makefile
Z# /usr/src/share/ms/Makefile
Z# /usr/src/share/misc/Makefile
Z# /usr/src/share/Makefile
Z# /usr/src/share/adb/Makefile
Z# /usr/src/share/fontinfo/Makefile
Z# /usr/src/share/lint/Makefile
Z# /usr/src/share/font/Makefile
Z# /usr/src/usr.sbin/Makefile
Z# /usr/src/usr.sbin/makewhatis/Makefile
Z# /usr/src/sbin/Makefile
Z# This archive created: Sun Nov 3 16:51:51 1996
Zexport PATH; PATH=/bin:/usr/bin:$PATH
Zif test -f '/usr/src/libexec/getNAME/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/libexec/getNAME/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/libexec/getNAME/Makefile'
ZX#
ZX# Public Domain. 1996/10/24 - sms
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD GTE) 1996/10/24
ZX#
ZXCFLAGS= -O
ZXSEPFLAG= -i
ZXSRCS= getNAME.c
ZXOBJS= getNAME.o
ZX
ZXall: getNAME
ZX
ZXgetNAME: ${OBJS}
ZX ${CC} ${CFLAGS} ${SEPFLAG} -o $@ ${OBJS}
ZX
ZXclean:
ZX rm -f ${OBJS} getNAME tags
ZX
ZXdepend: ${SRCS}
ZX mkdep ${CFLAGS} ${SRCS}
ZX
ZXinstall: getNAME
ZX install -s -o root -g bin -m 755 getNAME ${DESTDIR}/usr/libexec/getNAME
ZX
ZXlint: ${SRCS}
ZX lint -hax ${SRCS}
ZX
ZXtags: ${SRCS}
ZX ctags ${SRCS}
ZSHAR_EOF
Zchmod 644 '/usr/src/libexec/getNAME/Makefile'
Zfi
Zif test -f '/usr/src/libexec/makekey/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/libexec/makekey/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/libexec/makekey/Makefile'
ZX#
ZX# Public Domain. 1996/10/24 - sms
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD GTE) 1996/10/24
ZX#
ZXCFLAGS= -O
ZXSEPFLAG= -i
ZXSRCS= makekey.c
ZXOBJS= makekey.o
ZX
ZXall: makekey
ZX
ZXmakekey: ${OBJS}
ZX ${CC} ${CFLAGS} ${SEPFLAG} -o $@ ${OBJS}
ZX
ZXclean:
ZX rm -f ${OBJS} makekey tags
ZX
ZXdepend: ${SRCS}
ZX mkdep ${CFLAGS} ${SRCS}
ZX
ZXinstall: makekey
ZX install -s -o root -g bin -m 755 makekey ${DESTDIR}/usr/libexec/makekey
ZX
ZXlint: ${SRCS}
ZX lint -hax ${SRCS}
ZX
ZXtags: ${SRCS}
ZX ctags ${SRCS}
ZSHAR_EOF
Zchmod 644 '/usr/src/libexec/makekey/Makefile'
Zfi
Zif test -f '/usr/src/share/ms/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/share/ms/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/share/ms/Makefile'
ZX#
ZX# Public domain - 1996/10/21 - sms.
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD) 1996/10/21
ZX#
ZX# Makefile for -ms macros
ZX#
ZX
ZXSRCS= README end.awk endnote s.acc s.cov s.eqn s.ref s.tbl s.ths s.toc
ZX
ZXall: ${SRCS}
ZX
ZXinstall:${SRCS}
ZX -mkdir -p /usr/share/ms
ZX -chmod a+r /usr/share/ms
ZX install -c -m 444 ${SRCS} ${DESTDIR}/usr/share/ms
ZX chmod a+x ${DESTDIR}/usr/share/ms/endnote
ZX
ZXclean:
ZSHAR_EOF
Zchmod 644 '/usr/src/share/ms/Makefile'
Zfi
Zif test -f '/usr/src/share/misc/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/share/misc/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/share/misc/Makefile'
ZX#
ZX# Public domain - 1996/10/21 - sms
ZX#
ZX# @(#)Makefile 1.1 (2.11BSD) 1996/10/31
ZX#
ZX# Makefile for misc data files (lib.b from 'bc', usw.)
ZX#
ZX
ZXSRCS= eign lib.b Mail.help Mail.tildehelp units gprof.callg gprof.flat \
ZX vlpmacs
ZX
ZXall: ${SRCS}
ZX
ZXinstall:${SRCS}
ZX -mkdir -p ${DESTDIR}/usr/share/misc
ZX -chmod a+r,a+x ${DESTDIR}/usr/share/misc
ZX install -c -m 444 ${SRCS} ${DESTDIR}/usr/share/misc
ZX
ZXclean:
ZSHAR_EOF
Zchmod 444 '/usr/src/share/misc/Makefile'
Zfi
Zif test -f '/usr/src/share/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/share/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/share/Makefile'
ZX#
ZX# Public domain - 1996/10/21 - sms
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD) 1996/10/22
ZX#
ZXDESTDIR=
ZXCFLAGS= -O
ZXSEPFLAG= -i
ZX
ZXSUBDIR= adb font fontinfo learn me misc ms tmac termcap lint
ZX
ZXall: ${SUBDIR}
ZX
ZX${SUBDIR}: FRC
ZX cd $@; make ${MFLAGS} SEPFLAG=${SEPFLAG}
ZX
ZXFRC:
ZX
ZXinstall: FRC
ZX -for i in ${SUBDIR}; do \
ZX (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
ZX
ZXclean:
ZX for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
ZSHAR_EOF
Zchmod 644 '/usr/src/share/Makefile'
Zfi
Zif test -f '/usr/src/share/adb/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/share/adb/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/share/adb/Makefile'
ZX#
ZX# Public domain - 1996/10/21 - sms
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD) 1996/10/21
ZX#
ZX# Makefile for adb scripts
ZX#
ZX
ZXSRCS= buf callout callout.next file ifaddr ifnet inode ip label mbstat \
ZX mbuf mbuf.nxt mbufs mbufs.nxt proc protosw rusage socket tcpcb u xip
ZX
ZXall: ${SRCS}
ZX
ZXinstall:${SRCS}
ZX -mkdir -p ${DESTDIR}/usr/share/adb
ZX -chmod a+r,a+x ${DESTDIR}/usr/share/adb
ZX install -c -m 444 ${SRCS} ${DESTDIR}/usr/share/adb
ZX
ZXclean:
ZSHAR_EOF
Zchmod 444 '/usr/src/share/adb/Makefile'
Zfi
Zif test -f '/usr/src/share/fontinfo/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/share/fontinfo/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/share/fontinfo/Makefile'
ZX# Public domain - 1996/10/22 - sms
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD) 1996/10/22
ZX#
ZX# Makefile for fontinfo files.
ZX#
ZX
ZXSRCS= apl basker.b basker.i basker.r bocklin bodoni.b bodoni.i bodoni.r \
ZX chess clarendon cm.b cm.i cm.r countdown cyrillic delegate.b \
ZX delegate.i delegate.r fix gacham.b gacham.i gacham.r graphics \
ZX greek h19 hebrew meteor.b meteor.i meteor.r mona nonie.b nonie.i \
ZX nonie.r oldenglish otimes.b otimes.i otimes.r otimes.s pip playbill \
ZX script seal shadow sign stare.b stare.i stare.r times.b times.i \
ZX times.r times.s ugramma wumpus
ZX
ZXall: ${SRCS}
ZX
ZXinstall:${SRCS}
ZX -mkdir -p ${DESTDIR}/usr/share/fontinfo
ZX -chmod a+r,a+x ${DESTDIR}/usr/share/fontinfo
ZX install -c -m 444 ${SRCS} ${DESTDIR}/usr/share/fontinfo
ZX
ZXclean:
ZSHAR_EOF
Zchmod 444 '/usr/src/share/fontinfo/Makefile'
Zfi
Zif test -f '/usr/src/share/lint/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/share/lint/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/share/lint/Makefile'
ZX#
ZX# Public domain - 1996/10/23 - sms
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD) 1996/10/23
ZX#
ZX# Makefile for the lint libraries.
ZX#
ZX
ZXSRCS= llib-lc llib-lcurses llib-ldbm llib-lm llib-lmp \
ZX llib-lplot llib-ltermcap llib-port
ZX
ZXall:
ZX
ZXinstall:${SRCS}
ZX -mkdir -p ${DESTDIR}/usr/share/lint
ZX -chmod a+r,a+x ${DESTDIR}/usr/share/lint
ZX install -c -m 444 ${SRCS} ${DESTDIR}/usr/share/lint
ZX
ZXclean:
ZX
ZXtags:
ZX
ZXdepend:
ZSHAR_EOF
Zchmod 444 '/usr/src/share/lint/Makefile'
Zfi
Zif test -f '/usr/src/share/font/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/share/font/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/share/font/Makefile'
ZX#
ZX# Public domain - 1996/10/23 - sms
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD) 1996/10/23
ZX#
ZX# Makefile for the troff/nroff fonts
ZX#
ZX
ZXSRCS= fontlist ftB ftBC ftC ftCE ftCI ftCK ftCW ftFD ftG ftGI ftGM ftGR \
ZX ftH ftHI ftHM ftI ftL ftLI ftPA ftPB ftPI ftR ftS ftSB ftSI ftSM \
ZX ftTB ftTI ftTR ftTS ftUD ftap ftbb ftbi ftbk ftbr ftcb ftch ftci \
ZX ftcl ftco ftcr ftct ftcy ftdb ftdi ftdr ftfx ftgb ftgf ftgi ftgk \
ZX ftgr fthb fthn ftm ftmb ftmi ftmn ftmr ftnb ftni ftnr ftob ftoe ftoi \
ZX ftor ftpb ftpp ftsb ftsc ftsg ftsh ftsi ftsl ftsr fttB fttI fttR fttS \
ZX fttb ftti fttr ftts ftwp ftxx
ZX
ZXall: ${SRCS}
ZX
ZXinstall:${SRCS}
ZX -mkdir -p ${DESTDIR}/usr/share/font
ZX -chmod a+r,a+x ${DESTDIR}/usr/share/font
ZX install -c -m 444 ${SRCS} ${DESTDIR}/usr/share/font
ZX
ZXclean:
ZSHAR_EOF
Zchmod 444 '/usr/src/share/font/Makefile'
Zfi
Zif test -f '/usr/src/usr.sbin/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/usr.sbin/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/usr.sbin/Makefile'
ZX#
ZX# Public domain - 1996/10/24 - sms
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD) 1996/10/24
ZX#
ZXDESTDIR=
ZXCFLAGS= -O
ZXSEPFLAG= -i
ZX
ZXSUBDIR= lpr makewhatis sendmail
ZX
ZXall: ${SUBDIR}
ZX
ZX${SUBDIR}: FRC
ZX cd $@; make ${MFLAGS} SEPFLAG=${SEPFLAG} all
ZX
ZXFRC:
ZX
ZXinstall: FRC
ZX -for i in ${SUBDIR}; do \
ZX (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
ZX
ZXclean:
ZX for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
ZSHAR_EOF
Zchmod 644 '/usr/src/usr.sbin/Makefile'
Zfi
Zif test -f '/usr/src/usr.sbin/makewhatis/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/usr.sbin/makewhatis/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/usr.sbin/makewhatis/Makefile'
ZX#
ZX# Public Domain. 1996/10/24 - sms
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD GTE) 1996/10/24
ZX#
ZXCFLAGS= -O
ZXSEPFLAG= -i
ZXDESTDIR=
ZXOBJS=
ZX
ZXall:
ZX
ZXclean:
ZX
ZXdepend:
ZX
ZXinstall:
ZX install -c -o root -m 755 makewhatis.sh ${DESTDIR}/usr/sbin/makewhatis
ZX
ZXlint:
ZX
ZXtags:
ZSHAR_EOF
Zchmod 644 '/usr/src/usr.sbin/makewhatis/Makefile'
Zfi
Zif test -f '/usr/src/sbin/Makefile'
Zthen
Z echo shar: "will not over-write existing file '/usr/src/sbin/Makefile'"
Zelse
Zsed 's/^X//' << \SHAR_EOF > '/usr/src/sbin/Makefile'
ZX#
ZX# Public domain - 1996/10/26 - sms
ZX#
ZX# @(#)Makefile 1.0 (2.11BSD) 1996/10/26
ZX#
ZXDESTDIR=
ZXCFLAGS= -O
ZXSEPFLAG= -i
ZX
ZXSUBDIR= XNSrouted
ZX
ZXall: ${SUBDIR}
ZX
ZX${SUBDIR}: FRC
ZX cd $@; make ${MFLAGS} SEPFLAG=${SEPFLAG} all
ZX
ZXFRC:
ZX
ZXinstall: FRC
ZX -for i in ${SUBDIR}; do \
ZX (cd $$i; make ${MFLAGS} DESTDIR=${DESTDIR} install); done
ZX
ZXclean:
ZX for i in ${SUBDIR}; do (cd $$i; make ${MFLAGS} clean); done
ZSHAR_EOF
Zchmod 644 '/usr/src/sbin/Makefile'
Zfi
Zexit 0
Z# End of shell archive
SHAR_EOF
fi
exit 0
# End of shell archive