The branch releng/14.2 has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=a1e3ff6580de176e7b5e989ae7b345ee0797af0d
commit a1e3ff6580de176e7b5e989ae7b345ee0797af0d
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-01-29 17:34:06 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-01-29 17:34:06 +0000
Add UPDATING entries and bump version
Approved by: so
---
UPDATING | 17 +++++++++++++++++
sys/conf/newvers.sh | 2 +-
2 files changed, 18 insertions(+), 1 deletion(-)
diff --git a/UPDATING b/UPDATING
index 3a644b8feaf2..90037d45bd19 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,23 @@ 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.
+20250129:
+ 14.2-RELEASE-p1 SA-25:02.fs
+ SA-25:03.etcupdate
+ SA-25:04.ktrace
+ EN-25:02.audit
+ EN-25:03.tzdata
+
+ Buffer overflow in some filesystems via NFS [SA-25:02.fs]
+
+ Unprivileged access to system files [SA-25:03.etcupdate]
+
+ Uninitialized kernel memory disclosure via ktrace(2) [SA-25:04.ktrace]
+
+ System call auditing disabled by DTrace [EN-25:02.audit]
+
+ Timezone database information update [EN-25:03.tzdata]
+
20241203:
14.2-RELEASE.
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 8afaa8ccd571..9bfa4bd5853f 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="14.2"
-BRANCH="RELEASE"
+BRANCH="RELEASE-p1"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
