diff options
| -rw-r--r-- | distrib/miniroot/install.sub | 4 | ||||
| -rw-r--r-- | etc/root/root.mail | 8 | ||||
| -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 | ||||
| -rw-r--r-- | sys/sys/param.h | 6 |
8 files changed, 23 insertions, 20 deletions
diff --git a/distrib/miniroot/install.sub b/distrib/miniroot/install.sub index 5377446939e..64c01665147 100644 --- a/distrib/miniroot/install.sub +++ b/distrib/miniroot/install.sub @@ -1,4 +1,4 @@ -# $OpenBSD: install.sub,v 1.315 2003/08/07 19:13:00 deraadt Exp $ +# $OpenBSD: install.sub,v 1.316 2003/08/11 14:52:42 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 @@ -1710,7 +1710,7 @@ __EOT ROOTDISK= ROOTDEV= -VERSION=33 +VERSION=34 VNAME="$(( $VERSION / 10 )).$(( $VERSION % 10 ))" SETDIR="$VNAME/$ARCH" diff --git a/etc/root/root.mail b/etc/root/root.mail index 0098d7586db..b14e62cfcb8 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From deraadt@do-not-reply.openbsd.org Sat May 1 11:48:48 MST 2003 +From deraadt@do-not-reply.openbsd.org Sat Nov 1 11:48:48 MDT 2003 Return-Path: root -Date: May 1 11:48:48 MST 2003 +Date: Nov 1 11:48:48 MDT 2003 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 3.3! Secure by Default! +Subject: Welcome to OpenBSD 3.4! 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 @@ -26,7 +26,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.3/packages. +are on the same CD-ROM you installed from in the directory 3.4/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 diff --git a/share/mk/sys.mk b/share/mk/sys.mk index 06e734edc6e..60b3f007ab2 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.34 2003/08/08 22:32:13 miod Exp $ +# $OpenBSD: sys.mk,v 1.35 2003/08/11 14:52:42 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= 3 +OSMINOR= 4 OSREV= $(OSMAJOR).$(OSMINOR) OSrev= $(OSMAJOR)$(OSMINOR) diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common index 8cec3811630..b7f3ae71197 100644 --- a/share/tmac/mdoc/doc-common +++ b/share/tmac/mdoc/doc-common @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-common,v 1.31 2003/06/02 23:30:16 millert Exp $ +.\" $OpenBSD: doc-common,v 1.32 2003/08/11 14:52:42 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -196,7 +196,7 @@ .de Os .ds oS Null .if "\\$1"" \{\ -. ds oS OpenBSD 3.3 +. ds oS OpenBSD 3.4 .\} .if "\\$2"" \{\ . ds aa Non-Null @@ -264,6 +264,7 @@ . if "\\$2"3.1" .as oS \03.1 . 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 "\\*(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 3c309c4551b..56e050473c1 100644 --- a/share/tmac/mdoc/doc-syms +++ b/share/tmac/mdoc/doc-syms @@ -1,4 +1,4 @@ -.\" $OpenBSD: doc-syms,v 1.47 2003/07/16 07:43:28 jmc Exp $ +.\" $OpenBSD: doc-syms,v 1.48 2003/08/11 14:52:42 deraadt Exp $ .\" .\" Copyright (c) 1991, 1993 .\" The Regents of the University of California. All rights reserved. @@ -196,6 +196,7 @@ . if "\\$1"3.2" \&OpenBSD 3.2\\*(aa\\$2 . 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 \\n(.$==1 \{\ . if "\\$1"1.2" \&OpenBSD 1.2\\*(aa @@ -214,6 +215,7 @@ . if "\\$1"3.2" \&OpenBSD 3.2\\*(aa . 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"." \&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 8d9514b11bd..d3e3df74677 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.8 2003/06/03 01:35:30 drahn Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.9 2003/08/11 14:52:43 deraadt Exp $ */ /* * Copyright (c) 2001 Dale Rahn. * All rights reserved. @@ -34,7 +34,7 @@ MacRISC OpenBSD/macppc bootloader </DESCRIPTION> <BOOT-SCRIPT> -boot cd:,ofwboot /3.3/macppc/bsd.rd +boot cd:,ofwboot /3.4/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index af07f1f7658..dd79a709408 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.53 2003/06/02 23:28:01 millert Exp $ +# $OpenBSD: newvers.sh,v 1.54 2003/08/11 14:52:42 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -61,16 +61,16 @@ id=`basename ${d}` # change /X.X/macppc/bsd.rd ost="OpenBSD" -osr="3.3" +osr="3.4" 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 diff --git a/sys/sys/param.h b/sys/sys/param.h index bf722b76ec2..38de99090bf 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.52 2003/06/02 23:28:21 millert Exp $ */ +/* $OpenBSD: param.h,v 1.53 2003/08/11 14:52:42 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 200305 /* OpenBSD version (year & month). */ -#define OpenBSD3_3 1 /* OpenBSD 3.3 */ +#define OpenBSD 200311 /* OpenBSD version (year & month). */ +#define OpenBSD3_4 1 /* OpenBSD 3.4 */ #ifndef NULL #ifdef __GNUG__ |