From 560c1274b0fc703bcd70b520c84405d22a3f1b5a Mon Sep 17 00:00:00 2001 From: Stuart Bishop Date: Mon, 1 Feb 2021 18:59:37 +1100 Subject: [PATCH] Squashed 'tz/' changes from efc5c06192..4f0b29ebf7 336c8f8262 Release 2021a 91edda4982 Update web links 7d7a4fb5bd South Sudan changes from +03 to +02 on 2021-02-01. 500141665b No leap second on 2021-06-30 846c3ac7ab Release 2020f 15e0ac32c1 Fix rearguard.zi corruption in 2020e git-subtree-dir: tz git-subtree-split: 4f0b29ebf7b3da8ab5f8415abb8f47162ef9502c --- Makefile | 5 ++++- NEWS | 16 ++++++++++++++++ africa | 8 +++++++- leap-seconds.list | 8 ++++---- tz-link.html | 45 ++++++++++++++++----------------------------- ziguard.awk | 9 +++++---- 6 files changed, 52 insertions(+), 39 deletions(-) diff --git a/Makefile b/Makefile index 5064a19..1136af9 100644 --- a/Makefile +++ b/Makefile @@ -945,7 +945,10 @@ check_public: $(VERSION_DEPS) mkdir public.dir ln $(VERSION_DEPS) public.dir cd public.dir && $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL - for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi; do \ + for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi \ + public.dir/vanguard.zi public.dir/main.zi \ + public.dir/rearguard.zi; \ + do \ public.dir/zic -v -d public.dir/zoneinfo $$i 2>&1 || exit; \ done public.dir/zic -v -d public.dir/zoneinfo-all $(TDATA_TO_CHECK) diff --git a/NEWS b/NEWS index 6014b45..a60847b 100644 --- a/NEWS +++ b/NEWS @@ -1,5 +1,21 @@ News for the tz database +Release 2021a - 2021-01-24 10:54:57 -0800 + + Changes to future timestamps + + South Sudan changes from +03 to +02 on 2021-02-01 at 00:00. + (Thanks to Steffen Thorsen.) + + +Release 2020f - 2020-12-29 00:17:46 -0800 + + Change to build procedure + + 'make rearguard_tarballs' no longer generates a bad rearguard.zi, + fixing a 2020e bug. (Problem reported by Deborah Goldsmith.) + + Release 2020e - 2020-12-22 15:14:34 -0800 Briefly: diff --git a/africa b/africa index 59cf501..28168cf 100644 --- a/africa +++ b/africa @@ -1527,11 +1527,17 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931 3:00 - EAT 2017 Nov 1 2:00 - CAT +# From Steffen Thorsen (2021-01-18): +# "South Sudan will change its time zone by setting the clock back 1 +# hour on February 1, 2021...." +# from https://eyeradio.org/south-sudan-adopts-new-time-zone-makuei/ + # South Sudan # Zone NAME STDOFF RULES FORMAT [UNTIL] Zone Africa/Juba 2:06:28 - LMT 1931 2:00 Sudan CA%sT 2000 Jan 15 12:00 - 3:00 - EAT + 3:00 - EAT 2021 Feb 1 00:00 + 2:00 - CAT # Tanzania # See Africa/Nairobi. diff --git a/leap-seconds.list b/leap-seconds.list index e897a86..3198d65 100644 --- a/leap-seconds.list +++ b/leap-seconds.list @@ -204,10 +204,10 @@ # current -- the update time stamp, the data and the name of the file # will not change. # -# Updated through IERS Bulletin C60 -# File expires on: 28 June 2021 +# Updated through IERS Bulletin C61 +# File expires on: 28 December 2021 # -#@ 3833827200 +#@ 3849638400 # 2272060800 10 # 1 Jan 1972 2287785600 11 # 1 Jul 1972 @@ -252,4 +252,4 @@ # the hash line is also ignored in the # computation. # -#h 064356a8 39268b92 76e4d5ef 3e22fae1 0cca529c +#h 2ab8253d d4380d28 75f01343 381504f8 8f8a4bfc diff --git a/tz-link.html b/tz-link.html index 56ef9e4..abe38d8 100644 --- a/tz-link.html +++ b/tz-link.html @@ -352,12 +352,7 @@

