From: deraadt Date: Tue, 15 Jul 2014 21:59:16 +0000 (+0000) Subject: crank to 5.6-beta X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=1fc12403bddf84597001ca191a23af2678d84af4;p=openbsd crank to 5.6-beta --- diff --git a/etc/root/root.mail b/etc/root/root.mail index 13269e59f7b..24b5bab3e2a 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From deraadt@do-not-reply.openbsd.org Wed May 1 07:54:54 MST 2014 +From deraadt@do-not-reply.openbsd.org Wed Nov 1 07:54:54 MST 2014 Return-Path: root -Date: May 1 07:54:54 MST 2014 +Date: Nov 1 07:54:54 MST 2014 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 5.5! +Subject: Welcome to OpenBSD 5.6! 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.5/packages. +are on the same CD-ROM you installed from in the directory 5.6/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.5/packages/ + ftp://ftp.openbsd.org/pub/OpenBSD/5.6/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.5/packages/amd64/emacs-24.3p4-no_x11.tgz + # pkg_add -v /cdrom/5.6/packages/amd64/emacs-24.3p4-no_x11.tgz or alternatively install them via FTP this way: - # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/5.5/packages/amd64/emacs-24.3p4-no_x11.tgz + # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/5.6/packages/amd64/emacs-24.3p4-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 74973486984..e420f1c52f5 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.68 2014/01/12 11:26:09 deraadt Exp $ +# $OpenBSD: sys.mk,v 1.69 2014/07/15 21:59:16 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= 5 +OSMINOR= 6 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 9afc1eed1c3..d4a0f57728c 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.32 2014/01/12 11:26:09 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.33 2014/07/15 21:59:17 deraadt Exp $ */ /* * Copyright (c) 2001 Dale Rahn. * All rights reserved. @@ -34,7 +34,7 @@ MacRISC MacRISC3 MacRISC4 OpenBSD/macppc bootloader -boot cd:,ofwboot /5.5/macppc/bsd.rd +boot cd:,ofwboot /5.6/macppc/bsd.rd 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 17c4ab60338..f68776999e7 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.131 2014/03/05 18:54:32 chris Exp $ +# $OpenBSD: newvers.sh,v 1.132 2014/07/15 21:59:17 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.5" +osr="5.6" cat >vers.c <