From nobody Tue May 6 04:58:43 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 4Zs5l86BGjz5vS5r; Tue, 06 May 2025 04:58:44 +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 4Zs5l75yZ8z47GZ; Tue, 06 May 2025 04:58:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746507523; 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=ax0+YX2SZ9waQMLOcAyzlJzGTi3kUvpiq6UXTNHgl5o=; b=D+bwiFVT8EEGlQ6+iUKTtG0e3Z6+ox3Yg+7jfR5W40r+txvigdm2wUtNv2IeNXKbGwqQ7F jmatbBdZiBy6ZGea7gVAcqsZt1oI6N1x59w6YAC1L0mcjypLDOL4uXAttx8pxG7s1dOPPh H6S7bCykJXz0zy6XSOGD4x2Sd3AOuCkUpGv3eDgCWaDlfdlZ5McODDsAxlFVzHbF9EeGHc w/+NPoc1OjrwXywtDEZJnbQ3tl1hal9iWKtUEEP7G9jDWc0W2J0DnHATKHjfKp5VS9zEat 1OQp/7WI6pyGTdUx9knfNbkS7hqL7FTmcu7yM7H0Ld8mk1HCJBVwy3CC3BpoDg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1746507523; 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=ax0+YX2SZ9waQMLOcAyzlJzGTi3kUvpiq6UXTNHgl5o=; b=LO120e+3wizdcuSRKTvh3zlhSI1+g7KsHI9rsey+xV/sTM7y8HIOG23KDA3WRFbJMAMacF lw/EuEY7NqLtQt+384WpwwB63eCXtym430cO4fvdhm4gZNgFQDFWEGWatyIue7xZ0bfg+5 RP4E3CSssMtccrrETBSkc57FrHRAyGTC7Ko4l0vdopjWn9wRfkRP0EqLNSMzr5EJsELQGY 36dMTdRnb55wDkHZ9tLR8JE6GvDZ+eeuFVUdKCM1r7mp7FtwuKuF4pTwth8y08THws5/7T ig4mcLgKMdYfVlRAaLizuFnrKydQXqqGJAM62/EWMNgdiCIlWUfwqqPmsC195Q== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1746507523; a=rsa-sha256; cv=none; b=AJwB53OPvyVZ3sa81c1vAxfAzRFQ5gST0aj9iDDuQhRj9Xvgyv8w26qZUNa/SK8z3u1/Q4 pQK/q23QSH/3624YWKZ20GMmJkkvmzOjOS/h3uu91uPxuXjtsf2fmj19bDaN/3xGvGb7Ij QdYi5CgUrdqZo1r0oQEhuBCr01Fmkh+36Z2trYZDzs0QCcxStYzkQx8v8emgk6+bQNBmQF TkeWwkMSVUEwA5uffIryBEjfAHCKWJGkRYeRC6UOfRBnXIgCpxlWubCBXrIe/jw4eaINzl 3QJAGtDB3t5tCIae10BzKQ13ZGogwHKiB5fvaIPYs9PQYtYT/pOjgE+08bytvg== 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 4Zs5l751Cxzm3l; Tue, 06 May 2025 04:58:43 +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 5464wh4A096496; Tue, 6 May 2025 04:58:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 5464whSm096493; Tue, 6 May 2025 04:58:43 GMT (envelope-from git) Date: Tue, 6 May 2025 04:58:43 GMT Message-Id: <202505060458.5464whSm096493@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: 3502f06c6686 - stable/13 - 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/13 X-Git-Reftype: branch X-Git-Commit: 3502f06c6686fbb8335872b8bb3b951b549d8b2f Auto-Submitted: auto-generated The branch stable/13 has been updated by philip: URL: https://cgit.FreeBSD.org/src/commit/?id=3502f06c6686fbb8335872b8bb3b951b549d8b2f commit 3502f06c6686fbb8335872b8bb3b951b549d8b2f Author: Philip Paeps AuthorDate: 2025-04-01 08:09:37 +0000 Commit: Philip Paeps CommitDate: 2025-05-06 01:57:32 +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 d52ddb7c768d..e903a66dcfab 100644 --- a/share/zoneinfo/Makefile +++ b/share/zoneinfo/Makefile @@ -87,6 +87,20 @@ zoneinfo: ${TDATA} umask 022; cd ${.CURDIR}; \ zic -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 # # Sort TZS to ensure they are the same every build. find -s might @@ -110,6 +124,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: #