summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTheo de Raadt <deraadt@cvs.openbsd.org>1999-09-23 08:25:04 +0000
committerTheo de Raadt <deraadt@cvs.openbsd.org>1999-09-23 08:25:04 +0000
commitbe0defd40068ef04fdeae0d98a39fe7a9a1d159f (patch)
tree9b7bdb4e27236fa1395224f2bbfa8f3ece47ea49
parentc9ddb345840947059367871425560ad0ffe4d618 (diff)
move towards 2.6-beta
Diffstat
-rw-r--r--distrib/sets/lists/base/md.alpha14
-rw-r--r--distrib/sets/lists/base/md.amiga6
-rw-r--r--distrib/sets/lists/base/md.arc16
-rw-r--r--distrib/sets/lists/base/md.hp3002
-rw-r--r--distrib/sets/lists/base/md.i3866
-rw-r--r--distrib/sets/lists/base/md.mac68k6
-rw-r--r--distrib/sets/lists/base/md.mvme68k2
-rw-r--r--distrib/sets/lists/base/md.mvme88k16
-rw-r--r--distrib/sets/lists/base/md.pmax16
-rw-r--r--distrib/sets/lists/base/md.powerpc16
-rw-r--r--distrib/sets/lists/base/md.sparc6
-rw-r--r--share/mk/sys.mk4
-rw-r--r--share/tmac/mdoc/doc-common5
-rw-r--r--sys/conf/newvers.sh9
-rw-r--r--sys/sys/param.h6
15 files changed, 67 insertions, 63 deletions
diff --git a/distrib/sets/lists/base/md.alpha b/distrib/sets/lists/base/md.alpha
index 643fcaae6de..3be871e4447 100644
--- a/distrib/sets/lists/base/md.alpha
+++ b/distrib/sets/lists/base/md.alpha
@@ -1,15 +1,15 @@
./dev/scan0
./dev/scan1
./sbin/fdisk
-./usr/alpha-unknown-openbsd2.5
-./usr/alpha-unknown-openbsd2.5/bin
-./usr/alpha-unknown-openbsd2.5/lib
-./usr/alpha-unknown-openbsd2.5/lib/ldscripts
+./usr/alpha-unknown-openbsd2.6
+./usr/alpha-unknown-openbsd2.6/bin
+./usr/alpha-unknown-openbsd2.6/lib
+./usr/alpha-unknown-openbsd2.6/lib/ldscripts
./usr/include/alpha
./usr/include/readline
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1
-./usr/lib/gcc-lib/alpha-unknown-openbsd2.5/2.95.1/include
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1
+./usr/lib/gcc-lib/alpha-unknown-openbsd2.6/2.95.1/include
./usr/libdata/perl5/alpha-openbsd
./usr/libdata/perl5/alpha-openbsd/5.00503
./usr/libdata/perl5/alpha-openbsd/5.00503/.packlist
diff --git a/distrib/sets/lists/base/md.amiga b/distrib/sets/lists/base/md.amiga
index 7a4d7d1ef52..927c99ebd66 100644
--- a/distrib/sets/lists/base/md.amiga
+++ b/distrib/sets/lists/base/md.amiga
@@ -6,9 +6,9 @@
./usr/include/amiga
./usr/include/m68k
./usr/include/readline
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include
./usr/lib/libacl.so.4.1
./usr/lib/libc.so.23.1
./usr/lib/libc_r.so.1.1
diff --git a/distrib/sets/lists/base/md.arc b/distrib/sets/lists/base/md.arc
index 00705c1ac9c..63653eb733d 100644
--- a/distrib/sets/lists/base/md.arc
+++ b/distrib/sets/lists/base/md.arc
@@ -6,10 +6,10 @@
./usr/bin/ldd
./usr/include/mips
./usr/include/readline
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.5
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.5/2.8.1
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.5/2.8.1/include
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.5/2.8.1/include/objc
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.8.1
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.8.1/include
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.8.1/include/objc
./usr/lib/libacl.so.4.1
./usr/lib/libc.so.23.1
./usr/lib/libcrypto.so.1.0
@@ -414,10 +414,10 @@
./usr/libexec/ld.so
./usr/mdec/mbr
./usr/mdec/msdos5mb.gz
-./usr/mipsel-unknown-openbsd2.5
-./usr/mipsel-unknown-openbsd2.5/bin
-./usr/mipsel-unknown-openbsd2.5/lib
-./usr/mipsel-unknown-openbsd2.5/lib/ldscripts
+./usr/mipsel-unknown-openbsd2.6
+./usr/mipsel-unknown-openbsd2.6/bin
+./usr/mipsel-unknown-openbsd2.6/lib
+./usr/mipsel-unknown-openbsd2.6/lib/ldscripts
./usr/libdata/perl5/site_perl/mips-openbsd/pcap-int.ph
./usr/libdata/perl5/site_perl/mips-openbsd/sys/ataio.ph
./usr/libdata/perl5/site_perl/mips-openbsd/sys/sched.ph
diff --git a/distrib/sets/lists/base/md.hp300 b/distrib/sets/lists/base/md.hp300
index f88b223b4e1..6de6704c47e 100644
--- a/distrib/sets/lists/base/md.hp300
+++ b/distrib/sets/lists/base/md.hp300
@@ -5,7 +5,7 @@
./usr/include/hp300
./usr/include/m68k
./usr/include/readline
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6
./usr/lib/libacl.so.4.1
./usr/lib/libc.so.23.1
./usr/lib/libc_r.so.1.1
diff --git a/distrib/sets/lists/base/md.i386 b/distrib/sets/lists/base/md.i386
index 7296c84249e..8da55c1e404 100644
--- a/distrib/sets/lists/base/md.i386
+++ b/distrib/sets/lists/base/md.i386
@@ -7,7 +7,7 @@
./usr/bin/objdump
./usr/bin/pctr
./usr/include/i386
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6
./usr/lib/libacl.so.4.1
./usr/lib/libc.so.23.1
./usr/lib/libc_r.so.1.1
@@ -706,8 +706,8 @@
./usr/libdata/perl5/site_perl/i386-openbsd/net/if_sppp.ph
./usr/libdata/perl5/site_perl/i386-openbsd/pcap-int.ph
./usr/libdata/perl5/site_perl/i386-openbsd/sys/ataio.ph
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1
-./usr/lib/gcc-lib/i386-unknown-openbsd2.5/2.95.1/include
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1
+./usr/lib/gcc-lib/i386-unknown-openbsd2.6/2.95.1/include
./usr/libdata/perl5/site_perl/i386-openbsd/sys/sched.ph
./sbin/wicontrol
./usr/share/misc/pcvtfonts/koi8-8x10
diff --git a/distrib/sets/lists/base/md.mac68k b/distrib/sets/lists/base/md.mac68k
index c83d8ee9bbe..a14ee1d5085 100644
--- a/distrib/sets/lists/base/md.mac68k
+++ b/distrib/sets/lists/base/md.mac68k
@@ -5,7 +5,7 @@
./usr/bin/objdump
./usr/include/m68k
./usr/include/mac68k
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6
./usr/lib/libacl.so.4.1
./usr/lib/libc.so.23.1
./usr/lib/libc_r.so.1.1
@@ -658,6 +658,6 @@
./usr/libdata/perl5/m68k-openbsd/5.00503/.packlist
./usr/local/libdata/perl5/site_perl/m68k-openbsd
./usr/libexec/ld.so
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5/2.95.1/include
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6/2.95.1/include
./usr/libdata/perl5/site_perl/m68k-openbsd/sys/sched.ph
diff --git a/distrib/sets/lists/base/md.mvme68k b/distrib/sets/lists/base/md.mvme68k
index 66703477e4a..976d155f4b1 100644
--- a/distrib/sets/lists/base/md.mvme68k
+++ b/distrib/sets/lists/base/md.mvme68k
@@ -2,7 +2,7 @@
./sbin/ldconfig
./usr/bin/ldd
./usr/include/m68k
-./usr/lib/gcc-lib/m68k-unknown-openbsd2.5
+./usr/lib/gcc-lib/m68k-unknown-openbsd2.6
./usr/lib/libacl.so.4.1
./usr/lib/libc.so.23.1
./usr/lib/libc_r.so.1.1
diff --git a/distrib/sets/lists/base/md.mvme88k b/distrib/sets/lists/base/md.mvme88k
index 6346a7a131c..24a47fd0817 100644
--- a/distrib/sets/lists/base/md.mvme88k
+++ b/distrib/sets/lists/base/md.mvme88k
@@ -5,10 +5,10 @@
./usr/include/readline/chardefs.h
./usr/include/readline/keymaps.h
./usr/include/readline/readline.h
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include
-./usr/lib/gcc-lib/m88k-unknown-openbsd2.5/2.8.1/include/objc
+./usr/lib/gcc-lib/m88k-unknown-openbsd2.6
+./usr/lib/gcc-lib/m88k-unknown-openbsd2.6/2.8.1
+./usr/lib/gcc-lib/m88k-unknown-openbsd2.6/2.8.1/include
+./usr/lib/gcc-lib/m88k-unknown-openbsd2.6/2.8.1/include/objc
./usr/lib/perl5/m88k-openbsd
./usr/lib/perl5/m88k-openbsd/5.00404
./usr/lib/perl5/m88k-openbsd/5.00404/CORE
@@ -395,10 +395,10 @@
./usr/libdata/perl5/site_perl/m88k-openbsd/keynote.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/sys/swap.ph
./usr/libdata/perl5/site_perl/m88k-openbsd/termcap.ph
-./usr/m88k-unknown-openbsd2.5
-./usr/m88k-unknown-openbsd2.5/bin
-./usr/m88k-unknown-openbsd2.5/lib
-./usr/m88k-unknown-openbsd2.5/lib/ldscripts
+./usr/m88k-unknown-openbsd2.6
+./usr/m88k-unknown-openbsd2.6/bin
+./usr/m88k-unknown-openbsd2.6/lib
+./usr/m88k-unknown-openbsd2.6/lib/ldscripts
./usr/mdec/bootsd
./usr/mdec/bootst
./usr/mdec/bootxx
diff --git a/distrib/sets/lists/base/md.pmax b/distrib/sets/lists/base/md.pmax
index 76f82b390c8..d3dbf16a1d9 100644
--- a/distrib/sets/lists/base/md.pmax
+++ b/distrib/sets/lists/base/md.pmax
@@ -3,10 +3,10 @@
./usr/bin/ldd
./usr/include/mips
./usr/include/readline
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.5
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.5/2.8.1
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.5/2.8.1/include
-./usr/lib/gcc-lib/mipsel-unknown-openbsd2.5/2.8.1/include/objc
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.8.1
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.8.1/include
+./usr/lib/gcc-lib/mipsel-unknown-openbsd2.6/2.8.1/include/objc
./usr/lib/libacl.so.4.1
./usr/lib/libc.so.23.1
./usr/lib/libc_r.so.1.1
@@ -421,10 +421,10 @@
./usr/libexec/ld.so
./usr/mdec/bootrz
./usr/mdec/rzboot
-./usr/mipsel-unknown-openbsd2.5
-./usr/mipsel-unknown-openbsd2.5/bin
-./usr/mipsel-unknown-openbsd2.5/lib
-./usr/mipsel-unknown-openbsd2.5/lib/ldscripts
+./usr/mipsel-unknown-openbsd2.6
+./usr/mipsel-unknown-openbsd2.6/bin
+./usr/mipsel-unknown-openbsd2.6/lib
+./usr/mipsel-unknown-openbsd2.6/lib/ldscripts
./usr/libdata/perl5/site_perl/mips-openbsd/net/if_sppp.ph
./usr/libdata/perl5/site_perl/mips-openbsd/pcap-int.ph
./usr/libdata/perl5/site_perl/mips-openbsd/sys/ataio.ph
diff --git a/distrib/sets/lists/base/md.powerpc b/distrib/sets/lists/base/md.powerpc
index 99b41f5fdbf..aacf9c405d8 100644
--- a/distrib/sets/lists/base/md.powerpc
+++ b/distrib/sets/lists/base/md.powerpc
@@ -3,10 +3,10 @@
./sbin/fdisk
./usr/include/powerpc
./usr/include/readline
-./usr/lib/gcc-lib/powerpc-unknown-openbsd2.5
-./usr/lib/gcc-lib/powerpc-unknown-openbsd2.5/2.8.1
-./usr/lib/gcc-lib/powerpc-unknown-openbsd2.5/2.8.1/include
-./usr/lib/gcc-lib/powerpc-unknown-openbsd2.5/2.8.1/include/objc
+./usr/lib/gcc-lib/powerpc-unknown-openbsd2.6
+./usr/lib/gcc-lib/powerpc-unknown-openbsd2.6/2.8.1
+./usr/lib/gcc-lib/powerpc-unknown-openbsd2.6/2.8.1/include
+./usr/lib/gcc-lib/powerpc-unknown-openbsd2.6/2.8.1/include/objc
./usr/lib/perl5/powerpc-openbsd
./usr/lib/perl5/powerpc-openbsd/5.00404
./usr/lib/perl5/powerpc-openbsd/5.00404/CORE
@@ -378,10 +378,10 @@
./usr/mdec/mbr
./usr/mdec/msdos1mb.gz
./usr/mdec/ofwboot
-./usr/powerpc-unknown-openbsd2.5
-./usr/powerpc-unknown-openbsd2.5/bin
-./usr/powerpc-unknown-openbsd2.5/lib
-./usr/powerpc-unknown-openbsd2.5/lib/ldscripts
+./usr/powerpc-unknown-openbsd2.6
+./usr/powerpc-unknown-openbsd2.6/bin
+./usr/powerpc-unknown-openbsd2.6/lib
+./usr/powerpc-unknown-openbsd2.6/lib/ldscripts
./usr/libdata/perl5/site_perl/powerpc-openbsd/pcap-int.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/ataio.ph
./usr/libdata/perl5/site_perl/powerpc-openbsd/sys/sched.ph
diff --git a/distrib/sets/lists/base/md.sparc b/distrib/sets/lists/base/md.sparc
index 5e79dc169aa..b870f847021 100644
--- a/distrib/sets/lists/base/md.sparc
+++ b/distrib/sets/lists/base/md.sparc
@@ -11,7 +11,7 @@
./usr/bin/objdump
./usr/include/readline
./usr/include/sparc
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6
./usr/lib/libacl.so.4.1
./usr/lib/libc.so.23.1
./usr/lib/libc_r.so.1.1
@@ -684,6 +684,6 @@
./usr/libdata/perl5/site_perl/sparc-openbsd/machine/fgaio.ph
./usr/libdata/perl5/site_perl/sparc-openbsd/machine/scfio.ph
./usr/libdata/perl5/site_perl/sparc-openbsd/net/if_sppp.ph
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1
-./usr/lib/gcc-lib/sparc-unknown-openbsd2.5/2.95.1/include
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1
+./usr/lib/gcc-lib/sparc-unknown-openbsd2.6/2.95.1/include
./usr/libdata/perl5/site_perl/sparc-openbsd/sys/sched.ph
diff --git a/share/mk/sys.mk b/share/mk/sys.mk
index 5a4aea85797..45baf8797cc 100644
--- a/share/mk/sys.mk
+++ b/share/mk/sys.mk
@@ -1,4 +1,4 @@
-# $OpenBSD: sys.mk,v 1.20 1999/03/03 05:50:19 smurph Exp $
+# $OpenBSD: sys.mk,v 1.21 1999/09/23 08:25:01 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= 2
-OSMINOR= 5
+OSMINOR= 6
OSREV= $(OSMAJOR).$(OSMINOR)
OSrev= $(OSMAJOR)$(OSMINOR)
diff --git a/share/tmac/mdoc/doc-common b/share/tmac/mdoc/doc-common
index 70250b9ed2d..afdbd985168 100644
--- a/share/tmac/mdoc/doc-common
+++ b/share/tmac/mdoc/doc-common
@@ -1,4 +1,4 @@
-.\" $OpenBSD: doc-common,v 1.16 1999/09/22 23:22:46 aaron Exp $
+.\" $OpenBSD: doc-common,v 1.17 1999/09/23 08:25:03 deraadt Exp $
.\"
.\" Copyright (c) 1991, 1993
.\" The Regents of the University of California. All rights reserved.
@@ -250,6 +250,9 @@
. if "\\$2"2.1" .as oS \02.1
. if "\\$2"2.2" .as oS \02.2
. if "\\$2"2.3" .as oS \02.3
+. if "\\$2"2.4" .as oS \02.4
+. if "\\$2"2.5" .as oS \02.5
+. if "\\$2"2.6" .as oS \02.6
.\}
.if "\\*(oS"Null" .ds oS \0\\$1
.if "\\*(aa"Non-Null" .as oS \0\\$2
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 8a09c286a51..95045d0472a 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -1,6 +1,6 @@
#!/bin/sh -
#
-# $OpenBSD: newvers.sh,v 1.19 1999/09/20 02:47:26 deraadt Exp $
+# $OpenBSD: newvers.sh,v 1.20 1999/09/23 08:25:03 deraadt Exp $
# $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $
#
# Copyright (c) 1984, 1986, 1990, 1993
@@ -50,7 +50,8 @@ id=`basename ${d}`
# OpenBSD symbol
# OpenBSD_X_X symbol
# src/share/tmac/mdoc/doc-common
-# . ds oS OpenBSD X.X
+# change . ds oS OpenBSD X.X
+# add . if "\\$2"X.X" .as oS \0X.X
# src/share/tmac/mdocs/doc-syms
# ensure new release is listed
# src/share/mk/sys.mk
@@ -61,7 +62,7 @@ id=`basename ${d}`
#
ost="OpenBSD"
-osr="2.5"
+osr="2.6"
echo "char ostype[] = \"${ost}\";" > vers.c
echo "char osrelease[] = \"${osr}\";" >> vers.c
@@ -69,7 +70,7 @@ echo "char osversion[] = \"${id}#${v}\";" >> vers.c
echo "char sccs[8] = { ' ', ' ', ' ', ' ', '@', '(', '#', ')' };" >> vers.c
echo \
"char version[] = \
- \"${ost} ${osr}-current (${id}) #${v}: ${t}\\n ${u}@${h}:${d}\\n\";" \
+ \"${ost} ${osr}-beta (${id}) #${v}: ${t}\\n ${u}@${h}:${d}\\n\";" \
>> vers.c
echo `expr ${v} + 1` > version
diff --git a/sys/sys/param.h b/sys/sys/param.h
index e4909217e3b..83b1d601055 100644
--- a/sys/sys/param.h
+++ b/sys/sys/param.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: param.h,v 1.24 1999/09/17 13:13:46 espie Exp $ */
+/* $OpenBSD: param.h,v 1.25 1999/09/23 08:25:01 deraadt Exp $ */
/* $NetBSD: param.h,v 1.23 1996/03/17 01:02:29 thorpej Exp $ */
/*-
@@ -45,8 +45,8 @@
#define BSD4_3 1
#define BSD4_4 1
-#define OpenBSD 199905 /* OpenBSD version (year & month). */
-#define OpenBSD2_5 1 /* OpenBSD 2.5 */
+#define OpenBSD 199912 /* OpenBSD version (year & month). */
+#define OpenBSD2_6 1 /* OpenBSD 2.6 */
#ifndef NULL
#ifdef __GNUG__
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-03 08:04:28 +0000