History log of /src/distrib/sets/lists/etc/mi
Revision (<<< Hide revision tags) (Show revision tags >>>) Date Author Comments
Revision tags: perseant-exfatfs-base-20250801 netbsd-11-base
# 1.276 29-Dec-2024 jmmv

Don't install /etc/rc.d/postfix when MKPOSTFIX=no


Revision tags: perseant-exfatfs-base-20240630 perseant-exfatfs-base
# 1.275 09-Apr-2024 kre

branches: 1.275.2;

Revert previous, we have no /etc/skel/.editrc (currently anyway).
This change looks to have been accidentally included in the big
sets reduction/division.

This should fix the builds.


# 1.274 09-Apr-2024 nia

Add new sets: base32, debug32, manhtml

- base32 contains (when MKCOMPAT=yes) shared libraries for 32-bit
compatibility, previously included in base

- debug32 contains (when MKCOMPAT=yes) debug symbols and static libraries
containing debug symbols for 32-bit compatiblity, previously included
in debug

- manhtml contains (when MKHTML=yes) the HTML files previously included
in 'man', which are of limited utility without third-party software.

The motivation for this change is to be able to easily exclude sets
from CD-ROM images that go over the size limit without xz compression
(which many NetBSD platforms struggle to extract at acceptable speeds).


# 1.273 27-Sep-2023 riastradh

/etc/rc.d/cerctl_init: New script for certctl rehash in live images.

This is very limited -- it does not supplant postinstall to rehash
certificates on upgrade; it only runs certctl rehash if
/etc/openssl/certs is an empty directory, as you get in live images
not created with sysinst.

We could also have a more general-purpose way to run postinstall(8)
on first boot of an image, but that has a lot more moving parts to
think about, so let's start with this limited-scope low-risk
approach.

PR install/57629

XXX pullup-10


# 1.272 28-Aug-2023 riastradh

distrib/sets/lists: certs.conf belongs in etc, not in base.

Oops.


# 1.271 03-Feb-2023 mlelstv

Add start script to attach iscsi volumes at boot.

The default is to execute the script (iscsid_volumes=YES), so if you have
any volumes defined, you should also start iscsid (iscsid=YES) to avoid
error messages.


Revision tags: netbsd-10-base
# 1.270 06-Jun-2022 nia

branches: 1.270.2;
build system: Revert all the recent additions of MK[...] knobs that
allow conditionally disabling the building of certain user space
programs in the 'base' set.

There is not enough consensus that this is the right way and a few
people had strong objections, see source-changes-d@.


# 1.269 29-May-2022 nia

mk: Add a MKPPP flag to exclude pppd(8) and related utilities from
the build


# 1.268 28-May-2022 nia

mk: Add MKNTP, MKTCPDUMP knobs.


# 1.267 25-May-2022 nia

mk: Rename the MKMBONE option to MKMROUTING for greater accuracy and
to match the related kernel config option.


# 1.266 25-May-2022 nia

mk: Allow building base without the MBONE applications by setting
MKMBONE=no in mk.conf


Revision tags: cjep_sun2x-base1 cjep_sun2x-base cjep_staticlib_x-base1 cjep_staticlib_x-base thorpej-futex-base
# 1.265 26-Jan-2021 martin

Rename etc/rc.d/llvmlockdir to lvmlockdir - it has nothing to do with LLVM,
the name probably was a freudian slip of my fingers when I split that
fragment out of another rc.d script.


# 1.264 10-Jan-2021 riastradh

Various entropy integration improvements.

- New /etc/security check for entropy in daily security report.

- New /etc/rc.d/entropy script runs (after random_seed and rndctl) to
check for entropy at boot -- in rc.conf, you can:

. set `entropy=check' to halt multiuser boot and enter single-user
mode if not enough entropy

. set `entropy=wait' to make multiuser boot wait until enough entropy

Default is to always boot without waiting -- and rely on other
channels like security report to alert the operator if there's a
problem.

- New man page entropy(7) discussing the higher-level concepts and
system integration with cross-references.

- New paragraph in afterboot(8) about entropy citing entropy(7) for
more details.

This change addresses many of the issues discussed in security/55659.
This is a first draft; happy to take improvements to the man pages and
scripted messages to improve clarity.

