time zone data: Update to 2016i

Note that several of the time zones now use a numeric name
that is quoted with < >  (e.g. "<+03>-3")

musl 1.1.15 and earlier have a bug with < > quoted time zone names.
Fix for the bug
* has already been patched in musl upstream with
  http://git.musl-libc.org/cgit/musl/commit/?id=8ca27ac4bfe73bff785d0c26c1de0da92b55e5c6
* has been committed in LEDE with
  https://github.com/lede-project/source/commit/671cb35880308404a17c430c4b3b13dd506a5671
* has been submitted to Openwrt as pull request
  https://github.com/openwrt/openwrt/pull/163

Key changes in 2016d-2016i:
---------------------------

2016d:
     America/Caracas switches from -0430 to -04 on 2016-05-01.

     Asia/Magadan switches from +10 to +11 on 2016-04-24.

     New zone Asia/Tomsk, split off from Asia/Novosibirsk.

2016f:
     Asia/Novosibirsk switches from +06 to +07 on 2016-07-24.

     Asia/Novokuznetsk and Asia/Novosibirsk now use numeric time zone
     abbreviations instead of invented ones.

2016g:
     Turkey switched from EET/EEST (+02/+03) to permanent +03,
     effective 2016-09-07. Use "+03" rather than an invented
     abbreviation for the new time.

     Several zones in Antarctica and the former Soviet Union, along
     with zones intended for ships at sea that cannot use POSIX TZ
     strings, now use numeric time zone abbreviations instead of
     invented or obsolete alphanumeric abbreviations.

2016h:
     Asia/Gaza and Asia/Hebron end DST on 2016-10-29, not
     2016-10-21. Predict that future fall transitions will
     be on the last Saturday of October.

     Asia/Colombo now uses numeric time zone abbreviations like "+0530"
     instead of alphabetic ones like "IST" and "LKT".

2016i:
     Pacific/Tongatapu begins DST on 2016-11-06, ending on
     2017-01-15.  Assume future observances in Tonga will be
     from the first Sunday in November through the third Sunday in
     January, like Fiji. Switch to numeric time zone abbreviations
     for this zone.

     Northern Cyprus is now +03 year round, causing a split in Cyprus
     time zones starting 2016-10-30 at 04:00. This creates a zone
     Asia/Famagusta.

     Antarctica/Casey switched from +08 to +11 on 2016-10-22.

