crank to 6.8-beta

6 files changed, 18 insertions, 18 deletions

diff --git a/etc/root/root.mail b/etc/root/root.mail
index d7e31a1ca3e..be8eac295a7 100644
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Tue May 19 06:07:00 MST 2020
+From deraadt@do-not-reply.openbsd.org Tue Oct 10 06:07:00 MST 2020
 Return-Path: root
-Date: May 19 06:07:00 MST 2020
+Date: Oct 10 06:07:00 MST 2020
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to OpenBSD 6.7!
+Subject: Welcome to OpenBSD 6.8!
 
 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
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 93674d73c27..fe19629fa19 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: sys.mk,v 1.87 2020/04/05 06:34:19 deraadt Exp $
+#	$OpenBSD: sys.mk,v 1.88 2020/08/31 16:08:28 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=	6
-OSMINOR=	7
+OSMINOR=	8
 OSREV=		$(OSMAJOR).$(OSMINOR)
 OSrev=		$(OSMAJOR)$(OSMINOR)
 
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
index e64d9836374..d58b659b38b 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.44 2020/04/05 06:34:20 deraadt Exp $      */
+/*      $OpenBSD: bsd.tbxi,v 1.45 2020/08/31 16:08:28 deraadt Exp $      */
 /*
  * Copyright (c) 2001 Dale Rahn.
  * All rights reserved.
@@ -34,7 +34,7 @@ MacRISC MacRISC3 MacRISC4
 OpenBSD/macppc bootloader
 </DESCRIPTION>
 <BOOT-SCRIPT>
-boot cd:,ofwboot /6.7/macppc/bsd.rd
+boot cd:,ofwboot /6.8/macppc/bsd.rd
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 201B
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 5c6bc5fa772..1164a7db333 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: newvers.sh,v 1.175 2020/05/07 18:46:35 deraadt Exp $
+#	$OpenBSD: newvers.sh,v 1.176 2020/08/31 16:08:28 deraadt Exp $
 #	$NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
 #
 # Copyright (c) 1984, 1986, 1990, 1993
@@ -68,13 +68,13 @@ id=`basename "${d}"`
 #	and disable POOL_DEBUG in sys/conf/GENERIC
 
 ost="OpenBSD"
-osr="6.7"
+osr="6.8"
 
 cat >vers.c <<eof
-#define STATUS "-current"		/* just after a release */
+#define STATUS "-beta"			/* just before a release */
 #if 0
 #define STATUS ""			/* release */
-#define STATUS "-beta"			/* just before a release */
+#define STATUS "-current"		/* just after a release */
 #endif
 
 const char ostype[] = "${ost}";
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 76c5e2fec54..579c4c99d2b 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.130 2020/04/05 06:34:20 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.131 2020/08/31 16:08:28 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -41,8 +41,8 @@
 #define BSD4_3	1
 #define BSD4_4	1
 
-#define OpenBSD	202005		/* OpenBSD version (year & month). */
-#define OpenBSD6_7 1		/* OpenBSD 6.7 */
+#define OpenBSD	202010		/* OpenBSD version (year & month). */
+#define OpenBSD6_8 1		/* OpenBSD 6.8 */
 
 #include <sys/_null.h>
 
diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1
index ab612d5efa9..a731b4a0bc2 100644
--- a/usr.bin/signify/signify.1
+++ b/usr.bin/signify/signify.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: signify.1,v 1.50 2020/04/05 06:34:20 deraadt Exp $
+.\" $OpenBSD: signify.1,v 1.51 2020/08/31 16:08:28 deraadt Exp $
 .\"
 .\"Copyright (c) 2013 Marc Espie <espie@openbsd.org>
 .\"Copyright (c) 2013 Ted Unangst <tedu@openbsd.org>
@@ -14,7 +14,7 @@
 .\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
 .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
-.Dd $Mdocdate: April 5 2020 $
+.Dd $Mdocdate: August 31 2020 $
 .Dt SIGNIFY 1
 .Os
 .Sh NAME
@@ -171,12 +171,12 @@ Verify a release directory containing
 .Pa SHA256.sig
 and a full set of release files:
 .Bd -literal -offset indent -compact
-$ signify -C -p /etc/signify/openbsd-68-base.pub -x SHA256.sig
+$ signify -C -p /etc/signify/openbsd-69-base.pub -x SHA256.sig
 .Ed
 .Pp
 Verify a bsd.rd before an upgrade:
 .Bd -literal -offset indent -compact
-$ signify -C -p /etc/signify/openbsd-68-base.pub -x SHA256.sig bsd.rd
+$ signify -C -p /etc/signify/openbsd-69-base.pub -x SHA256.sig bsd.rd
 .Ed
 .Pp
 Sign a gzip archive: