Skip to content

Commit 560c127

Browse files
author
Stuart Bishop
committed
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
1 parent aaef58a commit 560c127

File tree

6 files changed

+52
-39
lines changed

6 files changed

+52
-39
lines changed

Makefile

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -945,7 +945,10 @@ check_public: $(VERSION_DEPS)
945945
mkdir public.dir
946946
ln $(VERSION_DEPS) public.dir
947947
cd public.dir && $(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL
948-
for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi; do \
948+
for i in $(TDATA_TO_CHECK) public.dir/tzdata.zi \
949+
public.dir/vanguard.zi public.dir/main.zi \
950+
public.dir/rearguard.zi; \
951+
do \
949952
public.dir/zic -v -d public.dir/zoneinfo $$i 2>&1 || exit; \
950953
done
951954
public.dir/zic -v -d public.dir/zoneinfo-all $(TDATA_TO_CHECK)

NEWS

Lines changed: 16 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,21 @@
11
News for the tz database
22

3+
Release 2021a - 2021-01-24 10:54:57 -0800
4+
5+
Changes to future timestamps
6+
7+
South Sudan changes from +03 to +02 on 2021-02-01 at 00:00.
8+
(Thanks to Steffen Thorsen.)
9+
10+
11+
Release 2020f - 2020-12-29 00:17:46 -0800
12+
13+
Change to build procedure
14+
15+
'make rearguard_tarballs' no longer generates a bad rearguard.zi,
16+
fixing a 2020e bug. (Problem reported by Deborah Goldsmith.)
17+
18+
319
Release 2020e - 2020-12-22 15:14:34 -0800
420

521
Briefly:

africa

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1527,11 +1527,17 @@ Zone Africa/Khartoum 2:10:08 - LMT 1931
15271527
3:00 - EAT 2017 Nov 1
15281528
2:00 - CAT
15291529

1530+
# From Steffen Thorsen (2021-01-18):
1531+
# "South Sudan will change its time zone by setting the clock back 1
1532+
# hour on February 1, 2021...."
1533+
# from https://eyeradio.org/south-sudan-adopts-new-time-zone-makuei/
1534+
15301535
# South Sudan
15311536
# Zone NAME STDOFF RULES FORMAT [UNTIL]
15321537
Zone Africa/Juba 2:06:28 - LMT 1931
15331538
2:00 Sudan CA%sT 2000 Jan 15 12:00
1534-
3:00 - EAT
1539+
3:00 - EAT 2021 Feb 1 00:00
1540+
2:00 - CAT
15351541

15361542
# Tanzania
15371543
# See Africa/Nairobi.

leap-seconds.list

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -204,10 +204,10 @@
204204
# current -- the update time stamp, the data and the name of the file
205205
# will not change.
206206
#
207-
# Updated through IERS Bulletin C60
208-
# File expires on: 28 June 2021
207+
# Updated through IERS Bulletin C61
208+
# File expires on: 28 December 2021
209209
#
210-
#@ 3833827200
210+
#@ 3849638400
211211
#
212212
2272060800 10 # 1 Jan 1972
213213
2287785600 11 # 1 Jul 1972
@@ -252,4 +252,4 @@
252252
# the hash line is also ignored in the
253253
# computation.
254254
#
255-
#h 064356a8 39268b92 76e4d5ef 3e22fae1 0cca529c
255+
#h 2ab8253d d4380d28 75f01343 381504f8 8f8a4bfc

tz-link.html

Lines changed: 16 additions & 29 deletions
Original file line numberDiff line numberDiff line change
@@ -352,12 +352,7 @@ <h2 id="protocols">Network protocols for <code><abbr>tz</abbr></code> data</h2>
352352
<a href="https://devguide.calconnect.org/Time-Zones/TZDS/">TZDIST
353353
implementations</a> are available.
354354
The <a href="https://www.ietf.org/mailman/listinfo/tzdist-bis">tzdist-bis
355-
mailing list</a> discussed the Internet draft <a
356-
id="TZDIST-Geolocate"
357-
href="https://tools.ietf.org/html/draft-murchison-tzdist-geolocate">TZDIST
358-
Geolocate Extension</a> (now expired), which let a client determine its timezone
359-
from its geographic location using a <a
360-
href="https://tools.ietf.org/html/rfc5870">'geo' URI</a>.</li>
355+
mailing list</a> discusses possible extensions.</li>
361356
<li>The <a href="https://tools.ietf.org/html/rfc5545">
362357
Internet Calendaring and Scheduling Core Object Specification
363358
(iCalendar)</a> (Internet <abbr>RFC</abbr> 5445)
@@ -410,11 +405,11 @@ <h2 id="compilers">Other <code><abbr>tz</abbr></code> compilers</h2>
410405
<li>The <a href="https://howardhinnant.github.io/date/tz.html">Time Zone
411406
Database Parser</a> is a
412407
<a href="https://en.wikipedia.org/wiki/C%2B%2B">C++</a> parser and
413-
runtime library with API <a
414-
href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0355r7.html">adopted
415-
into the draft standard</a> for
408+
runtime library with <a
409+
href="http://www.open-std.org/jtc1/sc22/wg21/docs/papers/2018/p0355r7.html">API</a>
410+
adopted by
416411
<a href="https://en.wikipedia.org/wiki/C++20">C++20</a>,
417-
the next iteration of the C++ standard.
412+
the current iteration of the C++ standard.
418413
It is freely available under the
419414
<abbr title="Massachusetts Institute of Technology">MIT</abbr> license.</li>
420415
<li><a id="ICU" href="http://site.icu-project.org">International Components for
@@ -627,11 +622,6 @@ <h2 id="software">Other <code><abbr>tz</abbr></code>-based time zone software</h
627622
implementations contain a copy of a 32-bit subset of a recent
628623
<code><abbr>tz</abbr></code> database in a
629624
Go-specific format.</li>
630-
<li><a
631-
href="http://users.skynet.be/Peter.Verthez/projects/intclock/">International
632-
clock (intclock)</a> is a clock that displays multiple time zones on
633-
<abbr>GNU</abbr>/Linux and similar systems. It is freely available
634-
under the <abbr>GPL</abbr>.</li>
635625
<li>Microsoft Windows 8.1
636626
and later has <code><abbr>tz</abbr></code> data and <abbr>CLDR</abbr>
637627
data (mentioned <a href="#CLDR">below</a>) used by the
@@ -677,10 +667,7 @@ <h2 id="other-dbs">Other time zone databases</h2>
677667
is Astrodienst's Web version of Shanks and Pottenger's out-of-print
678668
time zone history atlases
679669
<a href="https://www.worldcat.org/oclc/468828649">for the US</a> and
680-
<a href="https://www.worldcat.org/oclc/76950459">for the world</a>,
681-
now published in <a
682-
href="https://astrocom.com/astrology-products/software/acs-atlas-software">software</a>
683-
form by <a href="https://astrocom.com">ACS-Starcrafts</a>.
670+
<a href="https://www.worldcat.org/oclc/76950459">for the world</a>.
684671
Although these extensive atlases
685672
<a href="https://astrologynewsservice.com/opinion/how-astrologers-contributed-to-the-information-age-a-brief-history-of-time/">were
686673
sources for much of the older <code><abbr>tz</abbr></code> data</a>,
@@ -704,11 +691,13 @@ <h2 id="other-dbs">Other time zone databases</h2>
704691
<section>
705692
<h2 id="maps">Maps</h2>
706693
<ul>
707-
<li>The <a href="https://www.cia.gov/index.html">United States Central
708-
Intelligence Agency (<abbr
709-
title="Central Intelligence Agency">CIA</abbr>)</a> publishes a <a
710-
href="https://www.cia.gov/library/publications/the-world-factbook/graphics/ref_maps/physical/pdf/standard_time_zones_of_the_world.pdf">time
711-
zone map</a>; the
694+
<li>The <a
695+
href="https://www.cia.gov/the-world-factbook/maps/world-regional/">World
696+
and Regional Maps section</a> of <em>The World Factbook</em>, published by the
697+
<a href="https://www.cia.gov">US Central Intelligence
698+
Agency (<abbr
699+
title="Central Intelligence Agency">CIA</abbr>)</a>, contains a time
700+
zone map; the
712701
<a
713702
href="https://legacy.lib.utexas.edu/maps/world.html">Perry&ndash;Casta&ntilde;eda
714703
Library Map Collection</a>
@@ -734,7 +723,9 @@ <h2 id="maps">Maps</h2>
734723
<section>
735724
<h2 id="boundaries">Time zone boundaries</h2>
736725
<p>Geographical boundaries between timezones are available
737-
from several <a href="https://en.wikipedia.org/wiki/Geolocation">geolocation</a>
726+
from several <a
727+
href="https://en.wikipedia.org/wiki/Internet_geolocation">Internet
728+
geolocation</a>
738729
services and other sources.</p>
739730
<ul>
740731
<li><a href="https://github.com/evansiroky/timezone-boundary-builder">Timezone
@@ -883,10 +874,6 @@ <h2 id="national">National histories of legal time</h2>
883874
<dd>The Interior Ministry periodically issues <a
884875
href="ftp://ftp.cs.huji.ac.il/pub/tz/announcements"
885876
hreflang="he">announcements (in Hebrew)</a>.</dd>
886-
<dt>Italy</dt>
887-
<dd>The National Institute of Metrological Research publishes a
888-
<a href="http://oldsite.inrim.it/res/tf/ora_legale_i.shtml" hreflang="it">table
889-
of civil time (in Italian)</a>.</dd>
890877
<dt>Malaysia</dt>
891878
<dd>See Singapore <a href="#Singapore">below</a>.</dd>
892879
<dt>Mexico</dt>

ziguard.awk

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ DATAFORM != "main" {
3737

3838
# If this line should differ due to Czechoslovakia using negative SAVE values,
3939
# uncomment the desired version and comment out the undesired one.
40-
if (zone == "Europe/Prague" && /1947 Feb 23/) {
40+
if (zone == "Europe/Prague" && /^#?[\t ]+[01]:00[\t ]/ && /1947 Feb 23/) {
4141
if (($(in_comment + 2) != "-") == vanguard) {
4242
uncomment = in_comment
4343
} else {
@@ -65,10 +65,11 @@ DATAFORM != "main" {
6565
# uncomment the desired version and comment out the undesired one.
6666
Rule_Namibia = /^#?Rule[\t ]+Namibia[\t ]/
6767
Zone_using_Namibia_rule \
68-
= (zone == "Africa/Windhoek" \
68+
= (zone == "Africa/Windhoek" && /^#?[\t ]+[12]:00[\t ]/ \
6969
&& ($(in_comment + 2) == "Namibia" \
70-
|| (1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \
71-
|| in_comment + 3 == NF))
70+
|| ($(in_comment + 2) == "-" && $(in_comment + 3) == "CAT" \
71+
&& ((1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \
72+
|| in_comment + 3 == NF))))
7273
if (Rule_Namibia || Zone_using_Namibia_rule) {
7374
if ((Rule_Namibia \
7475
? ($(in_comment + 9) ~ /^-/ \

0 commit comments

Comments
 (0)