move to 7.1-beta

diff --git a/etc/root/root.mail b/etc/root/root.mail
index ec9d078..222e8ae 100644 (file)
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Thu Oct 14 07:00:00 MST 2021
+From deraadt@do-not-reply.openbsd.org Thu May  1 07:01:00 MST 2021
 Return-Path: root
-Date: Oct 14 07:00:00 MST 2021
+Date: May 1 07:01:00 MST 2021
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to OpenBSD 7.0!
+Subject: Welcome to OpenBSD 7.1!
 
 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 7a85a55..57a4c50 100644 (file)
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: sys.mk,v 1.90 2021/08/17 15:03:56 deraadt Exp $
+#      $OpenBSD: sys.mk,v 1.91 2022/02/20 17:11:05 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=       7
-OSMINOR=       0
+OSMINOR=       1
 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 1a22b96..09ddcb3 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.47 2021/08/17 15:03:56 deraadt Exp $      */
+/*      $OpenBSD: bsd.tbxi,v 1.48 2022/02/20 17:11:05 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 /7.0/macppc/bsd.rd
+boot cd:,ofwboot /7.1/macppc/bsd.rd
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 201B

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 4d6ece6..5ad0011 100644 (file)
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $OpenBSD: newvers.sh,v 1.185 2021/09/22 18:21:35 deraadt Exp $
+#      $OpenBSD: newvers.sh,v 1.186 2022/02/20 17:11:05 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="7.0"
+osr="7.1"
 
 cat >vers.c <<eof
 #define STATUS "-current"              /* just after a release */
 #if 0
-#define STATUS ""                      /* release */
 #define STATUS "-beta"                 /* just before a release */
+#define STATUS ""                      /* release */
 #define STATUS "-stable"               /* stable branch */
 #endif
 

diff --git a/sys/sys/param.h b/sys/sys/param.h
index f9e6a38..37d1556 100644 (file)
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: param.h,v 1.135 2021/09/19 16:55:01 deraadt Exp $     */
+/*     $OpenBSD: param.h,v 1.136 2022/02/20 17:11:05 deraadt Exp $     */
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -41,8 +41,8 @@
 #define BSD4_3 1
 #define BSD4_4 1
 
-#define OpenBSD        202110          /* OpenBSD version (year & month). */
-#define OpenBSD7_0 1           /* OpenBSD 7.0 */
+#define OpenBSD        202205          /* OpenBSD version (year & month). */
+#define OpenBSD7_1 1           /* OpenBSD 7.1 */
 
 #include <sys/_null.h>
 

diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1
index 9f6bd43..e973745 100644 (file)
--- a/usr.bin/signify/signify.1
+++ b/usr.bin/signify/signify.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: signify.1,v 1.54 2022/01/05 17:39:25 jmc Exp $
+.\" $OpenBSD: signify.1,v 1.55 2022/02/20 17:11:05 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: January 5 2022 $
+.Dd $Mdocdate: February 20 2022 $
 .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-71-base.pub -x SHA256.sig
+$ signify -C -p /etc/signify/openbsd-72-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-71-base.pub -x SHA256.sig bsd.rd
+$ signify -C -p /etc/signify/openbsd-72-base.pub -x SHA256.sig bsd.rd
 .Ed
 .Pp
 Sign a gzip archive: