diff options
| author |   deraadt <deraadt@openbsd.org> | 2017-08-20 16:56:43 +0000 |
|---|---|---|
| committer | deraadt <deraadt@openbsd.org> | 2017-08-20 16:56:43 +0000 |
| commit | a574151357152a2e36981bf0c9ecb732ae80a89a (patch) | |
| tree | 80edb4742f16a832707a8bcbf2bcee4d5857bc53 | |
| parent | clarify deprecation notice; (diff) | |
| download | wireguard-openbsd-a574151357152a2e36981bf0c9ecb732ae80a89a.tar.xz wireguard-openbsd-a574151357152a2e36981bf0c9ecb732ae80a89a.zip | |
crank to 6.2-beta
| -rw-r--r-- | etc/root/root.mail | 6 | ||||
| -rw-r--r-- | share/mk/sys.mk | 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 |
5 files changed, 14 insertions, 14 deletions
diff --git a/etc/root/root.mail b/etc/root/root.mail index a115a782bbd..3a53a2b2f26 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From deraadt@do-not-reply.openbsd.org Sun Apr 15 06:10:00 MDT 2017 +From deraadt@do-not-reply.openbsd.org Sun Oct 15 06:20:00 MDT 2017 Return-Path: root -Date: Apr 15 06:10:00 MDT 2017 +Date: Oct 15 06:20:00 MDT 2017 From: deraadt@do-not-reply.openbsd.org (Theo de Raadt) To: root -Subject: Welcome to OpenBSD 6.1! +Subject: Welcome to OpenBSD 6.2! 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 5239af8dfe8..2786a077584 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.81 2017/07/07 14:11:07 espie Exp $ +# $OpenBSD: sys.mk,v 1.82 2017/08/20 16:56:43 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= 6 -OSMINOR= 1 +OSMINOR= 2 OSREV= $(OSMAJOR).$(OSMINOR) OSrev= $(OSMAJOR)$(OSMINOR) diff --git a/sys/arch/macppc/stand/tbxidata/bsd.tbxi b/sys/arch/macppc/stand/tbxidata/bsd.tbxi index 4d5427a2ac2..e32556d852b 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.38 2017/03/04 16:52:47 deraadt Exp $ */ +/* $OpenBSD: bsd.tbxi,v 1.39 2017/08/20 16:56:43 deraadt Exp $ */ /* * Copyright (c) 2001 Dale Rahn. * All rights reserved. @@ -34,7 +34,7 @@ MacRISC MacRISC3 MacRISC4 OpenBSD/macppc bootloader </DESCRIPTION> <BOOT-SCRIPT> -boot cd:,ofwboot /6.1/macppc/bsd.rd +boot cd:,ofwboot /6.2/macppc/bsd.rd </BOOT-SCRIPT> <OS-BADGE-ICONS> 201B diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index 4f3dcad1437..3053d5c88a8 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.153 2017/04/02 00:27:36 deraadt Exp $ +# $OpenBSD: newvers.sh,v 1.154 2017/08/20 16:56:43 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -63,13 +63,13 @@ id=`basename "${d}"` # and disable POOL_DEBUG in sys/conf/GENERIC ost="OpenBSD" -osr="6.1" +osr="6.2" cat >vers.c <<eof -#define STATUS "-current" /* just after a release */ +#define STATUS "-beta" /* just before a release */ #if 0 +#define STATUS "-current" /* just after a release */ #define STATUS "" /* release */ -#define STATUS "-beta" /* just before a release */ #endif const char ostype[] = "${ost}"; diff --git a/sys/sys/param.h b/sys/sys/param.h index 0f5082fac7e..69ac22a6c18 100644 --- a/sys/sys/param.h +++ b/sys/sys/param.h @@ -1,4 +1,4 @@ -/* $OpenBSD: param.h,v 1.124 2017/03/04 16:52:47 deraadt Exp $ */ +/* $OpenBSD: param.h,v 1.125 2017/08/20 16:56:43 deraadt Exp $ */ /*- * Copyright (c) 1982, 1986, 1989, 1993 @@ -41,8 +41,8 @@ #define BSD4_3 1 #define BSD4_4 1 -#define OpenBSD 201705 /* OpenBSD version (year & month). */ -#define OpenBSD6_1 1 /* OpenBSD 6.1 */ +#define OpenBSD 201711 /* OpenBSD version (year & month). */ +#define OpenBSD6_2 2 /* OpenBSD 6.2 */ #include <sys/_null.h> |