From 39bbc4185182b69bf4487d24d5ff40ee3741983c Mon Sep 17 00:00:00 2001 From: deraadt Date: Wed, 17 Jun 2015 22:32:08 +0000 Subject: [PATCH] crank to 5.8-beta --- etc/root/root.mail | 14 +++++++------- share/mk/sys.mk | 4 ++-- sys/arch/macppc/stand/tbxidata/bsd.tbxi | 4 ++-- sys/sys/param.h | 6 +++--- 4 files changed, 14 insertions(+), 14 deletions(-) diff --git a/etc/root/root.mail b/etc/root/root.mail index 2fd04f9d2db..0459e81e896 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From deraadt@do-not-reply.openbsd.org Fri May 1 07:57:57 MST 2015 +From deraadt@do-not-reply.openbsd.org Fri Oct 18 07:58:58 MST 2015 Return-Path: root -Date: May 1 07:57:57 MST 2015 +Date: Oct 18 07:58:58 MST 2015 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 5.7! +Subject: Welcome to OpenBSD 5.8! 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.7/packages. +are on the same CD-ROM you installed from in the directory 5.8/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.7/packages/ + ftp://ftp.openbsd.org/pub/OpenBSD/5.8/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.7/packages/amd64/emacs-24.4p0-no_x11.tgz + # pkg_add -v /cdrom/5.8/packages/amd64/emacs-24.4p0-no_x11.tgz or alternatively install them via FTP this way: - # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/5.7/packages/amd64/emacs-24.4p0-no_x11.tgz + # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/5.8/packages/amd64/emacs-24.4p0-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/share/mk/sys.mk b/share/mk/sys.mk index a1eaaceee30..f6d003e05a1 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.72 2015/05/14 02:56:01 jsg Exp $ +# $OpenBSD: sys.mk,v 1.73 2015/06/17 22:32:08 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= 5 -OSMINOR= 7 +OSMINOR= 8 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 5f3a0162487..0ce96613973 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.34 2015/01/01 15:50:27 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.35 2015/06/17 22:32:08 deraadt Exp $ */ /* * Copyright (c) 2001 Dale Rahn. * All rights reserved. @@ -34,7 +34,7 @@ MacRISC MacRISC3 MacRISC4 OpenBSD/macppc bootloader -boot cd:,ofwboot /5.7/macppc/bsd.rd +boot cd:,ofwboot /5.8/macppc/bsd.rd 201B diff --git a/sys/sys/param.h b/sys/sys/param.h index 676151f027e..6543581dd92 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.115 2015/01/20 18:14:51 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.116 2015/06/17 22:32:08 deraadt Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 201505 /* OpenBSD version (year & month). */ -#define OpenBSD5_7 1 /* OpenBSD 5.7 */ +#define OpenBSD 201510 /* OpenBSD version (year & month). */ +c#define OpenBSD5_8 1 /* OpenBSD 5.8 */ #ifndef NULL #ifdef __GNUG__ -- 2.20.1