Skip to content

Commit 24e3475

Browse files
author
GitHub Actions
committed
Update tzdata and zoneinfo to version 2021c.
1 parent b918d6e commit 24e3475

File tree

13 files changed

+164
-113
lines changed

13 files changed

+164
-113
lines changed

tzdata/Makefile

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -504,7 +504,7 @@ MANTXTS= newctime.3.txt newstrftime.3.txt newtzset.3.txt \
504504
tzfile.5.txt tzselect.8.txt zic.8.txt zdump.8.txt \
505505
date.1.txt
506506
COMMON= calendars CONTRIBUTING LICENSE Makefile \
507-
NEWS README theory.html version
507+
NEWS README SECURITY theory.html version
508508
WEB_PAGES= tz-art.html tz-how-to.html tz-link.html
509509
CHECK_WEB_PAGES=check_theory.html check_tz-art.html \
510510
check_tz-how-to.html check_tz-link.html
@@ -539,7 +539,7 @@ ENCHILADA = $(EIGHT_YARDS) $(TZS)
539539
# This list is not the same as the output of 'git ls-files', since
540540
# .gitignore is not distributed.
541541
VERSION_DEPS= \
542-
calendars CONTRIBUTING LICENSE Makefile NEWS README \
542+
calendars CONTRIBUTING LICENSE Makefile NEWS README SECURITY \
543543
africa antarctica asctime.c asia australasia \
544544
backward backzone \
545545
checklinks.awk checktab.awk \
@@ -763,7 +763,7 @@ check_character_set: $(ENCHILADA)
763763
sharp='#' && \
764764
! grep -Env $(SAFE_LINE) $(MANS) date.1 $(MANTXTS) \
765765
$(MISC) $(SOURCES) $(WEB_PAGES) \
766-
CONTRIBUTING LICENSE README \
766+
CONTRIBUTING LICENSE README SECURITY \
767767
version tzdata.zi && \
768768
! grep -Env $(SAFE_LINE)'|^UNUSUAL_OK_'$(OK_CHAR)'*$$' \
769769
Makefile && \

tzdata/NEWS

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

3+
Release 2021c - 2021-10-01 14:21:49 -0700
4+
5+
Briefly:
6+
Revert most 2021b changes to 'backward'.
7+
Fix 'zic -b fat' bug in pre-1970 32-bit data.
8+
Fix two Link line typos.
9+
Distribute SECURITY file.
10+
11+
This release is intended as a bugfix release, to fix compatibility
12+
problems and typos reported since 2021b was released.
13+
14+
Changes to Link directives
15+
16+
Revert almost all of 2021b's changes to the 'backward' file,
17+
by moving Link directives back to where they were in 2021a.
18+
Although 'zic' doesn't care which source file contains a Link
19+
directive, some downstream uses ran into trouble with the move.
20+
(Problem reported by Stephen Colebourne for Joda-Time.)
21+
22+
Fix typo that linked Atlantic/Jan_Mayen to the wrong location
23+
(problem reported by Chris Walton).
24+
25+
Fix 'backzone' typo that linked America/Virgin to the wrong
26+
location (problem reported by Michael Deckers).
27+
28+
Changes to code
29+
30+
Fix a bug in 'zic -b fat' that caused old timestamps to be
31+
mishandled in 32-bit-only readers (problem reported by Daniel
32+
Fischer).
33+
34+
Changes to documentation
35+
36+
Distribute the SECURITY file (problem reported by Andreas Radke).
37+
38+
339
Release 2021b - 2021-09-24 16:23:00 -0700
440

541
Briefly:
@@ -18,13 +54,13 @@ Release 2021b - 2021-09-24 16:23:00 -0700
1854
tzfile.5 better matches a draft successor to RFC 8536.
1955
A new file SECURITY.
2056

21-
This release is prompted by recent announcements by Jordan and Samoa.
22-
It incorporates many other changes that had accumulated since 2021a.
23-
However, it omits most proposed changes that merged all Zones
24-
agreeing since 1970, as concerns were raised about doing too many of
25-
these changes at once. It does keeps some of these changes in the
26-
interest of making tzdb more equitable one step at a time; see
27-
"Merge more location-based Zones" below.
57+
This release is prompted by recent announcements by Jordan and Samoa.
58+
It incorporates many other changes that had accumulated since 2021a.
59+
However, it omits most proposed changes that merged all Zones
60+
agreeing since 1970, as concerns were raised about doing too many of
61+
these changes at once. It does keeps some of these changes in the
62+
interest of making tzdb more equitable one step at a time; see
63+
"Merge more location-based Zones" below.
2864

