Rebase to 2022agtz from https://github.com/JodaOrg/global-tz

This version is derived from the IANA 2022a tzdata but with some
pre-1970 data restored that had been moved to the backzone file
(which we do not currently ship).
From this point on, we will follow the global-tz fork.

diff --git a/share/zoneinfo/datfiles/africa b/share/zoneinfo/datfiles/africa
index 3537610..c47aec8 100644 (file)
--- a/share/zoneinfo/datfiles/africa
+++ b/share/zoneinfo/datfiles/africa
@@ -1,4 +1,4 @@
-# $OpenBSD: africa,v 1.67 2022/03/17 14:37:26 millert Exp $
+# $OpenBSD: africa,v 1.68 2022/07/25 21:43:58 millert Exp $
 # tzdb data for Africa and environs
 
 # This file is in the public domain, so clarified as of
@@ -99,20 +99,39 @@ Zone        Africa/Algiers  0:12:12 -       LMT     1891 Mar 16
                        1:00    -       CET
 
 # Angola
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Luanda   0:52:56 -       LMT     1892
+                       0:52:04 -       LMT     1911 Dec 31 23:00u # Luanda MT?
+                       1:00    -       WAT
+
 # Benin
-# See Africa/Lagos.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Africa/Porto-Novo 0:10:28 -       LMT     1912 Jan  1
+                       0:00    -       GMT     1934 Feb 26
+                       1:00    -       WAT
 
 # Botswana
-# See Africa/Maputo.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Gaborone 1:43:40 -       LMT     1885
+                       1:30    -       SAST    1903 Mar
+                       2:00    -       CAT     1943 Sep 19  2:00
+                       2:00    1:00    CAST    1944 Mar 19  2:00
+                       2:00    -       CAT
 
 # Burkina Faso
-# See Africa/Abidjan.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Africa/Ouagadougou        -0:06:04 -      LMT     1912
+                        0:00   -       GMT
 
 # Burundi
-# See Africa/Maputo.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Africa/Bujumbura  1:57:28 -       LMT     1890
+                       2:00    -       CAT
 
 # Cameroon
-# See Africa/Lagos.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Douala   0:38:48 -       LMT     1912
+                       1:00    -       WAT
 
 # Cape Verde / Cabo Verde
 #
@@ -129,7 +148,9 @@ Zone Atlantic/Cape_Verde -1:34:04 - LMT     1912 Jan 01  2:00u # Praia
                        -1:00   -       -01
 
 # Central African Republic
-# See Africa/Lagos.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Bangui   1:14:20 -       LMT     1912
+                       1:00    -       WAT
 
 # Chad
 # Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
@@ -139,31 +160,34 @@ Zone      Africa/Ndjamena 1:00:12 -       LMT     1912        # N'Djamena
                        1:00    -       WAT
 
 # Comoros
-# See Africa/Nairobi.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Indian/Comoro   2:53:04 -       LMT     1911 Jul # Moroni, Gran Comoro
+                       3:00    -       EAT
 
 # Democratic Republic of the Congo
-# See Africa/Lagos for the western part and Africa/Maputo for the eastern.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Africa/Kinshasa   1:01:12 -       LMT     1897 Nov  9
+                       1:00    -       WAT
+
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Africa/Lubumbashi 1:49:52 -       LMT     1897 Nov  9
+                       1:00    -       WAT     1920 Apr 25
+                       2:00    -       CAT
 
 # Republic of the Congo
-# See Africa/Lagos.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Africa/Brazzaville        1:01:08 -       LMT     1912
+                       1:00    -       WAT
 
 # 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/St_Helena # St Helena
 
 # Djibouti
-# See Africa/Nairobi.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Djibouti 2:52:36 -       LMT     1911 Jul
+                       3:00    -       EAT
 
 ###############################################################################
 
@@ -359,16 +383,24 @@ Zone      Africa/Cairo    2:05:09 -       LMT     1900 Oct
                        2:00    Egypt   EE%sT
 
 # Equatorial Guinea
-# See Africa/Lagos.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Malabo   0:35:08 -       LMT     1912
+                       0:00    -       GMT     1963 Dec 15
+                       1:00    -       WAT
 
 # Eritrea
-# See Africa/Nairobi.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Asmara   2:35:32 -       LMT     1870
+                       2:35:32 -       AMT     1890        # Asmara Mean Time
+                       2:35:20 -       ADMT    1936 May  5 # Adis Dera MT
+                       3:00    -       EAT
 
 # Eswatini (formerly Swaziland)
-# See Africa/Johannesburg.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Mbabane  2:04:24 -       LMT     1903 Mar
+                       2:00    -       SAST
 
 # 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
@@ -376,14 +408,44 @@ Zone      Africa/Cairo    2:05:09 -       LMT     1900 Oct
 # 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/Addis_Ababa        2:34:48 -       LMT     1870
+                       2:35:20 -       ADMT    1936 May  5 # Adis Dera MT
+                       3:00    -       EAT
 
 # Gabon
-# See Africa/Lagos.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Africa/Libreville 0:37:48 -       LMT     1912
+                       1:00    -       WAT
 
 # The Gambia
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Banjul   -1:06:36 -      LMT     1912
+                       -1:06:36 -      BMT     1933 Apr  1 # Banjul Mean Time
+                       -1:00   -       -01     1942 Feb  1  0:00
+                        0:00   -       GMT
+
 # Ghana
