From 883f66f70f023d82a112f7c9734314f420827eb3 Mon Sep 17 00:00:00 2001
From: Hannu Nyman <hannu.nyman@iki.fi>
Date: Tue, 30 Oct 2018 19:45:50 +0200
Subject: [PATCH] timezone data: update to 2018g

Update timezone data to 2018g

http://mm.icann.org/pipermail/tz-announce/2018-October/000052.html

 * Morocco switches to permanent +01 on 2018-10-27.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 111ebe2f62f28f3aa1fa038983e7d0b65e9df46c)
---
 modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua   | 4 ++--
 modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index 82dc55f95..c6f4477df 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -16,14 +16,14 @@ TZ = {
 	{ 'Africa/Brazzaville', 'WAT-1' },
 	{ 'Africa/Bujumbura', 'CAT-2' },
 	{ 'Africa/Cairo', 'EET-2' },
-	{ 'Africa/Casablanca', 'WET0WEST,M3.5.0,M10.5.0/3' },
+	{ 'Africa/Casablanca', '<+01>-1' },
 	{ 'Africa/Ceuta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Africa/Conakry', 'GMT0' },
 	{ 'Africa/Dakar', 'GMT0' },
 	{ 'Africa/Dar es Salaam', 'EAT-3' },
 	{ 'Africa/Djibouti', 'EAT-3' },
 	{ 'Africa/Douala', 'WAT-1' },
-	{ 'Africa/El Aaiun', 'WET0WEST,M3.5.0,M10.5.0/3' },
+	{ 'Africa/El Aaiun', '<+01>-1' },
 	{ 'Africa/Freetown', 'GMT0' },
 	{ 'Africa/Gaborone', 'CAT-2' },
 	{ 'Africa/Harare', 'CAT-2' },
diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
index 20f57dc1b..e63e2a695 100644
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -9,7 +9,6 @@ OFFSET = {
 	wat   =   3600,	-- WAT
 	cat   =   7200,	-- CAT
 	eet   =   7200,	-- EET
-	wet   =      0,	-- WET
 	sast  =   7200,	-- SAST
 	hst   = -36000,	-- HST
 	hdt   = -32400,	-- HDT
@@ -36,6 +35,7 @@ OFFSET = {
 	wita  =  28800,	-- WITA
 	kst   =  32400,	-- KST
 	jst   =  32400,	-- JST
+	wet   =      0,	-- WET
 	acst  =  34200,	-- ACST
 	acdt  =  37800,	-- ACDT
 	aest  =  36000,	-- AEST
-- 
2.25.1