summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--etc/root/root.mail14
-rw-r--r--sys/arch/macppc/stand/tbxidata/bsd.tbxi4
-rw-r--r--sys/conf/newvers.sh8
-rw-r--r--sys/sys/param.h6
4 files changed, 16 insertions, 16 deletions
diff --git a/etc/root/root.mail b/etc/root/root.mail
index e2a2e9ae79b..bdcdc9334b0 100644
--- a/etc/root/root.mail
+++ b/etc/root/root.mail
@@ -1,9 +1,9 @@
-From deraadt@do-not-reply.openbsd.org Sun Oct 18 07:58:58 MST 2015
+From deraadt@do-not-reply.openbsd.org Sun May 1 07:59:59 MST 2015
Return-Path: root
-Date: Oct 18 07:58:58 MST 2015
+Date: May 1 07:59:59 MST 2016
From: deraadt@do-not-reply.openbsd.org (Theo de Raadt)
To: root
-Subject: Welcome to OpenBSD 5.8!
+Subject: Welcome to OpenBSD 5.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
@@ -27,13 +27,13 @@ find further information regarding configuration in the file /usr/X11R6/README.
Several popular binary packages (pre-compiled applications) are available
for most architectures. If you installed from a CD-ROM the packages
-are on the same CD-ROM you installed from in the directory 5.8/packages.
+are on the same CD-ROM you installed from in the directory 5.9/packages.
CD-ROM space permitted us to include a subset of the full FTP packages
for the most common architectures. Please see the FTP sites to see a
full list of packages for each architecture:
- ftp://ftp.openbsd.org/pub/OpenBSD/5.8/packages/
+ ftp://ftp.openbsd.org/pub/OpenBSD/5.9/packages/
If you do not find a package you want on the CD, please go look at your
nearest FTP mirror site.
@@ -41,9 +41,9 @@ nearest FTP mirror site.
Select your architecture and download the tarballs of your choice. For example
to install the emacs package for amd64, execute:
# mount /dev/cd0a /cdrom
- # pkg_add -v /cdrom/5.8/packages/amd64/emacs-24.5p0-no_x11.tgz
+ # pkg_add -v /cdrom/5.9/packages/amd64/emacs-24.5p0-no_x11.tgz
or alternatively install them via FTP this way:
- # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/5.8/packages/amd64/emacs-24.5p0-no_x11.tgz
+ # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/5.9/packages/amd64/emacs-24.5p0-no_x11.tgz
Significant efforts were made to centralize all system configuration in the
/etc directory. You should be able to find each of the configuration files
diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi
index 0ce96613973..033f307712b 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.35 2015/06/17 22:32:08 deraadt Exp $ */
+/* $OpenBSD: bsd.tbxi,v 1.36 2015/12/19 19:44:09 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 /5.8/macppc/bsd.rd
+boot cd:,ofwboot /5.9/macppc/bsd.rd
</BOOT-SCRIPT>
<OS-BADGE-ICONS>
201B
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index f9099ab7467..b9c1da05f79 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: newvers.sh,v 1.140 2015/08/10 20:31:00 jca Exp $
+# $OpenBSD: newvers.sh,v 1.141 2015/12/19 19:44:09 deraadt Exp $
# $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -61,14 +61,14 @@ id=`basename "${d}"`
# and disable POOL_DEBUG in sys/conf/GENERIC
ost="OpenBSD"
-osr="5.8"
+osr="5.9"
cat >vers.c <<eof
+#define STATUS "-beta" /* just before a release */
#if 0
#define STATUS "" /* release */
-#define STATUS "-beta" /* just before a release */
-#endif
#define STATUS "-current" /* just after a release */
+#endif
const char ostype[] = "${ost}";
const char osrelease[] = "${osr}";
diff --git a/sys/sys/param.h b/sys/sys/param.h
index 7693fd85151..8f67b92d501 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.120 2015/10/06 21:17:01 deraadt Exp $ */
+/* $OpenBSD: param.h,v 1.121 2015/12/19 19:44:09 deraadt Exp $ */
/*-
* Copyright (c) 1982, 1986, 1989, 1993
@@ -41,8 +41,8 @@
#define BSD4_3 1
#define BSD4_4 1
-#define OpenBSD 201510 /* OpenBSD version (year & month). */
-#define OpenBSD5_8 1 /* OpenBSD 5.8 */
+#define OpenBSD 201605 /* OpenBSD version (year & month). */
+#define OpenBSD5_9 1 /* OpenBSD 5.9 */
#ifndef NULL
#ifdef __GNUG__