From de8ea3c7ed33750e2858a5eb852d2c49112ed4be Mon Sep 17 00:00:00 2001 From: deraadt Date: Sat, 17 Feb 2024 16:13:24 +0000 Subject: [PATCH] move to 7.5-beta --- etc/root/root.mail | 6 +++--- share/mk/sys.mk | 4 ++-- sys/arch/macppc/stand/tbxidata/bsd.tbxi | 4 ++-- sys/conf/newvers.sh | 8 ++++---- sys/sys/param.h | 6 +++--- usr.bin/signify/signify.1 | 8 ++++---- 6 files changed, 18 insertions(+), 18 deletions(-) diff --git a/etc/root/root.mail b/etc/root/root.mail index a73032b7cd5..72f64a3e99e 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From deraadt@do-not-reply.openbsd.org Mon Oct 16 07:04:00 MDT 2023 +From deraadt@do-not-reply.openbsd.org Mon Apr 4 07:05:00 MDT 2024 Return-Path: root -Date: Oct 16 07:04:00 MDT 2023 +Date: Apr 4 07:05:00 MDT 2024 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 7.4! +Subject: Welcome to OpenBSD 7.5! 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 f30ba4453af..91f33d4fa09 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.94 2023/09/18 13:16:13 deraadt Exp $ +# $OpenBSD: sys.mk,v 1.95 2024/02/17 16:13:24 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= 4 +OSMINOR= 5 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 b694435a51f..1f51c8da774 100644 --- a/sys/arch/macppc/stand/tbxidata/bsd.tbxi +++ b/sys/arch/macppc/stand/tbxidata/bsd.tbxi @@ -1,6 +1,6 @@ -/* $OpenBSD: bsd.tbxi,v 1.51 2023/09/18 13:16:13 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.52 2024/02/17 16:13:24 deraadt Exp $ */ /* * Copyright (c) 2001 Dale Rahn. * All rights reserved. @@ -34,7 +34,7 @@ MacRISC MacRISC3 MacRISC4 OpenBSD/macppc bootloader -boot cd:,ofwboot /7.4/macppc/bsd.rd +boot cd:,ofwboot /7.5/macppc/bsd.rd 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d0c1f277441..d982abe183c 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.200 2024/01/02 16:40:03 bluhm Exp $ +# $OpenBSD: newvers.sh,v 1.201 2024/02/17 16:13:24 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.4" +osr="7.5" cat >vers.c < diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1 index 6795d22cef4..0e9cd3f0ab4 100644 --- a/usr.bin/signify/signify.1 +++ b/usr.bin/signify/signify.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: signify.1,v 1.57 2023/09/18 13:16:13 deraadt Exp $ +.\" $OpenBSD: signify.1,v 1.58 2024/02/17 16:13:24 deraadt Exp $ .\" .\"Copyright (c) 2013 Marc Espie .\"Copyright (c) 2013 Ted Unangst @@ -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: September 18 2023 $ +.Dd $Mdocdate: February 17 2024 $ .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-74-base.pub -x SHA256.sig +$ signify -C -p /etc/signify/openbsd-75-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-74-base.pub -x SHA256.sig bsd.rd +$ signify -C -p /etc/signify/openbsd-75-base.pub -x SHA256.sig bsd.rd .Ed .Pp Sign a gzip archive: -- 2.20.1