+# Rule NAME    FROM    TO      -       IN      ON      AT      SAVE    LETTER/S
+Rule   Ghana   1919    only    -       Nov     24      0:00    0:20    +0020
+Rule   Ghana   1920    1942    -       Jan      1      2:00    0       GMT
+Rule   Ghana   1920    1939    -       Sep      1      2:00    0:20    +0020
+Rule   Ghana   1940    1941    -       May      1      2:00    0:20    +0020
+Rule   Ghana   1950    1955    -       Sep      1      2:00    0:30    +0030
+Rule   Ghana   1951    1956    -       Jan      1      2:00    0       GMT
+
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Accra    -0:00:52 -      LMT     1915 Nov  2
+                        0:00   Ghana   %s      1942 Feb  8
+                        0:30   -       +0030   1946 Jan  6
+                        0:00   Ghana   %s
+
 # Guinea
-# See Africa/Abidjan.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Conakry  -0:54:52 -      LMT     1912
+                        0:00   -       GMT     1934 Feb 26
+                       -1:00   -       -01     1960
+                        0:00   -       GMT
 
 # Guinea-Bissau
 #
@@ -447,18 +509,13 @@ 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.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Maseru   1:50:00 -       LMT     1903 Mar
+                       2:00    -       SAST    1943 Sep 19  2:00
+                       2:00    1:00    SAST    1944 Mar 19  2:00
+                       2:00    -       SAST
 
 # Liberia
 #
@@ -540,14 +597,32 @@ Zone      Africa/Tripoli  0:52:44 -       LMT     1920
                        2:00    -       EET
 
 # Madagascar
-# See Africa/Nairobi.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Indian/Antananarivo 3:10:04 -     LMT     1911 Jul
+                       3:00    -       EAT     1954 Feb 27 23:00s
+                       3:00    1:00    EAST    1954 May 29 23:00s
+                       3:00    -       EAT
 
 # Malawi
-# See Africa/Maputo.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Blantyre 2:20:00 -       LMT     1911 Jul 24
+                       2:21:10 -       ZMT     1914 Jun 30 # Zomba Mean Time
+                       2:21    -       ZMT     1925 Jul  1
+                       2:00    -       CAT
 
 # Mali
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Bamako   -0:32:00 -      LMT     1912
+                        0:00   -       GMT     1934 Feb 26
+                       -1:00   -       -01     1960 Jun 20
+                        0:00   -       GMT
+
 # Mauritania
-# See Africa/Abidjan.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Africa/Nouakchott -1:03:48 -      LMT     1912
+                        0:00   -       GMT     1934 Feb 26
+                       -1:00   -       -01     1960 Nov 28
+                        0:00   -       GMT
 
 # Mauritius
 
@@ -643,7 +718,9 @@ Zone Indian/Mauritius       3:50:00 -       LMT     1907 # Port Louis
 # no information; probably like Indian/Mauritius
 
 # Mayotte
-# See Africa/Nairobi.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Indian/Mayotte  3:00:56 -       LMT     1911 Jul # Mamoutzou
+                       3:00    -       EAT
 
 # Morocco
 # See Africa/Ceuta for Spanish Morocco.
@@ -1146,13 +1223,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,7 +1303,11 @@ Zone     Africa/Windhoek 1:08:24 -       LMT     1892 Feb 8
 # End of rearguard section.
 
 # Niger
-# See Africa/Lagos.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Niamey    0:08:28 -      LMT     1912
+                       -1:00   -       -01     1934 Feb 26
+                        0:00   -       GMT     1960
+                        1:00   -       WAT
 
 # Nigeria
 
@@ -1300,15 +1374,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
 # Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
@@ -1328,10 +1393,16 @@ Zone    Indian/Reunion  3:41:52 -       LMT     1911 Jun # Saint-Denis
 # Tromelin - inhabited until at least 1958
 
 # Rwanda
-# See Africa/Maputo.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Kigali   2:00:16 -       LMT     1935 Jun
+                       2:00    -       CAT
 
 # St Helena
-# See Africa/Abidjan.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Atlantic/St_Helena        -0:22:48 -      LMT     1890 # Jamestown
+                       -0:22:48 -      JMT     1951 # Jamestown Mean Time
+                        0:00   -       GMT
+
 # 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
@@ -1366,7 +1437,10 @@ Zone     Africa/Sao_Tome  0:26:56 -      LMT     1884
                         0:00   -       GMT
 
 # Senegal
-# See Africa/Abidjan.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Dakar    -1:09:44 -      LMT     1912
+                       -1:00   -       -01     1941 Jun
+                        0:00   -       GMT
 
 # Seychelles
 
@@ -1393,10 +1467,25 @@ Zone    Indian/Mahe     3:41:48 -       LMT     1907 Jan  1 # Victoria
 # Possibly the islands were uninhabited.
 
 # Sierra Leone
-# See Africa/Abidjan.
+# Rule NAME    FROM    TO      -       IN      ON      AT      SAVE    LETTER/S
+Rule   SL      1932    only    -       Dec      1       0:00   0:20    -0040
+Rule   SL      1933    1938    -       Mar     31      24:00   0       -01
+Rule   SL      1933    1939    -       Aug     31      24:00   0:20    -0040
+Rule   SL      1939    only    -       May     31      24:00   0       -01
+
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Freetown -0:53:00 -      LMT     1882
+                       -0:53:00 -      FMT     1913 Jul  1 # Freetown MT
+                       -1:00   SL      %s      1939 Sep  5
+                       -1:00   -       -01     1941 Dec  6 24:00
+                        0:00   SL      GMT/+01
 
 # Somalia
