From af6a422e4d89fa6c27d40bcc9a0dc7cda5e7605d Mon Sep 17 00:00:00 2001 From: Bradley White <14679271+devbww@users.noreply.github.com> Date: Tue, 26 Dec 2023 11:41:36 -0500 Subject: [PATCH] Update zoneinfo files to 2023d --- src/tzfile.h | 8 - testdata/README.zoneinfo | 2 +- testdata/version | 2 +- testdata/zoneinfo/America/Ensenada | Bin 1025 -> 1025 bytes testdata/zoneinfo/America/Godthab | Bin 965 -> 965 bytes testdata/zoneinfo/America/Goose_Bay | Bin 1580 -> 1580 bytes testdata/zoneinfo/America/Indiana/Winamac | Bin 612 -> 603 bytes testdata/zoneinfo/America/Matamoros | Bin 437 -> 437 bytes testdata/zoneinfo/America/Metlakatla | Bin 595 -> 586 bytes testdata/zoneinfo/America/Moncton | Bin 1493 -> 1493 bytes testdata/zoneinfo/America/Nuuk | Bin 965 -> 965 bytes testdata/zoneinfo/America/Ojinaga | Bin 709 -> 718 bytes testdata/zoneinfo/America/Santa_Isabel | Bin 1025 -> 1025 bytes testdata/zoneinfo/America/Scoresbysund | Bin 479 -> 984 bytes testdata/zoneinfo/America/St_Johns | Bin 1878 -> 1878 bytes testdata/zoneinfo/America/Tijuana | Bin 1025 -> 1025 bytes testdata/zoneinfo/Antarctica/Casey | Bin 243 -> 287 bytes testdata/zoneinfo/Antarctica/Macquarie | Bin 976 -> 976 bytes testdata/zoneinfo/Antarctica/Troll | Bin 177 -> 158 bytes testdata/zoneinfo/Antarctica/Vostok | Bin 133 -> 170 bytes testdata/zoneinfo/Asia/Gaza | Bin 2518 -> 2968 bytes testdata/zoneinfo/Asia/Hebron | Bin 2536 -> 2986 bytes testdata/zoneinfo/Asia/Nicosia | Bin 597 -> 597 bytes testdata/zoneinfo/Canada/Newfoundland | Bin 1878 -> 1878 bytes testdata/zoneinfo/Europe/Belfast | Bin 1599 -> 1599 bytes testdata/zoneinfo/Europe/Bucharest | Bin 661 -> 661 bytes testdata/zoneinfo/Europe/Chisinau | Bin 755 -> 755 bytes testdata/zoneinfo/Europe/Guernsey | Bin 1611 -> 1611 bytes testdata/zoneinfo/Europe/Isle_of_Man | Bin 1599 -> 1599 bytes testdata/zoneinfo/Europe/Jersey | Bin 1611 -> 1611 bytes testdata/zoneinfo/Europe/Kiev | Bin 558 -> 558 bytes testdata/zoneinfo/Europe/Kyiv | Bin 558 -> 558 bytes testdata/zoneinfo/Europe/London | Bin 1599 -> 1599 bytes testdata/zoneinfo/Europe/Nicosia | Bin 597 -> 597 bytes testdata/zoneinfo/Europe/Riga | Bin 694 -> 694 bytes testdata/zoneinfo/Europe/Sofia | Bin 592 -> 592 bytes testdata/zoneinfo/Europe/Tallinn | Bin 675 -> 675 bytes testdata/zoneinfo/Europe/Tiraspol | Bin 755 -> 755 bytes testdata/zoneinfo/Europe/Uzhgorod | Bin 558 -> 558 bytes testdata/zoneinfo/Europe/Vilnius | Bin 676 -> 676 bytes testdata/zoneinfo/Europe/Zaporozhye | Bin 558 -> 558 bytes testdata/zoneinfo/GB | Bin 1599 -> 1599 bytes testdata/zoneinfo/GB-Eire | Bin 1599 -> 1599 bytes testdata/zoneinfo/Mexico/BajaNorte | Bin 1025 -> 1025 bytes testdata/zoneinfo/Pacific/Norfolk | Bin 247 -> 237 bytes testdata/zoneinfo/iso3166.tab | 17 +- testdata/zoneinfo/zone1970.tab | 29 ++- testdata/zoneinfo/zonenow.tab | 301 ++++++++++++++++++++++ 48 files changed, 329 insertions(+), 30 deletions(-) create mode 100644 testdata/zoneinfo/zonenow.tab diff --git a/src/tzfile.h b/src/tzfile.h index 9cbdcff5..21ae37c1 100644 --- a/src/tzfile.h +++ b/src/tzfile.h @@ -21,14 +21,6 @@ ** Information about time zone files. */ -#ifndef TZDIR -# define TZDIR "/usr/share/zoneinfo" /* Time zone object file directory */ -#endif /* !defined TZDIR */ - -#ifndef TZDEFAULT -# define TZDEFAULT "/etc/localtime" -#endif /* !defined TZDEFAULT */ - #ifndef TZDEFRULES # define TZDEFRULES "posixrules" #endif /* !defined TZDEFRULES */ diff --git a/testdata/README.zoneinfo b/testdata/README.zoneinfo index 67e9c404..0fe55858 100644 --- a/testdata/README.zoneinfo +++ b/testdata/README.zoneinfo @@ -22,7 +22,7 @@ New versions can be generated using the following shell script. LOCALTIME=Factory \ TZDATA_TEXT= \ PACKRATDATA=backzone PACKRATLIST=zone.tab \ - ZONETABLES=zone1970.tab + ZONETABLES=zone1970.tab\ zonenow.tab tar --create --dereference --hard-dereference --file tzfile.tar \ --directory=tz tzfile.h tar --create --dereference --hard-dereference --file zoneinfo.tar \ diff --git a/testdata/version b/testdata/version index 7daa77e0..cd9c3f6d 100644 --- a/testdata/version +++ b/testdata/version @@ -1 +1 @@ -2023c +2023d diff --git a/testdata/zoneinfo/America/Ensenada b/testdata/zoneinfo/America/Ensenada index e8be26b139e653e1b07a3db14ea34bd290441947..42087af4cceb049f1395cabaaa85b7c39253ed97 100644 GIT binary patch delta 21 ccmZqVXyn-7!^~{Ex?!?Eb1Wm%c2Oa*T+TaR8hG37`M~ diff --git a/testdata/zoneinfo/America/Matamoros b/testdata/zoneinfo/America/Matamoros index 88cabcd1528c678db4e1ab1218e9dd6c032ed901..993ac47559c154e52af8fba1bcd7c9d0e3bea880 100644 GIT binary patch delta 22 dcmdnWyp?%F3?s8`f5PNMMmZ)%#>w@JW&lq>1`PlJ delta 23 fcmdnWyp?%F3?uWL=?#+;8D*K77?~#5GnxSaTeSw4 diff --git a/testdata/zoneinfo/America/Metlakatla b/testdata/zoneinfo/America/Metlakatla index 9fefee388e6fa613f9a273f62ffcc020d44b72ab..71b0eab085dbbb48050d7b6a271ebb1a29fb1926 100644 GIT binary patch delta 20 ccmcc2a*Aa_7^C*a@C3%m`x&(-zh=w;08f$!h5!Hn delta 47 zcmX@ba+zg97^BX{@B~I41|W!Od1t`L#LP1JAfx2u3yf@>Z0sP&#Ku1P5n~1bDKZNy diff --git a/testdata/zoneinfo/America/Moncton b/testdata/zoneinfo/America/Moncton index ecb69ef2c96a2a7f6fbf185882f060068979c642..020e33d976179e8f61a6040caaef3c8eb7f348bc 100644 GIT binary patch delta 26 icmcc0eU*E|8y1!s?GB8S1zANWv$9q*GEZ(~4FLdtP6!MD delta 26 icmcc0eU*E|8y1$&vmP)`7GxEj%*tBL$TYc;H3R^U@(CFL diff --git a/testdata/zoneinfo/America/Nuuk b/testdata/zoneinfo/America/Nuuk index 00b57bb13fbfa802e61f8b93d08622163a35a9a4..310774ea4fdd1798782a41f905d16e3548cd191e 100644 GIT binary patch delta 13 UcmX@gew2Mf9Wx{I8 zKg5U&Mi3S)ihc-NzpVN}?F$hkn!m(|$|x8WeIW{yijeC*ul)i3)aUrzi8+RHa-N`^$o!Ff&|U(4p_}LLW{`? zH*1WgC+FUu@_+%NZ%l?M!^-s{2dIjwx)3E-?1mvQ(ARm6okhzYb zEOdItp{wTtY^b~p8y&|AE)K&cV@f9Xn%?xIoBtj~w@mubn_maf?i&&48E=8!GwrZ- z)CAjNX4pQ`%#e9o{93dxYD90fd_;Hn7SVp~6gpsjiw=DI0Jmu#6`Xwvx96|H9hsX@ zn0X+R`Qo`Gx^wI*dS@bm?n<6Uckek1d*Xv|*QPj>gaGWV=!Co3+Je707%cNMWPb3) z3iRHE8g%IHPxQW=9^IE-4#U~6aR2Z;jHG7afk+PapZF}3c?VnXp$Eb<=xEhN^q?n$ zj_K~mbP-*w`5#Y_qI@|-QHqj(M-?l|kMFdOyeS>|GrB|&CCbJ*)Xh_M97pNhYIz;% VoATNtL@*F-n{XgVtt$P3f delta 74 zcmcb?exI2&Bq}q_XriFlLcQPBv7}^=yXd4*V V>G&G!nd%wn8|e5N8h}}bTmZxI5f%Ud diff --git a/testdata/zoneinfo/America/St_Johns b/testdata/zoneinfo/America/St_Johns index e5f2aec2bb2b56dbdb66f0c0a00ba243ed788d58..94d790baaccb72298bb577041cf3c8400339a7da 100644 GIT binary patch delta 29 lcmcb{ca3j@2^;hJ$Q6?v*`y~2uyIX}VVlaxJoyt_3ILka3CjQg delta 29 lcmcb{ca3j@2^;e^UXRI+Y|@hh*tjOguuWxTnf!?@1ptm*2`2ym diff --git a/testdata/zoneinfo/America/Tijuana b/testdata/zoneinfo/America/Tijuana index e8be26b139e653e1b07a3db14ea34bd290441947..42087af4cceb049f1395cabaaa85b7c39253ed97 100644 GIT binary patch delta 21 ccmZqVXyn-7!^~{Ex?!?Eb1Wm%et~_12{XIwet~_12{Ze24+cgiMuy3b%mI`Anb{{#VzvVSX(k5w diff --git a/testdata/zoneinfo/Antarctica/Troll b/testdata/zoneinfo/Antarctica/Troll index 4e31affb50e350376824492ff086867df62ae130..2359c44bd00ed44d2cdbf4f0aa0d9cea507814ed 100644 GIT binary patch delta 43 ncmdnUIFE5cm?9$s0|OHfa{w`e6R$f1NB{;{bPWt9cBumZa{UC( delta 62 zcmbQoxRG%}mR diff --git a/testdata/zoneinfo/Antarctica/Vostok b/testdata/zoneinfo/Antarctica/Vostok index 6e3290717e5a5586705b53043e3c6cbc07d140f1..4ce8f74784e970731f5f44b84f73780087890fa5 100644 GIT binary patch delta 91 zcmZo=T*WvcEQE!Dfq@x_dHw^z%ZSbfAe%wg*HQpP>uqfXQ4Fc|t_F+@j7(q-kVqF5f5`&#k1gK(0VICx;xjP+IHx&S{`eIiF#klM0$BdUiawCCdWI7( zCBX_#ZqWlPIOTo<%s*9c3gKTe1#37xMF7k{BbN{6pYd4);cpTL^UoH40`t$lz60i; zQ}$v2fpZgog8AoT`N912hgu3ijPoD11Ic;@h6{za!3r+gd;}}FI8z(KKOWZr61Wt& z7tFsba~UjuIc)}nKaUN}zhXEa%)jzyE0}-P)}a8zxSCxI=3kTA1Lj}5Gabyo&b1cI zzwRW}z~BxPy8de(Sm4H`Mh=C^^EsYOp1>hE`2vUHgRren9^RG$m0rRijnGWV(=UNNq zUw4vfU~mTtUH>%?EO28_C0N0Yhan$8jGGdN!2FxH8o=_mmQHN|3EbNL2f}}*50<~Z cE2&`eL=J_?>p7lHUcezZ`2mOGf;mBDYF#jk^Wdn$RZ1Ls~VEW=SF#kBG TdBJ2wE``bVT+b$la|Z(eq1+d{ diff --git a/testdata/zoneinfo/Asia/Nicosia b/testdata/zoneinfo/Asia/Nicosia index c210d0a5989c228886b400ab74c75b6fca94b70a..390347f442a486e296689c189e3346695bba5105 100644 GIT binary patch delta 25 hcmcc0a+PJnV@4L!*L)Wye`Hjj#Kg(SI9Y`j5miL4rvAFy&w?qtnjWSsns)e``rhzcVB diff --git a/testdata/zoneinfo/Europe/Bucharest b/testdata/zoneinfo/Europe/Bucharest index efa689ba9e0a782c9367f660a59060d9b1965345..c4a391e73b97e1342d352c5cc15a0bace202deef 100644 GIT binary patch delta 27 jcmbQrI+b;UFcYiM$({#{lNFfsCL1uZGcr&1V{!)oag7H= delta 25 hcmbQrI+b;UFcYh>?QQ|a$qG!mll7T6C;KtE0{~O_1{44Q diff --git a/testdata/zoneinfo/Europe/Chisinau b/testdata/zoneinfo/Europe/Chisinau index 6970b14c506c8119341052c2c142ac11b28a4917..9152e68594bb66cc756e0407654a203952fbd4e5 100644 GIT binary patch delta 22 ecmey&`k8fuH4}@`$({$3?U}3@SteIARR92Fc?abH delta 22 dcmey&`k8fuH4}@m?OKM(_Dt4{%#*8`Dgaed2ATi> diff --git a/testdata/zoneinfo/Europe/Guernsey b/testdata/zoneinfo/Europe/Guernsey index d40bcaa316e33daf689b8bbfce086baca8a84a74..f2d87c6bffb6f59351ea8eab944941c97259c896 100644 GIT binary patch delta 26 icmX@jbDC#^H!F+5a}|ckfvg6T>sfOdnI^wwjROF7L`j5mfvg6T>sfOd87IGGjROFAX9%nS diff --git a/testdata/zoneinfo/Europe/Isle_of_Man b/testdata/zoneinfo/Europe/Isle_of_Man index b0a37e7e09e0c7db916b62155896e857de56a662..9f5aaffd4f803b999658c91e3353d31d3d396076 100644 GIT binary patch delta 30 mcmdnbv!7=}Fe{6}a}|ckiL4rvAFy&w?qtnjWSabq)e``nbqVMI delta 30 mcmdnbv!7=}Fe{5;>`j5miL4rvAFy&w?qtnjWSsns)e``rhzcVB diff --git a/testdata/zoneinfo/Europe/Jersey b/testdata/zoneinfo/Europe/Jersey index 9a10a2ec0aa34bc139b308adad16cb1641c7179d..c83814dd6ae9edc95de7d58f756eef687edeb948 100644 GIT binary patch delta 26 icmX@jbDC#^H!F+5a}|ckfvg6T>sfOdnI^wwjROF7L`j5mfvg6T>sfOd87IGGjROFAX9%nS diff --git a/testdata/zoneinfo/Europe/Kiev b/testdata/zoneinfo/Europe/Kiev index 4e026859fdee32dd3f77a25274c5ccbebe0ee554..753a6c86f38586797589233f4528837f5b09151c 100644 GIT binary patch delta 22 ecmZ3-vW{iLWJVUlX@LQgr!%TCvQOT}SO5T4c?U26 delta 22 ecmZ3-vW{iLWJVUFqAdcGr!%TCGELscSO5T4eg`W6 diff --git a/testdata/zoneinfo/Europe/Kyiv b/testdata/zoneinfo/Europe/Kyiv index 4e026859fdee32dd3f77a25274c5ccbebe0ee554..753a6c86f38586797589233f4528837f5b09151c 100644 GIT binary patch delta 22 ecmZ3-vW{iLWJVUlX@LQgr!%TCvQOT}SO5T4c?U26 delta 22 ecmZ3-vW{iLWJVUFqAdcGr!%TCGELscSO5T4eg`W6 diff --git a/testdata/zoneinfo/Europe/London b/testdata/zoneinfo/Europe/London index 323cd3818ac6f77b4394982ea5a342b9ed262777..b9e95d92623c6cc4c35b16f7ceba3006f5ce4934 100644 GIT binary patch delta 30 mcmdnbv!7=}Fe{6}a}|ckiL4rvAFy&w?qtnjWSabq)e``nbqVMI delta 30 mcmdnbv!7=}Fe{5;>`j5miL4rvAFy&w?qtnjWSsns)e``rhzcVB diff --git a/testdata/zoneinfo/Europe/Nicosia b/testdata/zoneinfo/Europe/Nicosia index c210d0a5989c228886b400ab74c75b6fca94b70a..390347f442a486e296689c189e3346695bba5105 100644 GIT binary patch delta 25 hcmcc0a+PJnV@4L!*L)Wye`Hjj#Kg(SI9YpF diff --git a/testdata/zoneinfo/Europe/Sofia b/testdata/zoneinfo/Europe/Sofia index eabc972a22df300bf90b8da8897155cbb9655a3b..89450685cd149950dc6d65d1b4f076d96c3dc9a0 100644 GIT binary patch delta 30 kcmcb>a)D*TVMcDFlRXa@nV4CCaPkF46(%O8$zK>_0G!a)D*TVMcCa+uZ_;Ow24mIQasjGBYa^>*OztF#wC@2k`&^ diff --git a/testdata/zoneinfo/Europe/Tallinn b/testdata/zoneinfo/Europe/Tallinn index 5321bbd46e7a035956ac16584b13b397e192b5fe..fbebdc6255b547b1f3a547f0f92cc8148f05f186 100644 GIT binary patch delta 21 dcmZ3?x|nstA4cX9nS{yz8I2iPCL1#q0030o2J`>` delta 21 dcmZ3?x|nstA4cY7@e?NhXEbJHpKQ!j003O72b=%^ diff --git a/testdata/zoneinfo/Europe/Tiraspol b/testdata/zoneinfo/Europe/Tiraspol index 6970b14c506c8119341052c2c142ac11b28a4917..9152e68594bb66cc756e0407654a203952fbd4e5 100644 GIT binary patch delta 22 ecmey&`k8fuH4}@`$({$3?U}3@SteIARR92Fc?abH delta 22 dcmey&`k8fuH4}@m?OKM(_Dt4{%#*8`Dgaed2ATi> diff --git a/testdata/zoneinfo/Europe/Uzhgorod b/testdata/zoneinfo/Europe/Uzhgorod index 4e026859fdee32dd3f77a25274c5ccbebe0ee554..753a6c86f38586797589233f4528837f5b09151c 100644 GIT binary patch delta 22 ecmZ3-vW{iLWJVUlX@LQgr!%TCvQOT}SO5T4c?U26 delta 22 ecmZ3-vW{iLWJVUFqAdcGr!%TCGELscSO5T4eg`W6 diff --git a/testdata/zoneinfo/Europe/Vilnius b/testdata/zoneinfo/Europe/Vilnius index 75b2eebb57c54ab1dba6416fb085cc8b6d3a1405..43c3d7f1089366e1c48297906c2693712ac6d99c 100644 GIT binary patch delta 21 dcmZ3&x`cJZ7e;0w;e^TG8I2fOCTlTO0RT?F273Si delta 21 dcmZ3&x`cJZ7e?kb#|e|aGa4~+Ox9wm0svU=2T=e3 diff --git a/testdata/zoneinfo/Europe/Zaporozhye b/testdata/zoneinfo/Europe/Zaporozhye index 4e026859fdee32dd3f77a25274c5ccbebe0ee554..753a6c86f38586797589233f4528837f5b09151c 100644 GIT binary patch delta 22 ecmZ3-vW{iLWJVUlX@LQgr!%TCvQOT}SO5T4c?U26 delta 22 ecmZ3-vW{iLWJVUFqAdcGr!%TCGELscSO5T4eg`W6 diff --git a/testdata/zoneinfo/GB b/testdata/zoneinfo/GB index 323cd3818ac6f77b4394982ea5a342b9ed262777..b9e95d92623c6cc4c35b16f7ceba3006f5ce4934 100644 GIT binary patch delta 30 mcmdnbv!7=}Fe{6}a}|ckiL4rvAFy&w?qtnjWSabq)e``nbqVMI delta 30 mcmdnbv!7=}Fe{5;>`j5miL4rvAFy&w?qtnjWSsns)e``rhzcVB diff --git a/testdata/zoneinfo/GB-Eire b/testdata/zoneinfo/GB-Eire index 323cd3818ac6f77b4394982ea5a342b9ed262777..b9e95d92623c6cc4c35b16f7ceba3006f5ce4934 100644 GIT binary patch delta 30 mcmdnbv!7=}Fe{6}a}|ckiL4rvAFy&w?qtnjWSabq)e``nbqVMI delta 30 mcmdnbv!7=}Fe{5;>`j5miL4rvAFy&w?qtnjWSsns)e``rhzcVB diff --git a/testdata/zoneinfo/Mexico/BajaNorte b/testdata/zoneinfo/Mexico/BajaNorte index e8be26b139e653e1b07a3db14ea34bd290441947..42087af4cceb049f1395cabaaa85b7c39253ed97 100644 GIT binary patch delta 21 ccmZqVXyn-7!^~{Ex?!?Eb1Wm%g*zCy7#P-{U=(0r en6-gH%*Qu`LEF&K&Y=6e}A81B2YecwMg<>pw6uF*C8SGBC`o017h9ZD3$wU|6_=fs27*{Ru_^ o28LN17{nMDRvciI^6?E}&^9zQGy;*v20+pXOd5h%6VE6D02Kli1ONa4 diff --git a/testdata/zoneinfo/iso3166.tab b/testdata/zoneinfo/iso3166.tab index be3348d1..402c015e 100644 --- a/testdata/zoneinfo/iso3166.tab +++ b/testdata/zoneinfo/iso3166.tab @@ -3,17 +3,22 @@ # This file is in the public domain, so clarified as of # 2009-05-17 by Arthur David Olson. # -# From Paul Eggert (2022-11-18): +# From Paul Eggert (2023-09-06): # This file contains a table of two-letter country codes. Columns are # 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 3166-1 N1087 (2022-09-02). See: Updates on ISO 3166-1 -# https://isotc.iso.org/livelink/livelink/Open/16944257 -# 2. The usual English name for the coded region, -# chosen so that alphabetic sorting of subsets produces helpful lists. -# This is not the same as the English name in the ISO 3166 tables. +# ISO/TC 46 N1108 (2023-04-05). 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"), +# 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)"). # # The table is sorted by country code. # diff --git a/testdata/zoneinfo/zone1970.tab b/testdata/zoneinfo/zone1970.tab index 1f1cecb8..abd94897 100644 --- a/testdata/zoneinfo/zone1970.tab +++ b/testdata/zoneinfo/zone1970.tab @@ -37,7 +37,7 @@ #country- #codes coordinates TZ comments AD +4230+00131 Europe/Andorra -AE,OM,RE,SC,TF +2518+05518 Asia/Dubai Crozet, Scattered Is +AE,OM,RE,SC,TF +2518+05518 Asia/Dubai Crozet AF +3431+06912 Asia/Kabul AL +4120+01950 Europe/Tirane AM +4011+04430 Asia/Yerevan @@ -47,12 +47,13 @@ AQ -6736+06253 Antarctica/Mawson Mawson AQ -6448-06406 Antarctica/Palmer Palmer AQ -6734-06808 Antarctica/Rothera Rothera AQ -720041+0023206 Antarctica/Troll Troll +AQ -7824+10654 Antarctica/Vostok Vostok AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) AR -3124-06411 America/Argentina/Cordoba most areas: CB, CC, CN, ER, FM, MN, SE, SF AR -2447-06525 America/Argentina/Salta Salta (SA, LP, NQ, RN) AR -2411-06518 America/Argentina/Jujuy Jujuy (JY) AR -2649-06513 America/Argentina/Tucuman Tucumán (TM) -AR -2828-06547 America/Argentina/Catamarca Catamarca (CT); Chubut (CH) +AR -2828-06547 America/Argentina/Catamarca Catamarca (CT), Chubut (CH) AR -2926-06651 America/Argentina/La_Rioja La Rioja (LR) AR -3132-06831 America/Argentina/San_Juan San Juan (SJ) AR -3253-06849 America/Argentina/Mendoza Mendoza (MZ) @@ -81,7 +82,7 @@ BG +4241+02319 Europe/Sofia BM +3217-06446 Atlantic/Bermuda BO -1630-06809 America/La_Paz BR -0351-03225 America/Noronha Atlantic islands -BR -0127-04829 America/Belem Pará (east); Amapá +BR -0127-04829 America/Belem Pará (east), Amapá BR -0343-03830 America/Fortaleza Brazil (northeast: MA, PI, CE, RN, PB) BR -0803-03454 America/Recife Pernambuco BR -0712-04812 America/Araguaina Tocantins @@ -99,19 +100,19 @@ BR -0958-06748 America/Rio_Branco Acre BT +2728+08939 Asia/Thimphu BY +5354+02734 Europe/Minsk BZ +1730-08812 America/Belize -CA +4734-05243 America/St_Johns Newfoundland; Labrador (southeast) -CA +4439-06336 America/Halifax Atlantic - NS (most areas); PE +CA +4734-05243 America/St_Johns Newfoundland, Labrador (SE) +CA +4439-06336 America/Halifax Atlantic - NS (most areas), PE CA +4612-05957 America/Glace_Bay Atlantic - NS (Cape Breton) CA +4606-06447 America/Moncton Atlantic - New Brunswick CA +5320-06025 America/Goose_Bay Atlantic - Labrador (most areas) -CA,BS +4339-07923 America/Toronto Eastern - ON, QC (most areas) +CA,BS +4339-07923 America/Toronto Eastern - ON & QC (most areas) CA +6344-06828 America/Iqaluit Eastern - NU (most areas) -CA +4953-09709 America/Winnipeg Central - ON (west); Manitoba +CA +4953-09709 America/Winnipeg Central - ON (west), Manitoba CA +744144-0944945 America/Resolute Central - NU (Resolute) CA +624900-0920459 America/Rankin_Inlet Central - NU (central) CA +5024-10439 America/Regina CST - SK (most areas) CA +5017-10750 America/Swift_Current CST - SK (midwest) -CA +5333-11328 America/Edmonton Mountain - AB; BC (E); NT (E); SK (W) +CA +5333-11328 America/Edmonton Mountain - AB, BC(E), NT(E), SK(W) CA +690650-1050310 America/Cambridge_Bay Mountain - NU (west) CA +682059-1334300 America/Inuvik Mountain - NT (west) CA +5546-12014 America/Dawson_Creek MST - BC (Dawson Cr, Ft St John) @@ -126,7 +127,7 @@ CL -3327-07040 America/Santiago most of Chile CL -5309-07055 America/Punta_Arenas Region of Magallanes CL -2709-10926 Pacific/Easter Easter Island CN +3114+12128 Asia/Shanghai Beijing Time -CN,AQ +4348+08735 Asia/Urumqi Xinjiang Time, Vostok +CN +4348+08735 Asia/Urumqi Xinjiang Time CO +0436-07405 America/Bogota CR +0956-08405 America/Costa_Rica CU +2308-08222 America/Havana @@ -171,8 +172,8 @@ HT +1832-07220 America/Port-au-Prince HU +4730+01905 Europe/Budapest ID -0610+10648 Asia/Jakarta Java, Sumatra ID -0002+10920 Asia/Pontianak Borneo (west, central) -ID -0507+11924 Asia/Makassar Borneo (east, south); Sulawesi/Celebes, Bali, Nusa Tengarra; Timor (west) -ID -0232+14042 Asia/Jayapura New Guinea (West Papua / Irian Jaya); Malukus/Moluccas +ID -0507+11924 Asia/Makassar Borneo (east, south), Sulawesi/Celebes, Bali, Nusa Tengarra, Timor (west) +ID -0232+14042 Asia/Jayapura New Guinea (West Papua / Irian Jaya), Malukus/Moluccas IE +5320-00615 Europe/Dublin IL +314650+0351326 Asia/Jerusalem IN +2232+08822 Asia/Kolkata @@ -251,7 +252,7 @@ PK +2452+06703 Asia/Karachi PL +5215+02100 Europe/Warsaw PM +4703-05620 America/Miquelon PN -2504-13005 Pacific/Pitcairn -PR,AG,CA,AI,AW,BL,BQ,CW,DM,GD,GP,KN,LC,MF,MS,SX,TT,VC,VG,VI +182806-0660622 America/Puerto_Rico AST +PR,AG,CA,AI,AW,BL,BQ,CW,DM,GD,GP,KN,LC,MF,MS,SX,TT,VC,VG,VI +182806-0660622 America/Puerto_Rico AST - QC (Lower North Shore) PS +3130+03428 Asia/Gaza Gaza Strip PS +313200+0350542 Asia/Hebron West Bank PT +3843-00908 Europe/Lisbon Portugal (mainland) @@ -287,7 +288,7 @@ RU +4310+13156 Asia/Vladivostok MSK+07 - Amur River RU +643337+1431336 Asia/Ust-Nera MSK+07 - Oymyakonsky RU +5934+15048 Asia/Magadan MSK+08 - Magadan RU +4658+14242 Asia/Sakhalin MSK+08 - Sakhalin Island -RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E); N Kuril Is +RU +6728+15343 Asia/Srednekolymsk MSK+08 - Sakha (E), N Kuril Is RU +5301+15839 Asia/Kamchatka MSK+09 - Kamchatka RU +6445+17729 Asia/Anadyr MSK+09 - Bering Sea SA,AQ,KW,YE +2438+04643 Asia/Riyadh Syowa @@ -329,7 +330,7 @@ US +470659-1011757 America/North_Dakota/Center Central - ND (Oliver) US +465042-1012439 America/North_Dakota/New_Salem Central - ND (Morton rural) US +471551-1014640 America/North_Dakota/Beulah Central - ND (Mercer) US +394421-1045903 America/Denver Mountain (most areas) -US +433649-1161209 America/Boise Mountain - ID (south); OR (east) +US +433649-1161209 America/Boise Mountain - ID (south), OR (east) US,CA +332654-1120424 America/Phoenix MST - AZ (most areas), Creston BC US +340308-1181434 America/Los_Angeles Pacific US +611305-1495401 America/Anchorage Alaska (most areas) diff --git a/testdata/zoneinfo/zonenow.tab b/testdata/zoneinfo/zonenow.tab new file mode 100644 index 00000000..2dbe8f00 --- /dev/null +++ b/testdata/zoneinfo/zonenow.tab @@ -0,0 +1,301 @@ +# tzdb timezone descriptions, for users who do not care about old timestamps +# +# This file is in the public domain. +# +# 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 coments), +# 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. +# 2. The first column is irrelevant and ignored. +# 3. The table is sorted in a different way: +# first by standard time UTC offset; +# then, if DST is used, by daylight saving UTC offset; +# then by time zone abbreviation. +# 4. Every timezone has a nonempty comments column, with wording +# distinguishing the timezone only from other timezones with the +# same UTC offset at some point during the year. +# +# The format of this table is experimental, and may change in future versions. +# +# This table is intended as an aid for users, to help them select timezones +# appropriate for their practical needs. It is not intended to take or +# endorse any position on legal or territorial claims. +# +#XX coordinates TZ comments +# +# -11 - 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") +# +# -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") +# +# -09:30 +XX -0900-13930 Pacific/Marquesas Marquesas +# +# -09 +XX -2308-13457 Pacific/Gambier Gambier +# +# -09/-08 - AKST/AKDT (North America DST) +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 +# +# -07 - MST +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 +# +# -06 +XX -0054-08936 Pacific/Galapagos Galápagos +# +# -06 - CST +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 +# +# -05 +XX -1203-07703 America/Lima eastern South America +# +# -05 - EST +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 +# +# -04 +XX +1030-06656 America/Caracas western South America +# +# -04 - AST +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 (Paraguay DST) +XX -2516-05740 America/Asuncion Paraguay +# +# -04/-03 - AST/ADT (North America DST) +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") +# +# -03 +XX -2332-04637 America/Sao_Paulo eastern South America +# +# -03/-02 (North America DST) +XX +4703-05620 America/Miquelon St Pierre & Miquelon +# +# -02 +XX -0351-03225 America/Noronha Fernando de Noronha; South Georgia +# +# -02/-01 (EU DST) +XX +6411-05144 America/Nuuk most of Greenland +# +# -01 +XX +1455-02331 Atlantic/Cape_Verde Cape Verde +# +# -01/+00 (EU DST) +XX +3744-02540 Atlantic/Azores Azores +# -01/+00 (EU DST) until 2024-03-31; then -02/-01 (EU DST) +XX +7029-02158 America/Scoresbysund Ittoqqortoormiit +# +# +00 - 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") +# +# +00/+01 - WET/WEST (EU DST) +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") +# +# +01 - 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") +# +# +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") +# +# +02 - CAT +XX -2558+03235 Africa/Maputo central Africa ("CAT") +# +# +02 - EET +XX +3254+01311 Africa/Tripoli Libya; Kaliningrad ("EET") +# +# +02 - SAST +XX -2615+02800 Africa/Johannesburg southern Africa ("SAST") +# +# +02/+03 - EET/EEST (EU DST) +XX +3758+02343 Europe/Athens eastern Europe ("EET/EEST") +# +# +02/+03 - EET/EEST (Egypt DST) +XX +3003+03115 Africa/Cairo Egypt +# +# +02/+03 - EET/EEST (Lebanon DST) +XX +3353+03530 Asia/Beirut Lebanon +# +# +02/+03 - EET/EEST (Moldova DST) +XX +4700+02850 Europe/Chisinau Moldova +# +# +02/+03 - EET/EEST (Palestine DST) +XX +3130+03428 Asia/Gaza Palestine +# +# +02/+03 - IST/IDT (Israel DST) +XX +314650+0351326 Asia/Jerusalem Israel +# +# +03 +XX +4101+02858 Europe/Istanbul Near East; Belarus +# +# +03 - EAT +XX -0117+03649 Africa/Nairobi eastern Africa ("EAT") +# +# +03 - MSK +XX +554521+0373704 Europe/Moscow Moscow ("MSK") +# +# +03:30 +XX +3540+05126 Asia/Tehran Iran +# +# +04 +XX +2518+05518 Asia/Dubai Russia; Caucasus; Persian Gulf; Seychelles; Réunion +# +# +04:30 +XX +3431+06912 Asia/Kabul Afghanistan +# +# +05 +XX +4120+06918 Asia/Tashkent Russia; Tajikistan; Turkmenistan; Uzbekistan; Maldives +# +# +05 - 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") +# +# +05:45 +XX +2743+08519 Asia/Kathmandu Nepal +# +# +06 +XX +2343+09025 Asia/Dhaka Russia; Kyrgyzstan; Bhutan; Bangladesh; Chagos +# +# +06:30 +XX +1647+09610 Asia/Yangon Myanmar; Cocos +# +# +07 +XX +1345+10031 Asia/Bangkok Russia; Indochina; Christmas Island +# +# +07 - WIB +XX -0610+10648 Asia/Jakarta Indonesia ("WIB") +# +# +08 +XX +0117+10351 Asia/Singapore Russia; Brunei; Malaysia; Singapore +# +# +08 - AWST +XX -3157+11551 Australia/Perth Western Australia ("AWST") +# +# +08 - CST +XX +3114+12128 Asia/Shanghai China ("CST") +# +# +08 - HKT +XX +2217+11409 Asia/Hong_Kong Hong Kong ("HKT") +# +# +08 - PHT +XX +1435+12100 Asia/Manila Philippines ("PHT") +# +# +08 - WITA +XX -0507+11924 Asia/Makassar Indonesia ("WITA") +# +# +08:45 +XX -3143+12852 Australia/Eucla Eucla +# +# +09 +XX +5203+11328 Asia/Chita Russia; Palau; East Timor +# +# +09 - JST +XX +353916+1394441 Asia/Tokyo Japan ("JST") +# +# +09 - KST +XX +3733+12658 Asia/Seoul Korea ("KST") +# +# +09 - WIT +XX -0232+14042 Asia/Jayapura Indonesia ("WIT") +# +# +09:30 - 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") +# +# +10 +XX +4310+13156 Asia/Vladivostok Russia; Yap; Chuuk; Papua New Guinea; Dumont d'Urville +# +# +10 - AEST +XX -2728+15302 Australia/Brisbane Queensland ("AEST") +# +# +10 - ChST +XX +1328+14445 Pacific/Guam Mariana Islands ("ChST") +# +# +10/+11 - AEST/AEDT (Australia DST) +XX -3352+15113 Australia/Sydney southeast Australia ("AEST/AEDT") +# +# +10:30/+11 +XX -3133+15905 Australia/Lord_Howe Lord Howe Island +# +# +11 +XX -0613+15534 Pacific/Bougainville Russia; Kosrae; Bougainville; Solomons +# +# +11/+12 (Australia DST) +XX -2903+16758 Pacific/Norfolk Norfolk Island +# +# +12 +XX +5301+15839 Asia/Kamchatka Russia; Tuvalu; Fiji; etc. +# +# +12/+13 (New Zealand DST) +XX -3652+17446 Pacific/Auckland New Zealand ("NZST/NZDT") +# +# +12:45/+13:45 (Chatham DST) +XX -4357-17633 Pacific/Chatham Chatham Islands +# +# +13 +XX -210800-1751200 Pacific/Tongatapu Kanton; Tokelau; Samoa (western); Tonga +# +# +14 +XX +0152-15720 Pacific/Kiritimati Kiritimati