From 1bfc84289e524871aac339101d686fd3b49c6782 Mon Sep 17 00:00:00 2001 From: Warner Losh Date: Sun, 17 Nov 2024 16:55:05 -0700 Subject: [PATCH 1/2] cdefs.h: Fix bad version It's -isoC-2024 not -isoC2023. Fix it Noticed by: gperciva@tarsnap.com Sponsored by: Netflix --- share/man/man9/cdefs.9 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/share/man/man9/cdefs.9 b/share/man/man9/cdefs.9 index 38762c22f586..350e5d773004 100644 --- a/share/man/man9/cdefs.9 +++ b/share/man/man9/cdefs.9 @@ -385,7 +385,7 @@ Likewise, when C23 dialog is selected with or .St -p1003.1-2024 , definitions for -.St -isoC-2023 +.St -isoC-2024 are also included. .Ss Header Visibility Macros These macros are set by From d54fdd16636bbe6a38a5b0a636dd83cf64aa6e06 Mon Sep 17 00:00:00 2001 From: Colin Percival Date: Sun, 17 Nov 2024 16:06:17 -0800 Subject: [PATCH 2/2] release: Remove empty suffix from file names For "release" builds (as opposed to "snapshot" builds -- in this context BETAs and RCs are "releases") ${SNAP_SUFFIX} is empty; but it stuck into some ociimages filenames via a copy-and-paste error. The final filenames on the download mirrors were not affected, so this does not need to be merged to releng/14.2. MFC after: 3 days Sponsored by: Amazon --- release/Makefile.mirrors | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/release/Makefile.mirrors b/release/Makefile.mirrors index 8856389979d1..7f7c34e21077 100644 --- a/release/Makefile.mirrors +++ b/release/Makefile.mirrors @@ -360,8 +360,8 @@ oci-images-stage: . endfor . for CHECKSUM in ${CHECKSUM_FILES} cd ${RELEASEDIR}/ociimages && \ - ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} - cp -p ${RELEASEDIR}/ociimages/CHECKSUM.${CHECKSUM}-${SNAP_SUFFIX} \ + ${CHECKSUM:tl} ${OSRELEASE}* > CHECKSUM.${CHECKSUM} + cp -p ${RELEASEDIR}/ociimages/CHECKSUM.${CHECKSUM} \ ${OCI_DIR}/Latest/CHECKSUM.${CHECKSUM} . endfor .endif