From nobody Sat May 24 05:34:23 2025 X-Original-To: dev-commits-src-branches@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4b49h01CJlz5x8P3; Sat, 24 May 2025 05:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4b49h000nqz3frV; Sat, 24 May 2025 05:34:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748064864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjNG5UOzoD5zfvnVxh1LHD9DCScSPDDNYbYu7pWMBBM=; b=uiFuKwSgzAz7cD503d0jttl0DmNMeCTwbHDH+bd1g0kP6kJwv8d5qwCdYJ0LNzs1MCJgPk ALr2/1/4uXSf2vRObCkQegQvqomdTjJwZcLHTYNTiIiqj5inBmr9F/QhQxzPP87Zt5Uf/a YRHAIZ/VyFa+HYXU4PsQ0f4yvLDp1knX2AgHxHVzis89RJgRWW+N+PSX0/6epsqKniPCfM q0ExRlP49tuvfKphHIovSv6DX/rpwIX0mzrxS5WZps0NLZPUrJLgoW1Wr0zU30qjS4CtaL zb77Ewy7vLRYkdKGwIDXz3t7VEUwYJFiKnloBnz+2Os8sDMVrW6LjxtFfVK3wg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748064864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=IjNG5UOzoD5zfvnVxh1LHD9DCScSPDDNYbYu7pWMBBM=; b=kU+gHCrfKtJlhMjektOUkNqsDyeFaT6JMicJrD341EYJnyv2oSY0JPoSBjuc1IKYFOTa4A h0yOjfZX9lEUsDhlgIcDyMgVavB7vYBj2Z+7dyh+bneigvUIwZyspCh9Q4Edn97Oq6lgCu bVWPmVgj+UQukyV+D8t59AN0SDYBx1byW2en7m012JPuP53elZxDuBwHbK6m87vHXmWReZ dOoldz+fSOYDgJclIKHF1HLL5Rfroek5LU4laPMQElYqrBe5RVUDhr8giI4ujS7wwJ1tIQ vwjtYQDgHXQqOPsNqbp0VIBnX2+VYIIVcmIfcf/m1PPK1B7Cv5ig8ohFh0Fcag== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748064864; a=rsa-sha256; cv=none; b=MC0m8IIpyL48Ckdm9LLm9MfV5qnFwdIbLF+boKD0VovBGkocnRirUdA4I3lsWUCCzHXBqL NRpX3zy+kv47UPxOFfTtYvWSy4YoLOqo0XH0S0l8RhLo/ATuujKfNYO6zyDp07qF8v/yM/ ZlT9ypZ/ZD2UFZeNwxEYSCetHawkdxGMjP6/cNZewzViUY4nbmCYdwIJci2cmcioNZ29SO l8o7sXHlIOX03Ywxo+6xLSV9uCr46SiOoCEJU0TDRyTeNdqweXfHMYyPhsWxXliT0Ja5Ih H+23E2zRh1DqrCGEr7UhDt4lnpYBb6rp4+39XoZ+brdrcDxDsR4TYpPVTd62FA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4b49gz6g3Lz7KN; Sat, 24 May 2025 05:34:23 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 54O5YNpV002871; Sat, 24 May 2025 05:34:23 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54O5YNN2002867; Sat, 24 May 2025 05:34:23 GMT (envelope-from git) Date: Sat, 24 May 2025 05:34:23 GMT Message-Id: <202505240534.54O5YNN2002867@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-branches@FreeBSD.org From: Philip Paeps Subject: git: a48dc9b03b83 - releng/14.3 - zoneinfo: don't install version List-Id: Commits to the stable branches of the FreeBSD src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-branches@freebsd.org Sender: owner-dev-commits-src-branches@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: philip X-Git-Repository: src X-Git-Refname: refs/heads/releng/14.3 X-Git-Reftype: branch X-Git-Commit: a48dc9b03b83dfd1f04a901ee478324b6ced9c73 Auto-Submitted: auto-generated The branch releng/14.3 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=a48dc9b03b83dfd1f04a901ee478324b6ced9c73 commit a48dc9b03b83dfd1f04a901ee478324b6ced9c73 Author: Philip Paeps AuthorDate: 2025-05-21 09:15:50 +0000 Commit: Philip Paeps 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: #