7.0-beta

diff --git a/etc/root/root.mail b/etc/root/root.mail
index e92d600..a3c3993 100644 (file)
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Sat May  1 06:09:00 MST 2021
+From deraadt@do-not-reply.openbsd.org Mon Nov  1 07:00:00 MST 2021
 Return-Path: root
-Date: May 1 06:09:00 MST 2021
+Date: Nov 1 07:00:00 MST 2021
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to OpenBSD 6.9!
+Subject: Welcome to OpenBSD 7.0!
 
 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 06239a2..7a85a55 100644 (file)
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: sys.mk,v 1.89 2021/02/06 21:26:19 deraadt Exp $
+#      $OpenBSD: sys.mk,v 1.90 2021/08/17 15:03:56 deraadt Exp $
 #      $NetBSD: sys.mk,v 1.27 1996/04/10 05:47:19 mycroft Exp $
 #      @(#)sys.mk      5.11 (Berkeley) 3/13/91
 
@@ -9,8 +9,8 @@
 .endif
 
 unix=          We run OpenBSD.
-OSMAJOR=       6
-OSMINOR=       9
+OSMAJOR=       7
+OSMINOR=       0
 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 1235970..1a22b96 100644 (file)
--- 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.46 2021/02/06 21:26:19 deraadt Exp $      */
+/*      $OpenBSD: bsd.tbxi,v 1.47 2021/08/17 15:03:56 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.9/macppc/bsd.rd
+boot cd:,ofwboot /7.0/macppc/bsd.rd
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 201B

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index d977cda..9fa1d21 100644 (file)
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $OpenBSD: newvers.sh,v 1.182 2021/05/02 22:10:13 bluhm Exp $
+#      $OpenBSD: newvers.sh,v 1.183 2021/08/17 15:03:55 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.9"
+osr="7.0"
 
 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 */
 #define STATUS "-stable"               /* stable branch */
 #endif
 

diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1
index a731b4a..6e8e8fb 100644 (file)
--- a/usr.bin/signify/signify.1
+++ b/usr.bin/signify/signify.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: signify.1,v 1.51 2020/08/31 16:08:28 deraadt Exp $
+.\" $OpenBSD: signify.1,v 1.52 2021/08/17 15:03:56 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: August 31 2020 $
+.Dd $Mdocdate: August 17 2021 $
 .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-69-base.pub -x SHA256.sig
+$ signify -C -p /etc/signify/openbsd-70-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-69-base.pub -x SHA256.sig bsd.rd
+$ signify -C -p /etc/signify/openbsd-70-base.pub -x SHA256.sig bsd.rd
 .Ed
 .Pp
 Sign a gzip archive: