From 6c3f0964c339f6c630df87ff91ec1d5fc343826d Mon Sep 17 00:00:00 2001 From: purplerain Date: Sat, 17 Feb 2024 22:39:49 +0000 Subject: [PATCH] move to 1.5-beta (Yatagarasu) --- etc/root/root.mail | 6 +++--- etc/skel/dot.version | 2 +- share/mk/sys.mk | 4 ++-- sys/conf/newvers.sh | 8 ++++---- sys/sys/param.h | 6 +++--- usr.bin/signify/signify.1 | 8 ++++---- usr.sbin/httpd/httpd.h | 2 +- 7 files changed, 18 insertions(+), 18 deletions(-) diff --git a/etc/root/root.mail b/etc/root/root.mail index 2ca871bab..63637435e 100644 --- a/etc/root/root.mail +++ b/etc/root/root.mail @@ -1,9 +1,9 @@ -From purplerain@secbsd.org Fri Nov 10 00:00:00 UTC 2023 +From purplerain@secbsd.org Sat Apr 20 00:00:00 UTC 2024 Return-Path: root -Date: Nov 10 00:00:00 UTC 2023 +Date: Apr 20 00:00:00 UTC 2024 From: purplerain@secbsd.org (Purple Rain) To: root -Subject: Welcome to SecBSD 1.4! +Subject: Welcome to SecBSD 1.5! This message attempts to describe the most basic initial questions that a system administrator of an SecBSD box might have. You are urged to save diff --git a/etc/skel/dot.version b/etc/skel/dot.version index d5dbac8ef..997292484 100644 --- a/etc/skel/dot.version +++ b/etc/skel/dot.version @@ -1 +1 @@ -# SecBSD 1.4-ddf4db4: Thu Feb 1 02:09:51 UTC 2024 (Mictlantecuhtli) +# SecBSD 1.5-de8ea3c: Sat Feb 17 20:41:00 UTC 2024 (Yatagarasu) diff --git a/share/mk/sys.mk b/share/mk/sys.mk index a71fefcdd..418b58206 100644 --- a/share/mk/sys.mk +++ b/share/mk/sys.mk @@ -1,4 +1,4 @@ -# $OpenBSD: sys.mk,v 1.94 2023/09/18 13:16:13 deraadt Exp $ +# $OpenBSD: sys.mk,v 1.95 2024/02/17 16:13:24 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 SecBSD. OSMAJOR= 1 -OSMINOR= 4 +OSMINOR= 5 OSREV= $(OSMAJOR).$(OSMINOR) OSrev= $(OSMAJOR)$(OSMINOR) diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh index ea2abaf15..61ce300b3 100644 --- a/sys/conf/newvers.sh +++ b/sys/conf/newvers.sh @@ -1,6 +1,6 @@ #!/bin/sh - # -# $OpenBSD: newvers.sh,v 1.200 2024/01/02 16:40:03 bluhm Exp $ +# $OpenBSD: newvers.sh,v 1.201 2024/02/17 16:13:24 deraadt Exp $ # $NetBSD: newvers.sh,v 1.17.2.1 1995/10/12 05:17:11 jtc Exp $ # # Copyright (c) 1984, 1986, 1990, 1993 @@ -68,13 +68,13 @@ id=`basename "${d}"` # and disable POOL_DEBUG in sys/conf/GENERIC ost="SecBSD" -osr="1.4" +osr="1.5" cat >vers.c < diff --git a/usr.bin/signify/signify.1 b/usr.bin/signify/signify.1 index 4f17e1068..ac34beb57 100644 --- a/usr.bin/signify/signify.1 +++ b/usr.bin/signify/signify.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: signify.1,v 1.57 2023/09/18 13:16:13 deraadt Exp $ +.\" $OpenBSD: signify.1,v 1.58 2024/02/17 16:13:24 deraadt Exp $ .\" .\"Copyright (c) 2013 Marc Espie .\"Copyright (c) 2013 Ted Unangst @@ -14,7 +14,7 @@ .\"WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN .\"ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF .\"OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE. -.Dd $Mdocdate: September 18 2023 $ +.Dd $Mdocdate: February 17 2024 $ .Dt SIGNIFY 1 .Os .Sh NAME @@ -171,12 +171,12 @@ Verify a release directory containing .Pa SHA256.sig and a full set of release files: .Bd -literal -offset indent -compact -$ signify -C -p /etc/signify/secbsd-14-base.pub -x SHA256.sig +$ signify -C -p /etc/signify/secbsd-15-base.pub -x SHA256.sig .Ed .Pp Verify a bsd.rd before an upgrade: .Bd -literal -offset indent -compact -$ signify -C -p /etc/signify/secbsd-14-base.pub -x SHA256.sig bsd.rd +$ signify -C -p /etc/signify/secbsd-15-base.pub -x SHA256.sig bsd.rd .Ed .Pp Sign a gzip archive: diff --git a/usr.sbin/httpd/httpd.h b/usr.sbin/httpd/httpd.h index c0bb7ae38..c2ae04674 100644 --- a/usr.sbin/httpd/httpd.h +++ b/usr.sbin/httpd/httpd.h @@ -45,7 +45,7 @@ #define CONF_FILE "/etc/httpd.conf" #define HTTPD_USER "www" -#define HTTPD_SERVERNAME "Mictlantecuhtli" +#define HTTPD_SERVERNAME "Yatagarasu" #define HTTPD_DOCROOT "/htdocs" #define HTTPD_ERRDOCTEMPLATE "err" /* 3-char name */ #define HTTPD_ERRDOCROOT_MAX (PATH_MAX - sizeof("000.html"))