From add82c934bd817f49282ebde3a35f8896ee26bef Mon Sep 17 00:00:00 2001
From: millert <millert@openbsd.org>
Date: Wed, 17 Aug 2022 13:41:50 +0000
Subject: [PATCH] Update to tzdata2022cgtz from
 https://github.com/JodaOrg/global-tz Adds experimental structured comments in
 zone1970.tab to clarify whether Zones like Africa/Abidjan and Europe/Istanbul
 cross continent or ocean boundaries.

---
 share/zoneinfo/datfiles/asia         |  6 +++---
 share/zoneinfo/datfiles/zone1970.tab | 25 +++++++++++++++++++++++++
 2 files changed, 28 insertions(+), 3 deletions(-)

diff --git a/share/zoneinfo/datfiles/asia b/share/zoneinfo/datfiles/asia
index c31a1e6a76d..5930640de63 100644
--- a/share/zoneinfo/datfiles/asia
+++ b/share/zoneinfo/datfiles/asia
@@ -1,4 +1,4 @@
-# $OpenBSD: asia,v 1.99 2022/08/12 16:50:57 millert Exp $
+# $OpenBSD: asia,v 1.100 2022/08/17 13:41:50 millert Exp $
 # tzdb data for Asia and environs
 
 # This file is in the public domain, so clarified as of
@@ -1517,8 +1517,8 @@ Zone Asia/Jayapura	9:22:48 -	LMT	1932 Nov
 # onwards (which was during the Islamic Republic).
 
 # From Francis Santoni (2022-06-01):
-# for Iran and 1977 the effective change is only 20 october
-# (UIT No. 143 17.XI.1977) and not 23 september (UIT No. 141 13.IX.1977).
+# for Iran and 1977 the effective change is only 20 October
+# (UIT No. 143 17.XI.1977) and not 23 September (UIT No. 141 13.IX.1977).
 # UIT is the Operational Bulletin of International Telecommunication Union.
 
 # From Roozbeh Pournader (2003-03-15):
diff --git a/share/zoneinfo/datfiles/zone1970.tab b/share/zoneinfo/datfiles/zone1970.tab
index 3e1948cbb74..0672f15dd25 100644
--- a/share/zoneinfo/datfiles/zone1970.tab
+++ b/share/zoneinfo/datfiles/zone1970.tab
@@ -1,3 +1,4 @@
+# $OpenBSD: zone1970.tab,v 1.24 2022/08/17 13:41:50 millert Exp $
 # tzdb timezone descriptions
 #
 # This file is in the public domain.
@@ -351,3 +352,27 @@ VN	+1045+10640	Asia/Ho_Chi_Minh	Vietnam (south)
 VU	-1740+16825	Pacific/Efate
 WS	-1350-17144	Pacific/Apia
 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
+# 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.
+#
+# 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
+# more than one continent or ocean, each is listed separated by
+# 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/".
+#
+#@AQ	Antarctica/
+#@IS,SH	Atlantic/
+#@CY,TR	Asia/,Europe/
+#@SJ	Arctic/
+#@CC,CX,KM,MG,YT	Indian/
-- 
2.20.1