From nobody Sat May 24 04:42:22 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 4b48Wy5NMfz5x5YT; Sat, 24 May 2025 04:42:22 +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 4b48Wy2wGsz3c9D; Sat, 24 May 2025 04:42:22 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748061742; 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=n/iXBCwoPM4BeyJ3vSv/3Ee7aIBpHYQlIanOGwJHnzQ=; b=PeS/xULIpL0XxvjynFMIvXuhKU8RMTEB2QbEt8iya9SLEvP3uVNXFICx95Sc7dPt5lXCa4 Wp4Mx/fcV1059O9N6Tv+V+G1H7AfkiYwsT/OniNR0rXg8Qr3X4sP2P7907aO7UiLXeQ9eU pdjJ1ysXOtDcwszyQQAbaxbd/+WEfPztEMPUERHuzgC5k4nB7Jq3Eex/QEjR1/cZxdPyaF BDyyArJkiDUGs/tNU/C1kL9EPlg1zVc47nVrjChiQ1wldmQGe/M5uRqDnTXdv5ZFYm90/r mWHNyPFoujTvHS4gkmjR+mm8YrAfvHSjm8F2t1g98362zabfL6q2rzaoZv1oAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1748061742; 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=n/iXBCwoPM4BeyJ3vSv/3Ee7aIBpHYQlIanOGwJHnzQ=; b=cr0QgQIB0AnUeh6kfho12FwE5aDRcfSNHDnCVYOVRuXRbwkgwmU3OJgQJHu5K/14itY9dJ 8ZBDzkBaQ5jwrFmm9zjagc/KiFEScQVSdnoh6oVihzHpogZXCH0IP1C5daSZsC4PD48knd tI/Erd2kcdSpnATjoZ4hQH0+i6KqaZkm0GatIE6n5gCcJBW7QCDlBpCzSA6aG1P78kBlCU MHMUIKMfEKdeICXKwHSI3eGOUu6Sx33GnFqhKRZLcsww+lLFXmWpO2z53A+BZmF3g9nOsL my3rNWyftjoHMxyLWZvVso5M/P4XK5frrd19scW9yrtD+TNTQV3laXCbbq5YAg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1748061742; a=rsa-sha256; cv=none; b=I8DisiqP6hQzXbVSgVA4oFvBxAxrXAhBg6zHg/vLz6/B4OH08FCMAe6KW8Di1X6Wst8sK8 wpiM7gzpAdIjK0yanzzTs5QB6Q8KOVqOnnXDMz0/cfyEIIP3STkLjSYfd/vzWT0iZ3dptk pyeMM/pZy5O+XQGNTgfw4JZJt3fDmkNbe9pEgFCICOs/RwiqdZqYvNUSaQTFANk5MEy7at vY3kvwYEEt62si7i6uUHyprQ+Dz3ifFt8K+VWbzuPPhGWMeTLcYVY1GyDUV7yvzudp9okD 6sXwDaLx0obFpSjn8gnqAPoZzz2RmEtJSGYQvE7+/CanI0kKFfX3cVGU85VD7Q== 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 4b48Wy2WGhz5cs; Sat, 24 May 2025 04:42:22 +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 54O4gMEh008989; Sat, 24 May 2025 04:42:22 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54O4gMW8008953; Sat, 24 May 2025 04:42:22 GMT (envelope-from git) Date: Sat, 24 May 2025 04:42:22 GMT Message-Id: <202505240442.54O4gMW8008953@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: df16df7700c8 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: df16df7700c829c6807021ed883ef538806609d6 Auto-Submitted: auto-generated The branch stable/13 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=df16df7700c829c6807021ed883ef538806609d6 commit df16df7700c829c6807021ed883ef538806609d6 Author: Philip Paeps AuthorDate: 2025-05-21 09:15:50 +0000 Commit: Philip Paeps 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: #