-# See Africa/Nairobi.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Africa/Mogadishu  3:01:28 -       LMT     1893 Nov
+                       3:00    -       EAT     1931
+                       2:30    -       +0230   1957
+                       3:00    -       EAT
 
 # South Africa
 # Rule NAME    FROM    TO      -       IN      ON      AT      SAVE    LETTER/S
@@ -1406,8 +1495,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
@@ -1457,10 +1544,16 @@ Zone    Africa/Juba     2:06:28 -       LMT     1931
                        2:00    -       CAT
 
 # Tanzania
-# See Africa/Nairobi.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Africa/Dar_es_Salaam 2:37:08 -    LMT     1931
+                       3:00    -       EAT     1948
+                       2:45    -       +0245   1961
+                       3:00    -       EAT
 
 # Togo
-# See Africa/Abidjan.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Lome     0:04:52 -       LMT     1893
+                       0:00    -       GMT
 
 # Tunisia
 
@@ -1561,8 +1654,20 @@ Zone     Africa/Tunis    0:40:44 -       LMT     1881 May 12
                        1:00    Tunisia CE%sT
 
 # Uganda
-# See Africa/Nairobi.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Kampala  2:09:40 -       LMT     1928 Jul
+                       3:00    -       EAT     1930
+                       2:30    -       +0230   1948
+                       2:45    -       +0245   1957
+                       3:00    -       EAT
 
 # Zambia
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Lusaka   1:53:08 -       LMT     1903 Mar
+                       2:00    -       CAT
+
 # Zimbabwe
-# See Africa/Maputo.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Africa/Harare   2:04:12 -       LMT     1903 Mar
+                       2:00    -       CAT
+

diff --git a/share/zoneinfo/datfiles/antarctica b/share/zoneinfo/datfiles/antarctica
index c6b5f70..d24f5c4 100644 (file)
--- a/share/zoneinfo/datfiles/antarctica
+++ b/share/zoneinfo/datfiles/antarctica
@@ -1,4 +1,4 @@
-# $OpenBSD: antarctica,v 1.43 2021/10/22 14:40:49 millert Exp $
+# $OpenBSD: antarctica,v 1.44 2022/07/25 21:43:58 millert Exp $
 # tzdb data for Antarctica and environs
 
 # This file is in the public domain, so clarified as of
@@ -163,7 +163,12 @@ Zone Indian/Kerguelen      0       -       -00     1950 # Port-aux-Français
                        5:00    -       +05
 #
 # year-round base in the main continent
-# Dumont d'Urville - see Pacific/Port_Moresby.
+# Dumont d'Urville, Île des Pétrels, -6640+14001, since 1956-11
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Antarctica/DumontDUrville 0 -     -00     1947
+                       10:00   -       +10     1952 Jan 14
+                       0       -       -00     1956 Nov
+                       10:00   -       +10
 
 # France & Italy - year-round base
 # Concordia, -750600+1232000, since 2005
@@ -179,7 +184,11 @@ Zone Indian/Kerguelen      0       -       -00     1950 # Port-aux-Français
 # Zuchelli, Terra Nova Bay, -744140+1640647, since 1986
 
 # Japan - year-round bases
-# See Asia/Riyadh.
+# Syowa (also known as Showa), -690022+0393524, since 1957
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Antarctica/Syowa  0       -       -00     1957 Jan 29
+                       3:00    -       +03
+
 
 # S Korea - year-round base
 # Jang Bogo, Terra Nova Bay, -743700+1641205 since 2014

diff --git a/share/zoneinfo/datfiles/asia b/share/zoneinfo/datfiles/asia
index 7225d6c..38800c8 100644 (file)
--- a/share/zoneinfo/datfiles/asia
+++ b/share/zoneinfo/datfiles/asia
@@ -1,4 +1,4 @@
-# $OpenBSD: asia,v 1.97 2022/03/17 14:37:26 millert Exp $
+# $OpenBSD: asia,v 1.98 2022/07/25 21:43:58 millert Exp $
 # tzdb data for Asia and environs
 
 # This file is in the public domain, so clarified as of
@@ -151,7 +151,11 @@ Zone       Asia/Baku       3:19:24 -       LMT     1924 May  2
                        4:00    Azer    +04/+05
 
 # Bahrain
-# See Asia/Qatar.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Asia/Bahrain    3:22:20 -       LMT     1941 Jul 20  # Manamah
+                       3:30    -       +0330   1944 Jan  1
+                       4:00    -       +04     1972 Jun
+                       3:00    -       +03
 
 # Bangladesh
 # From Alexander Krivenyshev (2009-05-13):
@@ -279,7 +283,13 @@ Zone       Asia/Yangon     6:24:47 -       LMT     1880        # or Rangoon
                        6:30    -       +0630
 
 # Cambodia
-# See Asia/Bangkok.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Asia/Phnom_Penh 6:59:40 -       LMT     1906 Jul  1
+                       7:06:30 -       PLMT    1911 May  1
+                       7:00    -       +07     1942 Dec 31 23:00
+                       8:00    -       +08     1945 Mar 14 23:00
+                       9:00    -       +09     1945 Sep  2
+                       7:00    -       +07
 
 
 # China
