From: Jo-Philipp Wich <jow@openwrt.org>
Date: Sun, 2 Jan 2011 17:54:12 +0000 (+0000)
Subject: libs/sys: update zonedata to version 2010i
X-Git-Tag: 0.10.0~259
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=330c013475ee061585e944098c9855166874db53;p=oweals%2Fluci.git

libs/sys: update zonedata to version 2010i
---

diff --git a/libs/sys/luasrc/sys/zoneinfo/tzdata.lua b/libs/sys/luasrc/sys/zoneinfo/tzdata.lua
index 1fd02c4bb..2751b2af9 100644
--- a/libs/sys/luasrc/sys/zoneinfo/tzdata.lua
+++ b/libs/sys/luasrc/sys/zoneinfo/tzdata.lua
@@ -60,27 +60,26 @@ TZ = {
 	{ 'Africa/Porto-Novo', 'WAT-1' },
 	{ 'Africa/Sao Tome', 'GMT0' },
 	{ 'Africa/Tripoli', 'EET-2' },
-	{ 'Africa/Tunis', 'CET-1CEST,M3.5.0,M10.5.0/3' },
+	{ 'Africa/Tunis', 'CET-1' },
 	{ 'Africa/Windhoek', 'WAT-1WAST,M9.1.0,M4.1.0' },
 	{ 'America/Adak', 'HAST10HADT,M3.2.0,M11.1.0' },
 	{ 'America/Anchorage', 'AKST9AKDT,M3.2.0,M11.1.0' },
 	{ 'America/Anguilla', 'AST4' },
 	{ 'America/Antigua', 'AST4' },
 	{ 'America/Araguaina', 'BRT3' },
-	{ 'America/Argentina/Buenos Aires', 'ART3ARST,M10.3.0/0,M3.3.0/0' },
+	{ 'America/Argentina/Buenos Aires', 'ART3' },
 	{ 'America/Argentina/Catamarca', 'ART3' },
-	{ 'America/Argentina/Cordoba', 'ART3ARST,M10.3.0/0,M3.3.0/0' },
+	{ 'America/Argentina/Cordoba', 'ART3' },
 	{ 'America/Argentina/Jujuy', 'ART3' },
 	{ 'America/Argentina/La Rioja', 'ART3' },
 	{ 'America/Argentina/Mendoza', 'ART3' },
 	{ 'America/Argentina/Rio Gallegos', 'ART3' },
 	{ 'America/Argentina/Salta', 'ART3' },
 	{ 'America/Argentina/San Juan', 'ART3' },
-	{ 'America/Argentina/San Luis', 'WART4WARST,M10.3.0/0,M3.3.0/0' },
-	{ 'America/Argentina/Tucuman', 'ART3ARST,M10.3.0/0,M3.3.0/0' },
+	{ 'America/Argentina/Tucuman', 'ART3' },
 	{ 'America/Argentina/Ushuaia', 'ART3' },
 	{ 'America/Aruba', 'AST4' },
-	{ 'America/Asuncion', 'PYT4PYST,M10.3.0/0,M3.2.0/0' },
+	{ 'America/Asuncion', 'PYT4PYST,M10.1.0/0,M4.2.0/0' },
 	{ 'America/Atikokan', 'EST5' },
 	{ 'America/Bahia', 'BRT3' },
 	{ 'America/Barbados', 'AST4' },
@@ -144,6 +143,7 @@ TZ = {
 	{ 'America/Manaus', 'AMT4' },
 	{ '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/Menominee', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/Merida', 'CST6CDT,M4.1.0,M10.5.0' },
@@ -161,6 +161,7 @@ TZ = {
 	{ 'America/Noronha', 'FNT2' },
 	{ 'America/North Dakota/Center', 'CST6CDT,M3.2.0,M11.1.0' },
 	{ 'America/North Dakota/New Salem', 'CST6CDT,M3.2.0,M11.1.0' },
+	{ 'America/Ojinaga', 'MST7MDT,M3.2.0,M11.1.0' },
 	{ 'America/Panama', 'EST5' },
 	{ 'America/Pangnirtung', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/Paramaribo', 'SRT3' },
@@ -174,6 +175,7 @@ TZ = {
 	{ 'America/Recife', 'BRT3' },
 	{ 'America/Regina', 'CST6' },
 	{ 'America/Rio Branco', 'AMT4' },
+	{ 'America/Santa Isabel', 'PST8PDT,M4.1.0,M10.5.0' },
 	{ 'America/Santarem', 'BRT3' },
 	{ 'America/Santo Domingo', 'AST4' },
 	{ 'America/Sao Paulo', 'BRT3BRST,M10.3.0/0,M2.3.0/0' },
@@ -189,7 +191,7 @@ TZ = {
 	{ '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,M4.1.0,M10.5.0' },
+	{ 'America/Tijuana', 'PST8PDT,M3.2.0,M11.1.0' },
 	{ 'America/Toronto', 'EST5EDT,M3.2.0,M11.1.0' },
 	{ 'America/Tortola', 'AST4' },
 	{ 'America/Vancouver', 'PST8PDT,M3.2.0,M11.1.0' },
@@ -200,7 +202,8 @@ TZ = {
 	{ 'Antarctica/Casey', 'WST-8' },
 	{ 'Antarctica/Davis', 'DAVT-7' },
 	{ 'Antarctica/DumontDUrville', 'DDUT-10' },
-	{ 'Antarctica/Mawson', 'MAWT-6' },
+	{ 'Antarctica/Macquarie', 'MIST-11' },
+	{ 'Antarctica/Mawson', 'MAWT-5' },
 	{ 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
 	{ 'Antarctica/Rothera', 'ROTT3' },
 	{ 'Antarctica/South Pole', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
@@ -209,8 +212,7 @@ TZ = {
 	{ 'Arctic/Longyearbyen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Asia/Aden', 'AST-3' },
 	{ 'Asia/Almaty', 'ALMT-6' },
-	{ 'Asia/Amman', 'EET-2EEST,M3.5.4/0,M10.5.5/1' },
-	{ 'Asia/Anadyr', 'ANAT-12ANAST,M3.5.0,M10.5.0/3' },
+	{ 'Asia/Anadyr', 'ANAT-11ANAST,M3.5.0,M10.5.0/3' },
 	{ 'Asia/Aqtau', 'AQTT-5' },
 	{ 'Asia/Aqtobe', 'AQTT-5' },
 	{ 'Asia/Ashgabat', 'TMT-5' },
@@ -224,12 +226,12 @@ TZ = {
 	{ 'Asia/Choibalsan', 'CHOT-8' },
 	{ 'Asia/Chongqing', 'CST-8' },
 	{ 'Asia/Colombo', 'IST-5:30' },
-	{ 'Asia/Damascus', 'EET-2EEST,M3.5.5/0,J305/0' },
+	{ 'Asia/Damascus', 'EET-2EEST,M4.1.5/0,M10.5.5/0' },
 	{ 'Asia/Dhaka', 'BDT-6' },
 	{ 'Asia/Dili', 'TLT-9' },
 	{ 'Asia/Dubai', 'GST-4' },
 	{ 'Asia/Dushanbe', 'TJT-5' },
-	{ 'Asia/Gaza', 'EET-2EEST,J91/0,M8.5.4' },
+	{ 'Asia/Gaza', 'EET-2EEST,M3.5.6/0:01,M9.1.5' },
 	{ 'Asia/Harbin', 'CST-8' },
 	{ 'Asia/Ho Chi Minh', 'ICT-7' },
 	{ 'Asia/Hong Kong', 'HKT-8' },
@@ -238,7 +240,7 @@ TZ = {
 	{ 'Asia/Jakarta', 'WIT-7' },
 	{ 'Asia/Jayapura', 'EIT-9' },
 	{ 'Asia/Kabul', 'AFT-4:30' },
-	{ 'Asia/Kamchatka', 'PETT-12PETST,M3.5.0,M10.5.0/3' },
+	{ 'Asia/Kamchatka', 'PETT-11PETST,M3.5.0,M10.5.0/3' },
 	{ 'Asia/Karachi', 'PKT-5' },
 	{ 'Asia/Kashgar', 'CST-8' },
 	{ 'Asia/Kathmandu', 'NPT-5:45' },
@@ -253,6 +255,7 @@ TZ = {
 	{ 'Asia/Manila', 'PHT-8' },
 	{ 'Asia/Muscat', 'GST-4' },
 	{ 'Asia/Nicosia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+	{ 'Asia/Novokuznetsk', 'NOVT-6NOVST,M3.5.0,M10.5.0/3' },
 	{ 'Asia/Novosibirsk', 'NOVT-6NOVST,M3.5.0,M10.5.0/3' },
 	{ 'Asia/Omsk', 'OMST-6OMSST,M3.5.0,M10.5.0/3' },
 	{ 'Asia/Oral', 'ORAT-5' },
@@ -338,7 +341,7 @@ TZ = {
 	{ 'Europe/Prague', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Riga', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
 	{ 'Europe/Rome', 'CET-1CEST,M3.5.0,M10.5.0/3' },
-	{ 'Europe/Samara', 'SAMT-4SAMST,M3.5.0,M10.5.0/3' },
+	{ 'Europe/Samara', 'SAMT-3SAMST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/San Marino', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Sarajevo', 'CET-1CEST,M3.5.0,M10.5.0/3' },
 	{ 'Europe/Simferopol', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
@@ -365,7 +368,7 @@ TZ = {
 	{ 'Indian/Kerguelen', 'TFT-5' },
 	{ 'Indian/Mahe', 'SCT-4' },
 	{ 'Indian/Maldives', 'MVT-5' },
-	{ 'Indian/Mauritius', 'MUT-4MUST,M10.5.0,M3.5.0/3' },
+	{ 'Indian/Mauritius', 'MUT-4' },
 	{ 'Indian/Mayotte', 'EAT-3' },
 	{ 'Indian/Reunion', 'RET-4' },
 	{ 'Pacific/Apia', 'WST11' },
diff --git a/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua b/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua
index b396345c9..593492ace 100644
--- a/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua
@@ -27,9 +27,6 @@ OFFSET = {
 	ast   = -14400,	-- AST
 	brt   = -10800,	-- BRT
 	art   = -10800,	-- ART
-	arst  =  -7200,	-- ARST
-	wart  = -14400,	-- WART
-	warst = -10800,	-- WARST
 	pyt   = -14400,	-- PYT
 	pyst  = -10800,	-- PYST
 	est   = -18000,	-- EST
@@ -59,15 +56,16 @@ OFFSET = {
 	wst   =  28800,	-- WST
 	davt  =  25200,	-- DAVT
 	ddut  =  36000,	-- DDUT
-	mawt  =  21600,	-- MAWT
+	mist  =  39600,	-- MIST
+	mawt  =  18000,	-- MAWT
 	nzst  =  43200,	-- NZST
 	nzdt  =  46800,	-- NZDT
 	rott  = -10800,	-- ROTT
 	syot  =  10800,	-- SYOT
 	vost  =  21600,	-- VOST
 	almt  =  21600,	-- ALMT
-	anat  =  43200,	-- ANAT
-	anast =  46800,	-- ANAST
+	anat  =  39600,	-- ANAT
+	anast =  43200,	-- ANAST
 	aqtt  =  18000,	-- AQTT
 	tmt   =  18000,	-- TMT
 	azt   =  14400,	-- AZT
@@ -88,8 +86,8 @@ OFFSET = {
 	wit   =  25200,	-- WIT
 	eit   =  32400,	-- EIT
 	aft   =  16200,	-- AFT
-	pett  =  43200,	-- PETT
-	petst =  46800,	-- PETST
+	pett  =  39600,	-- PETT
+	petst =  43200,	-- PETST
 	pkt   =  18000,	-- PKT
 	npt   =  20700,	-- NPT
 	krat  =  25200,	-- KRAT
@@ -131,8 +129,8 @@ OFFSET = {
 	lhst  =  39600,	-- LHST
 	msk   =  10800,	-- MSK
 	msd   =  14400,	-- MSD
-	samt  =  14400,	-- SAMT
-	samst =  18000,	-- SAMST
+	samt  =  10800,	-- SAMT
+	samst =  14400,	-- SAMST
 	volt  =  10800,	-- VOLT
 	volst =  14400,	-- VOLST
 	iot   =  21600,	-- IOT
@@ -142,7 +140,6 @@ OFFSET = {
 	sct   =  14400,	-- SCT
 	mvt   =  18000,	-- MVT
 	mut   =  14400,	-- MUT
-	must  =  18000,	-- MUST
 	ret   =  14400,	-- RET
 	chast =  45900,	-- CHAST
 	chadt =  49500,	-- CHADT