The branch releng/13.4 has been updated by cperciva:
URL:
https://cgit.FreeBSD.org/src/commit/?id=58066db597befb899b2fe59031b2a32fb9183f0f
commit 58066db597befb899b2fe59031b2a32fb9183f0f
Author: Colin Percival <cperc...@freebsd.org>
AuthorDate: 2024-09-13 00:00:00 +0000
Commit: Colin Percival <cperc...@freebsd.org>
CommitDate: 2024-09-13 00:00:00 +0000
Update in preparation for 13.4-RELEASE
- Bump BRANCH to RELEASE
- Record the anticipated announcement date in UPDATING
- Set a static __FreeBSD_version in crtbrand.S
Approved by: re (implicit)
Sponsored by: Amazon
---
UPDATING | 3 +++
lib/csu/common/crtbrand.S | 2 +-
sys/conf/newvers.sh | 2 +-
3 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/UPDATING b/UPDATING
index f1c2c0d8617e..3080a1e5b420 100644
--- a/UPDATING
+++ b/UPDATING
@@ -12,6 +12,9 @@ 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.
+20240917:
+ 13.4-RELEASE.
+
20240904:
13.4-RC2-p1 SA-24:09.libnv
SA-24:11.ctl
diff --git a/lib/csu/common/crtbrand.S b/lib/csu/common/crtbrand.S
index 0ed86bfba2b2..7935e6b3dddb 100644
--- a/lib/csu/common/crtbrand.S
+++ b/lib/csu/common/crtbrand.S
@@ -43,7 +43,7 @@
.4byte NT_FREEBSD_ABI_TAG
1: .asciz NOTE_FREEBSD_VENDOR
2: .p2align 2
-3: .4byte __FreeBSD_version
+3: .4byte 1304000
4:
.section .note.GNU-stack,"",%progbits
diff --git a/sys/conf/newvers.sh b/sys/conf/newvers.sh
index 862c89a779f1..dd9ff3795158 100644
--- a/sys/conf/newvers.sh
+++ b/sys/conf/newvers.sh
@@ -53,7 +53,7 @@
TYPE="FreeBSD"
REVISION="13.4"
-BRANCH="RC3"
+BRANCH="RELEASE"
if [ -n "${BRANCH_OVERRIDE}" ]; then
BRANCH=${BRANCH_OVERRIDE}
fi