I considered changing motd to include an entropy warning with a
reference to the entropy(7) man page, but it's a little trickier:
- Not sure it's appropriate for all users to see at login rather than
users who have power to affect the entropy estimate (maybe it is,
just haven't decided).
- We only have a mechanism for changing once at boot; the message would
remain until next boot even if an operator adds enough entropy.
- The mechanism isn't really conducive to making a message appear
conditionally from boot to boot.


# 1.263 08-Sep-2020 martin

branches: 1.263.2;
Adjust for MOUNTCRITLOCAL -> CRITLOCALMOUNTED rename


# 1.262 27-Aug-2020 riastradh

Sort and deduplicate set lists.


# 1.261 22-Jul-2020 martin

Split the local disk availability step into two phases to allow scripts
that pre-populate parts of the system (e.g. a tmpfs based /var) an
easy place to plug in like:

# REQUIRE: mountcritlocal
# BEFORE: MOUNTCRITLOCAL

This also cleans up the existing special handling a bit by separating it
into new scripts. All later scripts now depend on MOUNTCRITLOCAL.
Discussed on tech-userlevel some time ago.


# 1.260 15-Jun-2020 christos

Rename blacklist -> blocklist


Revision tags: phil-wifi-20200421 phil-wifi-20200411 is-mlppp-base phil-wifi-20200406 phil-wifi-20191119
# 1.259 15-Sep-2019 brad

Add support for legacy ZFS filesystems, specified by mountpoint=legacy
in the ZFS properties of the dataset and a simple man page for
mount_zfs. With this, it is possible to put ZFS filesystems in
/etc/fstab as file system type zfs.

Add a rc.d script that kicks the module ZFS load mostly before
mountall runs simular to what LVM does. This allows for any legacy
mounts to be specified in critical_local_filesystems and allows for
ZFS pools on top of cgd (probably among other things). Introduce a
rc.conf variable called zfs which needs to be set to YES, in the usual
manor of things, to get zvols and ZFS dataset support rather then just
assume that 'zfs mount' does that in mountall. Fix a problem in
mountall if ZFS is not compiled into the system.


Revision tags: netbsd-9-base phil-wifi-20190609
# 1.258 11-May-2019 maxv

branches: 1.258.2;
Add smtoff, an rc.d script that disables Simultaneous Multi-Threading. It
parses the output of cpuctl, and executes "cpuctl offline" for each CPU
that has SmtID!=0.

The default is "smtoff=NO", which means that SMT remains enabled.


# 1.257 25-Apr-2019 roy

Don't install YP rc.d files with MKYP=no


# 1.256 10-Apr-2019 sevan

typo, pasto


# 1.255 10-Apr-2019 sevan

Include npf_boot rc.d scripts which loads an interim config early in boot.
By default /etc/default/npf.boot.conf which can be overriden by /etc/npf.boot.conf.


Revision tags: pgoyette-compat-20190127 pgoyette-compat-20190118
# 1.254 12-Jan-2019 roy

Install /etc/wpa_supplicant.conf


Revision tags: pgoyette-compat-1226 pgoyette-compat-1126 pgoyette-compat-1020 pgoyette-compat-0930
# 1.253 23-Sep-2018 maxv

Remove the userland part of ISDN. The kernel part is untouched for now.
ipppctl was actually an exact copy of pppoectl; there is no functional
change in pppoectl in this commit.


Revision tags: pgoyette-compat-0906 pgoyette-compat-0728
# 1.252 29-Jun-2018 roy

Remove dhclient from the base system.

Discussed here:
https://mail-index.netbsd.org/tech-userlevel/2018/06/21/msg011233.html


Revision tags: phil-wifi-base pgoyette-compat-0625 pgoyette-compat-0521 pgoyette-compat-0502 pgoyette-compat-0422 pgoyette-compat-0415 pgoyette-compat-0407 pgoyette-compat-0330 pgoyette-compat-0322 pgoyette-compat-0315 pgoyette-compat-base
# 1.251 17-Feb-2018 uwe

branches: 1.251.2; 1.251.4;
Actually install dhcpd6 rc script. Organize CONFIGFILES
alphabetically again while where.

PR 53018


# 1.250 09-Jan-2018 christos

Merge autofs support from: Tomohiro Kusumi
XXX: Does not work yet


Revision tags: perseant-stdc-iso10646-base
# 1.249 18-Jun-2017 christos

add racoon


# 1.248 09-Jun-2017 christos

add cron.


Revision tags: netbsd-8-0-RELEASE netbsd-8-0-RC2 netbsd-8-0-RC1 matt-nb8-mediatek-base netbsd-8-base
# 1.247 21-May-2017 riastradh

branches: 1.247.2;
Remove MKCRYPTO option.

Originally, MKCRYPTO was introduced because the United States
classified cryptography as a munition and restricted its export. The
export controls were substantially relaxed fifteen years ago, and are
essentially irrelevant for software with published source code.

In the intervening time, nobody bothered to remove the option after
its motivation -- the US export restriction -- was eliminated. I'm
not aware of any other operating system that has a similar option; I
expect it is mainly out of apathy for churn that we still have it.
Today, cryptography is an essential part of modern computing -- you
can't use the internet responsibly without cryptography.

The position of the TNF board of directors is that TNF makes no
representation that MKCRYPTO=no satisfies any country's cryptography
regulations.

My personal position is that the availability of cryptography is a
basic human right; that any local laws restricting it to a privileged
few are fundamentally immoral; and that it is wrong for developers to
spend effort crippling cryptography to work around such laws.

As proposed on tech-crypto, tech-security, and tech-userlevel to no
objections:

https://mail-index.netbsd.org/tech-crypto/2017/05/06/msg000719.html
https://mail-index.netbsd.org/tech-security/2017/05/06/msg000928.html
https://mail-index.netbsd.org/tech-userlevel/2017/05/06/msg010547.html

P.S. Reviewing all the uses of MKCRYPTO in src revealed a lot of
*bad* crypto that was conditional on it, e.g. DES in telnet... That
should probably be removed too, but on the grounds that it is bad,
not on the grounds that it is (nominally) crypto.


Revision tags: prg-localcount2-base3 prg-localcount2-base2 prg-localcount2-base1 prg-localcount2-base pgoyette-localcount-20170426 bouyer-socketcan-base1 pgoyette-localcount-20170320
# 1.246 08-Feb-2017 christos

Don't track /etc/nsd/nsd.conf and /etc/unbound/unbound.conf


Revision tags: bouyer-socketcan-base
# 1.245 07-Jan-2017 christos

branches: 1.245.2;
fix nsd rc.


# 1.244 07-Jan-2017 christos

add more nsd


Revision tags: pgoyette-localcount-20170107
# 1.243 05-Jan-2017 christos

add npfd


Revision tags: pgoyette-localcount-20161104 localcount-20160914
# 1.242 24-Aug-2016 szptvlfn

fix the build ( MKUNBOUND=no ).


# 1.241 23-Aug-2016 christos

add unbound.conf


# 1.240 22-Aug-2016 christos

Add missing unbound


Revision tags: pgoyette-localcount-20160806 pgoyette-localcount-20160726 pgoyette-localcount-base
# 1.239 13-Dec-2015 christos

branches: 1.239.2;
add ip6addrctl


# 1.238 23-Aug-2015 mrg

move the obsolete list files into their respective sets. this means
that if you install a new set and run "postinstall fix obsolete"
the expected things happen.

(hi 12.5 year old me who thought base was better than etc set, which
it really was, but this is better again :-)


# 1.237 30-Mar-2015 chopps

Add resize_root boot operation. If resize_root=YES in rc.conf then
the system attempts to resize the root file system to fill it's
partition prior to mounting read-write. Useful for things like AMI
file system images. May eventually be used by arm images after
coming up with similar solution for increasing the parition size.


# 1.236 21-Mar-2015 jmcneill

Process /etc/modules.conf (if present) at startup, before securelevel is
raised, to allow module loading on ports without a module aware bootloader.


# 1.235 21-Feb-2015 joerg

Add rc script for /sbin/iscsid.


# 1.234 25-Jan-2015 christos

stuff added by blacklist


# 1.233 12-Sep-2014 martin

Mark /etc/rc.d/rtsold and /rescue/rtsol as obsolete


Revision tags: netbsd-7-base yamt-pagecache-base9 tls-earlyentropy-base riastradh-xf86-video-intel-2-7-1-pre-2-21-15 riastradh-drm2-base3 tls-maxphys-base
# 1.232 11-Aug-2013 joerg

branches: 1.232.4;
Sort entries in strcmp order.


Revision tags: riastradh-drm2-base2 riastradh-drm2-base1 riastradh-drm2-base
# 1.231 01-May-2013 agc

Fix for problematic paths in /etc/daily and /etc/security reported in
PR/47645.

Add a separate file which contains the paths for the pkg_admin and
pkg_info utilities. This is called /etc/pkgpath.conf (to distinguish it
from pkg.conf).

Thanks also to Edgar Fuss for the sanity check.


# 1.230 25-Apr-2013 christos

add bind.keys


Revision tags: agc-symver-base
# 1.229 24-Feb-2013 jmmv

Install a kyua.conf file that sets unprivileged_user to _tests.


Revision tags: netbsd-6-0-6-RELEASE netbsd-6-1-5-RELEASE netbsd-6-1-4-RELEASE netbsd-6-0-5-RELEASE netbsd-6-1-3-RELEASE netbsd-6-0-4-RELEASE netbsd-6-1-2-RELEASE netbsd-6-0-3-RELEASE netbsd-6-1-1-RELEASE netbsd-6-0-2-RELEASE netbsd-6-1-RELEASE netbsd-6-1-RC4 netbsd-6-1-RC3 netbsd-6-1-RC2 netbsd-6-1-RC1 yamt-pagecache-base8 netbsd-6-0-1-RELEASE yamt-pagecache-base7 matt-nb6-plus-nbase yamt-pagecache-base6 netbsd-6-0-RELEASE netbsd-6-0-RC2 matt-nb6-plus-base netbsd-6-0-RC1 yamt-pagecache-base5 yamt-pagecache-base4 netbsd-6-base
# 1.228 07-Feb-2012 joerg

branches: 1.228.6;
Import the new apropos/whatis.

This code has been developed by Abhinav Upadhyay as part of Google's Summer
of Code 2011. It uses libmandoc to parse man pages and builds a Full
Text Index in a SQLite database. The combination of indexing the full
manual page, filtering out stop words and ranking individual matches
based on the section gives a much improved user experience.

The old makewhatis and friends are kept under MKMAKEMANDB=no for now.


# 1.227 17-Dec-2011 tsutsui

Add an rc.d(8) script for isibootd(8). Taken from ndbootd(8).


# 1.226 23-Nov-2011 tls

Load entropy at system boot (only works at securelevel < 1); save
at system shutdown. Disable with random_seed=NO in rc.conf if desired.

Goes to some trouble to never load or save to network filesystems.

Entropy should really be loaded by the boot loader but I am still
sorting out how to pass it to the kernel.


Revision tags: yamt-pagecache-base3 yamt-pagecache-base2 yamt-pagecache-base
# 1.225 06-Sep-2011 riz

branches: 1.225.2;
Create and install an rc.d file for devpubd - a daemon to listen
on drvctl and autocreate device nodes in /dev for those which don't have any.
Set the default to "NO" for now.


Revision tags: cherry-xenmp-base
# 1.224 27-May-2011 plunky

provide a new 'bluetooth' rc.d script, to handle Bluetooth configuration
in a simpler manner. This replaces btattach, btconfig, bthcid, btdevctl
and sdpd scripts, and also should not require any configuration settings
other than "bluetooth=YES", though the full range of configurations is
still possible.


# 1.223 11-Apr-2011 martin

Collect all of var/chroot/tcpdump in one set - so we have a chance to
win the checkflist game.


# 1.222 11-Apr-2011 martin

When run as root, tcpdump will chroot to /var/run/tcpdump - but it can
not look up /etc/protcols in there. So install a copy of /etc/protocols
into the chroot area.
Fixes PR bin/44721.


Revision tags: bouyer-quota2-nbase
# 1.221 20-Feb-2011 christos

fix saslc paths.


# 1.220 20-Feb-2011 christos

set fixes for SASLC


Revision tags: bouyer-quota2-base
# 1.219 02-Feb-2011 rmind

NPF checkpoint:
- Add libnpf(3) - a library to control NPF (configuration, ruleset, etc).
- Add NPF support for ftp-proxy(8).
- Add rc.d script for NPF.
- Convert npfctl(8) to use libnpf(3) and thus make it less depressive.
Note: next clean-up step should be a parser, once dholland@ will finish it.
- Add more documentation.
- Various fixes.


# 1.218 13-Jan-2011 kefren

branches: 1.218.2;
add ldpd rc script


Revision tags: matt-mips64-premerge-20101231
# 1.217 07-Nov-2010 jmmv

Adjust file lists after atf-0.12 import


# 1.216 05-Feb-2010 roy

Move the emergancy terminfo database from /root to /rescue.


# 1.215 04-Feb-2010 roy

Note .terminfo and .terminfo.db in /root.


# 1.214 15-Dec-2009 mrg

fix a bunch of issues with MKATF=no.


Revision tags: matt-premerge-20091211
# 1.213 29-Sep-2009 tsarna

Multicast DNS ("Bonjour") support, based on Apple's mDNSResponder.


# 1.212 25-Jul-2009 mbalmer

Add new files due recent gpio(4) rework.


# 1.211 23-Jun-2009 tron

Switch to building Postfix 2.6.2 via "external/ibm-public/postfix".


# 1.210 21-Jun-2009 christos

add nicknames


Revision tags: jym-xensuspend-nbase jym-xensuspend-base
# 1.209 28-Apr-2009 roy

Add an rc.d script for dhcpcd(8)


# 1.208 21-Apr-2009 joerg

Split fsck during boot into two phases. Check the root file system
first, mount root and run the various disk providers. Add swap and
check the remaining file systems after that.
This breaks the dependency cycle for lvm, which needs writeable /dev.
Depend on rndctl in cgd.


# 1.207 02-Feb-2009 joerg

branches: 1.207.2;
Merge pkg_install-20090201 and update build system.


# 1.206 16-Jan-2009 haad

Add lvm script to the lists.


# 1.205 04-Jan-2009 he

Add etc/rc.d/rndctl. "Hi, apb@!"


# 1.204 20-Dec-2008 isaki

x68k pow(4) now uses MI sysmon_pswitch framework. suggested by tsutsui@.
- Make MD poffd(8) retire, and use MI powerd(8) instead of it.
- Make /dev/pow1 retire, because nobody holds /dev/pow0 any longer.
Use /dev/pow0 for pow(4) ioctl.
- POWIOCSSIGNAL ioctl which is for poffd(8) is also obsoleted.


# 1.203 11-Dec-2008 mishka

Import rc.d/httpd script for httpd(8) daemon control.
See rc.conf(5) for options explanation.


# 1.202 05-Dec-2008 cube

Move etc/rc.d/x{dm,fs} into xetc.tgz.


# 1.201 12-Nov-2008 ad

Remove LKMs and switch to the module framework, pass 1.

Proposed on tech-kern@.


Revision tags: netbsd-5-base matt-mips64-base2 wrstuden-revivesa-base-3 wrstuden-revivesa-base-2 wrstuden-revivesa-base-1 wrstuden-revivesa-base mjf-devfs2-base
# 1.200 18-Jun-2008 yamt

branches: 1.200.2;
merge yamt-pf42 branch.
(import newer pf from OpenBSD 4.2)

ok'ed by peter@. requested by core@


Revision tags: yamt-pf42-base4 yamt-pf42-base3
# 1.199 24-May-2008 joerg

Hook dhcpcd into build.


Revision tags: hpcarm-cleanup-nbase yamt-pf42-baseX yamt-pf42-base2 yamt-pf42-base
# 1.198 15-Apr-2008 plunky

branches: 1.198.2; 1.198.4;
some changes to serial bluetooth host controller interfaces

btuartd(8) should be named btattach(8) for consistency
with other parts of NetBSD

make btattach(8) a single-use tool for less complexity

device specicific initialisation (from btuart(4)) is carried
out prior to activating the line discipline (in btattach(8)),
which simplifies the API somewhat and means that the user
tool and the kernel do not need to be kept in sync.

btuart(4) driver is much reduced; naming is made consistent
and all tsleep() and delay() are removed to userland


Revision tags: keiichi-mipv6-base mjf-devfs-base pc532-eol-2008 matt-armv6-nbase matt-armv6-base hpcarm-cleanup-base
# 1.197 22-Dec-2007 jmcneill

branches: 1.197.2; 1.197.6;
Add example hotkey_button script


Revision tags: cube-autoconf-base
# 1.196 12-Nov-2007 jmmv

Add the atf configuration files

This change adds the directory used by atf to look for its configuration
files.


Revision tags: matt-armv6-prevmlocking matt-mips64-base
# 1.195 14-Jul-2007 ad

branches: 1.195.4;
fixsb has done its job.


# 1.194 14-Jul-2007 adrianp

Updates for pkg_install-20070714


# 1.193 02-Jul-2007 xtraeme

Add the /etc/powerd/scripts/sensor_indicator to handle events on
indicator sensors.

Update powerd(8).


# 1.192 01-Jul-2007 xtraeme

Add the /etc/rc.d/envsys script required by envsys2.


# 1.191 01-Jul-2007 xtraeme

Imported envsys 2, a brief description of the new features:
(Part 4: documentation and configuration files)

* Support for detachable sensors.
* Cleaned up the API for simplicity and efficiency.
* Ability to send capacity/critical/warning events to powerd(8).
* Adapted all the code to the new locking order.
* Compatibility with the old envsys API: the ENVSYS_GTREINFO
and ENVSYS_GTREDATA ioctl(2)s are supported.
* Added support for a 'dictionary based communication channel' between
sysmon_power(9) and powerd(8), that means there is no 32 bytes event
size restriction anymore.
* Binary compatibility with old envstat(8) and powerd(8) via COMPAT_40.
* All drivers with the n^2 gtredata bug were fixed, PR kern/36226.

Tested by:

blymn: smsc(4).
bouyer: ipmi(4), mfi(4).
kefren: ug(4).
njoly: viaenv(4), adt7463.c.
riz: owtemp(4).
xtraeme: acpiacad(4), acpibat(4), acpitz(4), aiboost(4), it(4), lm(4).


# 1.190 08-Jun-2007 pavel

Remove the remaining sendmail config files (including everything in
/usr/share/sendmail) from the obsolete list. Instead, remove them in the
"sendmail" postinstall item, which is disabled by default, to prevent
losing sendmail configuration on upgrade. Fixes the rest of
PR install/36180.


# 1.189 03-Mar-2007 apb

Mark dev/MAKEDEV.subr as obsolete


# 1.188 26-Feb-2007 apb

add etc/MAKEDEV.subr


# 1.187 20-Feb-2007 kiyohara

Supprot Bluetooth HCI UART (H4) driver and daemon.


# 1.186 04-Feb-2007 rpaulo

Add /etc/login.conf.


# 1.185 04-Feb-2007 elad

Add support for per-user /tmp.

Enabled via per_user_tmp in /etc/rc.conf (default off).

See security(8) and rc.conf(5) for more details.

Lots of input from thorpej@ & christos@, thanks!


Revision tags: netbsd-4-base
# 1.184 12-Nov-2006 christos

branches: 1.184.2; 1.184.4;
put back phones, used by tip


# 1.183 12-Nov-2006 christos

goodbye uucp


# 1.182 07-Oct-2006 rpaulo

PR 34692: wpa_supplicant script.
By Jukka Salmi.


# 1.181 30-Sep-2006 hubertf

Revert previous commit - just keep logfiles around, don't nuke them on
upgrades.


# 1.180 28-Sep-2006 hubertf

add back aculog & mark as obsolete


# 1.179 26-Sep-2006 jmcneill

Add acadapter, lid_switch, and sleep_button powerd scripts.


# 1.178 18-Sep-2006 hubertf

Remove last traces of /var/log/aculog
OK'd by perry@


# 1.177 14-Sep-2006 pavel

Factor out common settings from /root/.shrc and /etc/skel/.shrc to a
new file /etc/shrc.

As proposed on tech-userlevel.


# 1.176 10-Sep-2006 plunky

update to bluetooth device attachment:

remove pseudo-device btdev(4) and inherent limitations

add bthub(4) which autoconfigures at bluetooth controllers as they
are enabled. bluetooth devices now attach here.

btdevctl(8) and its cache is updated to handle new semantics

etc/rc.d/btdevctl is updated to configure devices from a list
in /etc/bluetooth/btdevctl.conf


# 1.175 31-Aug-2006 hubertf

Sync behaviour of sh and ksh dotfiles for new users with those of root.
Addresses PR 32215 by Wouter Schoot


# 1.174 13-Aug-2006 plunky

rename btcontrol(8) as btdevctl(8) to make it fit with the NetBSD naming
scheme for control programs. This fixes pr 34051.


Revision tags: abandoned-netbsd-4-base
# 1.173 26-Jul-2006 tron

branches: 1.173.2;
Bluetooth fixes by Iain Hibbert:
Create "/etc/rc.d/btcontrol" to attach bluetooth devices at boot.


# 1.172 26-Jul-2006 tron

Bluetooth fixes by Iain Hibbert:
Remove bluetooth.conf(5) and config parsing from libbluetooth(3)
as this is no longer required.


# 1.171 11-Jul-2006 peter

Fix MKIPFILTER=no.


# 1.170 24-Jun-2006 mrg

add support for MKISCSI=no.


# 1.169 19-Jun-2006 gdamore

Initial import of bluetooth stack on behalf of Iain Hibbert. (plunky@,
NetBSD Foundation Membership still pending.) This stack was written by
Iain under sponsorship from Itronix Inc.

The stack includes support for rfcomm networking (networking via your
bluetooth enabled cell phone), hid devices (keyboards/mice), and headsets.

Drivers for both PCMCIA and USB bluetooth controllers are included.


# 1.168 09-Jun-2006 tron

Remove the "sendmail" configuration files and startup scripts from the
list of obsolete files. Resurrect the "sendmail" item which now flags
these files as obsolete unless the "sendmail" package is installed.


# 1.167 31-May-2006 tron

Resurrect "/etc/mail" and "/etc/mail/aliases". Postfix still uses that
configuration file.


# 1.166 30-May-2006 christos

Remove sendmail (requested by core@ and security-officer@)


# 1.165 30-Apr-2006 rpaulo

rc.d/irdaattach


# 1.164 30-Apr-2006 rpaulo

/etc/rc.d/hostapd


Revision tags: peter-altq-base
# 1.163 16-Mar-2006 jwise

branches: 1.163.2;
Some users use pf. Some use ipfilter. Syspkg was designed for situations
like this, where a user may well want to install one of these but not the
other.

To allow syspkg to be used for its intended purpose here, carefully split
out ipfilter and pf from the main {base,comp,man,misc}-net{,util}-* packages

(something which was partially done for ipf, but not done for pf in the
past).

This way, a user can pkg_delete *-{ipf,pf}-*, and not have utilities,
libraries, man pages, examples, or default /etc files for the packet filter
they don't like.


# 1.162 08-Feb-2006 agc

Add entries for the iSCSI target, and supporting library and manual
pages.


# 1.161 14-Sep-2005 lukem

Add a note explaining why we don't "obsolete" end-user configuration files.
Inspired by the fallout from the recent named.conf move.

XXX: consider fixing spamd.conf in a similar manner.


# 1.160 14-Sep-2005 lukem

Don't mark /etc/namedb/named.conf as "obsolete" since that will cause
a file that has end-user configuration to be unconditionally removed.
Instead, remove the entry from the set list, and add a note to UPDATING
reminding users of MKUPDATE=yes to manually rectify the problem in
their DESTDIR.

The "named" fix in postinstall(8) will migrate /etc/namedb/named.conf
to /etc/named.conf if the latter doesn't exist.
(The need for these style of migrations was why I implemented postinstall(8)
in the first place.)


# 1.159 30-Aug-2005 tron

Move "named.conf" example configuration to "/etc" because that is where
named(8) looks for it. You can now really get a caching name server
by simply setting "named=yes" in "/etc/rc.conf" as documented in
The NetBSD Guide. This fixes PR bin/30662 by Christian Hattemer.


# 1.158 23-Aug-2005 peter

Add new files for pf.boot.conf.


# 1.157 04-Aug-2005 peter

Add /etc/rc.d/ftpd.


# 1.156 27-Jun-2005 peter

Remove (pf)spamd. Its right to exist in NetBSD has been questioned since it
appeared and whether it's really part of pf or not is still unclear. Looking
at the other *BSDs it seems that they have left out spamd when importing pf,
and now we do that too. Also, the name conflicted with another more popular
used tool, after the rename to pfspamd it was left with completely unusable
documentation which apparently no-one wanted to fix.

A port of the latest spamd will be imported into pkgsrc soon.

Suggested by several people, no objections on last proposal on tech-userlevel.


# 1.155 25-Apr-2005 wiz

For obsolete files, make sure that both words behind the pathname contain
"obsolete".


# 1.154 17-Apr-2005 lukem

Move /etc/postinstall (and the etc.tgz set) to /usr/sbin/postinstall
(and the base.tgz set).


Revision tags: netbsd-3-base
# 1.153 04-Mar-2005 kleink

branches: 1.153.2;
Add lastlogx.


# 1.152 01-Mar-2005 christos

Add an xserver config file.


# 1.151 27-Feb-2005 christos

add ppp in pam.d


# 1.150 27-Feb-2005 thorpej

Major cleanup of PAM service configuration files.


# 1.149 22-Feb-2005 peter

Add MKIPFILTER; if set to no, don't build and install the ipf(4) programs,
headers and LKM.

Add MKPF; if set to no, don't build and install the pf(4) programs,
headers, LKM and spamd.

Both options default to yes, so nothing changed in the default build.

Reviewed by lukem.


# 1.148 22-Feb-2005 lukem

Move etc/release from etc.tgz to base.tgz, since the "build" target
in src/Makefile installs it (thus, being more consistent).
Should fix "./build.sh install=/" installation of /etc/release.
Requested by Hubert Feyrer (amongst others).


# 1.147 11-Jan-2005 lukem

We unconditionally populate etc/pam.d.


# 1.146 10-Jan-2005 christos

Add /etc/pam.d files.


# 1.145 10-Jan-2005 matt

Make sure the postfix files in ./etc/postfix are conditional on postfix


Revision tags: rtr-xorg-branch-base
# 1.144 18-Nov-2004 wiz

branches: 1.144.2;
Put obsolete files in the *-obsolete sets instead of whatever they
were in before they became obsolete (consistency).


# 1.143 29-Jun-2004 itojun

branches: 1.143.2;
add pf/pflogd


# 1.142 22-Jun-2004 itojun

additional files for pf


# 1.141 18-Apr-2004 dbj

enable rc.d fixsb script
initial testing suggests that it is working and I am confident it
will not cause irrevocable damage


Revision tags: netbsd-2-0-base
# 1.140 06-Feb-2004 itohy

branches: 1.140.2;
Add /etc/locate.conf


# 1.139 31-Jan-2004 christos

add identd


# 1.138 30-Jan-2004 lukem

Add ./etc/mtree/set.<setname> entry for each set.


# 1.137 14-Jan-2004 blymn

Added veriexec entry.


# 1.136 12-Jan-2004 lukem

more MKSENDMAIL=no support.
noted by Juan Romero Pardines in private email, and confirmed by me.


# 1.135 11-Jan-2004 lukem

reformat whitespace


# 1.134 11-Jan-2004 tls

Install default ssh_known_hosts file with public keys for Project servers.
Hopefully I didn't make too much of a hash of the postinstall support for
this; it currently installs the file if there's none in the destination,
and elsewise notes if the CVS version differs (or is missing) but doesn't
try to fix that.


# 1.133 04-Jan-2004 lukem

Rename /etc/release-info to /etc/release, to be consistent with other
implementations and Hubert's original intent.


# 1.132 04-Jan-2004 lukem

Run "cd etc && make install-release-info" at the end of the "build" target.
Based on Hubert Feyrer's suggestion on tech-userlevel@.


# 1.131 04-Jan-2004 lukem

Support MKCRYPTO=no


# 1.130 03-Jan-2004 lukem

support MKYP=no


# 1.129 03-Jan-2004 lukem

support MKSENDMAIL=no (with "sendmail" keyword)


# 1.128 29-Dec-2003 lukem

Significant overhaul of how the sets are used:

* Add an optional third field to the sets file which is a list of
comma separated keywords that control if the line is printed.
Currently supported keywords
kerberos4 ${MKKERBEROS4} != no
kerberos ${MKKERBEROS} != no
lint ${MKLINT} != no
obsolete ${obsolete} != 0.
In this case, non obsolete files are not printed.
(This will allow future support for builds with variables such as
MKHESIOD and MKYP set to "no".)

* Use sh(1)'s getopts where appropriate, and otherwise cleanup the
various scripts.

* Move defaults for sets.subr from sets.defaults into sets.subr.
Move replicated code for determining stuff such as shlibs type
from various scripts into sets.subr.

* Merge the obsolete.*, krb.*, krb4.* and lint.* into the appropriate
main lists with the relevant third field keyword(s).


# 1.127 27-Dec-2003 martin

Add etc/rc.d/rtclocaltime.


# 1.126 26-Dec-2003 lukem

Revert part of previous; etc/rc.d/kdc must be installed even if Kerberos
isn't enabled.
This is how the rc.d system works in conjunction with our current build
and install system; all the rc.d scripts are installed even if the
subsystems they control are not.


# 1.125 11-Dec-2003 dyoung

Fix the checkflist for builds without Kerberos 4 (MKKERBEROS4=no)
and without Kerberos 4 & 5 (MKKERBEROS=no). Previously checkflist
complained of missing files.

* move kerberos- and kerberos 4-only files into new flists,
distrib/sets/lists/*/krb.*

* make the flist generators grok MKKERBEROS{,4} variables

* fix Makefiles which treat MKKERBEROS=no as MKKERBEROS5=no.
9 out of 10 experts agree that it is ludicrous to build w/
KERBEROS4 and w/o KERBEROS5.

* fix header files, also, which treat MKKERBEROS=no as MKKERBEROS5=no.

* omit some Kerberos-only subdirectories from the build as
MKKERBEROS{,4} indicate

(I acknowledge the sentiment that flists are the wrong way to go,
and that the makefiles should produce the metalog directly. That
sounds to me like the right way to go, but I am not prepared to do
revamp all the makefiles. While my approach is expedient, it fits
painlessly within the current build architecture until we are
delivered from flist purgatory, and it does not postpone our
delivery. Fair enough?)


# 1.124 25-Nov-2003 dyoung

Finer-grained syspkgs to save space on tiny systems: move
calendar(1)-related and RPC-related files to their own packages.
Move the termcap(5) database to its own package, also.


# 1.123 24-Apr-2003 perry

add default skel/.logout file


# 1.122 20-Apr-2003 thorpej

Add a reset_button script.


# 1.121 18-Apr-2003 thorpej

Add /etc/powerd/scripts/power_button


# 1.120 18-Apr-2003 thorpej

Add /etc/rc.d/powerd


# 1.119 03-Apr-2003 taca

Reflect change of cron's log file.


# 1.118 24-Mar-2003 atatat

Adjust sets lists to account for new sendmail machinery.


# 1.117 15-Mar-2003 wiz

Add atc_score in place of atc_scores; completes solution of PR 20709.


# 1.116 22-Feb-2003 lukem

move the obsolete lists from etc to base, as they're more useful there.
suggested by matt green.


# 1.115 22-Feb-2003 lukem

all:
Use /var/db/obsolete instead of /etc/obsolete

etc/Makefile:
Create separate target "install-obsolete-files" to populate
/var/db/obsolete, instead of using "install-etc-files".

Makefile:
Add do-obsolete target, to run "cd etc && make install-obsolete-files",
and add this to BUILDTARGETS.
This moves the "obsolete files" creation from "distribution" to "build".


Per discussion with Andrew Brown.


# 1.114 20-Feb-2003 lukem

etc/postinstall
* Improve message display in find_file_in_dirlist()
* do_obsolete(): instead of running distrib/sets/makeobsolete to
temporarily generate the obsolete sets lists, look for them in
${SRC_DIR}/etc/obsolete/* or ${DEST_DIR}/etc/obsolete/*.
The obsolete check now works for "extracted etc.tgz" as the source dir.

etc/Makefile (install-etc-files), distrib/sets/lists/*
* Install obsolete set lists into /etc/obsolete/
* Tweak how pwd_mkdb files are added to METALOG

distrib/sets/makeobsolete
* Don't bother with "_obsolete" suffix on generated file names.


# 1.113 16-Jan-2003 martti

Back out previous (as discussed with releng). The correct way to set this is:

# echo "myserver" > /var/yp/binding/`domainname`.ypservers


# 1.112 16-Jan-2003 martti

Script to bind a NIS client to a known server.

$ grep yp /etc/rc.conf
ypbind=YES
ypbind_flags="-ypset"
ypset=YES
ypset_flags="myserver"


# 1.111 10-Jan-2003 lukem

add etc/rc.d/staticroute. (hi christos!)


Revision tags: fvdl_fs64_base
# 1.110 17-Dec-2002 lukem

Move dev/MAKEDEV from base to etc, just like everything else installed
by etc/Makefile::install-etc-files.

(Arguably a bunch of stuff in etc could move to base, but that's a
separate issue).


# 1.109 09-Oct-2002 elric

Added cgd rc.d script and put it in the appropriate postinstall and
mtree files.


# 1.108 05-Oct-2002 grant

add /etc/mail/local-host-names, required by sendmail(8).


# 1.107 17-Sep-2002 briggs

Add ./var/log/wtmpx


# 1.106 03-Sep-2002 abs

Split raidframe parity checking/rebuild out into raidframeparity, which is
called after quota so we don't end up with fsck and raidframe parity rebuild
taking forever after a crash/reboot.
While we are here check for raid[0-9].conf & raid[1-9][0-9].conf not
raid[0-9].conf & raid[0-9][0-9].conf


# 1.105 03-Sep-2002 wiz

Add /var/run/utmpx, requested by soren.


# 1.104 27-Aug-2002 takemura

Added touch panel calibration utility.


# 1.103 06-Aug-2002 soren

Update for etc/skel removals.


# 1.102 30-Jul-2002 wiz

Add /etc/rc.d/wdogctl.


# 1.101 06-Jul-2002 tv

Remove empty "ftpwelcome" entirely. This makes ftpd emit a two-line
extended greeting, which confuses lots of established firewalls.
(Not added to "obsolete" since removing this file is not mandatory.)


# 1.100 27-Jun-2002 christos

wsmoused additions.


# 1.99 03-Jun-2002 jmcneill

Move 'mixerctl' rc script from etc-sys-rc to etc-audio-rc.


# 1.98 02-Jun-2002 jmcneill

Add mixerctl rc.d script.


Revision tags: netbsd-1-6-RELEASE netbsd-1-6-RC3 netbsd-1-6-RC2 netbsd-1-6-RC1 netbsd-1-6-base
# 1.97 29-Apr-2002 lukem

branches: 1.97.2;
Complete the conversion back to the OpenSSH default configuration files of
"/etc/ssh/ssh_config" (from "/etc/ssh/ssh.conf") for ssh(1) and other
userland tools, and "/etc/ssh/sshd_config (from "/etc/ssh/sshd.conf")
for sshd(8).

etc/postinstall will detect this, and if "fix" is given, rename the files.


# 1.96 26-Apr-2002 lukem

add etc/postinstall


# 1.95 22-Apr-2002 minoura

Add passwd.conf.


# 1.94 11-Mar-2002 itojun

move sshd config files to /etc/ssh


# 1.93 11-Mar-2002 itojun

dig /etc/ssh


# 1.92 12-Feb-2002 thorpej

Add some missing postifx etc files.


# 1.91 11-Feb-2002 martti

ipfs allows state information created for NAT entries and rules using
keep state to be locked (modification prevented) and then saved to disk,
allowing for the system to experience a reboot, followed by the restoration
of that information, resulting in connections not being interrupted.

To activate this feature, set ipfs=YES in /etc/rc.conf


# 1.90 31-Jan-2002 lukem

- rename etc/rc.d/NETWORK to etc/rc.d/NETWORKIGN
- move entry for etc/rc.d/xntpd from base/obsolete.mi to etc/obsolete.mi


# 1.89 10-Dec-2001 martin

Add ifwatchd.


# 1.88 29-Oct-2001 augustss

Add moused.


# 1.87 04-Sep-2001 martin

Add etc/rc.d/downinterfaces.


# 1.86 23-Jun-2001 itojun

upgrade to openssh 2.9, around 2001/6/24 (from openbsd usr.bin/ssh).

- authorized_keys2 and known_hosts2 are obsoleted, and integrated
into those without "2".
- file name change, /etc/primes -> /etc/moduli
- cleanups


# 1.85 26-May-2001 itojun

install /etc/primes for ssh


# 1.84 22-May-2001 fredette

sunndd has been renamed ndbootd.


# 1.83 17-May-2001 fredette

Added entries for sunndd.


# 1.82 10-Apr-2001 enami

dhclient-script was moved to /sbin.
Pointed out by Kimio Ishii <ishii@sm.sony.co.jp>.


# 1.81 05-Apr-2001 thorpej

Add /etc/rc.d/altqd.


# 1.80 05-Apr-2001 wiz

Don't install /etc/rc.d/gated any longer, since gated isn't in the
base system.


# 1.79 26-Jan-2001 jwise

Change a package name.


# 1.78 26-Jan-2001 jwise

Add pkg names.


# 1.77 21-Jan-2001 itojun

make it clearer that /etc/rtadvd.conf is optional (normally,
configurations were derived from kernel interface settings).

install rtadvd.conf into /usr/share/exapmles/rtadvd, instead of /etc.

sync with kame.


# 1.76 18-Jan-2001 thorpej

Add rc.d/racoon.


# 1.75 15-Jan-2001 itojun

no longer need to ship IPv4-only sendmail.cf.


# 1.74 14-Jan-2001 minoura

Add etc/rc.d/poffd.


# 1.73 07-Jan-2001 ad

Add /etc/rc.d/isdnd.


# 1.72 30-Oct-2000 thorpej

Remove /etc/mail/aliases.db -- see etc/Makefile,v 1.168.


# 1.71 16-Oct-2000 simonb

Add /etc/skel files.

Part of fix for PR bin/10985.


# 1.70 14-Oct-2000 wiz

add etc/rc.d/newsyslog


# 1.69 01-Oct-2000 lukem

move default config files from /etc/default -> /etc/defaults, to be
consistent with what FreeBSD uses /etc/defaults for, and since SVR4
uses /etc/default for another purpose.
as discussed on tech-userlevel, and no objections were made.


# 1.68 28-Sep-2000 thorpej

Add ssh-related files.


# 1.67 26-Aug-2000 lukem

add rc.d/securelevel. noted in [install/10896] by Rafal Boni.


# 1.66 24-Aug-2000 enami

Remove an obsolete rc.wscons.


# 1.65 23-Aug-2000 lukem

migrate default installation config files from /etc to /etc/default


# 1.64 22-Aug-2000 lukem

repalce rc.d/fsck.sh with rc.d/fsck


# 1.63 06-Aug-2000 thorpej

kerberos -> kdc


# 1.62 26-Jul-2000 lukem

add rc.d/NETWORK, obsolete rc.d/systemfs


# 1.61 04-Jul-2000 itojun

sync sendmail default configuration file with GENERIC kernel setting.
was: sendmail-IPv6.cf(v4/v6) + sendmail.cf(v4)
now: sendmail-IPv4only.cf(v4) + sendmail.cf(v4/v6)

do we need etc/obsolete.mi?


Revision tags: netbsd-1-5-base
# 1.60 20-Jun-2000 minoura

branches: 1.60.2;
Sort.


# 1.59 13-Jun-2000 itojun

add rc.d/ipsec for ipsec configuration. when enabled, it will inject
/etc/ipsec.conf into "setkey -f". PR 9609.


# 1.58 07-Jun-2000 thorpej

Update for reality.


Revision tags: minoura-xpg4dl-base
# 1.57 13-May-2000 lukem

remove netstart


# 1.56 10-May-2000 thorpej

Update for location of aliases/aliases.db.


# 1.55 08-May-2000 itojun

make default sendmail.cf IPv4-only again.
roll sendmail-IPv6.cf, which does IPv4/v6.


# 1.54 06-May-2000 mycroft

Finish previous sync.


# 1.53 06-May-2000 mycroft

Sync (mostly).


# 1.52 03-May-2000 itojun

correct more sendmail upgrade issue.


# 1.51 03-May-2000 itojun

sync with sendmail upgrade.


# 1.50 02-May-2000 simonb

Adjust sets for ntp4.
XXX: Obsolete sets still need to be fixed.


# 1.49 01-May-2000 thorpej

Add postfix-related files.


# 1.48 26-Apr-2000 itojun

add zone file for "localhost.". this is included in examples in BIND8,
and is a good thing to have (no outside DNS server will supply this).


# 1.47 15-Apr-2000 tsarna

Update sets and obsolete lists to reflect death of nfsiod


# 1.46 08-Apr-2000 tsarna

add /etc/sysctl.conf


# 1.45 14-Mar-2000 shin

fix DAEMON,LOGIN,SERVERS,sshd in /etc/rc.d.


# 1.44 12-Mar-2000 jlam

Add /etc/rc.d scripts.


# 1.43 01-Mar-2000 itojun

change filename for IPv6 loopback address (::1).
many found it ugly, and I found that I've made a mistake in old name.
there needs to be 4 more "0"s!

this commit renames
etc/namedb/0000:0000:0000:0000:0000:0000:000 into etc/namedb/loopback.v6.
(based on recent discussion I did not use cvsmove)


# 1.42 28-Jan-2000 fair

added ./etc/ntp.conf per PR 4312


# 1.41 27-Jan-2000 itojun

add reverse lookup table for IPv6 loopback (::1).
ugly...


Revision tags: wrstuden-devbsize-19991221 wrstuden-devbsize-base comdex-fall-1999-base
# 1.40 07-Nov-1999 mycroft

branches: 1.40.2;
Add /root/.shrc.


# 1.39 28-Oct-1999 perry

sync to reality


# 1.38 21-Jul-1999 mycroft

branches: 1.38.2;
Make an aliases.db file when we install the aliases file.


# 1.37 04-Jul-1999 fvdl

Bring setlists up to date for i386 switch to ELF and ipv6.


# 1.36 19-Apr-1999 simonb

Add a NetBSD RCS tag to each distrib list file.


# 1.35 05-Apr-1999 perry

add aculog


Revision tags: netbsd-1-4-base
# 1.34 30-Mar-1999 simonb

branches: 1.34.2;
Add /etc/wscons.conf


# 1.33 18-Mar-1999 ross

ld.so.conf doesn't belong in mi.


# 1.32 16-Mar-1999 he

Sync to reality. gcov, rc.wscons, queue/list man pages, i386/ieee.h.


# 1.31 06-Mar-1999 he

Fixing various chaff, sync to current reality:
o mailwrapper, postfix and sendmail
o hello, sup.no.netbsd.org; bye to skarven.itea.unit.no
o innetgr / netgroup
o a few sendmail master config file changes


# 1.30 23-Jan-1999 mycroft

Catch up with the Joneses.


# 1.29 18-Jan-1999 lukem

add nsswitch.conf


# 1.28 05-Jan-1999 cjs

Sync with various changes over the last week or two.


# 1.27 19-Nov-1998 tron

Include "named.conf" instead of "named.boot".


# 1.26 29-Oct-1998 bad

/etc/rc.shutdown


# 1.25 05-Sep-1998 kleink

./etc/mtree/BSD.{pkg,x11}.dist are gone.


# 1.24 15-Jun-1998 lukem

sort files


# 1.23 02-Feb-1998 mikel

add /etc/ld.so.conf, from Steve Allen in PR misc/4892


# 1.22 22-Dec-1997 mikel

back out last change, /etc/aliases.db now auto-rebuilt by default sendmail.cf


# 1.21 18-Dec-1997 mikel

add /etc/aliases.db


# 1.20 02-Dec-1997 hubertf

add etc/mtree/BSD.x11.dist


# 1.19 24-Nov-1997 mrg

move games score files into etc so we don't clobber them


# 1.18 26-Oct-1997 mikel

update; from Steve Allen in PR misc/4345, with some additions by myself.


Revision tags: netbsd-1-3-base
# 1.17 30-Sep-1997 is

branches: 1.17.2;
/etc/magic -> /usr/share/misc/magic


# 1.16 07-Sep-1997 pk

remove etc/myname


# 1.15 31-Aug-1997 perry

sync to reality


# 1.14 31-Jul-1997 veego

Sync.


# 1.13 21-Jun-1997 mikel

add /etc/profile


# 1.12 30-Apr-1997 pk

Synchronize.


# 1.11 07-Apr-1997 scottr

Update for current reality.


# 1.10 14-Mar-1997 thorpej

Sync with reality.


# 1.9 10-Jan-1997 thorpej

Add the new *.conf and rc.lkm files.


# 1.8 08-Jan-1997 thorpej

Update to reflect current reality.


# 1.7 04-Dec-1996 lukem

AUTHPRIV syslog messages go to /var/log/authlog instead of /var/log/secure
(in line with other systems)


# 1.6 29-Nov-1996 jtk

add fdformat, its man pages, and fdc(4) page


# 1.5 20-Nov-1996 lukem

add /var/log/secure


# 1.4 16-Nov-1996 briggs

Updates from Steve Allen <wormey@eskimo.com> to match the current world.


# 1.3 09-Oct-1996 jtc

merge in 1.2 branch


# 1.2 27-May-1996 pk

sync


# 1.1 29-Aug-1994 cgd

branches: 1.1.1;
Initial revision