diff options
| -rw-r--r-- | etc/root/root.mail | 14 | ||||
| -rw-r--r-- | share/mk/sys.mk | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/tbxidata/bsd.tbxi | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 8 | ||||
| -rw-r--r-- | sys/sys/param.h | 6 |
5 files changed, 18 insertions, 18 deletions
diff --git a/etc/root/root.mail b/etc/root/root.mail index e7a5b61bc83..a87727baa80 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From deraadt@do-not-reply.openbsd.org Sat Nov 1 07:56:56 MST 2014 +From deraadt@do-not-reply.openbsd.org Sat May 1 07:56:56 MST 2014 Return-Path: root -Date: Nov 1 07:56:56 MST 2014 +Date: May 1 07:56:56 MST 2014 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 5.6! +Subject: Welcome to OpenBSD 5.7! 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.6/packages. +are on the same CD-ROM you installed from in the directory 5.7/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.6/packages/ + ftp://ftp.openbsd.org/pub/OpenBSD/5.7/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.6/packages/amd64/emacs-24.3p4-no_x11.tgz + # pkg_add -v /cdrom/5.7/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.6/packages/amd64/emacs-24.3p4-no_x11.tgz + # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/5.7/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 873dda80577..80b368a5c2f 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.70 2014/11/20 09:43:17 pascal Exp $ +# $OpenBSD: sys.mk,v 1.71 2015/01/01 15:50:27 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= 6 +OSMINOR= 7 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 d4a0f57728c..5f3a0162487 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.33 2014/07/15 21:59:17 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.34 2015/01/01 15:50:27 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.6/macppc/bsd.rd +boot cd:,ofwboot /5.7/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index b85d76a432b..770cd323aa5 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.134 2014/08/11 18:33:36 miod Exp $ +# $OpenBSD: newvers.sh,v 1.135 2015/01/01 15:50:27 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.6" +osr="5.7" cat >vers.c <<eof #if 0 #define STATUS "" /* release */ -#define STATUS "-beta" /* just before a release */ -#endif #define STATUS "-current" /* just after a release */ +#endif +#define STATUS "-beta" /* just before a release */ const char ostype[] = "${ost}"; const char osrelease[] = "${osr}"; diff --git a/sys/sys/param.h b/sys/sys/param.h index b6ef3a890e9..43e94a320ed 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.108 2014/10/22 06:55:10 dcoppa Exp $ */ +/* $OpenBSD: param.h,v 1.109 2015/01/01 15:50:27 deraadt Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 201411 /* OpenBSD version (year & month). */ -#define OpenBSD5_6 1 /* OpenBSD 5.6 */ +#define OpenBSD 201505 /* OpenBSD version (year & month). */ +#define OpenBSD5_7 1 /* OpenBSD 5.7 */ #ifndef NULL #ifdef __GNUG__ |