From nobody Wed Apr 19 11:58:39 2023 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 4Q1fSv349Bz45NST; Wed, 19 Apr 2023 11:58:39 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Q1fSv2dfXz3qdK; Wed, 19 Apr 2023 11:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681905519; 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=ehMJSe4TSkCL9iHhMJXXVXADwbzLlNXx5VEPZi4YCc8=; b=PkPsAOM3n0VWazSjz7eQERLDxKodS3KqRYypKrsilMxdNFXVMPfdhyfZRLmSg3GHVFgX8e Oi6Xl7Ok18gbvLaR37HOhVB/J8+6MkdqbHdnAm1ByIEEZicWBiN5kquMObNFJh1K9CfQaW HjJJYq9MOsx0ojbWRgTpekWixXRW1mHFtcOwV0WPzcHM3SKpJBwOzRJa7oIv83jBd4FWey HJdUrYt6owIgd5g14vvHkQXXRG6B6NLFCE/8G+IFvY3EBWlYe23lq15z1Dvcorxm07OIl9 87dOiVDBtMTizLFpk1Rf7LaZOVHyDadzNNdmudmi5Cku9THpEXJ8KRXh7/lcWg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681905519; 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=ehMJSe4TSkCL9iHhMJXXVXADwbzLlNXx5VEPZi4YCc8=; b=UQG9j7Y+riP7nW/fGNaI7Xk5dq/wXNBmwFcC4uSGSGuUyDAnjuISZCbOQBibpvmaOmFIUl eiYZcuwPZOHDHENqyCN8Cnwx3bGPeilByvIFFy2sGSxqBFn08ioP+YsDSl8hIChtlm02nU 3CvjQeSWrM65JD8NB2TGQwbKPIF7JfUUr+OA6MibkAA5F/P72m7ZCF3POcM+Woc5pbYJlY G+7BKxIOKuODMnl0NMUKiuM7v+DzwYzn1x9q8a8ThYn9BgPLfL0BF/PDY/6+k74bPlAepp 78t5NAMcJElDKPXTXqHg+CK4h1ryJXBX6vuJASZy+XG4T2qjaqFhZoQ4CtkBiA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681905519; a=rsa-sha256; cv=none; b=uquzYhRZFtv+wX17VPLgeuUTiiq6eIndohSKiedR8noqYFFfZCLAwalE2zihCO59I38ySb iKsrhuEZk4sFrN1wnhmaYi2hLcRZrRxfjKWVbGMkM50mvrvs8UdA3aKXUs9G/xEydyu9Kx izXE6NL6rv3Lrih3jykI+cR3YF3VNq7CdNVgM0E5EQhRj/1ltOCvwKFgxqe6vGWEVdZL3c e2ZUNx7cjm+vdF5gHnySym8SLHhw1R/p3DgMMF7xoCAtp1ylbXnq2Pn0DUzITkdpnRICgZ uc6d5RVHnwU56KFGc5nBTR4EfEgvsQlZdH581XjvDNb/NRb7kCV3e+uMmVqtYw== 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 4Q1fSv1Rl0ztDN; Wed, 19 Apr 2023 11:58:39 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33JBwdcA045744; Wed, 19 Apr 2023 11:58:39 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33JBwdw2045743; Wed, 19 Apr 2023 11:58:39 GMT (envelope-from git) Date: Wed, 19 Apr 2023 11:58:39 GMT Message-Id: <202304191158.33JBwdw2045743@gitrepo.freebsd.org> To: src-committers@FreeBSD.org, dev-commits-src-all@FreeBSD.org, dev-commits-src-main@FreeBSD.org From: Yuri Pankov Subject: git: 4fee5114c374 - main - tzsetup(8): update paths to zone tab and tzdata source 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: Sender: owner-dev-commits-src-all@freebsd.org X-BeenThere: dev-commits-src-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: yuripv X-Git-Repository: src X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 4fee5114c3749f2b12404b89e616d4cb69a01c92 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by yuripv: URL: https://cgit.FreeBSD.org/src/commit/?id=4fee5114c3749f2b12404b89e616d4cb69a01c92 commit 4fee5114c3749f2b12404b89e616d4cb69a01c92 Author: Yuri Pankov AuthorDate: 2023-04-19 11:56:58 +0000 Commit: Yuri Pankov CommitDate: 2023-04-19 11:56:58 +0000 tzsetup(8): update paths to zone tab and tzdata source tzsetup now uses zone1970.tab and zoneinfo source is located in contrib/tzdata, update the man page accordingly. While here, drop obsolete Tn macros and insert vertical breaks (mostly before Dl in examples) to improve readability. Reviewed by: pauamma_gundo.com (manpages) Differential Revision: https://reviews.freebsd.org/D39643 --- usr.sbin/tzsetup/tzsetup.8 | 50 ++++++++++++++++++++-------------------------- 1 file changed, 22 insertions(+), 28 deletions(-) diff --git a/usr.sbin/tzsetup/tzsetup.8 b/usr.sbin/tzsetup/tzsetup.8 index 6ac5749e0aa4..62ac88d4fdc2 100644 --- a/usr.sbin/tzsetup/tzsetup.8 +++ b/usr.sbin/tzsetup/tzsetup.8 @@ -24,7 +24,7 @@ .\" .\" $FreeBSD$ .\" -.Dd October 21, 2009 +.Dd April 18, 2023 .Dt TZSETUP 8 .Os .Sh NAME @@ -46,8 +46,7 @@ default zone. The .Nm utility also determines whether any adjustment is necessary for systems where -the hardware clock does not keep -.Tn UTC . +the hardware clock does not keep UTC. .Pp The following options are available: .Bl -tag -offset indent -width Fl @@ -61,8 +60,7 @@ Reinstall the zoneinfo file installed last time. The name is obtained from .Pa /var/db/zoneinfo . .It Fl s -Skip the initial question about adjusting the clock if not set to -.Tn UTC . +Skip the initial question about adjusting the clock if not set to UTC. .El .Pp It is possible to short-circuit the menu system by specifying the @@ -74,13 +72,9 @@ on the command line; this is intended mainly for pre-configured installation scripts or people who know which zoneinfo they want to install. .Sh TIMEZONE DATABASE The contents of the timezone database are indexed by -.Pa /usr/share/zoneinfo/zone.tab . -This file lists, for each timezone data file, the -.Tn ISO -3166 territory code, approximate geographical coordinates -(in -.Tn ISO -6709 format), +.Pa /usr/share/zoneinfo/zone1970.tab . +This file lists, for each timezone data file, the ISO 3166 territory code, +approximate geographical coordinates (in ISO 6709 format), and location within the territory. .Pp The maintainers of the database maintain the following policies: @@ -91,31 +85,29 @@ At least one zone for every country or inhabited geographical territory. One zone for every distinct, documented timezone history since the beginning of the .Ux -epoch (January 1, 1970, -.Tn GMT ) . +epoch (January 1, 1970, GMT). .It Each zone is named for the most populous city therein. (Where possible, the database includes pre-1970 history for its city.) .El +.Pp The source code to the database -.Pq Pa /usr/src/share/zoneinfo/[a-z]* +.Pq Pa /usr/src/contrib/tzdata/[a-z]* contains many additional comments and documentation references for the historically minded. .Sh FILES -.Bl -tag -width ".Pa /usr/share/zoneinfo/zone.tab" -compact +.Bl -tag -width ".Pa /usr/share/zoneinfo/zone1970.tab" -compact .It Pa /etc/localtime current time zone file .It Pa /etc/wall_cmos_clock see .Xr adjkerntz 8 .It Pa /usr/share/misc/iso3166 -mapping of -.Tn ISO -3166 territory codes to names +mapping of ISO 3166 territory codes to names .It Pa /usr/share/zoneinfo directory for zoneinfo files -.It Pa /usr/share/zoneinfo/zone.tab +.It Pa /usr/share/zoneinfo/zone1970.tab mapping of timezone file to country and location .It Pa /var/db/zoneinfo saved name of the timezone file installed last @@ -123,21 +115,24 @@ saved name of the timezone file installed last .Sh EXAMPLES Normal usage, to select the right zoneinfo file via the dialog-based user interface: -.Dl tzsetup +.Pp +.Dl # tzsetup .Pp Install the file .Pa /usr/share/zoneinfo/Australia/Sydney : -.Dl "tzsetup /usr/share/zoneinfo/Australia/Sydney" .Pp -Install the zoneinfo file for Australia/Sydney, assumed to be located -in +.Dl "# tzsetup /usr/share/zoneinfo/Australia/Sydney" +.Pp +Install the zoneinfo file for Australia/Sydney, assumed to be located in .Pa /usr/share/zoneinfo : -.Dl "tzsetup Australia/Sydney" +.Pp +.Dl "# tzsetup Australia/Sydney" .Pp After a reinstall of the zoneinfo files, you can reinstall the latest installed zoneinfo file (as specified in .Pa /var/db/zoneinfo ) : -.Dl "tzsetup -r" +.Pp +.Dl "# tzsetup -r" .Sh SEE ALSO .Xr date 1 , .Xr adjtime 2 , @@ -159,8 +154,7 @@ Programs which are already running when creates or updates .Pa /etc/localtime will not reflect the updated timezone. -When the system is first configured for a -.Pf non- Tn UTC +When the system is first configured for a non-UTC hardware clock, it is necessary to run .Xr adjkerntz 8 (which normally happens as a part of system startup) in order to update