git: df16df7700c8 - stable/13 - zoneinfo: don't install version
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 24 May 2025 04:42:22 UTC
The branch stable/13 has been updated by philip:
URL: https://cgit.FreeBSD.org/src/commit/?id=df16df7700c829c6807021ed883ef538806609d6
commit df16df7700c829c6807021ed883ef538806609d6
Author: Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2025-05-21 09:15:50 +0000
Commit: Philip Paeps <philip@FreeBSD.org>
CommitDate: 2025-05-24 04:39:20 +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
(cherry picked from commit 23a0c88b037625745b88d1661b9552f1ebe97ebc)
---
ObsoleteFiles.inc | 3 +++
share/zoneinfo/Makefile | 2 --
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc
index 7d17e95aca27..1b24771e6f94 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
+
# 20250310: caroot bundle updated
OLD_FILES+=usr/share/certs/trusted/Entrust_Root_Certification_Authority_-_G4.pem
OLD_FILES+=usr/share/certs/trusted/SecureSign_RootCA11.pem
diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile
index e903a66dcfab..119e398c8dfa 100644
--- a/share/zoneinfo/Makefile
+++ b/share/zoneinfo/Makefile
@@ -124,8 +124,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:
#