@@ -2704,10 +2714,20 @@ Zone    Asia/Pyongyang  8:23:00 -       LMT     1908 Apr  1
 ###############################################################################
 
 # Kuwait
-# See Asia/Riyadh.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Asia/Kuwait     3:11:56 -       LMT     1950
+                       3:00    -       +03
 
 # Laos
-# See Asia/Bangkok.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Asia/Vientiane  6:50:24 -       LMT     1906 Jul  1
+                       7:06:30 -       PLMT    1911 May  1
+                       7:00    -       +07     1942 Dec 31 23:00
+                       8:00    -       +08     1945 Mar 14 23:00
+                       9:00    -       +09     1945 Sep  2
+                       7:00    -       +07     1947 Apr  1
+                       8:00    -       +08     1955 Apr 15
+                       7:00    -       +07
 
 
 # Lebanon
@@ -2938,7 +2958,9 @@ Zone      Asia/Kathmandu  5:41:16 -       LMT     1920
                        5:45    -       +0545
 
 # Oman
-# See Asia/Dubai.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Asia/Muscat     3:54:24 -       LMT     1920
+                       4:00    -       +04
 
 # Pakistan
 
@@ -3545,7 +3567,6 @@ Zone      Asia/Manila     -15:56:00 -     LMT     1844 Dec 31
 Zone   Asia/Qatar      3:26:08 -       LMT     1920     # Al Dawhah / Doha
                        4:00    -       +04     1972 Jun
                        3:00    -       +03
-Link Asia/Qatar Asia/Bahrain
 
 # Saudi Arabia
 #
@@ -3592,9 +3613,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)
@@ -3851,8 +3869,6 @@ Zone      Asia/Dushanbe   4:35:12 -       LMT     1924 May  2
 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
 
 # Turkmenistan
 # From Shanks & Pottenger.
@@ -3867,7 +3883,6 @@ Zone      Asia/Ashgabat   3:53:32 -       LMT     1924 May  2 # or Ashkhabad
 # Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Dubai      3:41:12 -       LMT     1920
                        4:00    -       +04
-Link Asia/Dubai Asia/Muscat    # Oman
 
 # Uzbekistan
 # Byalokoz 1919 says Uzbekistan was 4:27:53.
@@ -3962,4 +3977,7 @@ Zone Asia/Ho_Chi_Minh     7:06:40 -       LMT     1906 Jul  1
 
 
 # Yemen
-# See Asia/Riyadh.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Asia/Aden       2:59:54 -       LMT     1950
+                       3:00    -       +03
+

diff --git a/share/zoneinfo/datfiles/australasia b/share/zoneinfo/datfiles/australasia
index aa8baca..2f60e8b 100644 (file)
--- a/share/zoneinfo/datfiles/australasia
+++ b/share/zoneinfo/datfiles/australasia
@@ -1,4 +1,4 @@
-# $OpenBSD: australasia,v 1.72 2021/10/22 14:40:49 millert Exp $
+# $OpenBSD: australasia,v 1.73 2022/07/25 21:43:58 millert Exp $
 # tzdb data for Australasia and environs, and for much of the Pacific
 
 # This file is in the public domain, so clarified as of
@@ -473,7 +473,6 @@ 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
 # Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
@@ -489,7 +488,12 @@ Zone Pacific/Kiritimati    -10:29:20 -     LMT     1901
                         14:00  -       +14
 
 # N Mariana Is
-# See Pacific/Guam.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Pacific/Saipan    -14:17:00 -     LMT     1844 Dec 31
+                        9:43:00 -      LMT     1901
+                        9:00   -       +09     1969 Oct
+                       10:00   -       +10     2000 Dec 23
+                       10:00   -       ChST    # Chamorro Standard Time
 
 # Marshall Is
 # Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
@@ -599,7 +603,9 @@ Zone Pacific/Chatham        12:13:48 -      LMT     1868 Nov  2
                        12:15   -       +1215   1946 Jan  1
                        12:45   Chatham +1245/+1345
 
-Link Pacific/Auckland Antarctica/McMurdo
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Antarctica/McMurdo        0       -       -00     1956
+                       12:00   NZ      NZ%sT
 
 # Auckland Is
 # uninhabited; Māori and Moriori, colonial settlers, pastoralists, sealers,
@@ -694,7 +700,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
 #
 # From Paul Eggert (2014-10-13):
 # Base the Bougainville entry on the Arawa-Kieta region, which appears to have
@@ -730,7 +735,6 @@ Zone Pacific/Pitcairn       -8:40:20 -      LMT     1901        # Adamstown
 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)
 
@@ -917,7 +921,11 @@ Zone Pacific/Funafuti      11:56:52 -      LMT     1901
 # uninhabited
 
 # Midway
-# See Pacific/Pago_Pago.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Pacific/Midway    -11:49:28 -     LMT     1901
+                       -11:00  -       -11     1956 Jun  3
+                       -11:00  1:00    -10     1956 Sep  2
+                       -11:00  -       -11
 
 # Palmyra
 # uninhabited since World War II; was probably like Pacific/Kiritimati

