From d1d999610aa4f5e16fd0872086b30a963fac84fe Mon Sep 17 00:00:00 2001
From: deraadt <deraadt@openbsd.org>
Date: Sat, 6 Feb 2021 21:26:19 +0000
Subject: [PATCH] 6.9-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 +++---
 5 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/etc/root/root.mail b/etc/root/root.mail
index ab4d6f89c94..01f13fb271f 100644
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Tue Oct 18 06:08:00 MST 2020
+From deraadt@do-not-reply.openbsd.org Tue May 1 06:08:00 MST 2021
 Return-Path: root
-Date: Oct 18 06:08:00 MST 2020
+Date: May 1 06:08:00 MST 2021
 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
 To: root
-Subject: Welcome to OpenBSD 6.8!
+Subject: Welcome to OpenBSD 6.9!
 
 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 fe19629fa19..06239a2b91f 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-#	$OpenBSD: sys.mk,v 1.88 2020/08/31 16:08:28 deraadt Exp $
+#	$OpenBSD: sys.mk,v 1.89 2021/02/06 21:26: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=	8
+OSMINOR=	9
 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 d58b659b38b..12359705adf 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.45 2020/08/31 16:08:28 deraadt Exp $      */
+/*      $OpenBSD: bsd.tbxi,v 1.46 2021/02/06 21:26:19 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.8/macppc/bsd.rd
+boot cd:,ofwboot /6.9/macppc/bsd.rd
 </BOOT-SCRIPT>
 <OS-BADGE-ICONS>
 201B
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index e478d3c5490..1c859b91e02 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
 #!/bin/sh -
 #
-#	$OpenBSD: newvers.sh,v 1.178 2020/09/30 14:46:02 jsg Exp $
+#	$OpenBSD: newvers.sh,v 1.179 2021/02/06 21:26:19 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.8"
+osr="6.9"
 
 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 579c4c99d2b..8060c52bab2 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/*	$OpenBSD: param.h,v 1.131 2020/08/31 16:08:28 deraadt Exp $	*/
+/*	$OpenBSD: param.h,v 1.132 2021/02/06 21:26:19 deraadt Exp $	*/
 
 /*-
  * Copyright (c) 1982, 1986, 1989, 1993
@@ -41,8 +41,8 @@
 #define BSD4_3	1
 #define BSD4_4	1
 
-#define OpenBSD	202010		/* OpenBSD version (year & month). */
-#define OpenBSD6_8 1		/* OpenBSD 6.8 */
+#define OpenBSD	202105		/* OpenBSD version (year & month). */
+#define OpenBSD6_9 1		/* OpenBSD 6.9 */
 
 #include <sys/_null.h>
 
-- 
2.20.1