diff options
| -rw-r--r-- | distrib/miniroot/install.sub | 4 | ||||
| -rw-r--r-- | etc/root/root.mail | 6 | ||||
| -rw-r--r-- | share/mk/sys.mk | 4 | ||||
| -rw-r--r-- | share/tmac/mdoc/doc-common | 5 | ||||
| -rw-r--r-- | share/tmac/mdoc/doc-syms | 4 | ||||
| -rw-r--r-- | sys/arch/macppc/stand/tbxidata/bsd.tbxi | 4 | ||||
| -rw-r--r-- | sys/conf/newvers.sh | 8 |
7 files changed, 19 insertions, 16 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 84acf5f827c..fe86a2ca017 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.330 2004/02/08 20:38:02 krw Exp $ +# $OpenBSD: install.sub,v 1.331 2004/02/27 18:02:46 deraadt Exp $ # $NetBSD: install.sub,v 1.5.2.8 1996/09/02 23:25:02 pk Exp $ # # Copyright (c) 1997-2003 Todd Miller, Theo de Raadt, Ken Westerback @@ -1674,7 +1674,7 @@ __EOT ROOTDISK= ROOTDEV= -VERSION=34 +VERSION=35 VNAME="$(( $VERSION / 10 )).$(( $VERSION % 10 ))" SETDIR="$VNAME/$ARCH" diff --git a/etc/root/root.mail b/etc/root/root.mail index a6ddf84cd2c..30ef25201dc 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 2003 +From deraadt@do-not-reply.openbsd.org Sat May 1 11:48:48 MST 2003 Return-Path: root -Date: Nov 1 11:48:48 MDT 2003 +Date: May 1 11:48:48 MST 2003 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 3.4! Secure by Default! +Subject: Welcome to OpenBSD 3.5! 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 diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 60b3f007ab2..c560a3cd606 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.35 2003/08/11 14:52:42 deraadt Exp $ +# $OpenBSD: sys.mk,v 1.36 2004/02/27 18:02:47 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= 4 +OSMINOR= 5 OSREV= $(OSMAJOR).$(OSMINOR) OSrev= $(OSMAJOR)$(OSMINOR) diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common index adc4a6bd548..0270b80dd7e 100644 --- a/share/tmac/mdoc/doc-common +++ b/share/tmac/mdoc/doc-common @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-common,v 1.35 2004/02/08 11:16:34 jmc Exp $ +.\" $OpenBSD: doc-common,v 1.36 2004/02/27 18:02:47 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -201,7 +201,7 @@ .de Os .ds oS Null .if "\\$1"" \{\ -. ds oS OpenBSD 3.4 +. ds oS OpenBSD 3.5 .\} .if "\\$2"" \{\ . ds aa Non-Null @@ -270,6 +270,7 @@ . if "\\$2"3.2" .as oS \03.2 . if "\\$2"3.3" .as oS \03.3 . if "\\$2"3.4" .as oS \03.4 +. if "\\$2"3.5" .as oS \03.5 .\} .if "\\*(oS"Null" .ds oS \0\\$1 .if "\\*(aa"Non-Null" .as oS \0\\$2 diff --git a/share/tmac/mdoc/doc-syms b/share/tmac/mdoc/doc-syms index b4ab0fc1177..2f28c686956 100644 --- a/share/tmac/mdoc/doc-syms +++ b/share/tmac/mdoc/doc-syms @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-syms,v 1.52 2004/02/13 23:24:30 andreas Exp $ +.\" $OpenBSD: doc-syms,v 1.53 2004/02/27 18:02:47 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -199,6 +199,7 @@ . if "\\$1"3.3" \&OpenBSD 3.3\\*(aa\\$2 . if "\\$1"3.4" \&OpenBSD 3.4\\*(aa\\$2 . if "\\$1"3.5" \&OpenBSD 3.5\\*(aa\\$2 +. if "\\$1"3.6" \&OpenBSD 3.6\\*(aa\\$2 .\} .if \\n(.$==1 \{\ . if "\\$1"1.2" \&OpenBSD 1.2\\*(aa @@ -218,6 +219,7 @@ . if "\\$1"3.3" \&OpenBSD 3.3\\*(aa . if "\\$1"3.4" \&OpenBSD 3.4\\*(aa . if "\\$1"3.5" \&OpenBSD 3.5\\*(aa +. if "\\$1"3.6" \&OpenBSD 3.6\\*(aa . if "\\$1"." \&OpenBSD\\$1\\*(aa . if "\\$1"," \&OpenBSD\\$1\\*(aa .\} diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi index b1bf2aaca05..b451cc7bf08 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.10 2003/08/27 03:10:17 drahn Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.11 2004/02/27 18:02:47 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.4/macppc/bsd.rd +boot cd:,ofwboot /3.5/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index d19639c4567..ef4c5624357 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.58 2004/01/01 00:16:46 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.59 2004/02/27 18:02:47 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -72,16 +72,16 @@ id=`basename ${d}` # ost="OpenBSD" -osr="3.4" +osr="3.5" cat >vers.c <<eof const char ostype[] = "${ost}"; const char osrelease[] = "${osr}"; const char osversion[] = "${id}#${v}"; const char sccs[] = - " @(#)${ost} ${osr}-current (${id}) #${v}: ${t}\n"; + " @(#)${ost} ${osr}-beta (${id}) #${v}: ${t}\n"; const char version[] = - "${ost} ${osr}-current (${id}) #${v}: ${t}\n ${u}@${h}:${d}\n"; + "${ost} ${osr}-beta (${id}) #${v}: ${t}\n ${u}@${h}:${d}\n"; eof expr ${v} + 1 > version |