diff options
| -rw-r--r-- | distrib/miniroot/install.sub | 4 | ||||
| -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 |
7 files changed, 23 insertions, 22 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 66c3c13d77d..73df8a804e8 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.399 2005/11/22 19:29:15 krw Exp $ +# $OpenBSD: install.sub,v 1.400 2006/01/19 03:30:04 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2005 Todd Miller, Theo de Raadt, Ken Westerback @@ -1647,7 +1647,7 @@ __EOT ROOTDISK= ROOTDEV= -VERSION=38 +VERSION=39 VNAME="$(( $VERSION / 10 )).$(( $VERSION % 10 ))" SETDIR="$VNAME/$ARCH" diff --git a/etc/root/root.mail b/etc/root/root.mail index a5c97a0edfe..d4a0f1bf1db 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 11:48:48 MST 2005 +From deraadt@do-not-reply.openbsd.org Sat May 1 11:48:48 MDT 2006 Return-Path: root -Date: Nov 1 11:48:48 MST 2005 +Date: May 1 11:48:48 MDT 2006 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 3.8! Secure by Default! +Subject: Welcome to OpenBSD 3.9! 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 3.8/packages. +are on the same CD-ROM you installed from in the directory 3.9/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/3.8/packages/ + ftp://ftp.openbsd.org/pub/OpenBSD/3.9/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/3.8/packages/i386/emacs-21.3p2.tgz + # pkg_add -v /cdrom/3.9/packages/i386/emacs-21.3p2.tgz or alternatively install them via FTP this way: - # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/3.8/packages/i386/emacs-21.3p2.tgz + # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/3.9/packages/i386/emacs-21.3p2.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 feb0442a792..b53156359bb 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.46 2005/08/09 00:46:09 deraadt Exp $ +# $OpenBSD: sys.mk,v 1.47 2006/01/19 03:30:04 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= 3 -OSMINOR= 8 +OSMINOR= 9 OSREV= $(OSMAJOR).$(OSMINOR) OSrev= $(OSMAJOR)$(OSMINOR) diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common index 9986986bdfa..8c4227e09a4 100644 --- a/share/tmac/mdoc/doc-common +++ b/share/tmac/mdoc/doc-common @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-common,v 1.45 2005/08/09 00:46:11 deraadt Exp $ +.\" $OpenBSD: doc-common,v 1.46 2006/01/19 03:30:04 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -200,7 +200,7 @@ .de Os .ds oS Null .if "\\$1"" \{\ -. ds oS OpenBSD 3.8 +. ds oS OpenBSD 3.9 .\} .if "\\$2"" \{\ . ds aa Non-Null @@ -273,6 +273,7 @@ . if "\\$2"3.6" .as oS \03.6 . if "\\$2"3.7" .as oS \03.7 . if "\\$2"3.8" .as oS \03.8 +. if "\\$2"3.9" .as oS \03.9 .\} .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 7fcd5835a29..2b57da5378e 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.14 2005/08/09 00:46:15 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.15 2006/01/19 03:30:04 deraadt Exp $ */ /* * Copyright (c) 2001 Dale Rahn. * All rights reserved. @@ -34,7 +34,7 @@ MacRISC MacRISC3 OpenBSD/macppc bootloader </DESCRIPTION> <BOOT-SCRIPT> -boot cd:,ofwboot /3.8/macppc/bsd.rd +boot cd:,ofwboot /3.9/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index efa49aea17a..b7d938a0ddb 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.72 2005/09/05 20:43:25 miod Exp $ +# $OpenBSD: newvers.sh,v 1.73 2006/01/19 03:30:04 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,12 +64,12 @@ id=`basename ${d}` # A month or so before release, select STATUS "-beta" ost="OpenBSD" -osr="3.8" +osr="3.9" cat >vers.c <<eof -#define STATUS "-current" -#if 0 #define STATUS "-beta" +#if 0 +#define STATUS "-current" #define STATUS "" /* release */ #endif diff --git a/sys/sys/param.h b/sys/sys/param.h index bd302b7dcfe..24b7f265f02 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.65 2005/12/31 19:29:39 millert Exp $ */ +/* $OpenBSD: param.h,v 1.66 2006/01/19 03:30:05 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 200511 /* OpenBSD version (year & month). */ -#define OpenBSD3_8 1 /* OpenBSD 3.8 */ +#define OpenBSD 200605 /* OpenBSD version (year & month). */ +#define OpenBSD3_9 1 /* OpenBSD 3.9 */ #ifndef NULL #ifdef __GNUG__ |