diff --git a/share/zoneinfo/datfiles/backward b/share/zoneinfo/datfiles/backward
index 229653f..b619a22 100644 (file)
--- a/share/zoneinfo/datfiles/backward
+++ b/share/zoneinfo/datfiles/backward
@@ -1,4 +1,4 @@
-# $OpenBSD: backward,v 1.39 2021/10/22 14:40:49 millert Exp $
+# $OpenBSD: backward,v 1.40 2022/07/25 21:43:58 millert Exp $
 # tzdb links for backward compatibility
 
 # This file is in the public domain, so clarified as of
@@ -10,13 +10,13 @@
 # for pre-1970 timestamps and so is out of scope for tzdb proper.
 
 # Link TARGET                  LINK-NAME
-Link   Africa/Nairobi          Africa/Asmera
-Link   Africa/Abidjan          Africa/Timbuktu
+Link   Africa/Asmara   Africa/Asmera
+Link   Africa/Bamako   Africa/Timbuktu
 Link   America/Argentina/Catamarca     America/Argentina/ComodRivadavia
 Link   America/Adak            America/Atka
 Link   America/Argentina/Buenos_Aires  America/Buenos_Aires
 Link   America/Argentina/Catamarca     America/Catamarca
-Link   America/Panama          America/Coral_Harbour
+Link   America/Atikokan        America/Coral_Harbour
 Link   America/Argentina/Cordoba       America/Cordoba
 Link   America/Tijuana         America/Ensenada
 Link   America/Indiana/Indianapolis    America/Fort_Wayne
@@ -31,8 +31,8 @@ Link  America/Rio_Branco      America/Porto_Acre
 Link   America/Argentina/Cordoba       America/Rosario
 Link   America/Tijuana         America/Santa_Isabel
 Link   America/Denver          America/Shiprock
-Link   America/Puerto_Rico     America/Virgin
-Link   Pacific/Auckland        Antarctica/South_Pole
+Link   America/St_Thomas       America/Virgin
+Link   Antarctica/McMurdo      Antarctica/South_Pole
 Link   Asia/Ashgabat           Asia/Ashkhabad
 Link   Asia/Kolkata            Asia/Calcutta
 Link   Asia/Shanghai           Asia/Chongqing

diff --git a/share/zoneinfo/datfiles/europe b/share/zoneinfo/datfiles/europe
index cc82206..6bf23cf 100644 (file)
--- a/share/zoneinfo/datfiles/europe
+++ b/share/zoneinfo/datfiles/europe
@@ -1,4 +1,4 @@
-# $OpenBSD: europe,v 1.83 2022/03/17 14:37:26 millert Exp $
+# $OpenBSD: europe,v 1.84 2022/07/25 21:43:58 millert Exp $
 # tzdb data for Europe and environs
 
 # This file is in the public domain, so clarified as of
@@ -498,7 +498,6 @@ Rule        GB-Eire 1990    1995    -       Oct     Sun>=22 1:00u   0       GMT
 # Summer Time Order 1997 (S.I. 1997/2982)
 # See EU for rules starting in 1996.
 #
-# Use Europe/London for Jersey, Guernsey, and the Isle of Man.
 
 # Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Europe/London   -0:01:15 -      LMT     1847 Dec  1  0:00s
@@ -506,9 +505,30 @@ Zone       Europe/London   -0:01:15 -      LMT     1847 Dec  1  0:00s
                         1:00   -       BST     1971 Oct 31  2:00u
                         0:00   GB-Eire %s      1996
                         0:00   EU      GMT/BST
-Link   Europe/London   Europe/Jersey
-Link   Europe/London   Europe/Guernsey
-Link   Europe/London   Europe/Isle_of_Man
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Europe/Jersey   -0:08:26 -      LMT     1898 Jun 11 16:00u
+                        0:00   GB-Eire %s      1940 Jul  2
+                        1:00   C-Eur   CE%sT   1945 May  8
+                        0:00   GB-Eire %s      1968 Oct 27
+                        1:00   -       BST     1971 Oct 31  2:00u
+                        0:00   GB-Eire %s      1996
+                        0:00   EU      GMT/BST
+
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Europe/Guernsey -0:10:09 -      LMT     1913 Jun 18
+                        0:00   GB-Eire %s      1940 Jul  2
+                        1:00   C-Eur   CE%sT   1945 May  8
+                        0:00   GB-Eire %s      1968 Oct 27
+                        1:00   -       BST     1971 Oct 31  2:00u
+                        0:00   GB-Eire %s      1996
+                        0:00   EU      GMT/BST
+
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Europe/Isle_of_Man        -0:17:55 -      LMT     1883 Mar 30  0:00s
+                        0:00   GB-Eire %s      1968 Oct 27
+                        1:00   -       BST     1971 Oct 31  2:00u
+                        0:00   GB-Eire %s      1996
+                        0:00   EU      GMT/BST
 
 # From Paul Eggert (2018-02-15):
 # In January 2018 we discovered that the negative SAVE values in the
@@ -964,7 +984,13 @@ Zone       Europe/Brussels 0:17:30 -       LMT     1880
                        1:00    EU      CE%sT
 
 # Bosnia and Herzegovina
-# See Europe/Belgrade.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Europe/Sarajevo 1:13:40 -       LMT     1884
+                       1:00    -       CET     1941 Apr 18 23:00
+                       1:00    C-Eur   CE%sT   1945 May  8  2:00s
+                       1:00    1:00    CEST    1945 Sep 16  2:00s
+                       1:00    -       CET     1982 Nov 27
+                       1:00    EU      CE%sT
 
 # Bulgaria
 #
