summaryrefslogtreecommitdiff
path: root/distrib
diff options
context:
space:
mode:
Diffstat (limited to 'distrib')
-rw-r--r--distrib/notes/INSTALL205
-rw-r--r--distrib/notes/Makefile23
-rw-r--r--distrib/notes/amiga/contents59
-rw-r--r--distrib/notes/amiga/install2
-rw-r--r--distrib/notes/amiga/legal28
-rw-r--r--distrib/notes/atari/legal7
-rw-r--r--distrib/notes/donations18
-rw-r--r--distrib/notes/hp300/legal7
-rw-r--r--distrib/notes/i386/contents87
-rw-r--r--distrib/notes/i386/hardware19
-rw-r--r--distrib/notes/i386/install26
-rw-r--r--distrib/notes/i386/legal29
-rw-r--r--distrib/notes/i386/prep2
-rw-r--r--distrib/notes/i386/upgrade33
-rw-r--r--distrib/notes/i386/whatis5
-rw-r--r--distrib/notes/i386/xfer18
-rw-r--r--distrib/notes/legal.common38
-rw-r--r--distrib/notes/mac68k/contents45
-rw-r--r--distrib/notes/mac68k/legal33
-rw-r--r--distrib/notes/pc532/legal106
-rw-r--r--distrib/notes/sparc/contents39
-rw-r--r--distrib/notes/sparc/legal17
-rw-r--r--distrib/notes/sun3/contents2
-rw-r--r--distrib/notes/sun3/legal16
24 files changed, 173 insertions, 691 deletions
diff --git a/distrib/notes/INSTALL b/distrib/notes/INSTALL
index 2d126b6e885..273332ab3d4 100644
--- a/distrib/notes/INSTALL
+++ b/distrib/notes/INSTALL
@@ -1,132 +1,70 @@
-INSTALLATION NOTES for OpenBSD/MACHINE 1.1
-
-
-
-Be sure to read _ALL_ of this document before you try to install
-OpenBSD/MACHINE.
-
+INSTALLATION NOTES for OpenBSD/MACHINE 2.0
What is OpenBSD?
----- -- ------
+----------------
OpenBSD is a Berkeley Networking Release 2 (Net/2) and 4.4BSD-Lite
-derived Operating System. It is a fully functional UN*X-like system
-which runs on many architectures and is being ported to more. OpenBSD,
-is a creation of the members of the network community and without the
-net it's likely that this release wouldn't have come about.
-
-OpenBSD 1.1 is a evolutionary release which contains over a year of
-changes to the kernel, user-level utilities, and documentation.
+which runs on many architectures and is being ported to more.
Continuing the multi-platform tradition, OpenBSD has added ports to
-atari and mvme68k based machines. Kernel interfaces have continued to
+mvme68k and arc machines. Kernel interfaces have continued to
be refined, and now several subsystems and device drivers are shared
among the different ports. You can look for this trend to continue.
-OpenBSD 1.1 has significantly enhanced the binary emulation subsystem
+Security of the system as a whole has been significantly
+improved. Source code for all critical system components has been
+checked for remote-access, local-access, denial-of-service, data
+destruction, or information-gathering problems.
+
+OpenBSD 2.0 has significantly enhanced the binary emulation subsystem
(which includes iBCS2, Linux, OSF/1, SunOS, SVR4, Solaris and Ultrix
compatibility) and several kernel subsystems have been generalized
to support this more readily. The binary emulation strategy is
aimed at making the emulation as accurate as possible.
-OpenBSD 1.1 is also the first release to see machine-independent disk
-striping. The concatenated disk driver (ccd), which was previously
-supported only by the hp300 port, has been vastly improved. Many
-bugs were fixed, and explicit references to device-dependent routines
-removed and replaced by calls to the generic "vnode operation"
-routines. In addition, several features were added, including partition
-support, dynamic configuration and unconfiguration via a user space system
-utility program, and virtually unlimited number of component devices.
+Cryptography components are part of OpenBSD. OpenBSD is from Canada,
+and export of these pieces (such as kerberosIV) to the world is not
+restricted.
-Many new user programs have been added in OpenBSD 1.1, as well,
+Many new user programs have been added in OpenBSD 2.0, as well,
bringing it closer to our goal of supplying a complete UN*X-like
-environment.
-
+environment. Tools like perl and ksh are standard,
#include "whatis"
-The Future of OpenBSD:
---- ------ -- ------
-
-We hope to have regular releases of the full binary and source trees,
-but these are difficult to coordinate, especially with all of the
-architectures which we now support! We hope to support even _more_
-hardware in the future, and have a rather large number of other ideas
-about what can be done to improve OpenBSD. We intend to continue our
-current practice of making the OpenBSD-current development source
-available on a daily or nearly-daily basis.
-
-We intend to integrate free, positive changes from whatever sources
-will provide them, providing that they are well thought-out and
-increase the usability of the system.
-
-Above all, we hope to create a stable and accessible system, and to be
-responsive to the needs and desires of OpenBSD users, because it is for
-and because of them that OpenBSD exists.
-
-
Sources of OpenBSD:
-------- -- ------
+-------------------
#include "mirrors"
-OpenBSD 1.1 Release Contents:
------- --- ------- --------
-
-The OpenBSD 1.1 release is organized in the following way:
-
-.../OpenBSD-1.1/
- BUGS Known bugs list (incomplete
- and out of date).
-
- CHANGES Changes since OpenBSD's last
- release (and before).
+OpenBSD 2.0 Release Contents:
+-----------------------------
- LAST_MINUTE Last minute changes.
+The OpenBSD 2.0 release is organized in the following way:
- MIRRORS A list of sites that mirror
- the OpenBSD 1.1 distribution.
-
- README.files README describing the
- distribution's contents.
-
- TODO OpenBSD's todo list (incomplete
- and out of date).
-
- patches/ Post-release source code
- patches.
-
- source/ Source distribution sets; see
+.../2.0/
+ src/ Source distribution sets; see
below.
In addition to the files and directories listed above, there is one
directory per architecture, for each of the architectures that OpenBSD
-1.1 has a binary distribution for. There are also
-'README.export-control' files sprinkled liberally throughout the
-distribution tree, which point out that there are some portions of the
-distribution (e.g. those containing crypt(3)) that should not be
-exported from the United States, and that if you do export them, it's
-your fault, not ours.
+1.1 has a binary distribution for.
The source distribution sets can be found in subdirectories of the
"source" subdirectory of the distribution tree. They contain the
complete sources to the system. The source distribution sets
are as follows:
- dsrc11 This set contains the "domestic" sources. These
- sources contain export-restricted encryption code
- and should not be exported from the U.S.
- [ 140K gzipped, 655K uncompressed ]
-
gsrc11 This set contains the "gnu" sources, including
the source for the compiler, assembler, groff,
and the other GNU utilities in the binary distribution
sets.
[ 7.1M gzipped, 30.4M uncompressed ]
- ksrc11 This set contains the sources to the OpenBSD 1.1
+ ksrc11 This set contains the sources to the OpenBSD 2.0
kernel, config(8), config.old(8) and dbsym(8).
[ 6.0M gzipped, 27.0M uncompressed ]
@@ -136,7 +74,7 @@ are as follows:
typesettable document set, the dictionaries, and more.
[ 2.4M gzipped, 8.9M uncompressed ]
- src11 This set contains all of the OpenBSD 1.1 sources which
+ src11 This set contains all of the OpenBSD 2.0 sources which
are not mentioned above.
[ 9.3M gzipped, 41.6M uncompressed ]
@@ -158,11 +96,11 @@ Catted together, the files belonging to a source distribution set
comprise a gzipped tar file. If you want to look at list of the files
contained in the set, you could use the command:
- cat set_name.?? | gunzip | tar tvf -
+ cd /usr/src; cat set_name.?? | tar tvfz -
or to actually extract the files contained in the set:
- cat set_name.?? | gunzip | tar xfp -
+ cd /usr/src; cat set_name.?? | tar xfpz -
In each of the source distribution set directories, there is a file
named "CKSUMS" which contains the checksums of the files in that
@@ -174,37 +112,37 @@ files is corrupt and have access to a cksum binary.
OpenBSD System Requirements and Supported Devices:
------- ------ ------------ --- --------- -------
+--------------------------------------------------
#include "hardware"
Getting the OpenBSD System on to Useful Media:
-------- --- ------ ------ -- -- ------ -----
+----------------------------------------------
#include "xfer"
Preparing your System for OpenBSD Installation:
---------- ---- ------ --- ------ ------------
+-----------------------------------------------
#include "prep"
Installing the OpenBSD System:
----------- --- ------ ------
+------------------------------
#include "install"
Upgrading a previously-installed OpenBSD System:
---------- - ---------- --------- ------ ------
+------------------------------------------------
#include "upgrade"
-Using online OpenBSD documentation
------ ------ ------ -------------
+Using online OpenBSD documentation:
+-----------------------------------
Documentation is available if you first install the manual
distribution set. Traditionally, the UN*X "man pages" (documentation)
@@ -245,29 +183,21 @@ related man pages will be displayed.
Administrivia:
--------------
+--------------
-Registration? What's that?
-
-If you've got something to say, do so! We'd like your input.
There are various mailing lists available via the mailing list
server at <majordomo@OpenBSD.ORG>. To get help on using the mailing
list server, send mail to that address with an empty body, and it will
reply with instructions.
-There are various mailing lists set up to deal with comments and
-questions about this release. Please send comments to:
-
- openbsd-comments@OpenBSD.ORG
-
-To report bugs, use the 'send-pr' command shipped with OpenBSD,
+To report bugs, use the 'sendbug' command shipped with OpenBSD,
and fill in as much information about the problem as you can. Good
bug reports include lots of details. Additionally, bug reports can
be sent by mail to:
- openbsd-bugs@NetBSD.ORG
+ bugs@OpenBSD.ORG
-Use of 'send-pr' is encouraged, however, because bugs reported with it
+Use of 'sendbug' is encouraged, however, because bugs reported with it
are entered into the OpenBSD bugs database, and thus can't slip through
the cracks.
@@ -277,69 +207,8 @@ you're interested in doing a serious amount of work on a specific
port, you probably should contact the "owner" of that port (listed
below).
-If you'd like to help with this effort, and have an idea as to how
-you could be useful, send mail and/or subscribe to:
-
- openbsd-help@OpenBSD.ORG
-
As a favor, please avoid mailing huge documents or files to these
mailing lists. Instead, put the material you would have sent up
for FTP somewhere, then mail the appropriate list about it, or, if
you'd rather not do that, mail the list saying you'll send the data
to those who want it.
-
-
-Thanks go to:
------- -- --
-
-Members and former members of UCB's Computer Systems Research Group,
-including (but not limited to):
- Keith Bostic
- Ralph Campbell
- Mike Karels
- Marshall Kirk McKusick
-for their ongoing work on BSD systems, support, and encouragement.
-
-Also, our thanks go to:
- Mike Hibler
- Rick Macklem
- Jan-Simon Pendry
- Chris Torek
-for answering lots of questions, fixing bugs, and doing the various work
-they've done.
-
-Without CVS, this project would be impossible to manage, so our hats
-go off to Brian Berliner, Jeff Polk, and the various other people
-who've had a hand in making CVS a useful tool.
-
-Dave Burgess <burgess@cynjut.infonet.net> has been maintaining the
-386BSD/NetBSD/FreeBSD FAQ for quite some time, and deserves to be
-recognized for it.
-
-The following people (in alphabetical order) have made donations or
-loans of hardware and/or money, to support OpenBSD development, and
-deserve credit for it:
-#include "donations"
-(If you're not on that list and should be, tell us! We probably were
-not able to get in touch with you, to verify that you wanted to be
-listed.)
-
-Finally, we thank all of the people who've put sweat and tears into
-developing OpenBSD since its inception in October (?), 1995. (Obviously,
-there are a lot more people who deserve thanks here. If you're one of
-them, and would like to mentioned, tell us!)
-
-
-We are:
--- ---
-(in alphabetical order)
-
-Legal Mumbo-jumbo:
------ ----- -----
-
-The following notices are required to satisfy the license terms of
-the software that we have mentioned in this document:
-
-#include "legal.common"
-
-#include "legal"
diff --git a/distrib/notes/Makefile b/distrib/notes/Makefile
index ff40afe09e9..504445dbc6c 100644
--- a/distrib/notes/Makefile
+++ b/distrib/notes/Makefile
@@ -1,16 +1,23 @@
# $NetBSD: Makefile,v 1.3 1994/10/31 05:01:45 cgd Exp $
-M?= ${MACHINE}
+NOPROG=
+NOMAN=
+
+M?= $(MACHINE)
TARG= INSTALL.$M
-SRC= ${.CURDIR}/INSTALL
-DEP= ${SRC} ${.CURDIR}/mirrors ${.CURDIR}/$M/whatis ${.CURDIR}/$M/contents \
- ${.CURDIR}/$M/hardware ${.CURDIR}/$M/xfer ${.CURDIR}/$M/prep \
- ${.CURDIR}/$M/install ${.CURDIR}/$M/upgrade ${.CURDIR}/donations \
- ${.CURDIR}/legal.common ${.CURDIR}/$M/legal
+SRC= $(.CURDIR)/INSTALL
+DEP= $(SRC) $(.CURDIR)/mirrors $(.CURDIR)/$M/whatis $(.CURDIR)/$M/contents \
+ $(.CURDIR)/$M/hardware $(.CURDIR)/$M/xfer $(.CURDIR)/$M/prep \
+ $(.CURDIR)/$M/install $(.CURDIR)/$M/upgrade $(.CURDIR)/donations \
+ $(.CURDIR)/legal.common $(.CURDIR)/$M/legal
+
+all: $(TARG)
-${TARG}: ${DEP}
- cpp -I${.CURDIR}/$M -DMACHINE=$M -Uunix -U$M -C -P ${SRC} > $@
+$(TARG): $(DEP)
+ cpp -I$(.CURDIR)/$M -DMACHINE=$M -Uunix -U$M -C -P $(SRC) > $@
clean cleandir:
/bin/rm INSTALL.*
+
+.include <bsd.prog.mk>
diff --git a/distrib/notes/amiga/contents b/distrib/notes/amiga/contents
index 4be4880376f..17272df6dfe 100644
--- a/distrib/notes/amiga/contents
+++ b/distrib/notes/amiga/contents
@@ -1,23 +1,19 @@
-The amiga-specific portion of the OpenBSD 1.1 release is found in the
+The amiga-specific portion of the OpenBSD 2.0 release is found in the
"amiga" subdirectory of the distribution. That subdirectory is layed
out as follows:
-.../OpenBSD-1.1/amiga/
- binary/ amiga binary distribution sets;
- see below.
+.../2.0/amiga/
+ bins/ amiga binary distribution sets;
+ see below.
+ miniroot/ amiga installation and upgrade
+ file system images; see below.
- miniroot/ amiga installation and upgrade
- file system images; see below.
-
- security/ amiga security distribution;
- see below;
-
- utils/ Miscellaneous amiga
- installation utilities; see
- installation section, below.
+ utils/ Miscellaneous amiga
+ installation utilities; see
+ installation section, below.
There are two amiga file system images to be found in the "amiga/miniroot"
-subdirectory of the OpenBSD 1.1 distribution. One of them is a upgrade
+subdirectory of the OpenBSD 2.0 distribution. One of them is a upgrade
image and one is an installation image. They are described in more
detail below. There are gzipped versions of each available, for easier
downloading. (The gzipped version have the ".gz" extension added to
@@ -34,7 +30,7 @@ Installation file system:
NFS file system or ftp. You can also load distribution sets from
a SCSI tape or from one of your existing AmigaDOS partitions.
- This file is named "inst-11.fs".
+ This file is named "inst-20.fs".
Upgrade file system:
@@ -50,15 +46,15 @@ Upgrade file system:
one of your existing AmigaDOS partitions, or from an existing
OpenBSD partition.
- This file is named "upgr-11.fs".
+ This file is named "upgr-20.fs".
The OpenBSD/amiga binary distribution sets contain the binaries which
-comprise the OpenBSD 1.1 release for the amiga. There are seven binary
-distribution sets, and the "security" distribution set. The binary
-distribution sets can be found in subdirectories of the "amiga/binary"
-subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
+comprise the OpenBSD 2.0 release for the amiga. There are seven binary
+distribution sets. The binary distribution sets can be found in
+subdirectories of the "amiga/bins" subdirectory of the OpenBSD 2.0
+distribution tree, and are as follows:
- base11 The OpenBSD/amiga 1.1 base binary distribution. You
+ base20 The OpenBSD/amiga 2.0 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -66,7 +62,7 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
everything described below.
[ 7M gzipped, 20M uncompressed ]
- comp11 The OpenBSD/amiga Compiler tools. All of the tools
+ comp20 The OpenBSD/amiga Compiler tools. All of the tools
relating to C, C++, and FORTRAN (yes, there are two!).
This set includes the system include files
(/usr/include), the linker, the compiler tool chain,
@@ -77,7 +73,7 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
call and library manual pages.
[ 5M gzipped, 15M uncompressed ]
- etc11 This distribution set contains the system
+ etc20 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -86,35 +82,26 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 60K gzipped, 340K uncompressed ]
- games11 This set includes the games and their manual pages.
+ games20 This set includes the games and their manual pages.
[ 3M gzipped, 7M uncompressed ]
- man11 This set includes all of the manual pages for the
+ man20 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 850K gzipped, 3M uncompressed ]
- misc11 This set includes the system dictionaries (which are
+ misc20 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 2M gzipped, 7M uncompressed ]
- text11 This set includes OpenBSD's text processing tools,
+ text20 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 784K gzipped, 3M uncompressed ]
-The amiga security distribution set is named "secr11" and can be found
-in the "amiga/security" subdirectory of the OpenBSD 1.1 distribution
-tree. It contains crypt.c (the source file for the DES encryption
-algorithm) and the binaries which depend on it. It can only be found
-on those sites which carry the complete OpenBSD distribution and that
-can legally obtain it. (Remember, because of United States law, this
-distribution set may not be exported to locations outside of the
-United States and Canada.) [ 128K gzipped, 307K uncompressed ]
-
The amiga binary distribution sets are distributed in the same form as
the source distribution sets; catted together, the members of a set
form a gzipped tar file. Each amiga binary distribution set also has
diff --git a/distrib/notes/amiga/install b/distrib/notes/amiga/install
index d6480ab6918..03f727bee23 100644
--- a/distrib/notes/amiga/install
+++ b/distrib/notes/amiga/install
@@ -315,7 +315,7 @@ on how to use these somewhat non-intuitive editors.
You should also put a copy of the bsd kernel in your root partition.
This can be done easily by mounting the AmigaDOS partition containing
-the kernel you used to start OpenBSD and copying the "netbsd" file to
+the kernel you used to start OpenBSD and copying the "bsd" file to
the root:
mount -r -t ados /dev/sd0d /mnt
cp /mnt/bsd /
diff --git a/distrib/notes/amiga/legal b/distrib/notes/amiga/legal
index 2fe233811a8..e69de29bb2d 100644
--- a/distrib/notes/amiga/legal
+++ b/distrib/notes/amiga/legal
@@ -1,28 +0,0 @@
- This product includes software developed by Klaus Burkert.
-
- This product includes software developed by Michael van Elst.
-
- This product includes software developed by Bernd Ernesti.
-
- This product includes software developed by Michael L. Hitch.
-
- This product includes software developed by Christian E. Hopps.
-
- This product includes software developed by Mika Kortelainen.
-
- This product includes software developed by Jukka Marin.
-
- This product includes software developed by Kari Mettinen.
-
- This product includes software developed by Brad Pepers.
-
- This product includes software developed by Ignatios Souvatzis.
-
- This product includes software developed by Ezra Story.
-
- This product includes software developed by Lutz Vieweg.
-
- This product includes software developed by Daniel Widenfalk.
-
- This product includes software developed by Markus Wild.
-
diff --git a/distrib/notes/atari/legal b/distrib/notes/atari/legal
index 431e6c06461..e69de29bb2d 100644
--- a/distrib/notes/atari/legal
+++ b/distrib/notes/atari/legal
@@ -1,7 +0,0 @@
- This product includes software developed by Christian E. Hopps.
-
- This product includes software developed by Gordon Ross
-
- This product includes software developed by Leo Weppelman.
-
- This product includes software developed by Markus Wild.
diff --git a/distrib/notes/donations b/distrib/notes/donations
index a716ee90134..e69de29bb2d 100644
--- a/distrib/notes/donations
+++ b/distrib/notes/donations
@@ -1,18 +0,0 @@
- Jason Brazile
- Dave Burgess
- Charles Conn
- Canada Connect Corporation
- Brian Carlstrom
- Tom Coulter
- Charles D. Cranor
- Demon Internet, UK
- Greg Gingerich
- Michael L. Hitch
- Scott Kaplan
- Chris Legrow
- Herb Peyerl
- Mike Price
- Thor Lancelot Simon
- Bill Sommerfeld
- Paul Southworth
- Steve Wadlow
diff --git a/distrib/notes/hp300/legal b/distrib/notes/hp300/legal
index f2b01450f4a..e69de29bb2d 100644
--- a/distrib/notes/hp300/legal
+++ b/distrib/notes/hp300/legal
@@ -1,7 +0,0 @@
- This product includes software developed by the Computer
- Systems Laboratory at the University of Utah.
-
- This product includes software developed at Ludd, University of
- Lule}, Sweden and its contributors.
-
- This product includes software developed by Gordon W. Ross.
diff --git a/distrib/notes/i386/contents b/distrib/notes/i386/contents
index c462024f9f3..5675060162e 100644
--- a/distrib/notes/i386/contents
+++ b/distrib/notes/i386/contents
@@ -1,25 +1,22 @@
-The i386-specific portion of the OpenBSD 1.1 release is found in the
+The i386-specific portion of the OpenBSD 2.0 release is found in the
"i386" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../OpenBSD-1.1/i386/
- INSTALL Installation notes; this file.
+.../2.0/i386/
+ INSTALL Installation notes; this file.
- binary/ i386 binary distribution sets;
- see below.
+ bins/ i386 binary distribution sets;
+ see below.
- floppies/ i386 boot and installation
- floppies; see below.
+ floppies/ i386 boot and installation
+ floppies; see below.
- security/ i386 security distribution;
- see below;
-
- utils/ Miscellaneous i386
- installation utilities; see
- installation section, below.
+ utils/ Miscellaneous i386
+ installation utilities; see
+ installation section, below.
There are four i386 floppy images to be found in the "i386/floppy"
-subdirectory of the OpenBSD 1.1 distribution. Two of them are bootable
+subdirectory of the OpenBSD 2.0 distribution. Two of them are bootable
kernel-copy floppies, one is an installation floppy, and one is an
upgrade floppy. They are all described in more detail below. There
are gzipped versions of each available, for easier downloading. (The
@@ -35,16 +32,6 @@ Bootable Kernel-copy floppies:
and confirm that you want to have the kernel copied to your
disk.
- There are two different kernel copy floppy images,
- "kcadp11.fs", and "kcoth11.fs". They are identical except
- that the kcadp floppy has the drivers for the supported Adaptec SCSI
- controllers -- the Adaptec 1520, 1522, 1540, 1542, 1740, 1742, 1744,
- and 2940 SCSI host adapters and the AIC6x60 and AIC7870 chips on
- motherboards or other brands of SCSI controllers -- and does not
- contain the drivers for any other SCSI host adapters, which
- are in the kernel on the kcoth floppy. (The kernels on the install
- disks are otherwise identical.)
-
Please note that because of space considerations the kernel
copy floppies no longer contain drivers that are not needed
during installation -- in particular, no drivers needed to run
@@ -52,40 +39,33 @@ Bootable Kernel-copy floppies:
recommended that you configure a custom kernel following
installation.
- For those that cannot configure a custom kernel, two "generic"
- kernel images, named "bsd-adp.gz" and "bsd-oth.gz", have
- been placed in the binaries directory. These are identical
- except that "bsd-adp.gz" contains support for Adaptec SCSI
- controllers, but no other SCSI controllers, and
- "bsd-oth.gz" contains support only for SCSI controllers
- other than the Adaptec. (These are similar in nature to the
- kernels on the kernel copy floppies but with additional device
- support.) It is strongly encouraged that you build a custom
+ For those that cannot configure a custom kernel, a "generic"
+ kernel image, named "bsd.gz" has been placed in the binaries
+ directory. It is strongly encouraged that you build a custom
kernel for your installation rather than use a prebuilt generic
kernel.
-
Installation floppy:
This disk contains the software necessary to prepare your hard
drive for OpenBSD and install the OpenBSD distribution. It is
not bootable, and must be used in conjunction with one of the
- kernel-copy floppies. This floppy is named "inst-11.fs".
+ kernel-copy floppies. This floppy is named "inst-20.fs".
Upgrade floppy:
This disk contains the software to be used in upgrading the
system from a previous version of OpenBSD. It is not bootable,
and must be used in conjunction with one of the kernel-copy
- floppies. This floppy is named "upgr11.fs"
+ floppies. This floppy is named "upgr20.fs"
The OpenBSD/i386 binary distribution sets contain the binaries which
-comprise the OpenBSD 1.1 release for the i386. There are seven binary
-distribution sets, and the "security" distribution set. The binary
-distribution sets can be found in subdirectories of the "i386/binary"
-subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
+comprise the OpenBSD 2.0 release for the i386. There are seven binary
+distribution sets. The binary distribution sets can be found in
+subdirectories of the "i386/bins" subdirectory of the OpenBSD 2.0
+distribution tree, and are as follows:
- base11 The OpenBSD/i386 1.1 base binary distribution. You
+ base20 The OpenBSD/i386 2.0 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -93,7 +73,7 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
everything described below.
[ 7.5M gzipped, 19.5M uncompressed ]
- comp11 The OpenBSD/i386 Compiler tools. All of the tools
+ comp20 The OpenBSD/i386 Compiler tools. All of the tools
relating to C, C++, and FORTRAN (yes, there are two!).
This set includes the system include files
(/usr/include), the linker, the compiler tool chain,
@@ -104,7 +84,7 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
call and library manual pages.
[ 4.9M gzipped, 15.0M uncompressed ]
- etc11 This distribution set contains the system
+ etc20 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -113,39 +93,26 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 63K gzipped, 338K uncompressed ]
- games11 This set includes the games and their manual pages.
+ games20 This set includes the games and their manual pages.
[ 2.8M gzipped, 6.9M uncompressed ]
- man11 This set includes all of the manual pages for the
+ man20 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 0.8M gzipped, 3.4M uncompressed ]
- misc11 This set includes the system dictionaries (which are
+ misc20 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.9M gzipped, 6.6M uncompressed ]
- text11 This set includes OpenBSD's text processing tools,
+ text20 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 0.8M gzipped, 2.9M uncompressed ]
-The i386 security distribution set is named "secr11" and can be found
-in the "i386/security" subdirectory of the OpenBSD 1.1 distribution
-tree. It contains crypt.c (the source file for the DES encryption
-algorithm) and the binaries which depend on it, as well as the "bdes"
-DES encryption program. You do not need this distribution set to use
-encrypted passwords in your password file; the "base11" distribution
-includes a crypt library which can perform only the decryption function.
-The "secr11" distribution set can be found only on those sites which
-carry the complete OpenBSD distribution and which can legally obtain it.
-(Remember, because of United States law, this distribution set may not be
-exported to locations outside of the United States and Canada.)
- [ 154K gzipped, 358K uncompressed ]
-
The i386 binary distribution sets are distributed in the same form as
the source distribution sets; catted together, the members of a set
form a gzipped tar file. Each i386 binary distribution set also has
diff --git a/distrib/notes/i386/hardware b/distrib/notes/i386/hardware
index 58e78eb4e9c..8905cfb6ef1 100644
--- a/distrib/notes/i386/hardware
+++ b/distrib/notes/i386/hardware
@@ -1,4 +1,4 @@
-OpenBSD/i386 1.1 runs on ISA (AT-Bus), EISA, PCI, and VL-bus systems
+OpenBSD/i386 2.0 runs on ISA (AT-Bus), EISA, PCI, and VL-bus systems
with 386-family processors, with or without math coprocessors. It
does NOT support MCA systems, such as some IBM PS/2 systems. The
minimal configuration is said to require 4M of RAM and 50M of disk space,
@@ -13,7 +13,6 @@ Supported devices include:
Floppy controllers.
MFM, ESDI, IDE, and RLL hard disk controllers.
SCSI host adapters:
- [Adaptec host adapters only on kcadp floppy]
Adaptec AHA-154xA, -B, -C, and -CF
Adaptec AHA-174x
Adaptec AIC-6260 and AIC-6360 based boards, including
@@ -26,8 +25,6 @@ Supported devices include:
the AIC7870 chip. This driver does *not* currently
work with non-PCI AIC-7xxx boards or the Adaptec 3940.
Buslogic 54x (Adaptec AHA-154x clones; driver on kcadp floppy)
-
- [Other host adapters only on kcoth floppy]
BusLogic 445, 74x, 9xx (But not the new "FlashPoint" series
of BusLogic SCSI adapters)
Symbios Logic (NCR) 53C8xx-based PCI SCSI host adapters
@@ -144,28 +141,28 @@ Parallel ports lpt0 0x378 7 [interrupt-driven or polling]
lpt2 0x3bc [polling only]
MFM/ESDI/IDE/RLL hard disk controller
- wdc0 0x1f0 14 [supports two disks]
+ wdc0 0x1f0 14 [supports two disks or atapi]
Floppy controller
fdc0 0x3f0 6 2 [supports two disks]
AHA-154x, AHA-174x (in compatibility mode), or BT-54x SCSI host adapters
- aha0 0x330 any any [only on kcadp kernel floppy]
+ aha0 0x330 any any
AHA-174x SCSI host adapters (in enhanced mode)
- ahb0 any any any [only on kcadp kernel floppy]
+ ahb0 any any any
BT445, BT74x, or BT9xx SCSI host adapters
- bt0 0x330 any any [only on kcoth kernel floppy]
+ bt0 0x330 any any
Ultrastor 14f, 24f (if it works), or 34f SCSI host adapters
- uha0 0x330 any any [only on kcoth kernel floppy]
+ uha0 0x330 any any
AHA-152x, AIC-6260- or AIC-6360-based SCSI host adapters
- aic0 0x340 11 6 [only on kcadp kernel floppy]
+ aic0 0x340 11 6
Symbios Logic/NCR 53C8xx based PCI SCSI host adapters
- ncr0 any any any [only on kcoth kernel floppy]
+ ncr0 any any any
SCSI disks sd0 first SCSI disk (by SCSI id)
sd1 second SCSI disk (by SCSI id)
diff --git a/distrib/notes/i386/install b/distrib/notes/i386/install
index a9d71c9941b..8255c0019e3 100644
--- a/distrib/notes/i386/install
+++ b/distrib/notes/i386/install
@@ -56,7 +56,7 @@ process again from scratch.
Once you have reached that prompt, remove the kernel-copy
floppy from the floppy drive. Make sure that the installation
- disk (the "inst-11" floppy) is writable, insert it into the
+ disk (the "inst-20" floppy) is writable, insert it into the
floppy drive, and hit any key.
You will then be presented with the OpenBSD kernel boot
@@ -223,12 +223,12 @@ process again from scratch.
Run the "Extract" command once for each distribution
set you wish to install. For instance, if you wish to
- install the "base11" distribution set, followed by the
- "man11" distribution set, and finally the "etc11"
+ install the "base20" distribution set, followed by the
+ "man20" distribution set, and finally the "etc20"
distribution set, use the commands:
- Extract base11
- Extract man11
- Extract etc11
+ Extract base20
+ Extract man20
+ Extract etc20
For each extraction, it will ask you if the extraction
should be verbose. If you reply affirmatively, it
@@ -283,9 +283,9 @@ process again from scratch.
hitting return at the prompt.
Use the "Extract" command to extract the distribution
- set. For instance, if you're extracting the "base11"
+ set. For instance, if you're extracting the "base20"
set, use the command:
- Extract base11
+ Extract base20
You will be asked if you wish the extraction to be
verbose. If you reply affirmatively, the name of each
file being extracted will be printed.
@@ -403,7 +403,7 @@ process again from scratch.
Once you have finished extracting all of the distribution sets
that you wish to install, and are back at the "#" prompt, you
are ready to configure your system. The configuration utility
- expects that you have installed the "base11" and "etc11"
+ expects that you have installed the "base20" and "etc20"
distribution sets. If you have not, you will not be able to
run it successfully (nor will you have a functional system, in
any case). To configure your newly-installed OpenBSD system,
@@ -415,8 +415,8 @@ process again from scratch.
Kernel Installation:
Enter "halt" at the prompt to halt the system. When the
- system is halted, remove the "inst-11" floppy from the floppy
- drive, and replace it with the OpenBSD 1.1 kernel-copy floppy
+ system is halted, remove the "inst-20" floppy from the floppy
+ drive, and replace it with the OpenBSD 2.0 kernel-copy floppy
that you previously booted from. Reboot with that floppy.
with that floppy.
@@ -445,13 +445,13 @@ Kernel Installation:
Once the system is halted, remove the kernel-copy floppy from
the floppy disk drive, and hit any key to reboot.
-Congratulations, you have successfully installed OpenBSD 1.1. When you
+Congratulations, you have successfully installed OpenBSD 2.0. When you
reboot into OpenBSD, you should log in as "root" at the login prompt.
There is no initial password, but if you're using the machine in a
networked environment, you should create yourself an account and
protect it and the "root" account with good passwords.
-Some of the files in the OpenBSD 1.1 distribution might need to be
+Some of the files in the OpenBSD 2.0 distribution might need to be
tailored for your site. In particular, the /etc/sendmail.cf file will
almost definitely need to be adjusted, and other files in /etc will
probably need to be modified, as well. If you are unfamiliar with
diff --git a/distrib/notes/i386/legal b/distrib/notes/i386/legal
index 323043159d4..e69de29bb2d 100644
--- a/distrib/notes/i386/legal
+++ b/distrib/notes/i386/legal
@@ -1,29 +0,0 @@
- This product includes software developed by Charles Hannum.
-
- This product includes software developed by Charles Hannum, by
- the University of Vermont and State Agricultural College and
- Garrett A. Wollman, by William F. Jolitz, and by the
- University of California, Berkeley, Lawrence Berkeley
- Laboratory, and its contributors.
-
- This product includes software developed by the University of
- Vermont and State Agricultural College and Garrett A. Wollman.
-
- This product includes software developed by Dean Huxley.
-
- This product includes software developed by Herb Peyerl.
-
-In the following statement, "This software" refers to the Mitsumi
-CD-ROM driver:
-
- This software was developed by Holger Veit and Brian Moore for
- use with "386BSD" and similar operating systems. "Similar
- operating systems" includes mainly non-profit oriented systems
- for research and education, including but not restricted to
- "NetBSD", "FreeBSD", "Mach" (by CMU).
-
-In the following statement, "This software" refers to the parallel
-port driver:
-
- This software is a component of "386BSD" developed by
- William F. Jolitz, TeleMuse.
diff --git a/distrib/notes/i386/prep b/distrib/notes/i386/prep
index 73c3a12006f..3de52f6d8c6 100644
--- a/distrib/notes/i386/prep
+++ b/distrib/notes/i386/prep
@@ -38,7 +38,7 @@ length (preferably in units of disk sectors or cylinders). You will
need that information when installing OpenBSD (and if the offset and
length are not in those units, you will have to convert them). Once
you have created the new OpenBSD partition, mark it as having a
-partition type of 0xA5 (165, in decimal). If you used "fdisk" to
+partition type of 0xA6 (166, in decimal). If you used "fdisk" to
partition your disk, you will probably have to use a different
partition editor to mark the partition with the correct type.
diff --git a/distrib/notes/i386/upgrade b/distrib/notes/i386/upgrade
index 35126ecefcf..61df886333d 100644
--- a/distrib/notes/i386/upgrade
+++ b/distrib/notes/i386/upgrade
@@ -1,13 +1,6 @@
-The upgrade to OpenBSD 1.1 is a binary upgrade; it would be prohibitive
-to make users upgrade by compiling and installing the 1.1 sources, and
-it would be very difficult to even compile a set of instructions that
-allowed them to do so. Because of the many changes to the system, it
-is difficult impractical to upgrade by recompiling from the sources
-and installing.
-
To do the upgrade, you must have the appropriate kernel-copy floppy
-image on a disk, and the upgr11.fs floppy image on another. You must
-also have at least the "base11" binary distribution set available,
+image on a disk, and the upgr20.fs floppy image on another. You must
+also have at least the "base20" binary distribution set available,
so that you can upgrade with it, using one of the upgrade methods
described above. Finally, you must have sufficient disk space
available to install the new binaries. Since the old binaries are
@@ -30,7 +23,7 @@ To upgrade your system, follow the following instructions:
"Boot" and ends with ":-"), hit return.
You will be prompted to insert a file system floppy. Remove
- the kernel-copy floppy and insert the upgr11 floppy, then hit
+ the kernel-copy floppy and insert the upgr20 floppy, then hit
any key to continue booting.
While booting, you will probably see several warnings. You
@@ -91,13 +84,13 @@ To upgrade your system, follow the following instructions:
After the software has been transferred to the machine (or
mounted, in the case of upgrading via NFS), change into the
- directory containing the "base11" distribution set. Once you
+ directory containing the "base20" distribution set. Once you
are there, run the "Set_tmp_dir" command, and hit return at
the prompt to select the default answer for the temporary
directory's path name. (It should be the path name of the
directory that you're in.)
- Run the command "Extract base11" to upgrade the base
+ Run the command "Extract base20" to upgrade the base
distribution.
Repeat the above two steps for all of the sets you wish to
@@ -116,8 +109,8 @@ To upgrade your system, follow the following instructions:
up the installation, by remaking some system databases. When
it is complete, you should use "halt" to halt the system.
- When the system is halted, remove the "upgr11" floppy from
- the floppy drive, and replace it with the OpenBSD 1.1
+ When the system is halted, remove the "upgr20" floppy from
+ the floppy drive, and replace it with the OpenBSD 2.0
kernel-copy floppy that you previously booted from. Reboot
with that floppy.
@@ -146,21 +139,15 @@ To upgrade your system, follow the following instructions:
Once the system is halted, remove the kernel-copy floppy from
the floppy disk drive, and hit any key to reboot.
-Your system has now been upgraded to OpenBSD 1.1.
+Your system has now been upgraded to OpenBSD 2.0.
After a new kernel has been copied to your hard disk, your
- machine is a complete OpenBSD 1.1 system. However, that
+ machine is a complete OpenBSD 2.0 system. However, that
doesn't mean that you're finished with the upgrade process.
There are several things that you should do, or might have to
do, to insure that the system works properly.
- First, if you did not upgrade your file systems to the new
- file system format during the upgrade process, and you are
- upgrading from a pre-1.0 OpenBSD, you may want to do so now,
- with "fsck -c 2". If you are unsure about the process, it's
- suggested that you read the fsck(8) manual page.
-
- Second, you will probably want to get the etc11 distribution,
+ Second, you will probably want to get the etc20 distribution,
extract it, and compare its contents with those in your /etc/
directory. You will probably want to replace some of your
system configuration files, or incorporate some of the changes
diff --git a/distrib/notes/i386/whatis b/distrib/notes/i386/whatis
index 9ced3ca9c12..b9cbb6ba05f 100644
--- a/distrib/notes/i386/whatis
+++ b/distrib/notes/i386/whatis
@@ -1,4 +1,4 @@
-For the i386, OpenBSD 1.1 brings greatly improved performance,
+For the i386, OpenBSD 2.0 brings greatly improved performance,
stability, and device support. Emulation for several UN*X and UN*X
like operating systems, including Linux and FreeBSD, has been added.
Many new PCI devices are supported, such as cards based on the AMD
@@ -8,6 +8,3 @@ and the Adaptec AIC7870 SCSI host adapter chip. Some drivers such as
on the i386 port. Though still not known to be entirely stable, the
"ncr" driver for 53c8xx-series SCSI adapters has had substantial bugs
and performance issues resolved.
-
-OpenBSD 1.1 on i386 is also fully backward compatible with old OpenBSD
-i386 binaries, so you don't need to recompile all your local programs.
diff --git a/distrib/notes/i386/xfer b/distrib/notes/i386/xfer
index 5507715cf88..a68f7ac023c 100644
--- a/distrib/notes/i386/xfer
+++ b/distrib/notes/i386/xfer
@@ -4,6 +4,7 @@ Installation is supported from several media types, including:
Tape
Remote NFS partition
FTP
+ rsh & restore
No matter which installation medium you choose, you'll need to have
two floppy disks (either 1.2M or 1.44 will work, though both should be
@@ -12,11 +13,6 @@ appropriate for your system. On the second, you'll put the install or
upgrade floppy image, depending on whether you're installing OpenBSD
for the first time, or upgrading a previous installation.
-If you are using an Adaptec SCSI host adapter, you need the kcadp11.fs
-kernel-copy image. If you're using any other SCSI host adapter,
-you'll need the kcoth11.fs image. If you're using a non-SCSI disk
-controller, either kernel-copy disk image will work for you.
-
If you are using a UN*X-like system to write the floppy images to
disks, you should use the "dd" command to copy the file system images
(.fs files) directly to the raw floppy disks. It is suggested that
@@ -90,14 +86,14 @@ following:
(If you can't figure it out, ask your system administrator.)
In the above example, "<dist_directories>" are the
distribution sets' directories, for the distribution sets you
- wish to place on the tape. For instance, to put the "base11"
- and "etc11" distributions on tape (in order to do the absolute
+ wish to place on the tape. For instance, to put the "base20"
+ and "etc20" distributions on tape (in order to do the absolute
minimum installation to a new disk), you would do the
following:
- cd .../OpenBSD-1.1 # the top of the tree
- cd i386/binary
- tar cf <tape_device> base11 etc11
+ cd .../1.2 # the top of the tree
+ cd i386/
+ tar cf <tape_device> base20 etc20
(Note that you still need to fill in "<tape_device>" in the
example.)
@@ -173,7 +169,7 @@ following:
Place the distribution sets you wish to upgrade somewhere in
your current file system tree. At a bare minimum, you must
upgrade the "base" binary distribution, and so must put the
- "base11" set somewhere in your file system. If you wish,
+ "base20" set somewhere in your file system. If you wish,
you can do the other sets, as well, but you should NOT upgrade
the "etc" distribution; the "etc" distribution contains system
configuration files that you should review and update by hand.
diff --git a/distrib/notes/legal.common b/distrib/notes/legal.common
index ed4ba5535e9..e69de29bb2d 100644
--- a/distrib/notes/legal.common
+++ b/distrib/notes/legal.common
@@ -1,38 +0,0 @@
- This product includes software developed by the University of
- California, Berkeley and its contributors.
-
- This product includes software developed by the Computer
- Systems Engineering Group at Lawrence Berkeley Laboratory.
-
- This product includes software developed by Christopher G. Demetriou.
-
- This product includes software developed by Adam Glass.
-
- This product includes software developed by Christian E. Hopps.
-
- This product includes software developed by John Kohl.
-
- This product includes software developed by Paul Kranenburg.
-
- This product includes software developed by Terrence R. Lambert.
-
- This product includes software developed by Frank van der Linden.
-
- This product includes software developed by Philip A. Nelson.
-
- This product includes software developed by Jochen Pohl.
-
- This product includes software developed by Chris Provenzano.
-
- This product includes software developed by Theo de Raadt.
-
- This product includes software developed by the David Muir Sharnoff.
-
- This product includes software developed by SigmaSoft, Th. Lockert.
-
- This product includes software developed by Jason Thorpe.
-
- This product includes software developed by TooLs GmbH.
-
- This product includes software developed by Christos Zoulas.
-
diff --git a/distrib/notes/mac68k/contents b/distrib/notes/mac68k/contents
index 56336465bc5..2d432b4bbc9 100644
--- a/distrib/notes/mac68k/contents
+++ b/distrib/notes/mac68k/contents
@@ -1,28 +1,24 @@
-The mac68k-specific portion of the OpenBSD 1.1 release is found in the
+The mac68k-specific portion of the OpenBSD 2.0 release is found in the
"mac68k" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../OpenBSD-1.1/mac68k/
- binary/ mac68k binary distribution sets;
- see below.
-
- security/ mac68k security distribution;
- see below.
-
- utils/ The mac68k installation utilities.
+.../2.0/mac68k/
+ bins/ mac68k binary distribution sets;
+ see below.
+ inst/ The mac68k installation utilities.
The OpenBSD/mac68k binary distribution sets contain the binaries which
-comprise the OpenBSD 1.1 release for the mac68k. There are eight binary
+comprise the OpenBSD 2.0 release for the mac68k. There are eight binary
distribution sets, and the "security" distribution set. The binary
-distribution sets can be found in subdirectories of the "mac68k/binary"
-subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
+distribution sets can be found in subdirectories of the "mac68k/bins"
+subdirectory of the OpenBSD 2.0 distribution tree, and are as follows:
- bsd10 The OpenBSD/mac68k 1.1 kernel binary. You MUST
+ bsd20 The OpenBSD/mac68k 2.0 kernel binary. You MUST
install this file. It is the kernel that you need
to boot the system.
[ 307K gzipped, 610K uncompressed ]
- base11 The OpenBSD/mac68k 1.1 base binary distribution. You
+ base20 The OpenBSD/mac68k 2.0 base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -30,7 +26,7 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
everything described below.
[ 6.2M gzipped, 18.4M uncompressed ]
- comp11 The OpenBSD/mac68k Compiler tools. All of the tools
+ comp20 The OpenBSD/mac68k Compiler tools. All of the tools
relating to C, C++, and FORTRAN (yes, there are two!).
This set includes the system include files
(/usr/include), the linker, the compiler tool chain,
@@ -41,7 +37,7 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
call and library manual pages.
[ 4.0M gzipped, 12.7M uncompressed ]
- etc11 This distribution set contains the system
+ etc20 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -50,35 +46,26 @@ subdirectory of the OpenBSD 1.1 distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 50K gzipped, 280K uncompressed ]
- games11 This set includes the games and their manual pages.
+ games20 This set includes the games and their manual pages.
[ 1.0M gzipped, 3.0M uncompressed ]
- man11 This set includes all of the manual pages for the
+ man20 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 0.7M gzipped, 2.8M uncompressed ]
- misc11 This set includes the system dictionaries (which are
+ misc20 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.6M gzipped, 5.7M uncompressed ]
- text11 This set includes OpenBSD's text processing tools,
+ text20 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 0.8M gzipped, 2.9M uncompressed ]
-The mac68k security distribution set is named "secr11" and can be found
-in the "mac68k/security" subdirectory of the OpenBSD 1.1 distribution
-tree. It contains the crypt libraries (for the DES encryption algorithm)
-and the binaries which depend on it. It can only be found on those sites
-which carry the complete OpenBSD distribution and that can legally obtain
-it. (Remember, because of United States law, this distribution set may
-not be exported to locations outside of the United States and Canada.)
-[ 109K gzipped, 260K uncompressed ]
-
The mac68k binary distribution sets are distributed in the same form as
the source distribution sets; catted together, the members of a set
form a gzipped tar file.
diff --git a/distrib/notes/mac68k/legal b/distrib/notes/mac68k/legal
index 38de539c961..e69de29bb2d 100644
--- a/distrib/notes/mac68k/legal
+++ b/distrib/notes/mac68k/legal
@@ -1,33 +0,0 @@
- This product includes software developed by the Alice Group.
-
- This product includes software developed by Christopher G. Demetriou.
-
- This product includes software developed by Christian E. Hopps.
-
-
-Contributions:
--------------
-
-The following people have made contributions of various sorts
-specificially for the Macintosh port (in alphabetical order):
-
- All of the users who have supplied us with good bug reports and
- moral support.
- Scott Kaplan for lending his IIci and Kensington Turbo Mouse for
- IIci/IIsi banked memory and internal video as well as
- non-Apple ADB devices.
- Markus Krummenacker for monetary donations.
- Glan Lalonde for an invaluable IIci page table dump.
- Brad Parker for serial and ethernet drivers/improvements.
- Scott Redman for lending Brad Grantham a PowerBook 160.
- Craig Ruff for assembling an '030 "pmove ttx" instruction.
- Larry Samuels for monetary donations.
- Peter Siebold for lending his IIvx in support of ADB and IIvx
- internal video.
- Schuyler Stultz for the loan of his Macintosh II when we
- desperately needed another machine on which to compile
- and test during the '93 Xmas vacation.
- Tenon Intersystems for monetary donations, MachTen, and Brad's
- access to several machines and documentation after hours.
- Virginia Tech English Department for loan of a IIci w/ NuBus
- video and 32MB of RAM--the first IIci to run NetBSD/Mac68k.
diff --git a/distrib/notes/pc532/legal b/distrib/notes/pc532/legal
index cdc135958a6..e69de29bb2d 100644
--- a/distrib/notes/pc532/legal
+++ b/distrib/notes/pc532/legal
@@ -1,106 +0,0 @@
-
- This product includes software developed by the Alice Group.
-
- This product includes software developed by Philip L. Budne.
-
- This product includes software developed by Christopher G. Demetriou.
-
- This product includes software developed by Philip A. Nelson.
-
- This product includes software developed by Matthias Pfaller.
-
- This product includes software at the Helsinki University of
- Technology.
-
-Some files have the following copyright:
-/*
- * Copyright (c) 1992 Helsinki University of Technology
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * HELSINKI UNIVERSITY OF TECHNOLOGY ALLOWS FREE USE OF THIS SOFTWARE IN
- * ITS "AS IS" CONDITION. HELSINKI UNIVERSITY OF TECHNOLOGY DISCLAIMS ANY
- * LIABILITY OF ANY KIND FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE
- * USE OF THIS SOFTWARE.
- */
-
-
-At least one file contains:
-
- * Copyright 1990 by Open Software Foundation,
- * Grenoble, FRANCE
- *
- * All Rights Reserved
- *
- * Permission to use, copy, modify, and distribute this software and
- * its documentation for any purpose and without fee is hereby granted,
- * provided that the above copyright notice appears in all copies and
- * that both the copyright notice and this permission notice appear in
- * supporting documentation, and that the name of OSF or Open Software
- * Foundation not be used in advertising or publicity pertaining to
- * distribution of the software without specific, written prior
- * permission.
- *
- * OSF DISCLAIMS ALL WARRANTIES WITH REGARD TO THIS SOFTWARE
- * INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS,
- * IN NO EVENT SHALL OSF BE LIABLE FOR ANY SPECIAL, INDIRECT, OR
- * CONSEQUENTIAL DAMAGES OR ANY DAMAGES WHATSOEVER RESULTING FROM
- * LOSS OF USE, DATA OR PROFITS, WHETHER IN ACTION OF CONTRACT,
- * NEGLIGENCE, OR OTHER TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION
- * WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
- */
-
-
-Some files have the following copyright:
-
-/*
- * Mach Operating System
- * Copyright (c) 1992 Carnegie Mellon University
- * Copyright (c) 1992 Helsinki University of Technology
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * CARNEGIE MELLON AND HELSINKI UNIVERSITY OF TECHNOLOGY ALLOW FREE USE
- * OF THIS SOFTWARE IN ITS "AS IS" CONDITION. CARNEGIE MELLON AND
- * HELSINKI UNIVERSITY OF TECHNOLOGY DISCLAIM ANY LIABILITY OF ANY KIND
- * FOR ANY DAMAGES WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- *
- * Carnegie Mellon requests users of this software to return to
- *
- * Software Distribution Coordinator or Software.Distribution@CS.CMU.EDU
- * School of Computer Science
- * Carnegie Mellon University
- * Pittsburgh PA 15213-3890
- *
- * any improvements or extensions that they make and grant Carnegie Mellon
- * the rights to redistribute these changes.
- */
-
-The IEEE floating point support in /usr/src/sys/arch/pc532/fpu has
-the following copyright:
-
-/*
- * IEEE floating point support for NS32081 and NS32381 fpus.
- * Copyright (c) 1995 Ian Dall
- * All Rights Reserved.
- *
- * Permission to use, copy, modify and distribute this software and its
- * documentation is hereby granted, provided that both the copyright
- * notice and this permission notice appear in all copies of the
- * software, derivative works or modified versions, and any portions
- * thereof, and that both notices appear in supporting documentation.
- *
- * IAN DALL ALLOWS FREE USE OF THIS SOFTWARE IN ITS "AS IS" CONDITION.
- * IAN DALL DISCLAIMS ANY LIABILITY OF ANY KIND FOR ANY DAMAGES
- * WHATSOEVER RESULTING FROM THE USE OF THIS SOFTWARE.
- */
diff --git a/distrib/notes/sparc/contents b/distrib/notes/sparc/contents
index f0086b18e34..8bffed4befb 100644
--- a/distrib/notes/sparc/contents
+++ b/distrib/notes/sparc/contents
@@ -2,15 +2,11 @@ The sparc-specific portion of the OpenBSD RELEASE release is found in the
"sparc" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../OpenBSD-RELEASE/sparc/
- binary/ sparc binary distribution sets;
- see below.
-
- security/ sparc security distribution;
- see below;
-
- install/ Base GENERIC kernels, tools,
- and installation script.
+.../2.0/sparc/
+ bins/ sparc binary distribution sets;
+ see below.
+ inst/ Base GENERIC kernels, tools,
+ and installation script.
The OpenBSD/sparc binary distribution sets contain the binaries which
comprise the OpenBSD RELEASE release for the sparc. There are seven binary
@@ -18,7 +14,7 @@ distribution sets, and the "security" distribution set. The binary
distribution sets can be found in subdirectories of the "sparc/binary"
subdirectory of the OpenBSD RELEASE distribution tree, and are as follows:
- base11 The OpenBSD/sparc RELEASE base binary distribution. You
+ base20 The OpenBSD/sparc RELEASE base binary distribution. You
MUST install this distribution set. It contains the
base OpenBSD utilities that are necessary for the
system to run and be minimally functional. It
@@ -26,8 +22,8 @@ subdirectory of the OpenBSD RELEASE distribution tree, and are as follows:
everything described below.
[ 8.0M gzipped, 24.4M uncompressed ]
- comp11 The OpenBSD/sparc Compiler tools. All of the tools
- relating to C, C++, and FORTRAN (yes, there are two!).
+ comp20 The OpenBSD/sparc Compiler tools. All of the tools
+ relating to C, C++, and FORTRAN.
This set includes the system include files
(/usr/include), the linker, the compiler tool chain,
and the various system libraries (except the shared
@@ -37,7 +33,7 @@ subdirectory of the OpenBSD RELEASE distribution tree, and are as follows:
call and library manual pages.
[ 5.4M gzipped, 17.6M uncompressed ]
- etc11 This distribution set contains the system
+ etc20 This distribution set contains the system
configuration files that reside in /etc and in several
other places. This set MUST be installed if you are
installing the system from scratch, but should NOT be
@@ -46,35 +42,26 @@ subdirectory of the OpenBSD RELEASE distribution tree, and are as follows:
CAREFULLY upgrade your configuration files by hand.)
[ 62K gzipped, 338K uncompressed ]
- games11 This set includes the games and their manual pages.
+ games20 This set includes the games and their manual pages.
[ 2.9M gzipped, 7.4M uncompressed ]
- man11 This set includes all of the manual pages for the
+ man20 This set includes all of the manual pages for the
binaries and other software contained in the base set.
Note that it does not include any of the manual pages
that are included in the other sets.
[ 0.8M gzipped, 3.3M uncompressed ]
- misc11 This set includes the system dictionaries (which are
+ misc20 This set includes the system dictionaries (which are
rather large), the typesettable document set, and
man pages for other architectures which happen to be
installed from the source tree by default.
[ 1.9M gzipped, 6.6M uncompressed ]
- text11 This set includes OpenBSD's text processing tools,
+ text20 This set includes OpenBSD's text processing tools,
including groff, all related programs, and their
manual pages.
[ 0.8M gzipped, 3.1M uncompressed ]
-The sparc security distribution set is named "secr11" and can be found
-in the "sparc/security" subdirectory of the OpenBSD RELEASE distribution
-tree. It contains crypt.c (the source file for the DES encryption
-algorithm) and the binaries which depend on it. It can only be found
-on those sites which carry the complete OpenBSD distribution and that
-can legally obtain it. (Remember, because of United States law, this
-distribution set may not be exported to locations outside of the
-United States and Canada.) [ 127K gzipped, 337K uncompressed ]
-
The sparc binary distribution sets are distributed in the same form as
the source distribution sets; catted together, the members of a set
form a gzipped tar file. Each sparc binary distribution set also has
diff --git a/distrib/notes/sparc/legal b/distrib/notes/sparc/legal
index d82afb8856f..e69de29bb2d 100644
--- a/distrib/notes/sparc/legal
+++ b/distrib/notes/sparc/legal
@@ -1,17 +0,0 @@
- This product includes software developed by the Alice Group.
-
- This product includes software developed by Charles D. Cranor.
-
- This product includes software developed by Peter Galbavy.
-
- This product includes software developed by Rolf Grossmann.
-
- This product includes software developed by David Miller.
-
- This product includes software developed by Gordon W. Ross.
-
- This product includes software developed by Charles Hannum, by the
- University of Vermont and State Agricultural College and Garrett A.
- Wollman, by William F. Jolitz, and by the University of California,
- Berkeley, Lawrence Berkeley Laboratory, and its contributors.
-
diff --git a/distrib/notes/sun3/contents b/distrib/notes/sun3/contents
index 21878bcc774..6a98311b774 100644
--- a/distrib/notes/sun3/contents
+++ b/distrib/notes/sun3/contents
@@ -3,7 +3,7 @@ The sun3-specific portion of the OpenBSD 1.1 release is found in the
"sun3" subdirectory of the distribution. That subdirectory is laid
out as follows:
-.../OpenBSD-1.1/sun3/
+.../2.0/sun3/
INSTALL.txt Installation notes; this file.
install/ Boot programs, a GENERIC kernel,
diff --git a/distrib/notes/sun3/legal b/distrib/notes/sun3/legal
index e237de43806..e69de29bb2d 100644
--- a/distrib/notes/sun3/legal
+++ b/distrib/notes/sun3/legal
@@ -1,16 +0,0 @@
-
- This product includes software developed by the Computer
- Systems Laboratory at the University of Utah.
-
- This product includes software developed by the University of
- Vermont and State Agricultural College and Garrett A. Wollman.
-
- This product includes software developed by Charles D. Cranor.
-
- This product includes software developed by Adam Glass.
-
- This product includes software developed by Charles Hannum.
-
- This product includes software developed by David Jones.
-
- This product includes software developed by Gordon W. Ross.