2965
Changes to future timestamps
3066

tzdata/SECURITY

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
Please report any sensitive security-related bugs via email to the
2+
tzdb designated coordinators, currently Paul Eggert
3+
4+
Put "tzdb security" at the start of your email's subject line.
5+
We prefer communications to be in English.
6+
7+
You should receive a response within a week. If not, please follow up
8+
via email to make sure we received your original message.
9+
10+
If we confirm the bug, we plan to notify affected third-party services
11+
or software that we know about, prepare an advisory, commit fixes to
12+
the main development branch as quickly as is practical, and finally
13+
publish the advisory on [email protected]. As with all tzdb contributions,
14+
we give credit to security contributors unless they wish to remain
15+
anonymous.

tzdata/africa

Lines changed: 37 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -150,6 +150,16 @@ Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena
150150
# Zone NAME STDOFF RULES FORMAT [UNTIL]
151151
Zone Africa/Abidjan -0:16:08 - LMT 1912
152152
0:00 - GMT
153+
Link Africa/Abidjan Africa/Accra # Ghana
154+
Link Africa/Abidjan Africa/Bamako # Mali
155+
Link Africa/Abidjan Africa/Banjul # The Gambia
156+
Link Africa/Abidjan Africa/Conakry # Guinea
157+
Link Africa/Abidjan Africa/Dakar # Senegal
158+
Link Africa/Abidjan Africa/Freetown # Sierra Leone
159+
Link Africa/Abidjan Africa/Lome # Togo
160+
Link Africa/Abidjan Africa/Nouakchott # Mauritania
161+
Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso
162+
Link Africa/Abidjan Atlantic/St_Helena # St Helena
153163

154164
# Djibouti
155165
# See Africa/Nairobi.
@@ -436,6 +446,15 @@ Zone Africa/Nairobi 2:27:16 - LMT 1908 May
436446
2:30 - +0230 1936 Dec 31 24:00
437447
2:45 - +0245 1942 Jul 31 24:00
438448
3:00 - EAT
449+
Link Africa/Nairobi Africa/Addis_Ababa # Ethiopia
450+
Link Africa/Nairobi Africa/Asmara # Eritrea
451+
Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
452+
Link Africa/Nairobi Africa/Djibouti
453+
Link Africa/Nairobi Africa/Kampala # Uganda
454+
Link Africa/Nairobi Africa/Mogadishu # Somalia
455+
Link Africa/Nairobi Indian/Antananarivo # Madagascar
456+
Link Africa/Nairobi Indian/Comoro
457+
Link Africa/Nairobi Indian/Mayotte
439458

440459
# Lesotho
441460
# See Africa/Johannesburg.
@@ -1122,6 +1141,13 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
11221141
# Zone NAME STDOFF RULES FORMAT [UNTIL]
11231142
Zone Africa/Maputo 2:10:20 - LMT 1903 Mar
11241143
2:00 - CAT
1144+
Link Africa/Maputo Africa/Blantyre # Malawi
1145+
Link Africa/Maputo Africa/Bujumbura # Burundi
1146+
Link Africa/Maputo Africa/Gaborone # Botswana
1147+
Link Africa/Maputo Africa/Harare # Zimbabwe
1148+
Link Africa/Maputo Africa/Kigali # Rwanda
1149+
Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo
1150+
Link Africa/Maputo Africa/Lusaka # Zambia
11251151

11261152

11271153
# Namibia
@@ -1269,6 +1295,15 @@ Zone Africa/Lagos 0:13:35 - LMT 1905 Jul 1
12691295
0:13:35 - LMT 1914 Jan 1
12701296
0:30 - +0030 1919 Sep 1
12711297
1:00 - WAT
1298+
Link Africa/Lagos Africa/Bangui # Central African Republic
1299+
Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
1300+
Link Africa/Lagos Africa/Douala # Cameroon
1301+
Link Africa/Lagos Africa/Kinshasa # Dem. Rep. of the Congo (west)
1302+
Link Africa/Lagos Africa/Libreville # Gabon
1303+
Link Africa/Lagos Africa/Luanda # Angola
1304+
Link Africa/Lagos Africa/Malabo # Equatorial Guinea
1305+
Link Africa/Lagos Africa/Niamey # Niger
1306+
Link Africa/Lagos Africa/Porto-Novo # Benin
12721307

12731308
# Réunion
12741309
# Zone NAME STDOFF RULES FORMAT [UNTIL]
@@ -1366,6 +1401,8 @@ Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
13661401
Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
13671402
1:30 - SAST 1903 Mar
13681403
2:00 SA SAST
1404+
Link Africa/Johannesburg Africa/Maseru # Lesotho
1405+
Link Africa/Johannesburg Africa/Mbabane # Eswatini
13691406
#
13701407
# Marion and Prince Edward Is
13711408
# scientific station since 1947