@@ -992,7 +1018,13 @@ Zone      Europe/Sofia    1:33:16 -       LMT     1880
                        2:00    EU      EE%sT
 
 # Croatia
-# See Europe/Belgrade.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Europe/Zagreb   1:03:52 -       LMT     1884
+                       1:00    -       CET     1941 Apr 18 23:00
+                       1:00    C-Eur   CE%sT   1945 May  8  2:00s
+                       1:00    1:00    CEST    1945 Sep 16  2:00s
+                       1:00    -       CET     1982 Nov 27
+                       1:00    EU      CE%sT
 
 # Cyprus
 # Please see the 'asia' file for Asia/Nicosia.
@@ -1902,7 +1934,10 @@ Zone     Europe/Riga     1:36:34 -       LMT     1880
 # I could confirm from the paper that Liechtenstein did in fact follow
 # the same DST in 1941 and 1942 as Switzerland did.
 
-Link Europe/Zurich Europe/Vaduz
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Europe/Vaduz    0:38:04 -       LMT     1894 Jun
+                       1:00    Swiss   CE%sT   1981
+                       1:00    EU      CE%sT
 
 
 # Lithuania
@@ -1994,7 +2029,13 @@ Zone Europe/Luxembourg   0:24:36 -       LMT     1904 Jun
                        1:00    EU      CE%sT
 
 # North Macedonia
-# See Europe/Belgrade.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   Europe/Skopje   1:25:44 -       LMT     1884
+                       1:00    -       CET     1941 Apr 18 23:00
+                       1:00    C-Eur   CE%sT   1945 May  8  2:00s
+                       1:00    1:00    CEST    1945 Sep 16  2:00s
+                       1:00    -       CET     1982 Nov 27
+                       1:00    EU      CE%sT
 
 # Malta
 #
@@ -2115,7 +2156,7 @@ Zone      Europe/Monaco   0:29:32 -       LMT     1892 Jun  1
                        1:00    EU      CE%sT
 
 # Montenegro
-# See Europe/Belgrade.
+Link   Europe/Belgrade Europe/Podgorica
 
 # Netherlands
 
@@ -3547,17 +3588,18 @@ Zone    Europe/Belgrade 1:22:00 -       LMT     1884
 # Shanks & Pottenger don't give as much detail, so go with Koželj.
                        1:00    -       CET     1982 Nov 27
                        1:00    EU      CE%sT
-Link Europe/Belgrade Europe/Ljubljana  # Slovenia
-Link Europe/Belgrade Europe/Podgorica  # Montenegro
-Link Europe/Belgrade Europe/Sarajevo   # Bosnia and Herzegovina
-Link Europe/Belgrade Europe/Skopje     # North Macedonia
-Link Europe/Belgrade Europe/Zagreb     # Croatia
 
 # Slovakia
 Link Europe/Prague Europe/Bratislava
 
 # Slovenia
-# See Europe/Belgrade.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone Europe/Ljubljana  0:58:04 -       LMT     1884
+                       1:00    -       CET     1941 Apr 18 23:00
+                       1:00    C-Eur   CE%sT   1945 May  8  2:00s
+                       1:00    1:00    CEST    1945 Sep 16  2:00s
+                       1:00    -       CET     1982 Nov 27
+                       1:00    EU      CE%sT
 
 # Spain
 #

diff --git a/share/zoneinfo/datfiles/northamerica b/share/zoneinfo/datfiles/northamerica
index 60ff82c..332f333 100644 (file)
--- a/share/zoneinfo/datfiles/northamerica
+++ b/share/zoneinfo/datfiles/northamerica
@@ -1,4 +1,4 @@
-# $OpenBSD: northamerica,v 1.78 2021/10/22 14:40:49 millert Exp $
+# $OpenBSD: northamerica,v 1.79 2022/07/25 21:43:58 millert Exp $
 # tzdb data for North and Central America and environs
 
 # This file is in the public domain, so clarified as of
@@ -830,7 +830,6 @@ Zone America/Phoenix        -7:28:18 -      LMT     1883 Nov 18 11:31:42
                        -7:00   -       MST     1967
                        -7:00   US      M%sT    1968 Mar 21
                        -7:00   -       MST
-Link America/Phoenix America/Creston
 
 # From Arthur David Olson (1988-02-13):
 # A writer from the Inter Tribal Council of Arizona, Inc.,
@@ -1598,9 +1597,11 @@ Zone America/Moncton     -4:19:08 -      LMT     1883 Dec  9
 # Quebec
 
 # From Paul Eggert (2020-01-10):
-# See America/Toronto for most of Quebec, including Montreal.
 # See America/Halifax for the Îles de la Madeleine and the Listuguj reserve.
-# See America/Puerto_Rico for east of Natashquan.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/Blanc-Sablon -3:48:28 -   LMT     1884
+                       -4:00   Canada  A%sT    1970
+                       -4:00   -       AST
 
 # Ontario
 
@@ -1769,7 +1770,6 @@ Zone America/Toronto      -5:17:32 -      LMT     1895
                        -5:00   Canada  E%sT    1946
                        -5:00   Toronto E%sT    1974
                        -5:00   Canada  E%sT
-Link America/Toronto America/Nassau
 Zone America/Thunder_Bay -5:57:00 -    LMT     1895
                        -6:00   -       CST     1910
                        -5:00   -       EST     1942
