diff options
| author | Philip Paeps <philip@FreeBSD.org> | 2022-08-11 02:48:24 +0000 |
|---|---|---|
| committer | Ed Maste <emaste@FreeBSD.org> | 2022-08-30 23:01:22 +0000 |
| commit | 707cecae4e345c9b0300a3fde9e30360cb03c54a (patch) | |
| tree | 2546c4cd9aefedb5b2f7f101fa73f057c6f16c64 /contrib/tzdata/etcetera | |
| parent | 77cd23716ffbd23a2f8773c599c742641e2b5ece (diff) | |
contrib/tzdata: import tzdata 2022b and 2022c
Changes: https://github.com/eggert/tz/blob/2022b/NEWS
Changes: https://github.com/eggert/tz/blob/2022c/NEWS
The tzdata2022b import restored the zoneinfo/GMT link.
Don't delete it again with 'make delete-old'.
(cherry picked from commit 9f9fc6bb8028ea29da6b04c338c750cedc3040f3)
(cherry picked from commit f5d5282cf7d1181f933626dcdc3525db0d70a266)
(cherry picked from commit 5f33eb7266f938857ce2fc9ea59679ea46a0694b)
(cherry picked from commit f7cb47731675828d27ebd55c9fc46953ee168d48)
Approved by: so
Diffstat (limited to 'contrib/tzdata/etcetera')
| -rw-r--r-- | contrib/tzdata/etcetera | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/contrib/tzdata/etcetera b/contrib/tzdata/etcetera index 987a6483b644..a7e0eb4168ad 100644 --- a/contrib/tzdata/etcetera +++ b/contrib/tzdata/etcetera @@ -17,13 +17,17 @@ # behind GMT but uses the completely misleading abbreviation "GMT". Zone Etc/GMT 0 - GMT + +# The following zone is used by tzcode functions like gmtime, +# which load the "UTC" file to handle seconds properly. Zone Etc/UTC 0 - UTC # The following link uses older naming conventions, # but it belongs here, not in the file 'backward', -# as functions like gmtime load the "UTC" file to handle leap seconds properly. -# We want this to work even on installations that omit the other older names. -Link Etc/UTC UTC +# as it is needed for tzcode releases through 2022a, +# where functions like gmtime load "GMT" instead of the "Etc/UTC". +# We want this to work even on installations that omit 'backward'. +Link Etc/GMT GMT Link Etc/UTC Etc/Universal Link Etc/UTC Etc/Zulu |