Signed-off-by: Hannu Nyman <hannu.nyman@iki.fi>
(cherry picked from commit 3936e79cf8d5d6df7c2c529dd1daacbd8d5ed31b)

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
index c9a507eaa2111946fa8b41fa7e2d351609db4d99..66136903a7722f0a8d65250dcf226c7417372b9c 100644 (file)
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzdata.lua
@@ -87,7 +87,7 @@ TZ = {
        { 'America/Cambridge Bay', 'MST7MDT,M3.2.0,M11.1.0' },
        { 'America/Campo Grande', 'AMT4AMST,M10.3.0/0,M2.3.0/0' },
        { 'America/Cancun', 'EST5' },
-       { 'America/Caracas', 'VET4:30' },
+       { 'America/Caracas', 'VET4' },
        { 'America/Cayenne', 'GFT3' },
        { 'America/Cayman', 'EST5' },
        { 'America/Chicago', 'CST6CDT,M3.2.0,M11.1.0' },
@@ -201,97 +201,99 @@ TZ = {
        { 'America/Winnipeg', 'CST6CDT,M3.2.0,M11.1.0' },
        { 'America/Yakutat', 'AKST9AKDT,M3.2.0,M11.1.0' },
        { 'America/Yellowknife', 'MST7MDT,M3.2.0,M11.1.0' },
-       { 'Antarctica/Casey', 'AWST-8' },
-       { 'Antarctica/Davis', 'DAVT-7' },
-       { 'Antarctica/DumontDUrville', 'DDUT-10' },
+       { 'Antarctica/Casey', '<+11>-11' },
+       { 'Antarctica/Davis', '<+07>-7' },
+       { 'Antarctica/DumontDUrville', '<+10>-10' },
        { 'Antarctica/Macquarie', 'MIST-11' },
-       { 'Antarctica/Mawson', 'MAWT-5' },
+       { 'Antarctica/Mawson', '<+05>-5' },
        { 'Antarctica/McMurdo', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
        { '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' },
-       { 'Antarctica/Vostok', 'VOST-6' },
+       { 'Antarctica/Rothera', '<-03>3' },
+       { 'Antarctica/Syowa', '<+03>-3' },
+       { 'Antarctica/Troll', '<+00>0<+02>-2,M3.5.0/1,M10.5.0/3' },
+       { 'Antarctica/Vostok', '<+06>-6' },
        { 'Arctic/Longyearbyen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Asia/Aden', 'AST-3' },
-       { 'Asia/Almaty', 'ALMT-6' },
+       { 'Asia/Almaty', '<+06>-6' },
        { 'Asia/Amman', 'EET-2EEST,M3.5.4/24,M10.5.5/1' },
-       { 'Asia/Anadyr', 'ANAT-12' },
-       { 'Asia/Aqtau', 'AQTT-5' },
-       { 'Asia/Aqtobe', 'AQTT-5' },
-       { 'Asia/Ashgabat', 'TMT-5' },
+       { 'Asia/Anadyr', '<+12>-12' },
+       { 'Asia/Aqtau', '<+05>-5' },
+       { 'Asia/Aqtobe', '<+05>-5' },
+       { 'Asia/Ashgabat', '<+05>-5' },
        { 'Asia/Baghdad', 'AST-3' },
        { 'Asia/Bahrain', 'AST-3' },
-       { 'Asia/Baku', 'AZT-4' },
+       { 'Asia/Baku', '<+04>-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/Bishkek', '<+06>-6' },
        { 'Asia/Brunei', 'BNT-8' },
-       { 'Asia/Chita', 'YAKT-9' },
+       { 'Asia/Chita', '<+09>-9' },
        { 'Asia/Choibalsan', 'CHOT-8CHOST,M3.5.6,M9.5.6/0' },
-       { 'Asia/Colombo', 'IST-5:30' },
+       { 'Asia/Colombo', '<+0530>-5:30' },
        { 'Asia/Damascus', 'EET-2EEST,M3.5.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,M3.5.6/1,M10.3.6/144' },
-       { 'Asia/Hebron', 'EET-2EEST,M3.5.6/1,M10.3.6/144' },
+       { 'Asia/Dushanbe', '<+05>-5' },
+       { 'Asia/Famagusta', '<+03>-3' },
+       { 'Asia/Gaza', 'EET-2EEST,M3.5.6/1,M10.5.6/1' },
+       { 'Asia/Hebron', 'EET-2EEST,M3.5.6/1,M10.5.6/1' },
        { 'Asia/Ho Chi Minh', 'ICT-7' },
        { 'Asia/Hong Kong', 'HKT-8' },
        { 'Asia/Hovd', 'HOVT-7HOVST,M3.5.6,M9.5.6/0' },
-       { 'Asia/Irkutsk', 'IRKT-8' },
+       { 'Asia/Irkutsk', '<+08>-8' },
        { 'Asia/Jakarta', 'WIB-7' },
        { 'Asia/Jayapura', 'WIT-9' },
        { 'Asia/Jerusalem', 'IST-2IDT,M3.4.4/26,M10.5.0' },
        { 'Asia/Kabul', 'AFT-4:30' },
-       { 'Asia/Kamchatka', 'PETT-12' },
+       { 'Asia/Kamchatka', '<+12>-12' },
        { 'Asia/Karachi', 'PKT-5' },
        { 'Asia/Kathmandu', 'NPT-5:45' },
-       { 'Asia/Khandyga', 'YAKT-9' },
+       { 'Asia/Khandyga', '<+09>-9' },
        { 'Asia/Kolkata', 'IST-5:30' },
-       { 'Asia/Krasnoyarsk', 'KRAT-7' },
+       { 'Asia/Krasnoyarsk', '<+07>-7' },
        { 'Asia/Kuala Lumpur', 'MYT-8' },
        { 'Asia/Kuching', 'MYT-8' },
        { 'Asia/Kuwait', 'AST-3' },
        { 'Asia/Macau', 'CST-8' },
-       { 'Asia/Magadan', 'MAGT-10' },
+       { 'Asia/Magadan', '<+11>-11' },
        { 'Asia/Makassar', 'WITA-8' },
        { 'Asia/Manila', 'PHT-8' },
        { 'Asia/Muscat', 'GST-4' },
        { 'Asia/Nicosia', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
-       { 'Asia/Novokuznetsk', 'KRAT-7' },
-       { 'Asia/Novosibirsk', 'NOVT-6' },
-       { 'Asia/Omsk', 'OMST-6' },
-       { 'Asia/Oral', 'ORAT-5' },
+       { 'Asia/Novokuznetsk', '<+07>-7' },
+       { 'Asia/Novosibirsk', '<+07>-7' },
+       { 'Asia/Omsk', '<+06>-6' },
+       { 'Asia/Oral', '<+05>-5' },
        { 'Asia/Phnom Penh', 'ICT-7' },
        { 'Asia/Pontianak', 'WIB-7' },
        { 'Asia/Pyongyang', 'KST-8:30' },
        { 'Asia/Qatar', 'AST-3' },
-       { 'Asia/Qyzylorda', 'QYZT-6' },
-       { 'Asia/Rangoon', 'MMT-6:30' },
+       { 'Asia/Qyzylorda', '<+06>-6' },
        { 'Asia/Riyadh', 'AST-3' },
-       { 'Asia/Sakhalin', 'SAKT-11' },
-       { 'Asia/Samarkand', 'UZT-5' },
+       { 'Asia/Sakhalin', '<+11>-11' },
+       { 'Asia/Samarkand', '<+05>-5' },
        { 'Asia/Seoul', 'KST-9' },
        { 'Asia/Shanghai', 'CST-8' },
        { 'Asia/Singapore', 'SGT-8' },
-       { 'Asia/Srednekolymsk', 'SRET-11' },
+       { 'Asia/Srednekolymsk', '<+11>-11' },
        { 'Asia/Taipei', 'CST-8' },
-       { 'Asia/Tashkent', 'UZT-5' },
-       { 'Asia/Tbilisi', 'GET-4' },
+       { 'Asia/Tashkent', '<+05>-5' },
+       { 'Asia/Tbilisi', '<+04>-4' },
        { 'Asia/Tehran', 'IRST-3:30IRDT,J80/0,J264/0' },
        { 'Asia/Thimphu', 'BTT-6' },
        { 'Asia/Tokyo', 'JST-9' },
+       { 'Asia/Tomsk', '<+07>-7' },
        { 'Asia/Ulaanbaatar', 'ULAT-8ULAST,M3.5.6,M9.5.6/0' },
        { 'Asia/Urumqi', 'XJT-6' },
-       { 'Asia/Ust-Nera', 'VLAT-10' },
+       { 'Asia/Ust-Nera', '<+10>-10' },
        { 'Asia/Vientiane', 'ICT-7' },
-       { 'Asia/Vladivostok', 'VLAT-10' },
-       { 'Asia/Yakutsk', 'YAKT-9' },
-       { 'Asia/Yekaterinburg', 'YEKT-5' },
-       { 'Asia/Yerevan', 'AMT-4' },
+       { 'Asia/Vladivostok', '<+10>-10' },
+       { 'Asia/Yakutsk', '<+09>-9' },
+       { 'Asia/Yangon', 'MMT-6:30' },
+       { 'Asia/Yekaterinburg', '<+05>-5' },
+       { 'Asia/Yerevan', '<+04>-4' },
        { 'Atlantic/Azores', 'AZOT1AZOST,M3.5.0/0,M10.5.0/1' },
        { 'Atlantic/Bermuda', 'AST4ADT,M3.2.0,M11.1.0' },
        { 'Atlantic/Canary', 'WET0WEST,M3.5.0/1,M10.5.0' },
@@ -332,10 +334,11 @@ TZ = {
        { 'Europe/Guernsey', 'GMT0BST,M3.5.0/1,M10.5.0' },
        { 'Europe/Helsinki', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
        { 'Europe/Isle of Man', 'GMT0BST,M3.5.0/1,M10.5.0' },
-       { 'Europe/Istanbul', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+       { 'Europe/Istanbul', '<+03>-3' },
        { 'Europe/Jersey', 'GMT0BST,M3.5.0/1,M10.5.0' },
        { 'Europe/Kaliningrad', 'EET-2' },
        { 'Europe/Kiev', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
+       { 'Europe/Kirov', '<+03>-3' },
        { 'Europe/Lisbon', 'WET0WEST,M3.5.0/1,M10.5.0' },
        { 'Europe/Ljubljana', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/London', 'GMT0BST,M3.5.0/1,M10.5.0' },
@@ -343,7 +346,7 @@ TZ = {
        { 'Europe/Madrid', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Malta', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Mariehamn', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
-       { 'Europe/Minsk', 'MSK-3' },
+       { 'Europe/Minsk', '<+03>-3' },
        { 'Europe/Monaco', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Moscow', 'MSK-3' },
        { 'Europe/Oslo', 'CET-1CEST,M3.5.0,M10.5.0/3' },
@@ -352,7 +355,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-4' },
+       { 'Europe/Samara', '<+04>-4' },
        { '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', 'MSK-3' },
@@ -367,7 +370,7 @@ TZ = {
        { 'Europe/Vatican', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Vienna', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Vilnius', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
-       { 'Europe/Volgograd', 'MSK-3' },
+       { 'Europe/Volgograd', '<+03>-3' },
        { 'Europe/Warsaw', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Zagreb', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Zaporozhye', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
@@ -377,7 +380,7 @@ TZ = {
        { 'Indian/Christmas', 'CXT-7' },
        { 'Indian/Cocos', 'CCT-6:30' },
        { 'Indian/Comoro', 'EAT-3' },
-       { 'Indian/Kerguelen', 'TFT-5' },
+       { 'Indian/Kerguelen', '<+05>-5' },
        { 'Indian/Mahe', 'SCT-4' },
        { 'Indian/Maldives', 'MVT-5' },
        { 'Indian/Mauritius', 'MUT-4' },
@@ -419,7 +422,7 @@ TZ = {
        { 'Pacific/Saipan', 'ChST-10' },
        { 'Pacific/Tahiti', 'TAHT10' },
        { 'Pacific/Tarawa', 'GILT-12' },
-       { 'Pacific/Tongatapu', 'TOT-13' },
+       { 'Pacific/Tongatapu', '<+13>-13<+14>,M11.1.0,M1.3.0/3' },
        { 'Pacific/Wake', 'WAKT-12' },
        { 'Pacific/Wallis', 'WFT-12' },
 }

diff --git a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
index a8417e06c8bcd2e2add497a7df468e0a4b1a2dd6..e5da7c6442715b3c3566478a1ac398de2f259606 100644 (file)
--- a/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/modules/luci-base/luasrc/sys/zoneinfo/tzoffset.lua
@@ -27,7 +27,7 @@ OFFSET = {
        cot   = -18000, -- COT
        mst   = -25200, -- MST
        mdt   = -21600, -- MDT
-       vet   = -16200, -- VET
+       vet   = -14400, -- VET
        gft   = -10800, -- GFT
        pst   = -28800, -- PST
        pdt   = -25200, -- PDT
@@ -49,59 +49,31 @@ OFFSET = {
        egst  =      0, -- EGST
        nst   = -12600, -- NST
        ndt   =  -9000, -- NDT
-       awst  =  28800, -- AWST
-       davt  =  25200, -- DAVT
-       ddut  =  36000, -- DDUT
        mist  =  39600, -- MIST
-       mawt  =  18000, -- MAWT
        nzst  =  43200, -- NZST
        nzdt  =  46800, -- NZDT
-       rott  = -10800, -- ROTT
-       syot  =  10800, -- SYOT
-       utc   =      0, -- UTC
-       vost  =  21600, -- VOST
-       almt  =  21600, -- ALMT
-       anat  =  43200, -- ANAT
-       aqtt  =  18000, -- AQTT
-       tmt   =  18000, -- TMT
-       azt   =  14400, -- AZT
        ict   =  25200, -- ICT
-       kgt   =  21600, -- KGT
        bnt   =  28800, -- BNT
-       yakt  =  32400, -- YAKT
        chot  =  28800, -- CHOT
        chost =  32400, -- CHOST
-       ist   =  19800, -- IST
        bdt   =  21600, -- BDT
        tlt   =  32400, -- TLT
        gst   =  14400, -- GST
-       tjt   =  18000, -- TJT
        hkt   =  28800, -- HKT
        hovt  =  25200, -- HOVT
        hovst =  28800, -- HOVST
-       irkt  =  28800, -- IRKT
        wib   =  25200, -- WIB
        wit   =  32400, -- WIT
+       ist   =   7200, -- IST
+       idt   =  10800, -- IDT
        aft   =  16200, -- AFT
-       pett  =  43200, -- PETT
        pkt   =  18000, -- PKT
        npt   =  20700, -- NPT
-       krat  =  25200, -- KRAT
        myt   =  28800, -- MYT
-       magt  =  36000, -- MAGT
        wita  =  28800, -- WITA
        pht   =  28800, -- PHT
-       novt  =  21600, -- NOVT
-       omst  =  21600, -- OMST
-       orat  =  18000, -- ORAT
        kst   =  30600, -- KST
-       qyzt  =  21600, -- QYZT
-       mmt   =  23400, -- MMT
-       sakt  =  39600, -- SAKT
-       uzt   =  18000, -- UZT
        sgt   =  28800, -- SGT
-       sret  =  39600, -- SRET
-       get   =  14400, -- GET
        irst  =  12600, -- IRST
        irdt  =  16200, -- IRDT
        btt   =  21600, -- BTT
@@ -109,8 +81,7 @@ OFFSET = {
        ulat  =  28800, -- ULAT
        ulast =  32400, -- ULAST
        xjt   =  21600, -- XJT
-       vlat  =  36000, -- VLAT
-       yekt  =  18000, -- YEKT
+       mmt   =  23400, -- MMT
        azot  =  -3600, -- AZOT
        azost =      0, -- AZOST
        cvt   =  -3600, -- CVT
@@ -121,12 +92,11 @@ OFFSET = {
        acwst =  31500, -- ACWST
        lhst  =  37800, -- LHST
        lhdt  =  39600, -- LHDT
+       awst  =  28800, -- AWST
        msk   =  10800, -- MSK
-       samt  =  14400, -- SAMT
        iot   =  21600, -- IOT
        cxt   =  25200, -- CXT
        cct   =  23400, -- CCT
-       tft   =  18000, -- TFT
        sct   =  14400, -- SCT
        mvt   =  18000, -- MVT
        mut   =  14400, -- MUT
@@ -163,7 +133,6 @@ OFFSET = {
        ckt   = -36000, -- CKT
        taht  = -36000, -- TAHT
        gilt  =  43200, -- GILT
-       tot   =  46800, -- TOT
        wakt  =  43200, -- WAKT
        wft   =  43200, -- WFT
 }