crank to 7.4-beta

diff --git a/etc/root/root.mail b/etc/root/root.mail
index 72c837f..f65e999 100644 (file)
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Mon Apr 10 07:03:00 MDT 2023
+From deraadt@do-not-reply.openbsd.org Mon Oct 27 07:04:00 MDT 2023
 Return-Path: root
-Date: Apr 10 07:03:00 MDT 2023
+Date: Oct 27 07:04:00 MDT 2023
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to OpenBSD 7.3!
+Subject: Welcome to OpenBSD 7.4!
 
 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 3e6e392..f30ba44 100644 (file)
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#      $OpenBSD: sys.mk,v 1.93 2023/03/04 14:49:37 deraadt Exp $
+#      $OpenBSD: sys.mk,v 1.94 2023/09/18 13:16:13 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=       3
+OSMINOR=       4
 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 b102730..b694435 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.50 2023/03/04 14:49:37 deraadt Exp $      */
+/*      $OpenBSD: bsd.tbxi,v 1.51 2023/09/18 13:16:13 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.3/macppc/bsd.rd
+boot cd:,ofwboot /7.4/macppc/bsd.rd
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 201B

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 9fd2594..69211dd 100644 (file)
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#      $OpenBSD: newvers.sh,v 1.195 2023/03/25 05:49:50 deraadt Exp $
+#      $OpenBSD: newvers.sh,v 1.196 2023/09/18 13:16:13 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.3"
+osr="7.4"
 
 cat >vers.c <<eof
-#define STATUS "-current"              /* just after a release */
+#define STATUS "-beta"                 /* just before a release */
 #if 0
+#define STATUS "-current"              /* just after a release */
 #define STATUS ""                      /* release */
-#define STATUS "-beta"                 /* just before a release */
 #define STATUS "-stable"               /* stable branch */
 #endif
 

diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1
index e538583..6795d22 100644 (file)
--- a/usr.bin/signify/signify.1
+++ b/usr.bin/signify/signify.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: signify.1,v 1.56 2022/07/20 15:12:39 deraadt Exp $
+.\" $OpenBSD: signify.1,v 1.57 2023/09/18 13:16:13 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: July 20 2022 $
+.Dd $Mdocdate: September 18 2023 $
 .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-73-base.pub -x SHA256.sig
+$ signify -C -p /etc/signify/openbsd-74-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-73-base.pub -x SHA256.sig bsd.rd
+$ signify -C -p /etc/signify/openbsd-74-base.pub -x SHA256.sig bsd.rd
 .Ed
 .Pp
 Sign a gzip archive: