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 | 10 | ||||
| -rw-r--r-- | sys/sys/param.h | 6 |
7 files changed, 23 insertions, 24 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index bd04adc4215..6b6d5f9aff6 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.359 2005/02/16 02:04:31 krw Exp $ +# $OpenBSD: install.sub,v 1.360 2005/03/07 00:05:59 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 @@ -1567,7 +1567,7 @@ __EOT ROOTDISK= ROOTDEV= -VERSION=36 +VERSION=37 VNAME="$(( $VERSION / 10 )).$(( $VERSION % 10 ))" SETDIR="$VNAME/$ARCH" diff --git a/etc/root/root.mail b/etc/root/root.mail index 6fc606480d9..8273e1a7e72 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 MDT 2004 +From deraadt@do-not-reply.openbsd.org Sat May 19 11:48:48 MDT 2005 Return-Path: root -Date: Nov 1 11:48:48 MDT 2004 +Date: May 19 11:48:48 MDT 2005 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 3.6! Secure by Default! +Subject: Welcome to OpenBSD 3.7! 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,7 +27,7 @@ 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.6/packages. +are on the same CD-ROM you installed from in the directory 3.7/packages. CD-ROM Space permitted us to include a subset of the following packages for the most common architectures. Please see the FTP sites if you find @@ -1309,16 +1309,16 @@ something you need missing. zsnes-1.36.tgz These and many other packages are also available via ftp at - ftp://ftp.openbsd.org/pub/OpenBSD/3.6/packages/ + ftp://ftp.openbsd.org/pub/OpenBSD/3.7/packages/ If you do not find a package you want on the CD, please go look at your 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.6/packages/i386/emacs-21.3.tgz + # pkg_add -v /cdrom/3.7/packages/i386/emacs-21.3.tgz or alternatively install them via FTP this way: - # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/3.6/packages/i386/emacs-21.3.tgz + # pkg_add -v ftp://ftp.openbsd.org/pub/OpenBSD/3.7/packages/i386/emacs-21.3.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 f151ea1b8f5..4fd452ef4af 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.44 2004/12/28 19:35:02 jolan Exp $ +# $OpenBSD: sys.mk,v 1.45 2005/03/07 00:06:00 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= 6 +OSMINOR= 7 OSREV= $(OSMAJOR).$(OSMINOR) OSrev= $(OSMAJOR)$(OSMINOR) diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common index 1d92cf565e6..17e8da5ec76 100644 --- a/share/tmac/mdoc/doc-common +++ b/share/tmac/mdoc/doc-common @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-common,v 1.42 2005/01/06 00:08:28 jmc Exp $ +.\" $OpenBSD: doc-common,v 1.43 2005/03/07 00:06:00 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -199,7 +199,7 @@ .de Os .ds oS Null .if "\\$1"" \{\ -. ds oS OpenBSD 3.6 +. ds oS OpenBSD 3.7 .\} .if "\\$2"" \{\ . ds aa Non-Null @@ -270,6 +270,7 @@ . if "\\$2"3.4" .as oS \03.4 . if "\\$2"3.5" .as oS \03.5 . if "\\$2"3.6" .as oS \03.6 +. if "\\$2"3.7" .as oS \03.7 .\} .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 222b2e2b5fd..16d44286915 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.12 2004/08/09 18:09:23 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.13 2005/03/07 00:06:00 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.6/macppc/bsd.rd +boot cd:,ofwboot /3.7/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index cb49dc9e85b..ee9fb162d9e 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.65 2004/09/14 22:00:32 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.66 2005/03/07 00:06:00 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -48,8 +48,6 @@ id=`basename ${d}` # src/share/tmac/mdoc/doc-common # change . ds oS OpenBSD X.X # add . if "\\$2"X.X" .as oS \0X.X -# src/share/tmac/mdoc/doc-syms -# ensure new release is listed # src/share/mk/sys.mk # OSMAJOR # OSMINOR @@ -66,12 +64,12 @@ id=`basename ${d}` # A month or so before release, select STATUS "-beta" ost="OpenBSD" -osr="3.6" +osr="3.7" 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 03f08aa15c5..8c13e430ef6 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.59 2004/11/28 01:36:38 mickey Exp $ */ +/* $OpenBSD: param.h,v 1.60 2005/03/07 00:05:59 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 200411 /* OpenBSD version (year & month). */ -#define OpenBSD3_6 1 /* OpenBSD 3.6 */ +#define OpenBSD 200501 /* OpenBSD version (year & month). */ +#define OpenBSD3_7 1 /* OpenBSD 3.7 */ #ifndef NULL #ifdef __GNUG__ |