The branch releng/14.1 has been updated by markj:
URL:
https://cgit.FreeBSD.org/src/commit/?id=89321a8f570708e0cfd744ef3b934f53da4e04c8
commit 89321a8f570708e0cfd744ef3b934f53da4e04c8
Author: Mark Johnston <ma...@freebsd.org>
AuthorDate: 2025-01-29 17:23:53 +0000
Commit: Mark Johnston <ma...@freebsd.org>
CommitDate: 2025-01-29 18:46:31 +0000
Add UPDATING entries and bump version
Approved by: so
---
UPDATING | 20 ++++++++++++++++++++
sys/conf/newvers.sh | 2 +-
2 files changed, 21 insertions(+), 1 deletion(-)
diff --git a/UPDATING b/UPDATING
index 7db8d96d692e..7d2136381614 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,26 @@ 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.1-RELEASE-p7 SA-25:01.openssh
+ SA-25:02.fs
+ SA-25:03.etcupdate
+ EN-25:01.rpc
+ EN-25:02.audit
+ EN-25:03.tzdata
+
+ OpenSSH Keystroke Obfuscation Bypass [SA-25:01.openssh]
+
+ Buffer overflow in some filesystems via NFS [SA-25:02.fs]
+
+ Unprivileged access to system files [SA-25:03.etcupdate]
+
+ NULL pointer dereference in the NFSv4 client [EN-25:01.rpc]
+
+ System call auditing disabled by DTrace [EN-25:02.audit]
+
+ Timezone database information update [EN-25:03.tzdata]
+
20241029:
14.1-RELEASE-p6 EN-24:17.pam_xdg
SA-24:17.bhyve
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index c8fcd643c0b9..388b566b79b0 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="14.1"
-BRANCH="RELEASE-p6"
+BRANCH="RELEASE-p7"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
