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 f72906d64e4..a71f8bfa544 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From deraadt@do-not-reply.openbsd.org Tue May 1 11:48:48 MDT 2007 +From deraadt@do-not-reply.openbsd.org Tue Nov 1 11:48:48 MST 2007 Return-Path: root -Date: May 1 11:48:48 MDT 2007 +Date: Nov 1 11:48:48 MST 2007 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 4.1! Secure by Default! +Subject: Welcome to OpenBSD 4.2! Secure by Default! 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 @@ 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.1/packages. +are on the same CD-ROM you installed from in the directory 4.2/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.1/packages/ + ftp://ftp.openbsd.org/pub/OpenBSD/4.2/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.1/packages/i386/emacs-21.4p3.tgz + # pkg_add -v /cdrom/4.2/packages/i386/emacs-21.4p3.tgz or alternatively install them via FTP this way: - # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/4.1/packages/i386/emacs-21.4p3.tgz + # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/4.2/packages/i386/emacs-21.4p3.tgz You are STRONGLY urged to use ssh instead of telnet, rlogin, or rsh! ssh is included in all OpenBSD systems. The implementation is OpenSSH, which we are diff --git a/share/mk/sys.mk b/share/mk/sys.mk index eb9ee57db48..ec93e916444 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.52 2007/02/12 13:10:02 henning Exp $ +# $OpenBSD: sys.mk,v 1.53 2007/07/25 20:07: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= 4 -OSMINOR= 1 +OSMINOR= 2 OSREV= $(OSMAJOR).$(OSMINOR) OSrev= $(OSMAJOR)$(OSMINOR) diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common index a6047909794..d5ed05a38fb 100644 --- a/share/tmac/mdoc/doc-common +++ b/share/tmac/mdoc/doc-common @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-common,v 1.53 2007/05/31 04:28:09 jmc Exp $ +.\" $OpenBSD: doc-common,v 1.54 2007/07/25 20:07:27 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -203,7 +203,7 @@ .de Os .ds oS Null .if "\\$1"" \{\ -. ds oS OpenBSD 4.1 +. ds oS OpenBSD 4.2 .\} .if "\\$2"" \{\ . ds aa Non-Null @@ -282,6 +282,7 @@ . if "\\$2"3.9" .as oS \03.9 . if "\\$2"4.0" .as oS \04.0 . if "\\$2"4.1" .as oS \04.1 +. if "\\$2"4.2" .as oS \04.2 .\} .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 a5e5e852b31..1b00c67fd2c 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.18 2007/02/12 13:10:02 henning Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.19 2007/07/25 20:07:28 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.1/macppc/bsd.rd +boot cd:,ofwboot /4.2/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 0b89b168a92..e47f4fa5426 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.83 2007/03/12 00:23:25 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.84 2007/07/25 20:07: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 @@ -64,13 +64,13 @@ id=`basename ${d}` # A month or so before release, select STATUS "-beta" ost="OpenBSD" -osr="4.1" +osr="4.2" 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 ce120cfc2ff..bdf2d63b47f 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.71 2007/07/17 18:53:03 otto Exp $ */ +/* $OpenBSD: param.h,v 1.72 2007/07/25 20:07:28 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 200705 /* OpenBSD version (year & month). */ -#define OpenBSD4_1 1 /* OpenBSD 4.1 */ +#define OpenBSD 200711 /* OpenBSD version (year & month). */ +#define OpenBSD4_2 1 /* OpenBSD 4.2 */ #ifndef NULL #ifdef __GNUG__ |