Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/tzfile.h
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@
** Each file begins with. . .
*/

#define TZ_MAGIC "TZif"
#define TZ_MAGIC "TZif"

struct tzhead {
char tzh_magic[4]; /* TZ_MAGIC */
Expand Down
2 changes: 1 addition & 1 deletion testdata/version
Original file line number Diff line number Diff line change
@@ -1 +1 @@
2025b
2025c
Binary file modified testdata/zoneinfo/America/Ensenada
Binary file not shown.
Binary file modified testdata/zoneinfo/America/Santa_Isabel
Binary file not shown.
Binary file modified testdata/zoneinfo/America/Tijuana
Binary file not shown.
Binary file modified testdata/zoneinfo/Mexico/BajaNorte
Binary file not shown.
18 changes: 9 additions & 9 deletions testdata/zoneinfo/iso3166.tab
Original file line number Diff line number Diff line change
Expand Up @@ -3,22 +3,22 @@
# This file is in the public domain, so clarified as of
# 2009-05-17 by Arthur David Olson.
#
# From Paul Eggert (2023-09-06):
# From Paul Eggert (2025-07-01):
# This file contains a table of two-letter country codes. Columns are
# separated by a single tab. Lines beginning with '#' are comments.
# separated by a single tab. Lines beginning with ‘#’ are comments.
# All text uses UTF-8 encoding. The columns of the table are as follows:
#
# 1. ISO 3166-1 alpha-2 country code, current as of
# ISO/TC 46 N1108 (2023-04-05). See: ISO/TC 46 Documents
# ISO/TC 46 N1127 (2024-02-29). See: ISO/TC 46 Documents
# https://www.iso.org/committee/48750.html?view=documents
# 2. The usual English name for the coded region. This sometimes
# departs from ISO-listed names, sometimes so that sorted subsets
# of names are useful (e.g., "Samoa (American)" and "Samoa
# (western)" rather than "American Samoa" and "Samoa"),
# of names are useful (e.g., Samoa (American) and Samoa
# (western) rather than American Samoa and Samoa),
# sometimes to avoid confusion among non-experts (e.g.,
# "Czech Republic" and "Turkey" rather than "Czechia" and "Türkiye"),
# and sometimes to omit needless detail or churn (e.g., "Netherlands"
# rather than "Netherlands (the)" or "Netherlands (Kingdom of the)").
# Czech Republic and Turkey rather than Czechia and Türkiye),
# and sometimes to omit needless detail or churn (e.g., Netherlands
# rather than Netherlands (the) or Netherlands (Kingdom of the)).
#
# The table is sorted by country code.
#
Expand Down Expand Up @@ -71,7 +71,7 @@ CD Congo (Dem. Rep.)
CF Central African Rep.
CG Congo (Rep.)
CH Switzerland
CI Côte d'Ivoire
CI Côte dIvoire
CK Cook Islands
CL Chile
CM Cameroon
Expand Down
24 changes: 12 additions & 12 deletions testdata/zoneinfo/zone1970.tab
Original file line number Diff line number Diff line change
Expand Up @@ -2,15 +2,15 @@
#
# This file is in the public domain.
#
# From Paul Eggert (2018-06-27):
# From Paul Eggert (2025-05-15):
# This file contains a table where each row stands for a timezone where
# civil timestamps have agreed since 1970. Columns are separated by
# a single tab. Lines beginning with '#' are comments. All text uses
# a single tab. Lines beginning with ‘#’ are comments. All text uses
# UTF-8 encoding. The columns of the table are as follows:
#
# 1. The countries that overlap the timezone, as a comma-separated list
# of ISO 3166 2-character country codes. See the file 'iso3166.tab'.
# 2. Latitude and longitude of the timezone's principal location
# of ISO 3166 2-character country codes.
# 2. Latitude and longitude of the timezones principal location
# in ISO 6709 sign-degrees-minutes-seconds format,
# either ±DDMM±DDDMM or ±DDMMSS±DDDMMSS,
# first latitude (+ is north), then longitude (+ is east).
Expand Down Expand Up @@ -197,7 +197,7 @@ KZ +4448+06528 Asia/Qyzylorda Qyzylorda/Kyzylorda/Kzyl-Orda
KZ +5312+06337 Asia/Qostanay Qostanay/Kostanay/Kustanay
KZ +5017+05710 Asia/Aqtobe Aqtöbe/Aktobe
KZ +4431+05016 Asia/Aqtau Mangghystaū/Mankistau
KZ +4707+05156 Asia/Atyrau Atyraū/Atirau/Gur'yev
KZ +4707+05156 Asia/Atyrau Atyraū/Atirau/Guryev
KZ +5113+05121 Asia/Oral West Kazakhstan
LB +3353+03530 Asia/Beirut
LK +0656+07951 Asia/Colombo
Expand Down Expand Up @@ -245,7 +245,7 @@ PE -1203-07703 America/Lima
PF -1732-14934 Pacific/Tahiti Society Islands
PF -0900-13930 Pacific/Marquesas Marquesas Islands
PF -2308-13457 Pacific/Gambier Gambier Islands
PG,AQ,FM -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas), Chuuk, Yap, Dumont d'Urville
PG,AQ,FM -0930+14710 Pacific/Port_Moresby Papua New Guinea (most areas), Chuuk, Yap, Dumont dUrville
PG -0613+15534 Pacific/Bougainville Bougainville
PH +143512+1205804 Asia/Manila
PK +2452+06703 Asia/Karachi
Expand All @@ -265,7 +265,7 @@ RO +4426+02606 Europe/Bucharest
RS,BA,HR,ME,MK,SI +4450+02030 Europe/Belgrade
RU +5443+02030 Europe/Kaliningrad MSK-01 - Kaliningrad
RU +554521+0373704 Europe/Moscow MSK+00 - Moscow area
# Mention RU and UA alphabetically. See "territorial claims" above.
# Mention RU and UA alphabetically. See territorial claims above.
RU,UA +4457+03406 Europe/Simferopol Crimea
RU +5836+04939 Europe/Kirov MSK+00 - Kirov
RU +4844+04425 Europe/Volgograd MSK+00 - Volgograd
Expand Down Expand Up @@ -353,20 +353,20 @@ ZA,LS,SZ -2615+02800 Africa/Johannesburg
# The next section contains experimental tab-separated comments for
# use by user agents like tzselect that identify continents and oceans.
#
# For example, the comment "#@AQ<tab>Antarctica/" means the country code
# For example, the comment #@AQ<tab>Antarctica/ means the country code
# AQ is in the continent Antarctica regardless of the Zone name,
# so Pacific/Auckland should be listed under Antarctica as well as
# under the Pacific because its line's country codes include AQ.
# under the Pacific because its lines country codes include AQ.
#
# If more than one country code is affected each is listed separated
# by commas, e.g., #@IS,SH<tab>Atlantic/". If a country code is in
# by commas, e.g., #@IS,SH<tab>Atlantic/. If a country code is in
# more than one continent or ocean, each is listed separated by
# commas, e.g., the second column of "#@CY,TR<tab>Asia/,Europe/".
# commas, e.g., the second column of #@CY,TR<tab>Asia/,Europe/.
#
# These experimental comments are present only for country codes where
# the continent or ocean is not already obvious from the Zone name.
# For example, there is no such comment for RU since it already
# corresponds to Zone names starting with both "Europe/" and "Asia/".
# corresponds to Zone names starting with both Europe/ and Asia/.
#
#@AQ Antarctica/
#@IS,SH Atlantic/
Expand Down
94 changes: 47 additions & 47 deletions testdata/zoneinfo/zonenow.tab
Original file line number Diff line number Diff line change
Expand Up @@ -5,12 +5,12 @@
# From Paul Eggert (2023-12-18):
# This file contains a table where each row stands for a timezone
# where civil timestamps are predicted to agree from now on.
# This file is like zone1970.tab (see zone1970.tab's comments),
# This file is like zone1970.tab (see zone1970.tabs comments),
# but with the following changes:
#
# 1. Each timezone corresponds to a set of clocks that are planned
# to agree from now on. This is a larger set of clocks than in
# zone1970.tab, where each timezone's clocks must agree from 1970 on.
# zone1970.tab, where each timezones clocks must agree from 1970 on.
# 2. The first column is irrelevant and ignored.
# 3. The table is sorted in a different way:
# first by standard time UTC offset;
Expand All @@ -29,19 +29,19 @@
#XX coordinates TZ comments
#
# -11 - SST
XX -1416-17042 Pacific/Pago_Pago Midway; Samoa ("SST")
XX -1416-17042 Pacific/Pago_Pago Midway; Samoa (SST)
#
# -11
XX -1901-16955 Pacific/Niue Niue
#
# -10 - HST
XX +211825-1575130 Pacific/Honolulu Hawaii ("HST")
XX +211825-1575130 Pacific/Honolulu Hawaii (HST)
#
# -10
XX -1732-14934 Pacific/Tahiti Tahiti; Cook Islands
#
# -10/-09 - HST / HDT (North America DST)
XX +515248-1763929 America/Adak western Aleutians in Alaska ("HST/HDT")
XX +515248-1763929 America/Adak western Aleutians in Alaska (HST/HDT)
#
# -09:30
XX -0900-13930 Pacific/Marquesas Marquesas
Expand All @@ -50,58 +50,58 @@ XX -0900-13930 Pacific/Marquesas Marquesas
XX -2308-13457 Pacific/Gambier Gambier
#
# -09/-08 - AKST/AKDT (North America DST)
XX +611305-1495401 America/Anchorage most of Alaska ("AKST/AKDT")
XX +611305-1495401 America/Anchorage most of Alaska (AKST/AKDT)
#
# -08
XX -2504-13005 Pacific/Pitcairn Pitcairn
#
# -08/-07 - PST/PDT (North America DST)
XX +340308-1181434 America/Los_Angeles Pacific ("PST/PDT") - US & Canada; Mexico near US border
XX +340308-1181434 America/Los_Angeles Pacific (PST/PDT) - US & Canada; Mexico near US border
#
# -07 - MST
XX +332654-1120424 America/Phoenix Mountain Standard ("MST") - Arizona; western Mexico; Yukon
XX +332654-1120424 America/Phoenix Mountain Standard (MST) - Arizona; western Mexico; Yukon
#
# -07/-06 - MST/MDT (North America DST)
XX +394421-1045903 America/Denver Mountain ("MST/MDT") - US & Canada; Mexico near US border
XX +394421-1045903 America/Denver Mountain (MST/MDT) - US & Canada; Mexico near US border
#
# -06
XX -0054-08936 Pacific/Galapagos Galápagos
#
# -06 - CST
XX +1924-09909 America/Mexico_City Central Standard ("CST") - Saskatchewan; central Mexico; Central America
XX +1924-09909 America/Mexico_City Central Standard (CST) - Saskatchewan; central Mexico; Central America
#
# -06/-05 (Chile DST)
XX -2709-10926 Pacific/Easter Easter Island
#
# -06/-05 - CST/CDT (North America DST)
XX +415100-0873900 America/Chicago Central ("CST/CDT") - US & Canada; Mexico near US border
XX +415100-0873900 America/Chicago Central (CST/CDT) - US & Canada; Mexico near US border
#
# -05
XX -1203-07703 America/Lima eastern South America
#
# -05 - EST
XX +175805-0764736 America/Jamaica Eastern Standard ("EST") - Caymans; Jamaica; eastern Mexico; Panama
XX +175805-0764736 America/Jamaica Eastern Standard (EST) - Caymans; Jamaica; eastern Mexico; Panama
#
# -05/-04 - CST/CDT (Cuba DST)
XX +2308-08222 America/Havana Cuba
#
# -05/-04 - EST/EDT (North America DST)
XX +404251-0740023 America/New_York Eastern ("EST/EDT") - US & Canada
XX +404251-0740023 America/New_York Eastern (EST/EDT) - US & Canada
#
# -04
XX +1030-06656 America/Caracas western South America
#
# -04 - AST
XX +1828-06954 America/Santo_Domingo Atlantic Standard ("AST") - eastern Caribbean
XX +1828-06954 America/Santo_Domingo Atlantic Standard (AST) - eastern Caribbean
#
# -04/-03 (Chile DST)
XX -3327-07040 America/Santiago most of Chile
#
# -04/-03 - AST/ADT (North America DST)
XX +4439-06336 America/Halifax Atlantic ("AST/ADT") - Canada; Bermuda
XX +4439-06336 America/Halifax Atlantic (AST/ADT) - Canada; Bermuda
#
# -03:30/-02:30 - NST/NDT (North America DST)
XX +4734-05243 America/St_Johns Newfoundland ("NST/NDT")
XX +4734-05243 America/St_Johns Newfoundland (NST/NDT)
#
# -03
XX -2332-04637 America/Sao_Paulo eastern and southern South America
Expand All @@ -122,43 +122,43 @@ XX +1455-02331 Atlantic/Cape_Verde Cape Verde
XX +3744-02540 Atlantic/Azores Azores
#
# +00 - GMT
XX +0519-00402 Africa/Abidjan far western Africa; Iceland ("GMT")
XX +0519-00402 Africa/Abidjan far western Africa; Iceland (GMT)
#
# +00/+01 - GMT/BST (EU DST)
XX +513030-0000731 Europe/London United Kingdom ("GMT/BST")
XX +513030-0000731 Europe/London United Kingdom (GMT/BST)
#
# +00/+01 - WET/WEST (EU DST)
XX +3843-00908 Europe/Lisbon western Europe ("WET/WEST")
XX +3843-00908 Europe/Lisbon western Europe (WET/WEST)
#
# +00/+02 - Troll DST
XX -720041+0023206 Antarctica/Troll Troll Station in Antarctica
#
# +01 - CET
XX +3647+00303 Africa/Algiers Algeria, Tunisia ("CET")
XX +3647+00303 Africa/Algiers Algeria, Tunisia (CET)
#
# +01 - WAT
XX +0627+00324 Africa/Lagos western Africa ("WAT")
XX +0627+00324 Africa/Lagos western Africa (WAT)
#
# +01/+00 - IST/GMT (EU DST in reverse)
XX +5320-00615 Europe/Dublin Ireland ("IST/GMT")
XX +5320-00615 Europe/Dublin Ireland (IST/GMT)
#
# +01/+00 - (Morocco DST)
XX +3339-00735 Africa/Casablanca Morocco
#
# +01/+02 - CET/CEST (EU DST)
XX +4852+00220 Europe/Paris central Europe ("CET/CEST")
XX +4852+00220 Europe/Paris central Europe (CET/CEST)
#
# +02 - CAT
XX -2558+03235 Africa/Maputo central Africa ("CAT")
XX -2558+03235 Africa/Maputo central Africa (CAT)
#
# +02 - EET
XX +3254+01311 Africa/Tripoli Libya; Kaliningrad ("EET")
XX +3254+01311 Africa/Tripoli Libya; Kaliningrad (EET)
#
# +02 - SAST
XX -2615+02800 Africa/Johannesburg southern Africa ("SAST")
XX -2615+02800 Africa/Johannesburg southern Africa (SAST)
#
# +02/+03 - EET/EEST (EU DST)
XX +3758+02343 Europe/Athens eastern Europe ("EET/EEST")
XX +3758+02343 Europe/Athens eastern Europe (EET/EEST)
#
# +02/+03 - EET/EEST (Egypt DST)
XX +3003+03115 Africa/Cairo Egypt
Expand All @@ -179,10 +179,10 @@ XX +314650+0351326 Asia/Jerusalem Israel
XX +4101+02858 Europe/Istanbul Near East; Belarus
#
# +03 - EAT
XX -0117+03649 Africa/Nairobi eastern Africa ("EAT")
XX -0117+03649 Africa/Nairobi eastern Africa (EAT)
#
# +03 - MSK
XX +554521+0373704 Europe/Moscow Moscow ("MSK")
XX +554521+0373704 Europe/Moscow Moscow (MSK)
#
# +03:30
XX +3540+05126 Asia/Tehran Iran
Expand All @@ -197,13 +197,13 @@ XX +3431+06912 Asia/Kabul Afghanistan
XX +4120+06918 Asia/Tashkent Russia; Kazakhstan; Tajikistan; Turkmenistan; Uzbekistan; Maldives
#
# +05 - PKT
XX +2452+06703 Asia/Karachi Pakistan ("PKT")
XX +2452+06703 Asia/Karachi Pakistan (PKT)
#
# +05:30
XX +0656+07951 Asia/Colombo Sri Lanka
#
# +05:30 - IST
XX +2232+08822 Asia/Kolkata India ("IST")
XX +2232+08822 Asia/Kolkata India (IST)
#
# +05:45
XX +2743+08519 Asia/Kathmandu Nepal
Expand All @@ -218,25 +218,25 @@ XX +1647+09610 Asia/Yangon Myanmar; Cocos
XX +1345+10031 Asia/Bangkok Russia; Indochina; Christmas Island
#
# +07 - WIB
XX -0610+10648 Asia/Jakarta Indonesia ("WIB")
XX -0610+10648 Asia/Jakarta Indonesia (WIB)
#
# +08
XX +0117+10351 Asia/Singapore Russia; Brunei; Malaysia; Singapore; Concordia
#
# +08 - AWST
XX -3157+11551 Australia/Perth Western Australia ("AWST")
XX -3157+11551 Australia/Perth Western Australia (AWST)
#
# +08 - CST
XX +3114+12128 Asia/Shanghai China ("CST")
XX +3114+12128 Asia/Shanghai China (CST)
#
# +08 - HKT
XX +2217+11409 Asia/Hong_Kong Hong Kong ("HKT")
XX +2217+11409 Asia/Hong_Kong Hong Kong (HKT)
#
# +08 - PHT
XX +143512+1205804 Asia/Manila Philippines ("PHT")
XX +143512+1205804 Asia/Manila Philippines (PHT)
#
# +08 - WITA
XX -0507+11924 Asia/Makassar Indonesia ("WITA")
XX -0507+11924 Asia/Makassar Indonesia (WITA)
#
# +08:45
XX -3143+12852 Australia/Eucla Eucla
Expand All @@ -245,31 +245,31 @@ XX -3143+12852 Australia/Eucla Eucla
XX +5203+11328 Asia/Chita Russia; Palau; East Timor
#
# +09 - JST
XX +353916+1394441 Asia/Tokyo Japan ("JST"); Eyre Bird Observatory
XX +353916+1394441 Asia/Tokyo Japan (JST); Eyre Bird Observatory
#
# +09 - KST
XX +3733+12658 Asia/Seoul Korea ("KST")
XX +3733+12658 Asia/Seoul Korea (KST)
#
# +09 - WIT
XX -0232+14042 Asia/Jayapura Indonesia ("WIT")
XX -0232+14042 Asia/Jayapura Indonesia (WIT)
#
# +09:30 - ACST
XX -1228+13050 Australia/Darwin Northern Territory ("ACST")
XX -1228+13050 Australia/Darwin Northern Territory (ACST)
#
# +09:30/+10:30 - ACST/ACDT (Australia DST)
XX -3455+13835 Australia/Adelaide South Australia ("ACST/ACDT")
XX -3455+13835 Australia/Adelaide South Australia (ACST/ACDT)
#
# +10
XX +4310+13156 Asia/Vladivostok Russia; Yap; Chuuk; Papua New Guinea; Dumont d'Urville
XX +4310+13156 Asia/Vladivostok Russia; Yap; Chuuk; Papua New Guinea; Dumont dUrville
#
# +10 - AEST
XX -2728+15302 Australia/Brisbane Queensland ("AEST")
XX -2728+15302 Australia/Brisbane Queensland (AEST)
#
# +10 - ChST
XX +1328+14445 Pacific/Guam Mariana Islands ("ChST")
XX +1328+14445 Pacific/Guam Mariana Islands (ChST)
#
# +10/+11 - AEST/AEDT (Australia DST)
XX -3352+15113 Australia/Sydney southeast Australia ("AEST/AEDT")
XX -3352+15113 Australia/Sydney southeast Australia (AEST/AEDT)
#
# +10:30/+11
XX -3133+15905 Australia/Lord_Howe Lord Howe Island
Expand All @@ -284,7 +284,7 @@ XX -2903+16758 Pacific/Norfolk Norfolk Island
XX +5301+15839 Asia/Kamchatka Russia; Tuvalu; Fiji; etc.
#
# +12/+13 (New Zealand DST)
XX -3652+17446 Pacific/Auckland New Zealand ("NZST/NZDT")
XX -3652+17446 Pacific/Auckland New Zealand (NZST/NZDT)
#
# +12:45/+13:45 (Chatham DST)
XX -4357-17633 Pacific/Chatham Chatham Islands
Expand Down