From: Hannu Nyman Date: Wed, 30 Mar 2016 08:30:36 +0000 (+0300) Subject: timezone data: update to 2016c X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=859e4353783c3c9b6b23eaa51604d360a73c1236;p=project%2Fluci.git timezone data: update to 2016c Update timezone data to 2016c. 2016b: http://mm.icann.org/pipermail/tz-announce/2016-March/000036.html Changes affecting future time stamps New zones Europe/Astrakhan and Europe/Ulyanovsk for Astrakhan and Ulyanovsk Oblasts, Russia, both of which will switch from +03 to +04 on 2016-03-27 at 02:00 local time. They need distinct zones since their post-1970 histories disagree. New zone Asia/Barnaul for Altai Krai and Altai Republic, Russia, which will switch from +06 to +07 on the same date and local time. Also, Asia/Sakhalin moves from +10 to +11 on 2016-03-27 at 02:00. As a trial of a new system that needs less information to be made up, the new zones use numeric time zone abbreviations like "+04" instead of invented abbreviations like "ASTT". Haiti will not observe DST in 2016. Palestine's spring-forward transition on 2016-03-26 is at 01:00, not 00:00. Guess future transitions will be March's last Saturday at 01:00, not March's last Friday at 24:00. 2016c: http://mm.icann.org/pipermail/tz-announce/2016-March/000037.html Changes affecting future time stamps Azerbaijan no longer observes DST. Chile reverts from permanent to seasonal DST. Guess that future transitions are August's and May's second Saturdays at 24:00 mainland time. Also, call the period from 2014-09-07 through 2016-05-14 daylight saving time instead of standard time, as that seems more appropriate now. Note for Openwrt usage: Either musl or busybox does not like the new timezone format. Although the rule looks ok in /etc/TZ, timezone is interpreted wrongly by date, uptime etc. "Old timezones" are handle correctly, but these new "<+04>-4" style zones do not work. Example below: Europe/Helsinki root@OpenWrt:~# cat /etc/TZ EET-2EEST,M3.5.0/3,M10.5.0/4 root@OpenWrt:~# uptime 11:00:52 up 18:17, load average: 0.43, 0.13, 0.11 root@OpenWrt:~# date Wed Mar 30 11:00:55 EEST 2016 Europe/Astrakhan ( Time is showed as GMT instead of the correct zone and zone name is parsed wrongly ) root@OpenWrt:~# cat /etc/TZ <+04>-4 root@OpenWrt:~# uptime 08:02:52 up 18:19, load average: 0.17, 0.18, 0.13 root@OpenWrt:~# date Wed Mar 30 08:02:59 +04>-4 2016 Signed-off-by: Hannu Nyman --- diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua index 1efe6dd9fa..c9a507eaa2 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua @@ -168,7 +168,7 @@ TZ = { { 'America/Paramaribo', 'SRT3' }, { 'America/Phoenix', 'MST7' }, { 'America/Port of Spain', 'AST4' }, - { 'America/Port-au-Prince', 'EST5EDT,M3.2.0,M11.1.0' }, + { 'America/Port-au-Prince', 'EST5' }, { 'America/Porto Velho', 'AMT4' }, { 'America/Puerto Rico', 'AST4' }, { 'America/Rainy River', 'CST6CDT,M3.2.0,M11.1.0' }, @@ -178,7 +178,7 @@ TZ = { { 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' }, { 'America/Rio Branco', 'ACT5' }, { 'America/Santarem', 'BRT3' }, - { 'America/Santiago', 'CLT3' }, + { 'America/Santiago', 'CLT4CLST,M8.2.6/24,M5.2.6/24' }, { 'America/Santo Domingo', 'AST4' }, { 'America/Sao Paulo', 'BRT3BRST,M10.3.0/0,M2.3.0/0' }, { 'America/Scoresbysund', 'EGT1EGST,M3.5.0/0,M10.5.0/1' }, @@ -207,7 +207,7 @@ TZ = { { 'Antarctica/Macquarie', 'MIST-11' }, { 'Antarctica/Mawson', 'MAWT-5' }, { 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' }, - { 'Antarctica/Palmer', 'CLT3' }, + { 'Antarctica/Palmer', 'CLT4CLST,M8.2.6/24,M5.2.6/24' }, { 'Antarctica/Rothera', 'ROTT3' }, { 'Antarctica/Syowa', 'SYOT-3' }, { 'Antarctica/Troll', 'UTC0CEST-2,M3.5.0/1,M10.5.0/3' }, @@ -222,8 +222,9 @@ TZ = { { 'Asia/Ashgabat', 'TMT-5' }, { 'Asia/Baghdad', 'AST-3' }, { 'Asia/Bahrain', 'AST-3' }, - { 'Asia/Baku', 'AZT-4AZST,M3.5.0/4,M10.5.0/5' }, + { 'Asia/Baku', 'AZT-4' }, { 'Asia/Bangkok', 'ICT-7' }, + { 'Asia/Barnaul', '<+07>-7' }, { 'Asia/Beirut', 'EET-2EEST,M3.5.0/0,M10.5.0/0' }, { 'Asia/Bishkek', 'KGT-6' }, { 'Asia/Brunei', 'BNT-8' }, @@ -235,8 +236,8 @@ TZ = { { 'Asia/Dili', 'TLT-9' }, { 'Asia/Dubai', 'GST-4' }, { 'Asia/Dushanbe', 'TJT-5' }, - { 'Asia/Gaza', 'EET-2EEST,M3.5.5/24,M10.3.6/144' }, - { 'Asia/Hebron', 'EET-2EEST,M3.5.5/24,M10.3.6/144' }, + { 'Asia/Gaza', 'EET-2EEST,M3.5.6/1,M10.3.6/144' }, + { 'Asia/Hebron', 'EET-2EEST,M3.5.6/1,M10.3.6/144' }, { 'Asia/Ho Chi Minh', 'ICT-7' }, { 'Asia/Hong Kong', 'HKT-8' }, { 'Asia/Hovd', 'HOVT-7HOVST,M3.5.6,M9.5.6/0' }, @@ -271,7 +272,7 @@ TZ = { { 'Asia/Qyzylorda', 'QYZT-6' }, { 'Asia/Rangoon', 'MMT-6:30' }, { 'Asia/Riyadh', 'AST-3' }, - { 'Asia/Sakhalin', 'SAKT-10' }, + { 'Asia/Sakhalin', 'SAKT-11' }, { 'Asia/Samarkand', 'UZT-5' }, { 'Asia/Seoul', 'KST-9' }, { 'Asia/Shanghai', 'CST-8' }, @@ -315,6 +316,7 @@ TZ = { { 'Australia/Sydney', 'AEST-10AEDT,M10.1.0,M4.1.0/3' }, { 'Europe/Amsterdam', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Andorra', 'CET-1CEST,M3.5.0,M10.5.0/3' }, + { 'Europe/Astrakhan', '<+04>-4' }, { 'Europe/Athens', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Europe/Belgrade', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Berlin', 'CET-1CEST,M3.5.0,M10.5.0/3' }, @@ -359,6 +361,7 @@ TZ = { { 'Europe/Stockholm', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Tallinn', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Europe/Tirane', 'CET-1CEST,M3.5.0,M10.5.0/3' }, + { 'Europe/Ulyanovsk', '<+04>-4' }, { 'Europe/Uzhgorod', 'EET-2EEST,M3.5.0/3,M10.5.0/4' }, { 'Europe/Vaduz', 'CET-1CEST,M3.5.0,M10.5.0/3' }, { 'Europe/Vatican', 'CET-1CEST,M3.5.0,M10.5.0/3' }, @@ -385,7 +388,7 @@ TZ = { { 'Pacific/Bougainville', 'BST-11' }, { 'Pacific/Chatham', 'CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45' }, { 'Pacific/Chuuk', 'CHUT-10' }, - { 'Pacific/Easter', 'EAST5' }, + { 'Pacific/Easter', 'EAST6EASST,M8.2.6/22,M5.2.6/22' }, { 'Pacific/Efate', 'VUT-11' }, { 'Pacific/Enderbury', 'PHOT-13' }, { 'Pacific/Fakaofo', 'TKT-13' }, diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua index 351ebccd38..a8417e06c8 100644 --- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua +++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua @@ -43,7 +43,8 @@ OFFSET = { uyt = -10800, -- UYT fnt = -7200, -- FNT srt = -10800, -- SRT - clt = -10800, -- CLT + clt = -14400, -- CLT + clst = -10800, -- CLST egt = -3600, -- EGT egst = 0, -- EGST nst = -12600, -- NST @@ -64,7 +65,6 @@ OFFSET = { aqtt = 18000, -- AQTT tmt = 18000, -- TMT azt = 14400, -- AZT - azst = 18000, -- AZST ict = 25200, -- ICT kgt = 21600, -- KGT bnt = 28800, -- BNT @@ -97,7 +97,7 @@ OFFSET = { kst = 30600, -- KST qyzt = 21600, -- QYZT mmt = 23400, -- MMT - sakt = 36000, -- SAKT + sakt = 39600, -- SAKT uzt = 18000, -- UZT sgt = 28800, -- SGT sret = 39600, -- SRET @@ -137,7 +137,8 @@ OFFSET = { chast = 45900, -- CHAST chadt = 49500, -- CHADT chut = 36000, -- CHUT - east = -18000, -- EAST + east = -21600, -- EAST + easst = -18000, -- EASST vut = 39600, -- VUT phot = 46800, -- PHOT tkt = 46800, -- TKT