From 0a50de1a3cb5943cb4082118a164f9e6293a214c Mon Sep 17 00:00:00 2001 From: deraadt Date: Fri, 10 Aug 2018 20:27:01 +0000 Subject: [PATCH] crank to 6.4-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 e9619625290..0567057b8ad 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From deraadt@do-not-reply.openbsd.org Sun Apr 15 06:30:00 MDT 2018 +From deraadt@do-not-reply.openbsd.org Sun Nov 1 06:30:00 MDT 2018 Return-Path: root -Date: Apr 15 06:30:00 MDT 2018 +Date: Nov 1 06:30:00 MDT 2018 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 6.3! +Subject: Welcome to OpenBSD 6.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 4542ec77f24..80c10139cd3 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.83 2018/02/28 14:56:46 deraadt Exp $ +# $OpenBSD: sys.mk,v 1.84 2018/08/10 20:27:01 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= 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 4f16fccc885..c4b47788324 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.40 2018/02/28 14:56:46 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.41 2018/08/10 20:27:01 deraadt Exp $ */ /* * Copyright (c) 2001 Dale Rahn. * All rights reserved. @@ -34,7 +34,7 @@ MacRISC MacRISC3 MacRISC4 OpenBSD/macppc bootloader -boot cd:,ofwboot /6.3/macppc/bsd.rd +boot cd:,ofwboot /6.4/macppc/bsd.rd 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 21a647f5605..b20a72699bd 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.162 2018/03/27 06:10:05 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.163 2018/08/10 20:27:01 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,12 +68,12 @@ id=`basename "${d}"` # and disable POOL_DEBUG in sys/conf/GENERIC ost="OpenBSD" -osr="6.3" +osr="6.4" cat >vers.c < diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1 index 1e2f61ec309..de3b433e3b0 100644 --- a/usr.bin/signify/signify.1 +++ b/usr.bin/signify/signify.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: signify.1,v 1.43 2018/02/28 14:56:46 deraadt Exp $ +.\" $OpenBSD: signify.1,v 1.44 2018/08/10 20:27:01 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: February 28 2018 $ +.Dd $Mdocdate: August 10 2018 $ .Dt SIGNIFY 1 .Os .Sh NAME @@ -165,12 +165,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-64-base.pub -x SHA256.sig +$ signify -C -p /etc/signify/openbsd-65-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-64-base.pub -x SHA256.sig bsd.rd +$ signify -C -p /etc/signify/openbsd-65-base.pub -x SHA256.sig bsd.rd .Ed .Pp Sign a gzip archive: -- 2.20.1