From nobody Thu May 1 06:38:26 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 4Zp4BV3xFBz5thG6; Thu, 01 May 2025 06:38:26 +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 4Zp4BV36Ymz3shM; Thu, 01 May 2025 06:38:26 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746081506; 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=Em/P2dwfpnahH87GtbDKo5vWcULj+LRpK6wD8Ey+ClM=; b=H9IKwMKzY2MG090Fcr9I640N1Z5ajGJ30nZ6bk8dQdht7QOd6FEfOC0UAGa0AkMRF9xy// Qc8Fvl5As1PDHo2ryYJp+ZK7psQQH7V1k9kt5oEaJVgjV+Pr1UEhm/HepiWb3If/pBmbqA A/kHRarTd3Gscdc55RzYnv2pH4C3vxr2/4TjbaUIoGqkIpoKkV3HP5OaJjSQBbf2EgOJyp ueM4/jIDJLKchvwrT6TFBDAIhSsd7nRS+Dwce7+42M2qbpUeUIWXvF/dptxLoXrJYDi0wE ksi8B3izOnlvshYw06pM4l/pyI5djoOgzDf281O+XZl9D8e790Moz7oZ/FgjSw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746081506; 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=Em/P2dwfpnahH87GtbDKo5vWcULj+LRpK6wD8Ey+ClM=; b=IAyaXvrZopzZmIHWawtK/PmhA2hf0crqho7WLhHTH1KBDfqmiL87Fm7NItU2BtDt0SW2OF PNr9xPAVY6StJUzL/hRVWL7fMWG5+JSeXysz/+I/A3K3B9LTmfYiYd/rX0IFQVPw/NiilM yXYXbCVsTUsJh/mqEnUuC/HWJh0DW7OZyUtRmi/tIh40FSHhttu8SUU54Svt63C2KdciOT zJci18r3yO10t9Kv1ObL/WjfHkJODuMPCV266hGr+9x89T6rDgHf03N/pCAE82z10JXFrr p89wDcTbB0CdUgY0t+rgXbZwnf2dxLPuM9Tz0VLFlOppM0mKjGoQz905N5uR5A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746081506; a=rsa-sha256; cv=none; b=S7t8xUZ+7YEkPz6CI9V8MhOK4yHvE5EPdNcEeC2MNiAtMUCwDLbsOTgKS4HGjAJDpqBLk4 kZ9dcBCpE15TLRwKGq5A1vSXt6YHieRCux1u5ORAyjScfuD3yLzVAfab8NLqXAr+ipTBmh yFoznW64Mzan1Qua2FE6ZmiDOfDkJcHU4lrAl8FwJXzsW+9SVsNeYktZF1MhvPaUpirujW c3F7or6KfR4KgFieuBkwkWiMYqD0CE86qM0W08+LaLJWQQ3qdgS3wgKEg6lKS9wyFr7mlI m7Ukf8Lq4sAR62zcjbufX5iGv9Am8RezIRduHh4Vy7YSoImvQNEUNHN3bel8fw== 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 4Zp4BV2P6cz2JN; Thu, 01 May 2025 06:38:26 +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 5416cQov075834; Thu, 1 May 2025 06:38:26 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5416cQtr075831; Thu, 1 May 2025 06:38:26 GMT (envelope-from git) Date: Thu, 1 May 2025 06:38:26 GMT Message-Id: <202505010638.5416cQtr075831@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: 4aed98a65ac9 - stable/14 - zoneinfo: also install tzdata.zi and 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/stable/14 X-Git-Reftype: branch X-Git-Commit: 4aed98a65ac91a65dc711fe1df5bdd1842d5c391 Auto-Submitted: auto-generated The branch stable/14 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=4aed98a65ac91a65dc711fe1df5bdd1842d5c391 commit 4aed98a65ac91a65dc711fe1df5bdd1842d5c391 Author: Philip Paeps AuthorDate: 2025-04-01 08:09:37 +0000 Commit: Philip Paeps CommitDate: 2025-05-01 00:51:12 +0000 zoneinfo: also install tzdata.zi and version Build and install the shrunk version of the time zone database required by libc++ 19 std::chrono::current_zone (etc). While here, also install the tzdata 'version' file to align more closely with other vendors. PR: 282377 Reviewed by: dim, emaste, imp Differential Revision: https://reviews.freebsd.org/D49577 (cherry picked from commit 91506dba7f2eb147eeb55ec30640bc11755a1e8e) --- share/zoneinfo/Makefile | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/share/zoneinfo/Makefile b/share/zoneinfo/Makefile index d4b37ce991aa..54d715916b71 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -99,6 +99,20 @@ zonefiles: ${TDATA} (umask 022; cd ${.CURDIR}; \ ${ZIC:Uzic} -D -d ${TZBUILDDIR} ${ZICFLAGS} -m ${NOBINMODE} \ ${LEAPFILE} ${TZFILES}) + (umask 022; cd ${TZBUILDDIR}; \ + read -r version <${CONTRIBDIR}version && \ + LC_ALL=C awk \ + -v DATAFORM='main' \ + -v PACKRATDATA='' \ + -v PACKRATLIST='' \ + -f ${CONTRIBDIR}ziguard.awk ${TZFILES} >${TZBUILDDIR}/main.zi; \ + LC_ALL=C awk \ + -v dataform='main' \ + -v deps='zishrink.awk' \ + -v redo='posix_only' \ + -v version="$$version" \ + -f ${CONTRIBDIR}zishrink.awk \ + main.zi >tzdata.zi; rm main.zi) (cd ${TZBUILDDIR} && find * -type f | LC_ALL=C sort) > ${.TARGET} beforeinstall: install-zoneinfo @@ -114,6 +128,8 @@ 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: #