From a48dc9b03b83dfd1f04a901ee478324b6ced9c73 Mon Sep 17 00:00:00 2001 From: Philip Paeps Date: Wed, 21 May 2025 17:15:50 +0800 Subject: [PATCH] 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 439df5e8937..0b8a3b9d465 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 54d715916b7..86279d48a2f 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: #