From 27537b4a5eb9de120a1f5b3d6614b7bca2e20752 Mon Sep 17 00:00:00 2001
From: Philip Paeps <philip@FreeBSD.org>
Date: Mon, 1 Jul 2024 16:50:42 +0800
Subject: [PATCH] Add UPDATING entries and bump the branch version.

Approved by:	so
---
 UPDATING            | 5 +++++
 sys/conf/newvers.sh | 2 +-
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/UPDATING b/UPDATING
index d972b89c5f6..9972de7d6fa 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.
 
+20240701:
+	14.1-RELEASE-p1 SA-24:04.openssh
+
+	Fix pre-authentication remote code execution in sshd [SA-24:04.openssh]
+
 20240619:
 	14.1-RELEASE-p1 EN-24:10.zfs
 			EN-24:13.libc++
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 8b55836841d..ba482a7931d 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
 
 TYPE="FreeBSD"
 REVISION="14.1"
-BRANCH="RELEASE-p1"
+BRANCH="RELEASE-p2"
 if [ -n "${BRANCH_OVERRIDE}" ]; then
 	BRANCH=${BRANCH_OVERRIDE}
 fi