move to 3.2-beta

8 files changed, 25 insertions, 22 deletions

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index 0badce13a94..643cb419611 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.253 2002/08/27 02:27:07 krw Exp $
+#	$OpenBSD: install.sub,v 1.254 2002/09/10 21:36:56 deraadt Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2002 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1990,7 +1990,7 @@ __EOT
 
 ROOTDISK=
 ROOTDEV=
-VERSION=31
+VERSION=32
 VERSION_MAJOR=$(( $VERSION / 10 ))
 VERSION_MINOR=$(( $VERSION % 10 ))
 export VERSION VERSION_MAJOR VERSION_MINOR
diff --git a/etc/root/root.mail b/etc/root/root.mail
index f0d84c1fa8b..8ab68ba485e 100644
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Sat Jun  1 11:48:48 MDT 2002
+From deraadt@do-not-reply.openbsd.org Sat Nov  1 11:48:48 MST 2002
 Return-Path: root
-Date: Jun 1 11:48:48 MDT 2002
+Date: Nov 1 11:48:48 MST 2002
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to OpenBSD 3.1!  Secure by Default!
+Subject: Welcome to OpenBSD 3.2!  Secure by Default!
 
 This message attempts to describe the most basic initial questions that a
 system administrator of an OpenBSD box might have.  You are urged to save
@@ -26,7 +26,7 @@ further information regarding configuration in the file /usr/X11R6/README.
 
 Several popular binary packages (pre-compiled applications) are available
 for most architectures.  If you installed from a CD-ROM the packages
-are on the same CD-ROM you installed from in the directory 3.1/packages.
+are on the same CD-ROM you installed from in the directory 3.2/packages.
 
 CD-ROM Space permitted us to include a subset of the following packages
 for the most common architectures.  Please see the FTP sites if you find
@@ -883,17 +883,17 @@ something you need missing.
    zsnes-1.337.tgz
 
 These and many other packages are also available via ftp at
-      ftp://ftp.openbsd.org/pub/OpenBSD/3.1/packages/
+      ftp://ftp.openbsd.org/pub/OpenBSD/3.2/packages/
 If you do not find a package you want on the CD, please go look at your
 nearest FTP mirror site.
 
 Select your architecture and download the tarballs of your choice.  For example
 to install the emacs package for i386, execute:
   # mount /dev/cd0a /cdrom
-  # pkg_add -v /cdrom/3.1/packages/i386/emacs-20.7.tgz
+  # pkg_add -v /cdrom/3.2/packages/i386/emacs-20.7.tgz
 or alternatively install them via FTP this way:
   # pkg_add -v \
-    ftp://ftp.openbsd.org/pub/OpenBSD/3.1/packages/i386/emacs-20.7.tgz
+    ftp://ftp.openbsd.org/pub/OpenBSD/3.2/packages/i386/emacs-20.7.tgz
 
 You are STRONGLY urged to use ssh instead of telnet, rlogin, or rsh!  ssh is
 included in all OpenBSD systems.  The implementation is OpenSSH, which we are
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 77975b28d08..b3d920ef089 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: sys.mk,v 1.29 2002/03/22 23:29:28 deraadt Exp $
+#	$OpenBSD: sys.mk,v 1.30 2002/09/10 21:36:57 deraadt Exp $
 #	$NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $
 #	@(#)sys.mk	5.11 (Berkeley) 3/13/91
 
@@ -10,7 +10,7 @@
 
 unix=		We run OpenBSD.
 OSMAJOR=	3
-OSMINOR=	1
+OSMINOR=	2
 OSREV=		$(OSMAJOR).$(OSMINOR)
 OSrev=		$(OSMAJOR)$(OSMINOR)
 
diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index 42e1b16f57f..37f17632704 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-common,v 1.28 2002/07/07 09:02:30 jufi Exp $
+.\"	$OpenBSD: doc-common,v 1.29 2002/09/10 21:36:57 deraadt Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -200,7 +200,7 @@
 .de Os
 .ds oS Null
 .if "\\$1"" \{\
-.	ds oS OpenBSD 3.1
+.	ds oS OpenBSD 3.2
 .\}
 .if "\\$2"" \{\
 .	ds aa Non-Null
@@ -266,6 +266,7 @@
 .	if "\\$2"2.9"  .as oS \02.9
 .	if "\\$2"3.0"  .as oS \03.0
 .	if "\\$2"3.1"  .as oS \03.1