@@ -1785,7 +1785,12 @@ Zone America/Rainy_River -6:18:16 -      LMT     1895
                        -6:00   Canada  C%sT    1940 Sep 29
                        -6:00   1:00    CDT     1942 Feb  9  2:00s
                        -6:00   Canada  C%sT
-# For Atikokan see America/Panama.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/Atikokan  -6:06:28 -      LMT     1895
+                       -6:00   Canada  C%sT    1940 Sep 29
+                       -6:00   1:00    CDT     1942 Feb  9  2:00s
+                       -6:00   Canada  C%sT    1945 Sep 30  2:00
+                       -5:00   -       EST
 
 
 # Manitoba
@@ -2029,7 +2034,11 @@ Zone America/Fort_Nelson -8:10:47 -      LMT     1884
                        -8:00   Vanc    P%sT    1987
                        -8:00   Canada  P%sT    2015 Mar  8  2:00
                        -7:00   -       MST
-# For Creston see America/Phoenix.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/Creston   -7:46:04 -      LMT     1884
+                       -7:00   -       MST     1916 Oct 1
+                       -8:00   -       PST     1918 Jun 2
+                       -7:00   -       MST
 
 # Northwest Territories, Nunavut, Yukon
 
@@ -2810,12 +2819,31 @@ Zone America/Tijuana    -7:48:04 -      LMT     1922 Jan  1  0:11:56
 ###############################################################################
 
 # Anguilla
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/Anguilla  -4:12:16 -      LMT     1912 Mar  2
+                       -4:00   -       AST
+
 # Antigua and Barbuda
-# See America/Puerto_Rico.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   America/Antigua -4:07:12 -      LMT     1912 Mar 2
+                       -5:00   -       EST     1951
+                       -4:00   -       AST
+
 
 # The Bahamas
-# See America/Toronto.
+# Rule NAME    FROM    TO      -       IN      ON      AT      SAVE    LETTER/S
+Rule   Bahamas 1942    only    -       May      1      24:00   1:00    W
+Rule   Bahamas 1944    only    -       Dec     31      24:00   0       S
+Rule   Bahamas 1945    only    -       Feb      1      0:00    1:00    W
+Rule   Bahamas 1945    only    -       Aug     14      23:00u  1:00    P # Peace
+Rule   Bahamas 1945    only    -       Oct     17      24:00   0       S
+Rule   Bahamas 1964    1975    -       Oct     lastSun 2:00    0       S
+Rule   Bahamas 1964    1975    -       Apr     lastSun 2:00    1:00    D
 
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   America/Nassau  -5:09:30 -      LMT     1912 Mar 2
+                       -5:00   Bahamas E%sT    1976
+                       -5:00   US      E%sT
 
 # Barbados
 
@@ -3028,10 +3056,13 @@ Zone Atlantic/Bermuda   -4:19:18 -      LMT     1890    # Hamilton
                        -4:00   US      A%sT
 
 # Caribbean Netherlands
-# See America/Puerto_Rico.
+# See America/Kralendijk in southamerica.
 
 # Cayman Is
-# See America/Panama.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   America/Cayman  -5:25:32 -      LMT     1890     # Georgetown
+                       -5:07:10 -      KMT     1912 Feb # Kingston Mean Time
+                       -5:00   -       EST
 
 # Costa Rica
 
@@ -3258,7 +3289,10 @@ Zone     America/Havana  -5:29:28 -      LMT     1890
                        -5:00   Cuba    C%sT
 
 # Dominica
-# See America/Puerto_Rico.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/Dominica  -4:05:36 -      LMT     1911 Jul  1  0:01 # Roseau
+                       -4:00   -       AST
+
 
 # Dominican Republic
 
@@ -3307,10 +3341,19 @@ Zone America/El_Salvador -5:56:48 -     LMT     1921 # San Salvador
                        -6:00   Salv    C%sT
 
 # Grenada
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   America/Grenada -4:07:00 -      LMT     1911 Jul # St George's
+                       -4:00   -       AST
+
 # Guadeloupe
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/Guadeloupe        -4:06:08 -      LMT     1911 Jun  8 # Pointe-à-Pitre
+                       -4:00    -      AST
+
 # St Barthélemy
+# See America/St_Barthelemy in southamerica.
 # St Martin (French part)
-# See America/Puerto_Rico.
+# See America/Marigot in southamerica.
 
 # Guatemala
 #
@@ -3497,7 +3540,10 @@ Zone America/Martinique  -4:04:20 -      LMT     1890        # Fort-de-France
                        -4:00   -       AST
 
 # Montserrat
-# See America/Puerto_Rico.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/Montserrat        -4:08:52 -      LMT     1911 Jul  1  0:01 # Cork Hill
+                       -4:00   -       AST
+
 
 # Nicaragua
 #
@@ -3569,8 +3615,6 @@ Zone      America/Managua -5:45:08 -      LMT     1890
 Zone   America/Panama  -5:18:08 -      LMT     1890
                        -5:19:36 -      CMT     1908 Apr 22 # Colón Mean Time
                        -5:00   -       EST
-Link America/Panama America/Atikokan
-Link America/Panama America/Cayman
 
 # Puerto Rico
 # There are too many San Juans elsewhere, so we'll use 'Puerto_Rico'.
