The branch releng/14.3 has been updated by philip:
URL:
https://cgit.FreeBSD.org/src/commit/?id=a48dc9b03b83dfd1f04a901ee478324b6ced9c73
commit a48dc9b03b83dfd1f04a901ee478324b6ced9c73
Author: Philip Paeps <phi...@freebsd.org>
AuthorDate: 2025-05-21 09:15:50 +0000
Commit: Philip Paeps <phi...@freebsd.org>
CommitDate: 2025-05-24 05:33:02 +0000
zoneinfo: don't install version
The commit teaching the build to install tzdata.zi for libcxx also
instals version. It turns out this makes at least one piece of third
party software cry: rubygem-tzinfo expects any file in zoneinfo to be at
least 44 bytes long. Clearly this is a bug in rubygem-tzinfo but since
nothing actually uses version, we may as well not install it ... as we
did previously.
Reported by: delphij
Fixes: 91506dba7f2e zoneinfo: also install tzdata.zi and version
MFC after: 1 day
Approved by: re (cperciva)
(cherry picked from commit 23a0c88b037625745b88d1661b9552f1ebe97ebc)
(cherry picked from commit 16ad4d77121dd117513c6044c0f076df144fa368)
---
ObsoleteFiles.inc | 3 +++
share/zoneinfo/Makefile | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 439df5e89377..0b8a3b9d4651 100644
--- a/ObsoleteFiles.inc
+++ b/ObsoleteFiles.inc
@@ -51,6 +51,9 @@
# xargs -n1 | sort | uniq -d;
# done
+# 20250524: don't install zoneinfo version
+OLD_FILES+=usr/share/zoneinfo/version
+
# 20250521: NDFREE(9) -> NDFREE_PNBUF(9)
OLD_FILES+=usr/share/man/man9/NDFREE.9.gz
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index 54d715916b71..86279d48a2f3 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -128,8 +128,6 @@ install-zoneinfo:
${CONTRIBDIR}/zone.tab ${DESTDIR}/usr/share/zoneinfo/
${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
${CONTRIBDIR}/zone1970.tab ${DESTDIR}/usr/share/zoneinfo/
- ${INSTALL} ${TAG_ARGS} -o ${BINOWN} -g ${BINGRP} -m ${NOBINMODE} \
- ${CONTRIBDIR}/version ${DESTDIR}/usr/share/zoneinfo/
afterinstall:
#