Network protocols for tz data

TZDIST implementations are available. The tzdist-bis -mailing list discussed the Internet draft TZDIST -Geolocate Extension (now expired), which let a client determine its timezone -from its geographic location using a 'geo' URI. +mailing list discusses possible extensions.
  • The Internet Calendaring and Scheduling Core Object Specification (iCalendar) (Internet RFC 5445) @@ -410,11 +405,11 @@

    Other tz compilers

  • The Time Zone Database Parser is a C++ parser and -runtime library with API adopted -into the draft standard for +runtime library with API +adopted by C++20, -the next iteration of the C++ standard. +the current iteration of the C++ standard. It is freely available under the MIT license.
  • International Components for @@ -627,11 +622,6 @@

    Other tz-based time zone softwaretz database in a Go-specific format.

    • -
  • International -clock (intclock) is a clock that displays multiple time zones on -GNU/Linux and similar systems. It is freely available -under the GPL.
  • Microsoft Windows 8.1 and later has tz data and CLDR data (mentioned below) used by the @@ -677,10 +667,7 @@

    Other time zone databases

    is Astrodienst's Web version of Shanks and Pottenger's out-of-print time zone history atlases for the US and -for the world, -now published in software -form by ACS-Starcrafts. +for the world. Although these extensive atlases were sources for much of the older tz data, @@ -704,11 +691,13 @@

    Other time zone databases

    Maps

      -
    • The United States Central -Intelligence Agency (CIA) publishes a time -zone map; the +
    • The World +and Regional Maps section of The World Factbook, published by the +US Central Intelligence +Agency (CIA), contains a time +zone map; the Perry–Castañeda Library Map Collection @@ -734,7 +723,9 @@

      Maps

      Time zone boundaries

      Geographical boundaries between timezones are available -from several geolocation +from several Internet +geolocation services and other sources.

      • Timezone @@ -883,10 +874,6 @@

        National histories of legal time

        The Interior Ministry periodically issues announcements (in Hebrew).
        -
        Italy
        -
        The National Institute of Metrological Research publishes a -table -of civil time (in Italian).
        Malaysia
        See Singapore below.
        Mexico
        diff --git a/ziguard.awk b/ziguard.awk index e27e799..7d6f7c9 100644 --- a/ziguard.awk +++ b/ziguard.awk @@ -37,7 +37,7 @@ DATAFORM != "main" { # If this line should differ due to Czechoslovakia using negative SAVE values, # uncomment the desired version and comment out the undesired one. - if (zone == "Europe/Prague" && /1947 Feb 23/) { + if (zone == "Europe/Prague" && /^#?[\t ]+[01]:00[\t ]/ && /1947 Feb 23/) { if (($(in_comment + 2) != "-") == vanguard) { uncomment = in_comment } else { @@ -65,10 +65,11 @@ DATAFORM != "main" { # uncomment the desired version and comment out the undesired one. Rule_Namibia = /^#?Rule[\t ]+Namibia[\t ]/ Zone_using_Namibia_rule \ - = (zone == "Africa/Windhoek" \ + = (zone == "Africa/Windhoek" && /^#?[\t ]+[12]:00[\t ]/ \ && ($(in_comment + 2) == "Namibia" \ - || (1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \ - || in_comment + 3 == NF)) + || ($(in_comment + 2) == "-" && $(in_comment + 3) == "CAT" \ + && ((1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \ + || in_comment + 3 == NF)))) if (Rule_Namibia || Zone_using_Namibia_rule) { if ((Rule_Namibia \ ? ($(in_comment + 9) ~ /^-/ \