diff options
| -rw-r--r-- | etc/root/root.mail | 14 | ||||
| -rw-r--r-- | share/mk/sys.mk | 4 | ||||
| -rw-r--r-- | share/tmac/mdoc/doc-common | 5 | ||||
| -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 |
6 files changed, 21 insertions, 20 deletions
diff --git a/etc/root/root.mail b/etc/root/root.mail index 5216ad385d6..6a303338b41 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From deraadt@do-not-reply.openbsd.org Wed Mar 1 07:47:47 MDT 2010 +From deraadt@do-not-reply.openbsd.org Wed Sep 1 07:47:47 MDT 2010 Return-Path: root -Date: Mar 1 07:47:47 MDT 2010 +Date: Sep 1 07:47:47 MDT 2010 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 4.7! +Subject: Welcome to OpenBSD 4.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 4.7/packages. +are on the same CD-ROM you installed from in the directory 4.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/4.7/packages/ + ftp://ftp.openbsd.org/pub/OpenBSD/4.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 i386, execute: # mount /dev/cd0a /cdrom - # pkg_add -v /cdrom/4.7/packages/i386/emacs-22.3p2.tgz + # pkg_add -v /cdrom/4.8/packages/i386/emacs-22.3p2.tgz or alternatively install them via FTP this way: - # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/4.7/packages/i386/emacs-22.3p2.tgz + # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/4.8/packages/i386/emacs-22.3p2.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 524b3e4ae76..656ddc50135 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.58 2010/01/26 23:04:28 miod Exp $ +# $OpenBSD: sys.mk,v 1.59 2010/07/24 15:31: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= 4 -OSMINOR= 7 +OSMINOR= 8 OSREV= $(OSMAJOR).$(OSMINOR) OSrev= $(OSMAJOR)$(OSMINOR) diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common index 11eed95c1e2..447b24da35c 100644 --- a/share/tmac/mdoc/doc-common +++ b/share/tmac/mdoc/doc-common @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-common,v 1.65 2010/01/26 23:04:28 miod Exp $ +.\" $OpenBSD: doc-common,v 1.66 2010/07/24 15:31:19 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -204,7 +204,7 @@ .de Os .ds oS Null .if "\\$1"" \{\ -. ds oS OpenBSD 4.7 +. ds oS OpenBSD 4.8 .\} .if "\\$2"" \{\ . ds aa Non-Null @@ -290,6 +290,7 @@ . if "\\$2"4.5" .as oS \04.5 . if "\\$2"4.6" .as oS \04.6 . if "\\$2"4.7" .as oS \04.7 +. if "\\$2"4.8" .as oS \04.8 .\} .if "\\*(oS"Null" .ds oS \0\\$1 .if "\\*(aa"Non-Null" .as oS \0\\$2 diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi index e3d90b7ba5f..41046c4b73b 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.24 2010/01/26 23:04:28 miod Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.25 2010/07/24 15:31:21 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 /4.7/macppc/bsd.rd +boot cd:,ofwboot /4.8/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 9cba8df26b6..e8394ebf87d 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.104 2010/03/18 21:17:48 otto Exp $ +# $OpenBSD: newvers.sh,v 1.105 2010/07/24 15:31:53 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -64,13 +64,13 @@ id=`basename ${d}` # and disable POOL_DEBUG in sys/conf/GENERIC ost="OpenBSD" -osr="4.7" +osr="4.8" 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 d9167885f11..cb91d96b7a1 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.87 2010/04/23 21:34:40 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.88 2010/07/24 15:31:19 deraadt Exp $ */ /* $NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $ */ /*- @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 201005 /* OpenBSD version (year & month). */ -#define OpenBSD4_7 1 /* OpenBSD 4.7 */ +#define OpenBSD 201011 /* OpenBSD version (year & month). */ +#define OpenBSD4_8 1 /* OpenBSD 4.8 */ #ifndef NULL #ifdef __GNUG__ |