move to 3.6-beta

8 files changed, 26 insertions, 23 deletions

diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub
index ac125111cd2..5c5e4ec32ca 100644
--- a/distrib/miniroot/install.sub
+++ b/distrib/miniroot/install.sub
@@ -1,4 +1,4 @@
-#	$OpenBSD: install.sub,v 1.350 2004/07/25 03:33:04 krw Exp $
+#	$OpenBSD: install.sub,v 1.351 2004/08/09 18:08:50 deraadt Exp $
 #	$NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $
 #
 # Copyright (c) 1997-2004 Todd Miller, Theo de Raadt, Ken Westerback
@@ -1733,7 +1733,7 @@ __EOT
 ROOTDISK=
 ROOTDEV=
 
-VERSION=35
+VERSION=36
 
 VNAME="$(( $VERSION / 10 )).$(( $VERSION % 10 ))"
 SETDIR="$VNAME/$ARCH"
diff --git a/etc/root/root.mail b/etc/root/root.mail
index ae36e2c884e..2c17ed21738 100644
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Sat May  1 11:48:48 MST 2004
+From deraadt@do-not-reply.openbsd.org Sat Nov  1 11:48:48 MDT 2004
 Return-Path: root
-Date: May 1 11:48:48 MST 2004
+Date: Nov 1 11:48:48 MDT 2004
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to OpenBSD 3.5!  Secure by Default!
+Subject: Welcome to OpenBSD 3.6!  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
@@ -27,7 +27,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.5/packages.
+are on the same CD-ROM you installed from in the directory 3.6/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
@@ -1200,16 +1200,16 @@ something you need missing.
   zsnes-1.36.tgz                          
 
 These and many other packages are also available via ftp at
-      ftp://ftp.openbsd.org/pub/OpenBSD/3.5/packages/
+      ftp://ftp.openbsd.org/pub/OpenBSD/3.6/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.5/packages/i386/emacs-20.7.tgz
+ # pkg_add -v /cdrom/3.6/packages/i386/emacs-20.7.tgz
 or alternatively install them via FTP this way:
- # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/3.5/packages/i386/emacs-20.7.tgz
+ # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/3.6/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 f493e8f8ad3..39a90a3b7e7 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: sys.mk,v 1.37 2004/04/05 19:17:25 miod Exp $
+#	$OpenBSD: sys.mk,v 1.38 2004/08/09 18:08:51 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=	5
+OSMINOR=	6
 OSREV=		$(OSMAJOR).$(OSMINOR)
 OSrev=		$(OSMAJOR)$(OSMINOR)
 
diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index aa5f8a363e0..6caf22323ce 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-common,v 1.38 2004/06/06 22:38:10 jmc Exp $
+.\"	$OpenBSD: doc-common,v 1.39 2004/08/09 18:08:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -203,7 +203,7 @@
 .de Os
 .ds oS Null
 .if "\\$1"" \{\
-.	ds oS OpenBSD 3.5
+.	ds oS OpenBSD 3.6
 .\}
 .if "\\$2"" \{\
 .	ds aa Non-Null
@@ -273,6 +273,7 @@
 .	if "\\$2"3.3"  .as oS \03.3
 .	if "\\$2"3.4"  .as oS \03.4
 .	if "\\$2"3.5"  .as oS \03.5
+.	if "\\$2"3.6"  .as oS \03.6
 .\}
 .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 0a19b5d5dbc..765df80726c 100644
--- a/share/tmac/mdoc/doc-syms
+++ b/share/tmac/mdoc/doc-syms
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: doc-syms,v 1.54 2004/05/05 12:57:59 grange Exp $
+.\"	$OpenBSD: doc-syms,v 1.55 2004/08/09 18:08:51 deraadt Exp $
 .\"
 .\" Copyright (c) 1991, 1993
 .\"	The Regents of the University of California.  All rights reserved.
@@ -202,6 +202,7 @@
 .	if "\\$1"3.4"  \&OpenBSD 3.4\\*(aa\\$2
 .	if "\\$1"3.5"  \&OpenBSD 3.5\\*(aa\\$2
 .	if "\\$1"3.6"  \&OpenBSD 3.6\\*(aa\\$2
+.	if "\\$1"3.7"  \&OpenBSD 3.7\\*(aa\\$2
 .\}
 .if \\n(.$==1 \{\
 .	if "\\$1"1.2"  \&OpenBSD 1.2\\*(aa
@@ -222,6 +223,7 @@
 .	if "\\$1"3.4"  \&OpenBSD 3.4\\*(aa
 .	if "\\$1"3.5"  \&OpenBSD 3.5\\*(aa
 .	if "\\$1"3.6"  \&OpenBSD 3.6\\*(aa
+.	if "\\$1"3.7"  \&OpenBSD 3.7\\*(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 b451cc7bf08..222b2e2b5fd 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.11 2004/02/27 18:02:47 deraadt Exp $      */
+/*      $OpenBSD: bsd.tbxi,v 1.12 2004/08/09 18:09:23 deraadt Exp $      */
 /*
  * Copyright (c) 2001 Dale Rahn.
  * All rights reserved.
@@ -34,7 +34,7 @@ MacRISC MacRISC3
 OpenBSD/macppc bootloader
 </DESCRIPTION>
 <BOOT-SCRIPT>
-boot cd:,ofwboot /3.5/macppc/bsd.rd
+boot cd:,ofwboot /3.6/macppc/bsd.rd
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 201B
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 8eb3a4c1461..e12b227bae7 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: newvers.sh,v 1.62 2004/04/05 08:34:10 deraadt Exp $
+#	$OpenBSD: newvers.sh,v 1.63 2004/08/09 18:08:50 deraadt Exp $
 #	$NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
@@ -66,12 +66,12 @@ id=`basename ${d}`
 #	A month or so before release, select STATUS "-beta"
 
 ost="OpenBSD"
-osr="3.5"
+osr="3.6"
 
 cat >vers.c <<eof
-#define STATUS "-current"
-#if 0
 #define STATUS "-beta"
+#if 0
+#define STATUS "-current"
 #define STATUS ""			/* release */
 #endif
 
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 68651439d80..e72d1a1c9ba 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.55 2004/05/31 18:35:35 millert Exp $	*/
+/*	$OpenBSD: param.h,v 1.56 2004/08/09 18:08:50 deraadt Exp $	*/
 /*	$NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $	*/
 
 /*-
@@ -41,8 +41,8 @@
 #define BSD4_3	1
 #define BSD4_4	1
 
-#define OpenBSD	200405		/* OpenBSD version (year & month). */
-#define OpenBSD3_5 1		/* OpenBSD 3.5 */
+#define OpenBSD	2001005		/* OpenBSD version (year & month). */
+#define OpenBSD3_6 1		/* OpenBSD 3.6 */
 
 #ifndef NULL
 #ifdef 	__GNUG__