git: 6f2acba9969a - stable/12 - contrib/tzdata: import tzdata 2022f
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Tue, 01 Nov 2022 01:08:22 UTC
The branch stable/12 has been updated by philip:
URL: https://cgit.FreeBSD.org/src/commit/?id=6f2acba9969a81d63e2854b44ed82af864108108
commit 6f2acba9969a81d63e2854b44ed82af864108108
Author: Philip Paeps <philip@FreeBSD.org>
AuthorDate: 2022-10-29 02:38:01 +0000
Commit: Philip Paeps <philip@FreeBSD.org>
CommitDate: 2022-11-01 01:07:17 +0000
contrib/tzdata: import tzdata 2022f
Changes: https://github.com/eggert/tz/blob/2022f/NEWS
(cherry picked from commit 9142a2a37b2fe65d46ace08a098ad26b8ff81541)
---
contrib/tzdata/Makefile | 40 ++++--
contrib/tzdata/NEWS | 101 +++++++++++++++
contrib/tzdata/africa | 213 ++++++++-----------------------
contrib/tzdata/antarctica | 2 +-
contrib/tzdata/asia | 69 +++-------
contrib/tzdata/australasia | 58 +++------
contrib/tzdata/backward | 291 +++++++++++++++++++++++++++++++++---------
contrib/tzdata/backzone | 69 ++++++++++
contrib/tzdata/checklinks.awk | 24 +++-
contrib/tzdata/etcetera | 17 +--
contrib/tzdata/europe | 202 ++++++++++-------------------
contrib/tzdata/northamerica | 171 ++++++-------------------
contrib/tzdata/southamerica | 15 ---
contrib/tzdata/theory.html | 1 +
contrib/tzdata/version | 2 +-
contrib/tzdata/ziguard.awk | 70 ++++++++++
contrib/tzdata/zone.tab | 3 -
contrib/tzdata/zone1970.tab | 3 -
18 files changed, 736 insertions(+), 615 deletions(-)
diff --git a/contrib/tzdata/Makefile b/contrib/tzdata/Makefile
index b68f843d08ee..34cec49d3af4 100644
--- a/contrib/tzdata/Makefile
+++ b/contrib/tzdata/Makefile
@@ -210,7 +210,8 @@ LDLIBS=
# -DHAVE_DECL_ENVIRON if <unistd.h> declares 'environ'
# -DHAVE_DIRECT_H if mkdir needs <direct.h> (MS-Windows)
# -DHAVE_GENERIC=0 if _Generic does not work
-# -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)
+# -DHAVE_GETRANDOM if getgrandom works (e.g., GNU/Linux)*
+# -DHAVE_GETTEXT if 'gettext' works (e.g., GNU/Linux, FreeBSD, Solaris)*
# -DHAVE_INCOMPATIBLE_CTIME_R if your system's time.h declares
# ctime_r and asctime_r incompatibly with the POSIX standard
# (Solaris when _POSIX_PTHREAD_SEMANTICS is not defined).
@@ -222,16 +223,17 @@ LDLIBS=
# -DHAVE_MALLOC_ERRNO=0 if malloc etc. do not set errno on failure.
# -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
# functions like 'link' or variables like 'tzname' required by POSIX
+# -DHAVE_SETENV=0 if your system lacks the setenv function
# -DHAVE_SNPRINTF=0 if your system lacks the snprintf function
-# -DHAVE_STDBOOL_H if you have a non-C99 compiler with <stdbool.h>
-# -DHAVE_STDINT_H if you have a non-C99 compiler with <stdint.h>
+# -DHAVE_STDINT_H if you have a non-C99 compiler with <stdint.h>*
# -DHAVE_STRFTIME_L if <time.h> declares locale_t and strftime_l
# -DHAVE_STRDUP=0 if your system lacks the strdup function
# -DHAVE_STRTOLL=0 if your system lacks the strtoll function
# -DHAVE_SYMLINK=0 if your system lacks the symlink function
-# -DHAVE_SYS_STAT_H=0 if your compiler lacks a <sys/stat.h>
+# -DHAVE_SYS_STAT_H=0 if your compiler lacks a <sys/stat.h>*
# -DHAVE_TZSET=0 if your system lacks a tzset function
-# -DHAVE_UNISTD_H=0 if your compiler lacks a <unistd.h>
+# -DHAVE_UNISTD_H=0 if your compiler lacks a <unistd.h>*
+# -DHAVE_UTMPX_H=0 if your compiler lacks a <utmpx.h>*
# -Dlocale_t=XXX if your system uses XXX instead of locale_t
# -DRESERVE_STD_EXT_IDS if your platform reserves standard identifiers
# with external linkage, e.g., applications cannot define 'localtime'.
@@ -254,14 +256,17 @@ LDLIBS=
# Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
# -DZIC_BLOAT_DEFAULT=\"fat\" to default zic's -b option to "fat", and
# similarly for "slim". Fat TZif files work around incompatibilities
-# and bugs in some TZif readers, notably readers that mishandle 64-bit
-# data in TZif files. Slim TZif files are more efficient and do not
-# work around these incompatibilities and bugs. If not given, the
-# default is "slim".
+# and bugs in some TZif readers, notably older ones that
+# ignore or otherwise mishandle 64-bit data in TZif files;
+# however, fat TZif files may trigger bugs in newer TZif readers.
+# Slim TZif files are more efficient, and are the default.
# -DZIC_MAX_ABBR_LEN_WO_WARN=3
# (or some other number) to set the maximum time zone abbreviation length
# that zic will accept without a warning (the default is 6)
# $(GCC_DEBUG_FLAGS) if you are using recent GCC and want lots of checking
+#
+# * Options marked "*" can be omitted if your compiler is C23 compatible.
+#
# Select instrumentation via "make GCC_INSTRUMENT='whatever'".
GCC_INSTRUMENT = \
-fsanitize=undefined -fsanitize-address-use-after-scope \
@@ -397,8 +402,9 @@ ZIC= $(zic) $(ZFLAGS)
# To shrink the size of installed TZif files,
# append "-r @N" to omit data before N-seconds-after-the-Epoch.
-# To grow the files and work around older application bugs, append "-b fat";
-# see ZIC_BLOAT_DEFAULT above.
+# To grow the files and work around bugs in older applications,
+# possibly at the expense of introducing bugs in newer ones,
+# append "-b fat"; see ZIC_BLOAT_DEFAULT above.
# See the zic man page for more about -b and -r.
ZFLAGS=
@@ -818,13 +824,19 @@ check_slashed_abbrs: $(TDATA_TO_CHECK)
CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; }
check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
- $(AWK) '/^Link/ {print $$3}' backward | LC_ALL=C sort -cu
+ $(AWK) '/^Link/ {printf "%.5d %s\n", g, $$3} /^$$/ {g++}' \
+ backward | LC_ALL=C sort -cu
$(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu
touch $@
check_links: checklinks.awk $(TDATA_TO_CHECK) tzdata.zi
- $(AWK) -f checklinks.awk $(TDATA_TO_CHECK)
- $(AWK) -f checklinks.awk tzdata.zi
+ $(AWK) \
+ -v DATAFORM=$(DATAFORM) \
+ -v backcheck=backward \
+ -f checklinks.awk $(TDATA_TO_CHECK)
+ $(AWK) \
+ -v DATAFORM=$(DATAFORM) \
+ -f checklinks.awk tzdata.zi
touch $@
check_tables: checktab.awk $(YDATA) backward $(ZONETABLES)
diff --git a/contrib/tzdata/NEWS b/contrib/tzdata/NEWS
index bce987a2b7c7..086151073a3b 100644
--- a/contrib/tzdata/NEWS
+++ b/contrib/tzdata/NEWS
@@ -1,5 +1,106 @@
News for the tz database
+Release 2022f - 2022-10-28 18:04:57 -0700
+
+ Briefly:
+ Mexico will no longer observe DST except near the US border.
+ Chihuahua moves to year-round -06 on 2022-10-30.
+ Fiji no longer observes DST.
+ Move links to 'backward'.
+ In vanguard form, GMT is now a Zone and Etc/GMT a link.
+ zic now supports links to links, and vanguard form uses this.
+ Simplify four Ontario zones.
+ Fix a Y2438 bug when reading TZif data.
+ Enable 64-bit time_t on 32-bit glibc platforms.
+ Omit large-file support when no longer needed.
+ In C code, use some C23 features if available.
+ Remove no-longer-needed workaround for Qt bug 53071.
+
+ Changes to future timestamps.
+
+ Mexico will no longer observe DST after 2022, except for areas
+ near the US border that continue to observe US DST rules.
+ On 2022-10-30 at 02:00 the Mexican state of Chihuahua moves
+ from -07 (-06 with DST) to year-round -06, thus not changing
+ its clocks that day. The new law states that Chihuahua
+ near the US border no longer observes US DST.
+
+ Fiji will not observe DST in 2022/3. (Thanks to Shalvin Narayan.)
+ For now, assume DST is suspended indefinitely.
+
+ Changes to data
+
+ Move links to 'backward' to ease and simplify link maintenance.
+ This affects generated data only if you use 'make BACKWARD='.
+
+ GMT is now a Zone and Etc/GMT a link instead of vice versa,
+ as GMT is needed for leap second support whereas Etc/GMT is not.
+ However, this change exposes a bug in TZUpdater 2.3.2 so it is
+ present only in vanguard form for now.
+
+ Vanguard form now uses links to links, as zic now supports this.
+
+ Changes to past timestamps
+
+ Simplify four Ontario zones, as most of the post-1970 differences
+ seem to have been imaginary. (Problem reported by Chris Walton.)
+ Move America/Nipigon, America/Rainy_River, and America/Thunder_Bay
+ to 'backzone'; backward-compatibility links still work, albeit
+ with some different timestamps before November 2005.
+
+ Changes to code
+
+ zic now supports links to links regardless of input line order.
+ For example, if Australia/Sydney is a Zone, the lines
+ Link Australia/Canberra Australia/ACT
+ Link Australia/Sydney Australia/Canberra
+ now work correctly, even though the shell commands
+ ln Australia/Canberra Australia/ACT
+ ln Australia/Sydney Australia/Canberra
+ would fail because the first command attempts to use a link
+ Australia/Canberra that does not exist until after the second
+ command is executed. Previously, zic had unspecified behavior if
+ a Link line's target was another link, and zic often misbehaved if
+ a Link line's target was a later Link line.
+
+ Fix line number in zic's diagnostic for a link to a link.
+
+ Fix a bug that caused localtime to mishandle timestamps starting
+ in the year 2438 when reading data generated by 'zic -b fat' when
+ distant-future DST transitions occur at times given in standard
+ time or in UT, not the usual case of local time. This occurs when
+ the corresponding .zi Rule lines specify DST transitions with TO
+ columns of 'max' and AT columns that end in 's' or 'u'. The
+ number 2438 comes from the 32-bit limit in the year 2038, plus the
+ 400-year Gregorian cycle. (Problem reported by Bradley White.)
+
+ On glibc 2.34 and later, which optionally supports 64-bit time_t
+ on platforms like x86 where time_t was traditionally 32 bits,
+ default time_t to 64 instead of 32 bits. This lets functions like
+ localtime support timestamps after the year 2038, and fixes
+ year-2038 problems in zic when accessing files dated after 2038.
+ To continue to limit time_t to 32 bits on these platforms, use
+ "make CFLAGS='-D_TIME_BITS=32'".
+
+ In C code, do not enable large-file support on platforms like AIX
+ and macOS that no longer need it now that tzcode does not use
+ off_t or related functions like 'stat'. Large-file support is
+ still enabled by default on GNU/Linux, as it is needed for 64-bit
+ time_t support.
+
+ In C code, prefer C23 keywords to pre-C23 macros for alignof,
+ bool, false, and true. Also, use the following C23 features if
+ available: __has_include, unreachable.
+
+ zic no longer works around Qt bug 53071, as the relevant Qt
+ releases have been out of support since 2019. This change affects
+ only fat TZif files, as thin files never had the workaround.
+
+ zdump no longer modifies the environ vector when compiled on
+ platforms lacking tm_zone or when compiled with -DUSE_LTZ=0.
+ This avoid undefined behavior on POSIX platforms.
+
+
Release 2022e - 2022-10-11 11:13:02 -0700
Briefly:
diff --git a/contrib/tzdata/africa b/contrib/tzdata/africa
index 7cbd6b0ecd73..92a61259f916 100644
--- a/contrib/tzdata/africa
+++ b/contrib/tzdata/africa
@@ -97,22 +97,6 @@ Zone Africa/Algiers 0:12:12 - LMT 1891 Mar 16
0:00 Algeria WE%sT 1981 May
1:00 - CET
-# Angola
-# Benin
-# See Africa/Lagos.
-
-# Botswana
-# See Africa/Maputo.
-
-# Burkina Faso
-# See Africa/Abidjan.
-
-# Burundi
-# See Africa/Maputo.
-
-# Cameroon
-# See Africa/Lagos.
-
# Cape Verde / Cabo Verde
#
# From Paul Eggert (2018-02-16):
@@ -127,9 +111,6 @@ Zone Atlantic/Cape_Verde -1:34:04 - LMT 1912 Jan 01 2:00u # Praia
-2:00 - -02 1975 Nov 25 2:00
-1:00 - -01
-# Central African Republic
-# See Africa/Lagos.
-
# Chad
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena
@@ -137,33 +118,29 @@ Zone Africa/Ndjamena 1:00:12 - LMT 1912 # N'Djamena
1:00 1:00 WAST 1980 Mar 8
1:00 - WAT
-# Comoros
-# See Africa/Nairobi.
-
-# Democratic Republic of the Congo
-# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
+# Burkina Faso
+# Côte d'Ivoire (Ivory Coast)
+# The Gambia
+# Ghana
+# Guinea
+# Iceland
+# Mali
+# Mauritania
+# St Helena
+# Senegal
+# Sierra Leone
+# Togo
-# Republic of the Congo
-# See Africa/Lagos.
+# The other parts of the St Helena territory are similar:
+# Tristan da Cunha: on GMT, say Whitman and the CIA
+# Ascension: on GMT, say the USNO (1995-12-21) and the CIA
+# Gough (scientific station since 1955; sealers wintered previously):
+# on GMT, says the CIA
+# Inaccessible, Nightingale: uninhabited
-# Côte d'Ivoire / Ivory Coast
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Abidjan -0:16:08 - LMT 1912
0:00 - GMT
-Link Africa/Abidjan Africa/Accra # Ghana
-Link Africa/Abidjan Africa/Bamako # Mali
-Link Africa/Abidjan Africa/Banjul # The Gambia
-Link Africa/Abidjan Africa/Conakry # Guinea
-Link Africa/Abidjan Africa/Dakar # Senegal
-Link Africa/Abidjan Africa/Freetown # Sierra Leone
-Link Africa/Abidjan Africa/Lome # Togo
-Link Africa/Abidjan Africa/Nouakchott # Mauritania
-Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso
-Link Africa/Abidjan Atlantic/Reykjavik # Iceland
-Link Africa/Abidjan Atlantic/St_Helena # St Helena
-
-# Djibouti
-# See Africa/Nairobi.
###############################################################################
@@ -359,33 +336,6 @@ Rule Egypt 2014 only - Sep lastThu 24:00 0 -
Zone Africa/Cairo 2:05:09 - LMT 1900 Oct
2:00 Egypt EE%sT
-# Equatorial Guinea
-# See Africa/Lagos.
-
-# Eritrea
-# See Africa/Nairobi.
-
-# Eswatini (formerly Swaziland)
-# See Africa/Johannesburg.
-
-# Ethiopia
-# See Africa/Nairobi.
-#
-# Unfortunately tzdb records only Western clock time in use in Ethiopia,
-# as the tzdb format is not up to properly recording a common Ethiopian
-# timekeeping practice that is based on solar time. See:
-# Mortada D. If you have a meeting in Ethiopia, you'd better double
-# check the time. PRI's The World. 2015-01-30 15:15 -05.
-# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time
-
-# Gabon
-# See Africa/Lagos.
-
-# The Gambia
-# Ghana
-# Guinea
-# See Africa/Abidjan.
-
# Guinea-Bissau
#
# From Paul Eggert (2018-02-16):
@@ -398,7 +348,16 @@ Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 1:00u
-1:00 - -01 1975
0:00 - GMT
+# Comoros
+# Djibouti
+# Eritrea
+# Ethiopia
# Kenya
+# Madagascar
+# Mayotte
+# Somalia
+# Tanzania
+# Uganda
# From P Chan (2020-10-24):
#
@@ -441,6 +400,14 @@ Zone Africa/Bissau -1:02:20 - LMT 1912 Jan 1 1:00u
# The 1908-05-01 announcement does not give an effective date,
# so just say "1908 May".
+# From Paul Eggert (2018-09-11):
+# Unfortunately tzdb records only Western clock time in use in Ethiopia,
+# as the tzdb format is not up to properly recording a common Ethiopian
+# timekeeping practice that is based on solar time. See:
+# Mortada D. If you have a meeting in Ethiopia, you'd better double
+# check the time. PRI's The World. 2015-01-30 15:15 -05.
+# https://www.pri.org/stories/2015-01-30/if-you-have-meeting-ethiopia-you-better-double-check-time
+
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Nairobi 2:27:16 - LMT 1908 May
2:30 - +0230 1928 Jun 30 24:00
@@ -448,18 +415,6 @@ Zone Africa/Nairobi 2:27:16 - LMT 1908 May
2:30 - +0230 1936 Dec 31 24:00
2:45 - +0245 1942 Jul 31 24:00
3:00 - EAT
-Link Africa/Nairobi Africa/Addis_Ababa # Ethiopia
-Link Africa/Nairobi Africa/Asmara # Eritrea
-Link Africa/Nairobi Africa/Dar_es_Salaam # Tanzania
-Link Africa/Nairobi Africa/Djibouti
-Link Africa/Nairobi Africa/Kampala # Uganda
-Link Africa/Nairobi Africa/Mogadishu # Somalia
-Link Africa/Nairobi Indian/Antananarivo # Madagascar
-Link Africa/Nairobi Indian/Comoro
-Link Africa/Nairobi Indian/Mayotte
-
-# Lesotho
-# See Africa/Johannesburg.
# Liberia
#
@@ -540,16 +495,6 @@ Zone Africa/Tripoli 0:52:44 - LMT 1920
1:00 Libya CE%sT 2013 Oct 25 2:00
2:00 - EET
-# Madagascar
-# See Africa/Nairobi.
-
-# Malawi
-# See Africa/Maputo.
-
-# Mali
-# Mauritania
-# See Africa/Abidjan.
-
# Mauritius
# From Steffen Thorsen (2008-06-25):
@@ -643,12 +588,6 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# Agalega Is, Rodriguez
# no information; probably like Indian/Mauritius
-# Mayotte
-# See Africa/Nairobi.
-
-# Morocco
-# See Africa/Ceuta for Spanish Morocco.
-
# From Alex Krivenyshev (2008-05-09):
# Here is an article that Morocco plan to introduce Daylight Saving Time between
# 1 June, 2008 and 27 September, 2008.
@@ -1137,7 +1076,14 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
0:00 Morocco +00/+01 2018 Oct 28 3:00
1:00 Morocco +01/+00
+# Botswana
+# Burundi
+# Democratic Republic of the Congo (eastern)
+# Malawi
# Mozambique
+# Rwanda
+# Zambia
+# Zimbabwe
#
# Shanks gives 1903-03-01 for the transition to CAT.
# Perhaps the 1911-05-26 Portuguese decree
@@ -1147,14 +1093,6 @@ Zone Africa/El_Aaiun -0:52:48 - LMT 1934 Jan # El Aaiún
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Africa/Maputo 2:10:20 - LMT 1903 Mar
2:00 - CAT
-Link Africa/Maputo Africa/Blantyre # Malawi
-Link Africa/Maputo Africa/Bujumbura # Burundi
-Link Africa/Maputo Africa/Gaborone # Botswana
-Link Africa/Maputo Africa/Harare # Zimbabwe
-Link Africa/Maputo Africa/Kigali # Rwanda
-Link Africa/Maputo Africa/Lubumbashi # E Dem. Rep. of Congo
-Link Africa/Maputo Africa/Lusaka # Zambia
-
# Namibia
@@ -1233,9 +1171,16 @@ Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
# 2:00 - CAT
# End of rearguard section.
-# Niger
-# See Africa/Lagos.
+# Angola
+# Benin
+# Cameroon
+# Central African Republic
+# Democratic Republic of the Congo (western)
+# Republic of the Congo
+# Equatorial Guinea
+# Gabon
+# Niger
# Nigeria
# From P Chan (2020-12-03):
@@ -1301,32 +1246,6 @@ Zone Africa/Lagos 0:13:35 - LMT 1905 Jul 1
0:13:35 - LMT 1914 Jan 1
0:30 - +0030 1919 Sep 1
1:00 - WAT
-Link Africa/Lagos Africa/Bangui # Central African Republic
-Link Africa/Lagos Africa/Brazzaville # Rep. of the Congo
-Link Africa/Lagos Africa/Douala # Cameroon
-Link Africa/Lagos Africa/Kinshasa # Dem. Rep. of the Congo (west)
-Link Africa/Lagos Africa/Libreville # Gabon
-Link Africa/Lagos Africa/Luanda # Angola
-Link Africa/Lagos Africa/Malabo # Equatorial Guinea
-Link Africa/Lagos Africa/Niamey # Niger
-Link Africa/Lagos Africa/Porto-Novo # Benin
-
-# Réunion
-# See Asia/Dubai.
-#
-# The Crozet Islands also observe Réunion time; see the 'antarctica' file.
-
-# Rwanda
-# See Africa/Maputo.
-
-# St Helena
-# See Africa/Abidjan.
-# The other parts of the St Helena territory are similar:
-# Tristan da Cunha: on GMT, say Whitman and the CIA
-# Ascension: on GMT, say the USNO (1995-12-21) and the CIA
-# Gough (scientific station since 1955; sealers wintered previously):
-# on GMT, says the CIA
-# Inaccessible, Nightingale: uninhabited
# São Tomé and Príncipe
@@ -1355,19 +1274,10 @@ Zone Africa/Sao_Tome 0:26:56 - LMT 1884
1:00 - WAT 2019 Jan 1 02:00
0:00 - GMT
-# Senegal
-# See Africa/Abidjan.
-
-# Seychelles
-# See Asia/Dubai.
-
-# Sierra Leone
-# See Africa/Abidjan.
-
-# Somalia
-# See Africa/Nairobi.
-
+# Eswatini (Swaziland)
+# Lesotho
# South Africa
+
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule SA 1942 1943 - Sep Sun>=15 2:00 1:00 -
Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
@@ -1375,8 +1285,6 @@ Rule SA 1943 1944 - Mar Sun>=15 2:00 0 -
Zone Africa/Johannesburg 1:52:00 - LMT 1892 Feb 8
1:30 - SAST 1903 Mar
2:00 SA SAST
-Link Africa/Johannesburg Africa/Maseru # Lesotho
-Link Africa/Johannesburg Africa/Mbabane # Eswatini
#
# Marion and Prince Edward Is
# scientific station since 1947
@@ -1425,12 +1333,6 @@ Zone Africa/Juba 2:06:28 - LMT 1931
3:00 - EAT 2021 Feb 1 00:00
2:00 - CAT
-# Tanzania
-# See Africa/Nairobi.
-
-# Togo
-# See Africa/Abidjan.
-
# Tunisia
# From Gwillim Law (2005-04-30):
@@ -1528,10 +1430,3 @@ Rule Tunisia 2006 2008 - Oct lastSun 2:00s 0 -
Zone Africa/Tunis 0:40:44 - LMT 1881 May 12
0:09:21 - PMT 1911 Mar 11 # Paris Mean Time
1:00 Tunisia CE%sT
-
-# Uganda
-# See Africa/Nairobi.
-
-# Zambia
-# Zimbabwe
-# See Africa/Maputo.
diff --git a/contrib/tzdata/antarctica b/contrib/tzdata/antarctica
index dbdf20932f04..f02755ae856f 100644
--- a/contrib/tzdata/antarctica
+++ b/contrib/tzdata/antarctica
@@ -306,4 +306,4 @@ Zone Antarctica/Rothera 0 - -00 1976 Dec 1
# we have to go around and set them back 5 minutes or so.
# Maybe if we let them run fast all of the time, we'd get to leave here sooner!!
#
-# See 'australasia' for Antarctica/McMurdo.
+# See Pacific/Auckland.
diff --git a/contrib/tzdata/asia b/contrib/tzdata/asia
index af1b822c6a84..6e8ad282ee61 100644
--- a/contrib/tzdata/asia
+++ b/contrib/tzdata/asia
@@ -149,9 +149,6 @@ Zone Asia/Baku 3:19:24 - LMT 1924 May 2
4:00 EUAsia +04/+05 1997
4:00 Azer +04/+05
-# Bahrain
-# See Asia/Qatar.
-
# Bangladesh
# From Alexander Krivenyshev (2009-05-13):
# According to newspaper Asian Tribune (May 6, 2009) Bangladesh may introduce
@@ -254,10 +251,8 @@ Zone Indian/Chagos 4:49:40 - LMT 1907
5:00 - +05 1996
6:00 - +06
-# Brunei
-# See Asia/Kuching.
-
-# Burma / Myanmar
+# Cocos (Keeling) Islands
+# Myanmar (Burma)
# Milne says 6:24:40 was the meridian of the time ball observatory at Rangoon.
@@ -273,11 +268,6 @@ Zone Asia/Yangon 6:24:47 - LMT 1880 # or Rangoon
6:30 - +0630 1942 May
9:00 - +09 1945 May 3
6:30 - +0630
-Link Asia/Yangon Indian/Cocos
-
-# Cambodia
-# See Asia/Bangkok.
-
# China
@@ -665,10 +655,9 @@ Zone Asia/Shanghai 8:05:43 - LMT 1901
8:00 PRC C%sT
# Xinjiang time, used by many in western China; represented by Ürümqi / Ürümchi
# / Wulumuqi. (Please use Asia/Shanghai if you prefer Beijing time.)
+# Vostok base in Antarctica matches this since 1970.
Zone Asia/Urumqi 5:50:20 - LMT 1928
6:00 - +06
-Link Asia/Urumqi Antarctica/Vostok
-
# Hong Kong
@@ -1172,10 +1161,6 @@ Zone Asia/Famagusta 2:15:48 - LMT 1921 Nov 14
3:00 - +03 2017 Oct 29 1:00u
2:00 EUAsia EE%sT
-# Classically, Cyprus belongs to Asia; e.g. see Herodotus, Histories, I.72.
-# However, for various reasons many users expect to find it under Europe.
-Link Asia/Nicosia Europe/Nicosia
-
# Georgia
# From Paul Eggert (1994-11-19):
# Today's _Economist_ (p 60) reports that Georgia moved its clocks forward
@@ -2704,14 +2689,6 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1
8:30 - KST 2018 May 4 23:30
9:00 - KST
-###############################################################################
-
-# Kuwait
-# See Asia/Riyadh.
-
-# Laos
-# See Asia/Bangkok.
-
# Lebanon
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
@@ -2743,7 +2720,9 @@ Rule Lebanon 1999 max - Oct lastSun 0:00 0 -
Zone Asia/Beirut 2:22:00 - LMT 1880
2:00 Lebanon EE%sT
-# Malaysia
+# Brunei
+# Malaysia (eastern)
+#
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule NBorneo 1935 1941 - Sep 14 0:00 0:20 -
Rule NBorneo 1935 1941 - Dec 14 0:00 0 -
@@ -2760,14 +2739,12 @@ Zone Asia/Kuching 7:21:20 - LMT 1926 Mar
8:00 NBorneo +08/+0820 1942 Feb 16
9:00 - +09 1945 Sep 12
8:00 - +08
-Link Asia/Kuching Asia/Brunei
# Maldives
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Indian/Maldives 4:54:00 - LMT 1880 # Malé
4:54:00 - MMT 1960 # Malé Mean Time
5:00 - +05
-Link Indian/Maldives Indian/Kerguelen
# Mongolia
@@ -2930,9 +2907,6 @@ Zone Asia/Kathmandu 5:41:16 - LMT 1920
5:30 - +0530 1986
5:45 - +0545
-# Oman
-# See Asia/Dubai.
-
# Pakistan
# From Rives McDow (2002-03-13):
@@ -3543,14 +3517,18 @@ Zone Asia/Manila -15:56:00 - LMT 1844 Dec 31
9:00 - JST 1944 Nov
8:00 Phil P%sT
+# Bahrain
# Qatar
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Qatar 3:26:08 - LMT 1920 # Al Dawhah / Doha
4:00 - +04 1972 Jun
3:00 - +03
-Link Asia/Qatar Asia/Bahrain
+# Kuwait
# Saudi Arabia
+# Yemen
+#
+# Japan's year-round bases in Antarctica match this since 1970.
#
# From Paul Eggert (2018-08-29):
# Time in Saudi Arabia and other countries in the Arabian peninsula was not
@@ -3595,9 +3573,6 @@ Link Asia/Qatar Asia/Bahrain
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Riyadh 3:06:52 - LMT 1947 Mar 14
3:00 - +03
-Link Asia/Riyadh Antarctica/Syowa
-Link Asia/Riyadh Asia/Aden # Yemen
-Link Asia/Riyadh Asia/Kuwait
# Singapore
# taken from Mok Ly Yng (2003-10-30)
@@ -3612,7 +3587,6 @@ Zone Asia/Singapore 6:55:25 - LMT 1901 Jan 1
9:00 - +09 1945 Sep 12
7:30 - +0730 1982 Jan 1
8:00 - +08
-Link Asia/Singapore Asia/Kuala_Lumpur
# Spratly Is
# no information
@@ -3858,14 +3832,15 @@ Zone Asia/Dushanbe 4:35:12 - LMT 1924 May 2
5:00 1:00 +06 1991 Sep 9 2:00s
5:00 - +05
+# Cambodia
+# Christmas I
+# Laos
# Thailand
+# Vietnam (northern)
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Bangkok 6:42:04 - LMT 1880
6:42:04 - BMT 1920 Apr # Bangkok Mean Time
7:00 - +07
-Link Asia/Bangkok Asia/Phnom_Penh # Cambodia
-Link Asia/Bangkok Asia/Vientiane # Laos
-Link Asia/Bangkok Indian/Christmas
# Turkmenistan
# From Shanks & Pottenger.
@@ -3876,13 +3851,15 @@ Zone Asia/Ashgabat 3:53:32 - LMT 1924 May 2 # or Ashkhabad
4:00 RussiaAsia +04/+05 1992 Jan 19 2:00
5:00 - +05
+# Oman
+# Réunion
+# Seychelles
# United Arab Emirates
+#
+# The Crozet Is also observe Réunion time; see the 'antarctica' file.
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Asia/Dubai 3:41:12 - LMT 1920
4:00 - +04
-Link Asia/Dubai Asia/Muscat # Oman
-Link Asia/Dubai Indian/Mahe
-Link Asia/Dubai Indian/Reunion
# Uzbekistan
# Byalokoz 1919 says Uzbekistan was 4:27:53.
@@ -3902,7 +3879,7 @@ Zone Asia/Tashkent 4:37:11 - LMT 1924 May 2
5:00 RussiaAsia +05/+06 1992
5:00 - +05
-# Vietnam
+# Vietnam (southern)
# From Paul Eggert (2014-10-04):
# Milne gives 7:16:56 for the meridian of Saigon in 1899, as being
@@ -3976,7 +3953,3 @@ Zone Asia/Ho_Chi_Minh 7:06:30 - LMT 1906 Jul 1
# For timestamps in north Vietnam back to 1970 (the tzdb cutoff),
# use Asia/Bangkok; see the VN entries in the file zone1970.tab.
# For timestamps before 1970, see Asia/Hanoi in the file 'backzone'.
-
-
-# Yemen
-# See Asia/Riyadh.
diff --git a/contrib/tzdata/australasia b/contrib/tzdata/australasia
index d6d11718e032..af0410ab9035 100644
--- a/contrib/tzdata/australasia
+++ b/contrib/tzdata/australasia
@@ -251,13 +251,6 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov
10:00 1:00 AEDT 2011
10:00 AT AE%sT
-# Christmas
-# See Asia/Bangkok.
-
-# Cocos (Keeling) Is
-# See Asia/Yangon.
-
-
# Fiji
# Milne gives 11:55:44 for Suva.
@@ -393,8 +386,14 @@ Zone Antarctica/Macquarie 0 - -00 1899 Nov
# concerned shifting arrival and departure times, which may look like a simple
# thing but requires some significant logistical adjustments domestically and
# internationally."
-# Assume for now that DST will resume with the recent pre-2020 rules for the
-# 2022/2023 season.
+
+# From Shalvin Narayan (2022-10-27):
+# Please note that there will not be any daylight savings time change
+# in Fiji for 2022-2023....
+# https://www.facebook.com/FijianGovernment/posts/pfbid0mmWVTYmTibn66ybpFda75pDcf34SSpoSaskJW5gXwaKo5Sgc7273Q4fXWc6kQV6Hl
+#
+# From Paul Eggert (2022-10-27):
+# For now, assume DST is suspended indefinitely.
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 -
@@ -409,8 +408,6 @@ Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 -
Rule Fiji 2015 2021 - Jan Sun>=12 3:00 0 -
Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 -
Rule Fiji 2020 only - Dec 20 2:00 1:00 -
-Rule Fiji 2022 max - Nov Sun>=8 2:00 1:00 -
-Rule Fiji 2023 max - Jan Sun>=12 3:00 0 -
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji +12/+13
@@ -426,7 +423,9 @@ Zone Pacific/Tahiti -9:58:16 - LMT 1912 Oct # Papeete
# Clipperton (near North America) is administered from French Polynesia;
# it is uninhabited.
+
# Guam
+# N Mariana Is
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
# http://guamlegislature.com/Public_Laws_5th/PL05-025.pdf
@@ -466,17 +465,20 @@ Zone Pacific/Guam -14:21:00 - LMT 1844 Dec 31
9:00 - +09 1944 Jul 31
10:00 Guam G%sT 2000 Dec 23
10:00 - ChST # Chamorro Standard Time
-Link Pacific/Guam Pacific/Saipan # N Mariana Is
-# Kiribati
+
+# Kiribati (Gilbert Is)
+# Marshall Is
+# Tuvalu
+# Wake
+# Wallis & Futuna
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Tarawa 11:32:04 - LMT 1901 # Bairiki
12:00 - +12
-Link Pacific/Tarawa Pacific/Funafuti
-Link Pacific/Tarawa Pacific/Majuro
-Link Pacific/Tarawa Pacific/Wake
-Link Pacific/Tarawa Pacific/Wallis
+# Kiribati (except Gilbert Is)
+# See Pacific/Tarawa for the Gilbert Is.
+# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Kanton 0 - -00 1937 Aug 31
-12:00 - -12 1979 Oct
-11:00 - -11 1994 Dec 31
@@ -486,9 +488,6 @@ Zone Pacific/Kiritimati -10:29:20 - LMT 1901
-10:00 - -10 1994 Dec 31
14:00 - +14
-# N Mariana Is
-# See Pacific/Guam.
-
# Marshall Is
# See Pacific/Tarawa for most locations.
# Zone NAME STDOFF RULES FORMAT [UNTIL]
@@ -538,6 +537,7 @@ Zone Pacific/Noumea 11:05:48 - LMT 1912 Jan 13 # Nouméa
###############################################################################
# New Zealand
+# McMurdo Station and Scott Base in Antarctica use Auckland time.
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
Rule NZ 1927 only - Nov 6 2:00 1:00 S
@@ -573,7 +573,6 @@ Rule Chatham 2008 max - Apr Sun>=1 2:45s 0 -
Zone Pacific/Auckland 11:39:04 - LMT 1868 Nov 2
11:30 NZ NZ%sT 1946 Jan 1
12:00 NZ NZ%sT
-Link Pacific/Auckland Antarctica/McMurdo
Zone Pacific/Chatham 12:13:48 - LMT 1868 Nov 2
12:15 - +1215 1946 Jan 1
@@ -672,8 +671,6 @@ Zone Pacific/Palau -15:02:04 - LMT 1844 Dec 31 # Koror
Zone Pacific/Port_Moresby 9:48:40 - LMT 1880
9:48:32 - PMMT 1895 # Port Moresby Mean Time
10:00 - +10
-Link Pacific/Port_Moresby Antarctica/DumontDUrville
-Link Pacific/Port_Moresby Pacific/Chuuk
#
# From Paul Eggert (2014-10-13):
# Base the Bougainville entry on the Arawa-Kieta region, which appears to have
@@ -706,10 +703,10 @@ Zone Pacific/Pitcairn -8:40:20 - LMT 1901 # Adamstown
-8:00 - -08
# American Samoa
+# Midway
Zone Pacific/Pago_Pago 12:37:12 - LMT 1892 Jul 5
-11:22:48 - LMT 1911
-11:00 - SST # S=Samoa
-Link Pacific/Pago_Pago Pacific/Midway # in US minor outlying islands
# Samoa (formerly and also known as Western Samoa)
@@ -801,7 +798,6 @@ Zone Pacific/Apia 12:33:04 - LMT 1892 Jul 5
# Zone NAME STDOFF RULES FORMAT [UNTIL]
Zone Pacific/Guadalcanal 10:39:48 - LMT 1912 Oct # Honiara
11:00 - +11
-Link Pacific/Guadalcanal Pacific/Pohnpei
# Tokelau
#
@@ -841,9 +837,6 @@ Zone Pacific/Tongatapu 12:19:12 - LMT 1945 Sep 10
13:00 - +13 1999
13:00 Tonga +13/+14
-# Tuvalu
-# See Pacific/Tarawa.
-
# US minor outlying islands
@@ -894,15 +887,9 @@ Zone Pacific/Tongatapu 12:19:12 - LMT 1945 Sep 10
# Kingman
# uninhabited
-# Midway
-# See Pacific/Pago_Pago.
-
# Palmyra
# uninhabited since World War II; was probably like Pacific/Kiritimati
-# Wake
-# See Pacific/Tarawa.
-
# Vanuatu
@@ -939,9 +926,6 @@ Rule Vanuatu 1992 only - Oct Sat>=22 24:00 1:00 -
Zone Pacific/Efate 11:13:16 - LMT 1912 Jan 13 # Vila
11:00 Vanuatu +11/+12
-# Wallis and Futuna
-# See Pacific/Tarawa.
-
###############################################################################
# NOTES
diff --git a/contrib/tzdata/backward b/contrib/tzdata/backward
index 14e4b145486b..4c1c5d5f8f71 100644
--- a/contrib/tzdata/backward
+++ b/contrib/tzdata/backward
@@ -4,7 +4,7 @@
# 2009-05-17 by Arthur David Olson.
# This file provides links from old or merged timezone names to current ones.
-# Many names changed in late 1993, and many merged names moved here
+# Many names changed in 1993 and in 1995, and many merged names moved here
# in the period from 2013 through 2022. Several of these names are
# also present in the file 'backzone', which has data important only
# for pre-1970 timestamps and so is out of scope for tzdb proper.
@@ -13,50 +13,24 @@
# building with 'make BACKWARD=', in practice downstream users
# typically use this file for backward compatibility.
*** 1384 LINES SKIPPED ***