From nobody Sat May 24 04:33:55 2025 X-Original-To: dev-commits-src-all@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 4b48LD1rh0z5x52h; Sat, 24 May 2025 04:33:56 +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 4b48LD0FSZz3bwk; Sat, 24 May 2025 04:33:56 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748061236; 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=ouHti+VHn7G0IuEW8JeZeO4+N2mUr0+7zuG6apd026Y=; b=A+nx3yzesbkIUEZUDgXYh3FUvIo2duQ2rFtqVKimS9dgHXgpR0pWhqDIX0I14xM5DqCjUc lzVZV/wYW+j9KEAA/89GN9XeYWnfYpUmEAozgVggl5buiaS3lpVyi2yn8trI1vviK6LdCn TULlVGPrwLAdxs0H7xOxFvmd4mM9Cu8/cn+gId+tIcT8+4EVB053x9+E0TkXpnMBHstUPB K0pX0pZobTV9tRA5RT7gHPTbsewhe24nqXy2NXDnFR9Vp8h+SJV8ee632VO6mfnDrfh8kL dWV/LZwb9AheVt0oenJTW7iNN8nzFT//rVPEnUJA17nOct5osXDY5FAq85z8pg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748061236; 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=ouHti+VHn7G0IuEW8JeZeO4+N2mUr0+7zuG6apd026Y=; b=p1GVeLrJ+2WBgQM7dATmyL75QOEgzx0P7QPbXEKP7bhMKrV2XS/N5xNadE2hd5nX0H9B70 Asj0OF8RWZdGIYqTbgyVwXokUTnmqJSbeCC5J1+gNCTsTTgmyFxDbZtpTWIwKbNIOqbbPR qrxWz+zOruCfBJtrZCTlQ63b7VFMAPn18FgrIOlbwg/buqwQM9OXduSga3Arf4hvvz8cwR 6Ovs0DcEqv1BhaYibOGCOOA7pC1X1sPhiCHZeZddK0yUbRdbIDFM7buP8yLfOgIZYkNoTa BX3FCTvpU2yuHnrTZD7sUjb43glwTopCl4CKeyBofyLEaifZr4nCXqo11R9OeA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748061236; a=rsa-sha256; cv=none; b=czadHnGwLKSOd0WguHt50+pbValf1GQC1Sbexg7KpzYmB8admXaoc8jhHXvcYHyc7GO98Y DvpQ1FOTrGuXe4l8S6n3nN8kZj/VwZzrjvl2CSBUO9EHB3n2gNfrEKPSbcUkMBWoLK1eEi 7OjpCNJfujUm83qwYiomnVEM8MsgCwO0qobi+vmcxTYKXf7SlRePbanEvrhZpBbvXWcJ4d M3qWz5EXYKW3ffWf6MFW+v1dZAlX2hxEPRBWB81U+mE4Ar+YENtNzcETKLdeKRH58/GGxI VVsMZ2xLyqXh566XICZ49fqGFG1C1aOu91guTXsA/l2hXLc7ign7QJqvVX+zsg== 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 4b48LC6yvXz57K; Sat, 24 May 2025 04:33:55 +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 54O4Xten090520; Sat, 24 May 2025 04:33:55 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54O4XtRe090517; Sat, 24 May 2025 04:33:55 GMT (envelope-from git) Date: Sat, 24 May 2025 04:33:55 GMT Message-Id: <202505240433.54O4XtRe090517@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: 16ad4d77121d - stable/14 - zoneinfo: don't install version List-Id: Commit messages for all branches of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-all@freebsd.org Sender: owner-dev-commits-src-all@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/stable/14 X-Git-Reftype: branch X-Git-Commit: 16ad4d77121dd117513c6044c0f076df144fa368 Auto-Submitted: auto-generated The branch stable/14 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=16ad4d77121dd117513c6044c0f076df144fa368 commit 16ad4d77121dd117513c6044c0f076df144fa368 Author: Philip Paeps AuthorDate: 2025-05-21 09:15:50 +0000 Commit: Philip Paeps CommitDate: 2025-05-24 04:33:27 +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 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: #