+.	if "\\$2"3.2"  .as oS \03.2
 .\}
 .if "\\*(oS"Null" .ds oS \0\\$1
 .if "\\*(aa"Non-Null" .as oS \0\\$2
diff --git a/share/tmac/mdoc/doc-syms b/share/tmac/mdoc/doc-syms
index aaa99a660cc..4b65821807d 100644
--- a/share/tmac/mdoc/doc-syms
+++ b/share/tmac/mdoc/doc-syms
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-syms,v 1.41 2002/05/11 15:26:45 millert Exp $
+.\"	$OpenBSD: doc-syms,v 1.42 2002/09/10 21:36:57 deraadt Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -196,6 +196,7 @@
 .	if "\\$1"3.0"  \&OpenBSD 3.0\\*(aa\\$2
 .	if "\\$1"3.1"  \&OpenBSD 3.1\\*(aa\\$2
 .	if "\\$1"3.2"  \&OpenBSD 3.2\\*(aa\\$2
+.	if "\\$1"3.3"  \&OpenBSD 3.3\\*(aa\\$2
 .\}
 .if \\n(.$==1 \{\
 .	if "\\$1"1.2"  \&OpenBSD 1.2\\*(aa
@@ -212,6 +213,7 @@
 .	if "\\$1"3.0"  \&OpenBSD 3.0\\*(aa
 .	if "\\$1"3.1"  \&OpenBSD 3.1\\*(aa
 .	if "\\$1"3.2"  \&OpenBSD 3.2\\*(aa
+.	if "\\$1"3.3"  \&OpenBSD 3.3\\*(aa
 .	if "\\$1"."    \&OpenBSD\\$1\\*(aa
 .	if "\\$1","    \&OpenBSD\\$1\\*(aa
 .\}
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
index 256c0317a92..e272fe3a521 100644
--- a/sys/arch/macppc/stand/tbxidata/bsd.tbxi
+++ b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
@@ -1,6 +1,6 @@
 <CHRP-BOOT>
 <LICENSE>
-/*      $OpenBSD: bsd.tbxi,v 1.5 2002/04/01 02:05:27 drahn Exp $      */
+/*      $OpenBSD: bsd.tbxi,v 1.6 2002/09/10 21:36:57 deraadt Exp $      */
 /*
  * Copyright (c) 2001 Dale Rahn. All rights reserved.
  *
@@ -38,7 +38,7 @@ MacRISC
 OpenBSD/macppc bootloader
 </DESCRIPTION>
 <BOOT-SCRIPT>
-boot cd:,ofwboot /3.1/macppc/bsd.rd
+boot cd:,ofwboot /3.2/macppc/bsd.rd
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 201B
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index f776caea222..f68e1bd5daf 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: newvers.sh,v 1.43 2002/04/17 02:09:01 deraadt Exp $
+#	$OpenBSD: newvers.sh,v 1.44 2002/09/10 21:36:57 deraadt Exp $
 #	$NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
@@ -65,7 +65,7 @@ id=`basename ${d}`
 #		change	/X.X/macppc/bsd.rd
 
 ost="OpenBSD"
-osr="3.1"
+osr="3.2"
 
 cat >vers.c <<eof
 const char ostype[] = "${ost}";
@@ -73,7 +73,7 @@ const char osrelease[] = "${osr}";
 const char osversion[] = "${id}#${v}";
 const char sccs[8] = { ' ', ' ', ' ', ' ', '@', '(', '#', ')' };
 const char version[] =
-    "${ost} ${osr}-current (${id}) #${v}: ${t}\n    ${u}@${h}:${d}\n";
+    "${ost} ${osr}-beta (${id}) #${v}: ${t}\n    ${u}@${h}:${d}\n";
 eof
 
 expr ${v} + 1 > version
diff --git a/sys/sys/param.h b/sys/sys/param.h
index a1f6591d4d1..959f70289fa 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.48 2002/04/24 21:53:12 espie Exp $	*/
+/*	$OpenBSD: param.h,v 1.49 2002/09/10 21:36:57 deraadt Exp $	*/
 /*	$NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $	*/
 
 /*-
@@ -45,8 +45,8 @@
 #define BSD4_3	1
 #define BSD4_4	1
 
-#define OpenBSD	200206		/* OpenBSD version (year & month). */
-#define OpenBSD3_1 1		/* OpenBSD 3.1 */
+#define OpenBSD	200211		/* OpenBSD version (year & month). */
+#define OpenBSD3_2 1		/* OpenBSD 3.2 */
 
 #ifndef NULL
 #ifdef 	__GNUG__