From 3d46f2593a821960f896e109e1d6f89c481d6004 Mon Sep 17 00:00:00 2001
From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Fri, 2 Feb 2018 18:21:58 +0200
Subject: [PATCH] timezone data: update to 2018c
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

Update timezone data to 2018c

http://mm.icann.org/pipermail/tz-announce/2018-January/000048.html

   Briefly:
   Sao Tome and Príncipe switched from +00 to +01.
   Brazil's DST will now start on November's first Sunday.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit eae2f37b62393b0355238507ffdddb045b7d2fdb)
---
 modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 48ae5747c..6668dad83 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -51,7 +51,7 @@ TZ = {
 	{ 'Africa/Nouakchott', 'GMT0' },
 	{ 'Africa/Ouagadougou', 'GMT0' },
 	{ 'Africa/Porto-Novo', 'WAT-1' },
-	{ 'Africa/Sao Tome', 'GMT0' },
+	{ 'Africa/Sao Tome', 'WAT-1' },
 	{ 'Africa/Tripoli', 'EET-2' },
 	{ 'Africa/Tunis', 'CET-1' },
 	{ 'Africa/Windhoek', 'CAT-2' },
@@ -85,7 +85,7 @@ TZ = {
 	{ 'America/Bogota', '<-05>5' },
 	{ 'America/Boise', 'MST7MDT,M3.2.0,M11.1.0' },
 	{ 'America/Cambridge Bay', 'MST7MDT,M3.2.0,M11.1.0' },
-	{ 'America/Campo Grande', '<-04>4<-03>,M10.3.0/0,M2.3.0/0' },
+	{ 'America/Campo Grande', '<-04>4<-03>,M11.1.0/0,M2.3.0/0' },
 	{ 'America/Cancun', 'EST5' },
 	{ 'America/Caracas', '<-04>4' },
 	{ 'America/Cayenne', '<-03>3' },
@@ -94,7 +94,7 @@ TZ = {
 	{ 'America/Chihuahua', 'MST7MDT,M4.1.0,M10.5.0' },
 	{ 'America/Costa Rica', 'CST6' },
 	{ 'America/Creston', 'MST7' },
-	{ 'America/Cuiaba', '<-04>4<-03>,M10.3.0/0,M2.3.0/0' },
+	{ 'America/Cuiaba', '<-04>4<-03>,M11.1.0/0,M2.3.0/0' },
 	{ 'America/Curacao', 'AST4' },
 	{ 'America/Danmarkshavn', 'GMT0' },
 	{ 'America/Dawson', 'PST8PDT,M3.2.0,M11.1.0' },
@@ -181,7 +181,7 @@ TZ = {
 	{ 'America/Santarem', '<-03>3' },
 	{ 'America/Santiago', '<-04>4<-03>,M8.2.6/24,M5.2.6/24' },
 	{ 'America/Santo Domingo', 'AST4' },
-	{ 'America/Sao Paulo', '<-03>3<-02>,M10.3.0/0,M2.3.0/0' },
+	{ 'America/Sao Paulo', '<-03>3<-02>,M11.1.0/0,M2.3.0/0' },
 	{ 'America/Scoresbysund', '<-01>1<+00>,M3.5.0/0,M10.5.0/1' },
 	{ 'America/Sitka', 'AKST9AKDT,M3.2.0,M11.1.0' },
 	{ 'America/St Barthelemy', 'AST4' },
-- 
2.25.1