diff options
| -rw-r--r-- | etc/root/root.mail | 6 | ||||
| -rw-r--r-- | share/mk/sys.mk | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/tbxidata/bsd.tbxi | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 8 | ||||
| -rw-r--r-- | sys/sys/param.h | 6 | ||||
| -rw-r--r-- | 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 3ab7e39d890..f64b14ae75a 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From deraadt@do-not-reply.openbsd.org Wed Nov 1 06:30:00 MST 2019 +From deraadt@do-not-reply.openbsd.org Wed May 1 06:30:00 MST 2019 Return-Path: root -Date: Nov 1 06:30:00 MST 2019 +Date: May 1 06:30:00 MST 2019 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 6.6! +Subject: Welcome to OpenBSD 6.7! 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 22ce114c716..93674d73c27 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.86 2019/08/10 03:56:02 deraadt Exp $ +# $OpenBSD: sys.mk,v 1.87 2020/04/05 06:34:19 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= 6 +OSMINOR= 7 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 60583fe9b05..e64d9836374 100644 --- 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.43 2019/08/10 03:56:02 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.44 2020/04/05 06:34:20 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.6/macppc/bsd.rd +boot cd:,ofwboot /6.7/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 8f8f7a2bd8f..245903e9e45 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.172 2019/10/12 14:42:51 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.173 2020/04/05 06:34:20 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.6" +osr="6.7" 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 */ #endif const char ostype[] = "${ost}"; diff --git a/sys/sys/param.h b/sys/sys/param.h index 7e12b16abb9..76c5e2fec54 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.129 2019/08/10 03:56:02 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.130 2020/04/05 06:34:20 deraadt Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 201911 /* OpenBSD version (year & month). */ -#define OpenBSD6_6 1 /* OpenBSD 6.6 */ +#define OpenBSD 202005 /* OpenBSD version (year & month). */ +#define OpenBSD6_7 1 /* OpenBSD 6.7 */ #include <sys/_null.h> diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1 index 511209a735a..ab612d5efa9 100644 --- a/usr.bin/signify/signify.1 +++ b/usr.bin/signify/signify.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: signify.1,v 1.49 2020/01/21 12:13:21 tb Exp $ +.\" $OpenBSD: signify.1,v 1.50 2020/04/05 06:34:20 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 21 2020 $ +.Dd $Mdocdate: April 5 2020 $ .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-67-base.pub -x SHA256.sig +$ signify -C -p /etc/signify/openbsd-68-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-67-base.pub -x SHA256.sig bsd.rd +$ signify -C -p /etc/signify/openbsd-68-base.pub -x SHA256.sig bsd.rd .Ed .Pp Sign a gzip archive: |