@@ -3579,29 +3623,18 @@ Zone America/Puerto_Rico -4:24:25 -     LMT     1899 Mar 28 12:00 # San Juan
                        -4:00   -       AST     1942 May  3
                        -4:00   US      A%sT    1946
                        -4:00   -       AST
-Link America/Puerto_Rico America/Anguilla
-Link America/Puerto_Rico America/Antigua
-Link America/Puerto_Rico America/Aruba
-Link America/Puerto_Rico America/Curacao
-Link America/Puerto_Rico America/Blanc-Sablon  # Quebec (Lower North Shore)
-Link America/Puerto_Rico America/Dominica
-Link America/Puerto_Rico America/Grenada
-Link America/Puerto_Rico America/Guadeloupe
-Link America/Puerto_Rico America/Kralendijk    # Caribbean Netherlands
-Link America/Puerto_Rico America/Lower_Princes # Sint Maarten
-Link America/Puerto_Rico America/Marigot       # St Martin (French part)
-Link America/Puerto_Rico America/Montserrat
-Link America/Puerto_Rico America/Port_of_Spain # Trinidad & Tobago
-Link America/Puerto_Rico America/St_Barthelemy # St Barthélemy
-Link America/Puerto_Rico America/St_Kitts      # St Kitts & Nevis
-Link America/Puerto_Rico America/St_Lucia
-Link America/Puerto_Rico America/St_Thomas     # Virgin Islands (US)
-Link America/Puerto_Rico America/St_Vincent
-Link America/Puerto_Rico America/Tortola       # Virgin Islands (UK)
 
 # St Kitts-Nevis
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/St_Kitts  -4:10:52 -      LMT     1912 Mar  2 # Basseterre
+                       -4:00   -       AST
+
 # St Lucia
-# See America/Puerto_Rico.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/St_Lucia  -4:04:00 -      LMT     1890 # Castries
+                       -4:04:00 -      CMT     1912 # Castries Mean Time
+                       -4:00   -       AST
+
 
 # St Pierre and Miquelon
 # There are too many St Pierres elsewhere, so we'll use 'Miquelon'.
@@ -3612,10 +3645,14 @@ Zone America/Miquelon   -3:44:40 -      LMT     1911 May 15 # St Pierre
                        -3:00   Canada  -03/-02
 
 # St Vincent and the Grenadines
-# See America/Puerto_Rico.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/St_Vincent        -4:04:56 -      LMT     1890 # Kingstown
+                       -4:04:56 -      KMT     1912 # Kingstown Mean Time
+                       -4:00   -       AST
+
 
 # Sint Maarten
-# See America/Puerto_Rico.
+# See America/Lower_Princes in southamerica.
 
 # Turks and Caicos
 #
@@ -3686,8 +3723,15 @@ Zone America/Grand_Turk  -4:44:32 -      LMT     1890
                        -5:00   US      E%sT
 
 # British Virgin Is
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/Tortola   -4:18:28 -      LMT     1911 Jul # Road Town
+                       -4:00   -       AST
+
 # US Virgin Is
-# See America/Puerto_Rico.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/St_Thomas -4:19:44 -      LMT     1911 Jul # Charlotte Amalie
+                       -4:00   -       AST
+
 
 
 # Local Variables:

diff --git a/share/zoneinfo/datfiles/southamerica b/share/zoneinfo/datfiles/southamerica
index f849c0e..4d4d136 100644 (file)
--- a/share/zoneinfo/datfiles/southamerica
+++ b/share/zoneinfo/datfiles/southamerica
@@ -1,4 +1,4 @@
-# $OpenBSD: southamerica,v 1.73 2022/03/17 14:37:27 millert Exp $
+# $OpenBSD: southamerica,v 1.74 2022/07/25 21:43:58 millert Exp $
 # tzdb data for South America and environs
 
 # This file is in the public domain, so clarified as of
@@ -575,7 +575,10 @@ Zone America/Argentina/Ushuaia -4:33:12 - LMT      1894 Oct 31
                        -3:00   -       -03
 
 # Aruba
-# See America/Puerto_Rico.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   America/Aruba   -4:40:24 -      LMT     1912 Feb 12 # Oranjestad
+                       -4:30   -       -0430   1965
+                       -4:00   -       AST
 
 # Bolivia
 # Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
@@ -1397,7 +1400,13 @@ Zone     America/Bogota  -4:56:16 -      LMT     1884 Mar 13
 # no information; probably like America/Bogota
 
 # Curaçao
-# See America/Puerto_Rico.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone   America/Curacao -4:35:47 -      LMT     1912 Feb 12 # Willemstad
+                       -4:30   -       -0430   1965
+                       -4:00   -       AST
+
+Link   America/Curacao America/Kralendijk
+Link   America/Curacao America/Lower_Princes
 #
 # From Arthur David Olson (2011-06-15):
 # use links for places with new iso3166 codes.
@@ -1721,8 +1730,12 @@ Zone America/Paramaribo  -3:40:40 -      LMT     1911
                        -3:00   -       -03
 
 # Trinidad and Tobago
-# See America/Puerto_Rico.
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
+Zone America/Port_of_Spain -4:06:04 -  LMT     1912 Mar 2
+                       -4:00   -       AST
 
+Link   America/Port_of_Spain   America/Marigot
+Link   America/Port_of_Spain   America/St_Barthelemy
 # Uruguay
 # From Paul Eggert (1993-11-18):
 # Uruguay wins the prize for the strangest peacetime manipulation of the rules.