aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGordon Tetlow <gordon@FreeBSD.org>2025-02-21 02:38:02 +0000
committerGordon Tetlow <gordon@FreeBSD.org>2025-02-21 02:45:53 +0000
commitac2cbb46b5f1efa7f7b5d4eb15631337329ec5b2 (patch)
tree8edb743aefeb939b96697fb40647b6fbbc3b9eea
parent4b8a2f716588e58ddb39ccdb60189e8c57239457 (diff)
Add UPDATING entries and bump versionreleng/14.2
Approved by: so
-rw-r--r--UPDATING5
-rw-r--r--sys/conf/newvers.sh2
2 files changed, 6 insertions, 1 deletions
diff --git a/UPDATING b/UPDATING
index 90037d45bd19..d9103d7b1e29 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,11 @@ Items affecting the ports and packages system can be found in
/usr/ports/UPDATING. Please read that file before updating system packages
and/or ports.
+20250221:
+ 14.2-RELEASE-p2 SA-25:05.openssh
+
+ Multiple vulnerabilities in OpenSSH [SA-25:05.openssh]
+
20250129:
14.2-RELEASE-p1 SA-25:02.fs
SA-25:03.etcupdate
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 9bfa4bd5853f..49d6f96be2c8 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="14.2"
-BRANCH="RELEASE-p1"
+BRANCH="RELEASE-p2"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi