From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Mon, 31 Oct 2022 18:06:11 +0000 (+0200)
Subject: timezone data: update to 2022f
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=04257f6704c1b8707ee7a58ca4ec0f18a2133611;p=project%2Fluci.git

timezone data: update to 2022f

Update timezone data to 2022f.
* http://mm.icann.org/pipermail/tz-announce/2022-October/000075.html

 -   Mexico will no longer observe DST after 2022, except for areas
     near the US border that continue to observe US DST rules.
     On 2022-10-30 at 02:00 the Mexican state of Chihuahua moves
     from -07 (-06 with DST) to year-round -06.
 -   Fiji will not observe DST in 2022/3.
     For now, assume DST is suspended indefinitely.
 -   Simplify four Ontario zones.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
[adapt the commit in master, lua instead of ucode]
(cherry picked from commit ec905e6e9744d68106978907db48ac75a5966db4)
---

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 3ef2f4caf4..9760e2dc8f 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -76,7 +76,7 @@ TZ = {
 	{ 'America/Asuncion', '<-04>4<-03>,M10.1.0/0,M3.4.0/0' },
 	{ 'America/Atikokan', 'EST5' },
 	{ 'America/Bahia', '<-03>3' },
-	{ 'America/Bahia Banderas', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Bahia Banderas', 'CST6' },
 	{ 'America/Barbados', 'AST4' },
 	{ 'America/Belem', '<-03>3' },
 	{ 'America/Belize', 'CST6' },
@@ -91,7 +91,7 @@ TZ = {
 	{ 'America/Cayenne', '<-03>3' },
 	{ 'America/Cayman', 'EST5' },
 	{ 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' },
-	{ 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' },
+	{ 'America/Chihuahua', 'CST6' },
 	{ 'America/Costa Rica', 'CST6' },
 	{ 'America/Creston', 'MST7' },
 	{ 'America/Cuiaba', '<-04>4' },
@@ -143,26 +143,25 @@ TZ = {
 	{ 'America/Marigot', 'AST4' },
 	{ 'America/Martinique', 'AST4' },
 	{ 'America/Matamoros', 'CST6CDT,M3.2.0,M11.1.0' },
-	{ 'America/Mazatlan', 'MST7MDT,M4.1.0,M10.5.0' },
+	{ 'America/Mazatlan', 'MST7' },
 	{ 'America/Menominee', 'CST6CDT,M3.2.0,M11.1.0' },
-	{ 'America/Merida', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Merida', 'CST6' },
 	{ 'America/Metlakatla', 'AKST9AKDT,M3.2.0,M11.1.0' },
-	{ 'America/Mexico City', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Mexico City', 'CST6' },
 	{ 'America/Miquelon', '<-03>3<-02>,M3.2.0,M11.1.0' },
 	{ 'America/Moncton', 'AST4ADT,M3.2.0,M11.1.0' },
-	{ 'America/Monterrey', 'CST6CDT,M4.1.0,M10.5.0' },
+	{ 'America/Monterrey', 'CST6' },
 	{ 'America/Montevideo', '<-03>3' },
 	{ 'America/Montserrat', 'AST4' },
 	{ 'America/Nassau', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/New York', 'EST5EDT,M3.2.0,M11.1.0' },
-	{ 'America/Nipigon', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/Nome', 'AKST9AKDT,M3.2.0,M11.1.0' },
 	{ 'America/Noronha', '<-02>2' },
 	{ 'America/North Dakota/Beulah', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/North Dakota/Center', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/North Dakota/New Salem', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Nuuk', '<-03>3<-02>,M3.5.0/-2,M10.5.0/-1' },
-	{ 'America/Ojinaga', 'MST7MDT,M3.2.0,M11.1.0' },
+	{ 'America/Ojinaga', 'CST6' },
 	{ 'America/Panama', 'EST5' },
 	{ 'America/Pangnirtung', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/Paramaribo', '<-03>3' },
@@ -172,7 +171,6 @@ TZ = {
 	{ 'America/Porto Velho', '<-04>4' },
 	{ 'America/Puerto Rico', 'AST4' },
 	{ 'America/Punta Arenas', '<-03>3' },
-	{ 'America/Rainy River', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Rankin Inlet', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Recife', '<-03>3' },
 	{ 'America/Regina', 'CST6' },
@@ -193,7 +191,6 @@ TZ = {
 	{ 'America/Swift Current', 'CST6' },
 	{ 'America/Tegucigalpa', 'CST6' },
 	{ 'America/Thule', 'AST4ADT,M3.2.0,M11.1.0' },
-	{ 'America/Thunder Bay', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/Tijuana', 'PST8PDT,M3.2.0,M11.1.0' },
 	{ 'America/Toronto', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/Tortola', 'AST4' },
@@ -422,7 +419,7 @@ TZ = {
 	{ 'Pacific/Easter', '<-06>6<-05>,M9.1.6/22,M4.1.6/22' },
 	{ 'Pacific/Efate', '<+11>-11' },
 	{ 'Pacific/Fakaofo', '<+13>-13' },
-	{ 'Pacific/Fiji', '<+12>-12<+13>,M11.2.0,M1.2.3/99' },
+	{ 'Pacific/Fiji', '<+12>-12' },
 	{ 'Pacific/Funafuti', '<+12>-12' },
 	{ 'Pacific/Galapagos', '<-06>6' },
 	{ 'Pacific/Gambier', '<-09>9' },
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
index caee1d2c1c..80bea8416e 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -17,7 +17,6 @@ OFFSET = {
 	ast   = -14400,	-- AST
 	est   = -18000,	-- EST
 	cst   = -21600,	-- CST
-	cdt   = -18000,	-- CDT
 	mst   = -25200,	-- MST
 	mdt   = -21600,	-- MDT
 	pst   = -28800,	-- PST