tzdata/asia

Lines changed: 9 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1173,9 +1173,10 @@ Zone Asia/Famagusta 2:15:48 - LMT 1921 Nov 14
11731173
2:00 EUAsia EE%sT 2016 Sep 8
11741174
3:00 - +03 2017 Oct 29 1:00u
11751175
2:00 EUAsia EE%sT
1176+
11761177
# Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
11771178
# However, for various reasons many users expect to find it under Europe.
1178-
# See the 'backward' file for the Europe/Nicosia link.
1179+
Link Asia/Nicosia Europe/Nicosia
11791180

11801181
# Georgia
11811182
# From Paul Eggert (1994-11-19):
@@ -3531,6 +3532,7 @@ Zone Asia/Manila -15:56:00 - LMT 1844 Dec 31
35313532
Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha
35323533
4:00 - +04 1972 Jun
35333534
3:00 - +03
3535+
Link Asia/Qatar Asia/Bahrain
35343536

35353537
# Saudi Arabia
35363538
#
@@ -3577,6 +3579,9 @@ Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha
35773579
# Zone NAME STDOFF RULES FORMAT [UNTIL]
35783580
Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14
35793581
3:00 - +03
3582+
Link Asia/Riyadh Antarctica/Syowa
3583+
Link Asia/Riyadh Asia/Aden # Yemen
3584+
Link Asia/Riyadh Asia/Kuwait
35803585

35813586
# Singapore
35823587
# taken from Mok Ly Yng (2003-10-30)
@@ -3833,6 +3838,8 @@ Zone Asia/Dushanbe 4:35:12 - LMT 1924 May 2
38333838
Zone Asia/Bangkok 6:42:04 - LMT 1880
38343839
6:42:04 - BMT 1920 Apr # Bangkok Mean Time
38353840
7:00 - +07
3841+
Link Asia/Bangkok Asia/Phnom_Penh # Cambodia
3842+
Link Asia/Bangkok Asia/Vientiane # Laos
38363843

38373844
# Turkmenistan
38383845
# From Shanks & Pottenger.
@@ -3847,6 +3854,7 @@ Zone Asia/Ashgabat 3:53:32 - LMT 1924 May 2 # or Ashkhabad
38473854
# Zone NAME STDOFF RULES FORMAT [UNTIL]
38483855
Zone Asia/Dubai 3:41:12 - LMT 1920
38493856
4:00 - +04
3857+
Link Asia/Dubai Asia/Muscat # Oman
38503858

38513859
# Uzbekistan
38523860
# Byalokoz 1919 says Uzbekistan was 4:27:53.

tzdata/australasia

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -458,6 +458,7 @@ Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31
458458
9:00 - +09 1944 Jul 31
459459
10:00 Guam G%sT 2000 Dec 23
460460
10:00 - ChST # Chamorro Standard Time
461+
Link Pacific/Guam Pacific/Saipan # N Mariana Is
461462

462463
# Kiribati
463464
# Zone NAME STDOFF RULES FORMAT [UNTIL]
@@ -583,6 +584,8 @@ Zone Pacific/Chatham 12:13:48 - LMT 1868 Nov 2
583584
12:15 - +1215 1946 Jan 1
584585
12:45 Chatham +1245/+1345
585586

587+
Link Pacific/Auckland Antarctica/McMurdo
588+
586589
# Auckland Is
587590
# uninhabited; Māori and Moriori, colonial settlers, pastoralists, sealers,
588591
# and scientific personnel have wintered
@@ -676,6 +679,7 @@ Zone Pacific/Palau -15:02:04 - LMT 1844 Dec 31 # Koror
676679
Zone Pacific/Port_Moresby 9:48:40 - LMT 1880
677680
9:48:32 - PMMT 1895 # Port Moresby Mean Time
678681
10:00 - +10
682+
Link Pacific/Port_Moresby Antarctica/DumontDUrville
679683
#
680684
# From Paul Eggert (2014-10-13):
681685
# Base the Bougainville entry on the Arawa-Kieta region, which appears to have
@@ -711,6 +715,7 @@ Zone Pacific/Pitcairn -8:40:20 - LMT 1901 # Adamstown
711715
Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
712716
-11:22:48 - LMT 1911
713717
-11:00 - SST # S=Samoa
718+
Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
714719

715720
# Samoa (formerly and also known as Western Samoa)
716721

0 commit comments

Comments
 (0)