From nobody Wed May 21 17:18:03 2025 X-Original-To: dev-commits-src-main@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 4b2dRH3Qfcz5wDs5; Wed, 21 May 2025 17:18:03 +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 4b2dRH2fXTz3pwR; Wed, 21 May 2025 17:18:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747847883; 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=LCHIB0k/bt50QHnKnL+oouxvhZWMiLZJ7eoXEhLxXhI=; b=NkRmz4lRY7hDWNmu4ZS992DWBzXtOjL1OtVNrBCtGUJNWbB01n/7hJyRDh9C/O81T5FCau 3N/9/wyxZrY5KuzdW4BP6GThvhErnggUCDNqFid5vTOJC7ITxSHBVj1FUamnuu+sSxMS+j Ai1gV5IE55kfzEoDT8YRb0GADG3fwfMcLp9vVPDmSCU9jxhiit4tFZ/gk2x2q7I+rMTAlq YtXua/81+DHro2bXpK8At4xDApeulX2GEVrM4ZesBa4SL1/pvZC9+JUgY5bmCzLPlikBC5 vB7aFF9VE+d6IECMGuK4TmcWcFPB7IhZ60T8nmw5Xti9545t7hgYsQ7cJ80OVg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1747847883; 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=LCHIB0k/bt50QHnKnL+oouxvhZWMiLZJ7eoXEhLxXhI=; b=s/WvKd6dahP1ipVN2ElD8eM5oEMdgw5jmGmAZwbAmC33TtHtUtFLeFiiPh5OK15uuElT40 z+NK/P0AkEr4DRqo4D+JNTm3CA+IHEMgKfL0Zs1f+9cRHmN3d/EPyDjDDZRnlXyvJ7J5Tl dClHx2pzwgI5BcL6cZ0vdszQoMFigaN3ptIObNRIoV/OkpK6vw4DlXHsMhQB3M41jxuIrx sw3vEhNfJn6PMzOwS9nyjX9xSO8GPuNAXV9L/L1D4AVlzT28cO+UA9epBsKyyki5dJFwlY HlkJblMkClE+AW8m03/WNG5TgA/e/UC4fzZNeO+UR4nL0PmB4PU0gRL4EVOoaA== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1747847883; a=rsa-sha256; cv=none; b=dqHAG1Ql6y4CDVhVDqHQdrMKRHCLpdaVqjDxOHb/UWf0+l6PxJmBkYrjpvzOUvlrw+KK6H QNlV9MDX150nqGouOYLkf+qV+YIsMdgriI469dni/2Gvr+TBFT9GRFIUhM3xawALi+LOmh wiy0QdfrmPu6O4M/cVO9znKLXn/F32Iyh/bL8owidxawy0i5XgfqWNH+UFMLiU644ziyS+ Y3lFu/NzUrSQXHBWBRebIqtiwYas9AWuygRia+W9tH/scGwrJWwR+NQrztSctBfyii75aQ E6/cPLbr0ZDXeCAcS6EVQjcjxaOqoReg2pC9P1tqIUFJ3XWUMgntzA8ouYgiyQ== 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 4b2dRH1y9XzkJV; Wed, 21 May 2025 17:18:03 +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 54LHI3d6019354; Wed, 21 May 2025 17:18:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 54LHI3nb019351; Wed, 21 May 2025 17:18:03 GMT (envelope-from git) Date: Wed, 21 May 2025 17:18:03 GMT Message-Id: <202505211718.54LHI3nb019351@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Philip Paeps Subject: git: 23a0c88b0376 - main - zoneinfo: don't install version List-Id: Commit messages for the main branch of the src repository List-Archive: https://lists.freebsd.org/archives/dev-commits-src-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-src-main@freebsd.org Sender: owner-dev-commits-src-main@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/main X-Git-Reftype: branch X-Git-Commit: 23a0c88b037625745b88d1661b9552f1ebe97ebc Auto-Submitted: auto-generated The branch main has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=23a0c88b037625745b88d1661b9552f1ebe97ebc commit 23a0c88b037625745b88d1661b9552f1ebe97ebc Author: Philip Paeps AuthorDate: 2025-05-21 09:15:50 +0000 Commit: Philip Paeps CommitDate: 2025-05-21 17:17:49 +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 --- ObsoleteFiles.inc | 3 +++ share/zoneinfo/Makefile | 2 -- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/ObsoleteFiles.inc b/ObsoleteFiles.inc index b90ac11dfc69..8f5da0483a87 100644 --- a/ObsoleteFiles.inc +++ b/ObsoleteFiles.inc @@ -51,6 +51,9 @@ # xargs -n1 | sort | uniq -d; # done +# 20250521: don't install zoneinfo version +OLD_FILES+=usr/share/zoneinfo/version + # 20250516: 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 e3111c915a93..993f9abaeeb3 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -127,8 +127,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: #