crank to 6.4-beta

diff --git a/etc/root/root.mail b/etc/root/root.mail
index e961962..0567057 100644 (file)
--- 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 4542ec7..80c1013 100644 (file)
--- 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 4f16fcc..c4b4778 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.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
 </DESCRIPTION>
 <BOOT-SCRIPT>
-boot cd:,ofwboot /6.3/macppc/bsd.rd
+boot cd:,ofwboot /6.4/macppc/bsd.rd
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 201B

diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 21a647f..b20a726 100644 (file)
--- 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 <<eof
-#define STATUS "-current"              /* just after a release */
-#if 0
 #define STATUS "-beta"                 /* just before a release */
+#if 0
+#define STATUS "-current"              /* just after a release */
 #define STATUS ""                      /* release */
 #endif
 

diff --git a/sys/sys/param.h b/sys/sys/param.h
index d03b8ca..a09e906 100644 (file)
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*     $OpenBSD: param.h,v 1.126 2018/02/28 14:56:46 deraadt Exp $     */
+/*     $OpenBSD: param.h,v 1.127 2018/08/10 20:27:01 deraadt Exp $     */
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -41,8 +41,8 @@
 #define BSD4_3 1
 #define BSD4_4 1
 
-#define OpenBSD        201805          /* OpenBSD version (year & month). */
-#define OpenBSD6_3 1           /* OpenBSD 6.3 */
+#define OpenBSD        201811          /* OpenBSD version (year & month). */
+#define OpenBSD6_4 1           /* OpenBSD 6.4 */
 
 #include <sys/_null.h>
 

diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1
index 1e2f61e..de3b433 100644 (file)
--- 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 <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: 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: