luci-0.10: merge r7909

diff --git a/libs/sys/luasrc/sys/zoneinfo/tzdata.lua b/libs/sys/luasrc/sys/zoneinfo/tzdata.lua
index 2751b2af966afbd068cb2f5b41c7d796bfdb9f9a..1a99f6a7ebe857ab7cbc9cb91cfe5b54e260d810 100644 (file)
--- a/libs/sys/luasrc/sys/zoneinfo/tzdata.lua
+++ b/libs/sys/luasrc/sys/zoneinfo/tzdata.lua
@@ -36,6 +36,7 @@ TZ = {
        { 'Africa/Gaborone', 'CAT-2' },
        { 'Africa/Harare', 'CAT-2' },
        { 'Africa/Johannesburg', 'SAST-2' },
+       { 'Africa/Juba', 'EAT-3' },
        { 'Africa/Kampala', 'EAT-3' },
        { 'Africa/Khartoum', 'EAT-3' },
        { 'Africa/Kigali', 'CAT-2' },
@@ -81,7 +82,8 @@ TZ = {
        { 'America/Aruba', 'AST4' },
        { 'America/Asuncion', 'PYT4PYST,M10.1.0/0,M4.2.0/0' },
        { 'America/Atikokan', 'EST5' },
-       { 'America/Bahia', 'BRT3' },
+       { 'America/Bahia', 'BRT3BRST,M10.3.0/0,M2.3.0/0' },
+       { 'America/Bahia Banderas', 'CST6CDT,M4.1.0,M10.5.0' },
        { 'America/Barbados', 'AST4' },
        { 'America/Belem', 'BRT3' },
        { 'America/Belize', 'CST6' },
@@ -111,7 +113,7 @@ TZ = {
        { 'America/El Salvador', 'CST6' },
        { 'America/Fortaleza', 'BRT3' },
        { 'America/Glace Bay', 'AST4ADT,M3.2.0,M11.1.0' },
-       { 'America/Goose Bay', 'AST4ADT,M3.2.0/0:01,M11.1.0/0:01' },
+       { 'America/Goose Bay', 'AST4ADT,M3.2.0,M11.1.0' },
        { 'America/Grand Turk', 'EST5EDT,M3.2.0,M11.1.0' },
        { 'America/Grenada', 'AST4' },
        { 'America/Guadeloupe', 'AST4' },
@@ -135,9 +137,11 @@ TZ = {
        { 'America/Juneau', 'AKST9AKDT,M3.2.0,M11.1.0' },
        { 'America/Kentucky/Louisville', 'EST5EDT,M3.2.0,M11.1.0' },
        { 'America/Kentucky/Monticello', 'EST5EDT,M3.2.0,M11.1.0' },
+       { 'America/Kralendijk', 'AST4' },
        { 'America/La Paz', 'BOT4' },
        { 'America/Lima', 'PET5' },
        { 'America/Los Angeles', 'PST8PDT,M3.2.0,M11.1.0' },
+       { 'America/Lower Princes', 'AST4' },
        { 'America/Maceio', 'BRT3' },
        { 'America/Managua', 'CST6' },
        { 'America/Manaus', 'AMT4' },
@@ -147,6 +151,7 @@ TZ = {
        { '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' },
+       { 'America/Metlakatla', 'MeST8' },
        { 'America/Mexico City', 'CST6CDT,M4.1.0,M10.5.0' },
        { 'America/Miquelon', 'PMST3PMDT,M3.2.0,M11.1.0' },
        { 'America/Moncton', 'AST4ADT,M3.2.0,M11.1.0' },
@@ -159,6 +164,7 @@ TZ = {
        { 'America/Nipigon', 'EST5EDT,M3.2.0,M11.1.0' },
        { 'America/Nome', 'AKST9AKDT,M3.2.0,M11.1.0' },
        { 'America/Noronha', 'FNT2' },
+       { 'America/North Dakota/Beulah', 'CST6CDT,M3.2.0,M11.1.0' },
        { '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' },
@@ -174,6 +180,7 @@ TZ = {
        { 'America/Rankin Inlet', 'CST6CDT,M3.2.0,M11.1.0' },
        { 'America/Recife', 'BRT3' },
        { 'America/Regina', 'CST6' },
+       { 'America/Resolute', 'CST6CDT,M3.2.0,M11.1.0' },
        { 'America/Rio Branco', 'AMT4' },
        { 'America/Santa Isabel', 'PST8PDT,M4.1.0,M10.5.0' },
        { 'America/Santarem', 'BRT3' },
@@ -181,8 +188,9 @@ TZ = {
        { 'America/Sao Paulo', 'BRT3BRST,M10.3.0/0,M2.3.0/0' },
        { 'America/Scoresbysund', 'EGT1EGST,M3.5.0/0,M10.5.0/1' },
        { 'America/Shiprock', 'MST7MDT,M3.2.0,M11.1.0' },
+       { 'America/Sitka', 'AKST9AKDT,M3.2.0,M11.1.0' },
        { 'America/St Barthelemy', 'AST4' },
-       { 'America/St Johns', 'NST3:30NDT,M3.2.0/0:01,M11.1.0/0:01' },
+       { 'America/St Johns', 'NST3:30NDT,M3.2.0,M11.1.0' },
        { 'America/St Kitts', 'AST4' },
        { 'America/St Lucia', 'AST4' },
        { 'America/St Thomas', 'AST4' },
@@ -212,7 +220,7 @@ TZ = {
        { 'Arctic/Longyearbyen', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Asia/Aden', 'AST-3' },
        { 'Asia/Almaty', 'ALMT-6' },
-       { 'Asia/Anadyr', 'ANAT-11ANAST,M3.5.0,M10.5.0/3' },
+       { 'Asia/Anadyr', 'ANAT-12' },
        { 'Asia/Aqtau', 'AQTT-5' },
        { 'Asia/Aqtobe', 'AQTT-5' },
        { 'Asia/Ashgabat', 'TMT-5' },
@@ -231,33 +239,34 @@ TZ = {
        { 'Asia/Dili', 'TLT-9' },
        { 'Asia/Dubai', 'GST-4' },
        { 'Asia/Dushanbe', 'TJT-5' },
-       { 'Asia/Gaza', 'EET-2EEST,M3.5.6/0:01,M9.1.5' },
+       { 'Asia/Gaza', 'EET-2' },
        { 'Asia/Harbin', 'CST-8' },
+       { 'Asia/Hebron', 'EET-2' },
        { 'Asia/Ho Chi Minh', 'ICT-7' },
        { 'Asia/Hong Kong', 'HKT-8' },
        { 'Asia/Hovd', 'HOVT-7' },
-       { 'Asia/Irkutsk', 'IRKT-8IRKST,M3.5.0,M10.5.0/3' },
+       { 'Asia/Irkutsk', 'IRKT-9' },
        { 'Asia/Jakarta', 'WIT-7' },
        { 'Asia/Jayapura', 'EIT-9' },
        { 'Asia/Kabul', 'AFT-4:30' },
-       { 'Asia/Kamchatka', 'PETT-11PETST,M3.5.0,M10.5.0/3' },
+       { 'Asia/Kamchatka', 'PETT-12' },
        { 'Asia/Karachi', 'PKT-5' },
        { 'Asia/Kashgar', 'CST-8' },
        { 'Asia/Kathmandu', 'NPT-5:45' },
        { 'Asia/Kolkata', 'IST-5:30' },
-       { 'Asia/Krasnoyarsk', 'KRAT-7KRAST,M3.5.0,M10.5.0/3' },
+       { 'Asia/Krasnoyarsk', 'KRAT-8' },
        { 'Asia/Kuala Lumpur', 'MYT-8' },
        { 'Asia/Kuching', 'MYT-8' },
        { 'Asia/Kuwait', 'AST-3' },
        { 'Asia/Macau', 'CST-8' },
-       { 'Asia/Magadan', 'MAGT-11MAGST,M3.5.0,M10.5.0/3' },
+       { 'Asia/Magadan', 'MAGT-12' },
        { 'Asia/Makassar', 'CIT-8' },
        { '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/Novokuznetsk', 'NOVT-7' },
+       { 'Asia/Novosibirsk', 'NOVT-7' },
+       { 'Asia/Omsk', 'OMST-7' },
        { 'Asia/Oral', 'ORAT-5' },
        { 'Asia/Phnom Penh', 'ICT-7' },
        { 'Asia/Pontianak', 'WIT-7' },
@@ -266,7 +275,7 @@ TZ = {
        { 'Asia/Qyzylorda', 'QYZT-6' },
        { 'Asia/Rangoon', 'MMT-6:30' },
        { 'Asia/Riyadh', 'AST-3' },
-       { 'Asia/Sakhalin', 'SAKT-10SAKST,M3.5.0,M10.5.0/3' },
+       { 'Asia/Sakhalin', 'SAKT-11' },
        { 'Asia/Samarkand', 'UZT-5' },
        { 'Asia/Seoul', 'KST-9' },
        { 'Asia/Shanghai', 'CST-8' },
@@ -279,9 +288,9 @@ TZ = {
        { 'Asia/Ulaanbaatar', 'ULAT-8' },
        { 'Asia/Urumqi', 'CST-8' },
        { 'Asia/Vientiane', 'ICT-7' },
-       { 'Asia/Vladivostok', 'VLAT-10VLAST,M3.5.0,M10.5.0/3' },
-       { 'Asia/Yakutsk', 'YAKT-9YAKST,M3.5.0,M10.5.0/3' },
-       { 'Asia/Yekaterinburg', 'YEKT-5YEKST,M3.5.0,M10.5.0/3' },
+       { 'Asia/Vladivostok', 'VLAT-11' },
+       { 'Asia/Yakutsk', 'YAKT-10' },
+       { 'Asia/Yekaterinburg', 'YEKT-6' },
        { 'Asia/Yerevan', 'AMT-4AMST,M3.5.0,M10.5.0/3' },
        { 'Atlantic/Azores', 'AZOT1AZOST,M3.5.0/0,M10.5.0/1' },
        { 'Atlantic/Bermuda', 'AST4ADT,M3.2.0,M11.1.0' },
@@ -323,7 +332,7 @@ TZ = {
        { '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/Jersey', 'GMT0BST,M3.5.0/1,M10.5.0' },
-       { 'Europe/Kaliningrad', 'EET-2EEST,M3.5.0,M10.5.0/3' },
+       { 'Europe/Kaliningrad', 'FET-3' },
        { 'Europe/Kiev', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
        { 'Europe/Lisbon', 'WET0WEST,M3.5.0/1,M10.5.0' },
        { 'Europe/Ljubljana', 'CET-1CEST,M3.5.0,M10.5.0/3' },
@@ -332,16 +341,16 @@ 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', 'EET-2EEST,M3.5.0,M10.5.0/3' },
+       { 'Europe/Minsk', 'FET-3' },
        { 'Europe/Monaco', 'CET-1CEST,M3.5.0,M10.5.0/3' },
-       { 'Europe/Moscow', 'MSK-3MSD,M3.5.0,M10.5.0/3' },
+       { 'Europe/Moscow', 'MSK-4' },
        { 'Europe/Oslo', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Paris', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { 'Europe/Podgorica', 'CET-1CEST,M3.5.0,M10.5.0/3' },
        { '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-3SAMST,M3.5.0,M10.5.0/3' },
+       { 'Europe/Samara', 'SAMT-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', 'EET-2EEST,M3.5.0/3,M10.5.0/4' },
@@ -355,7 +364,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', 'VOLT-3VOLST,M3.5.0,M10.5.0/3' },
+       { 'Europe/Volgograd', 'VOLT-4' },
        { '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' },
@@ -371,9 +380,10 @@ TZ = {
        { 'Indian/Mauritius', 'MUT-4' },
        { 'Indian/Mayotte', 'EAT-3' },
        { 'Indian/Reunion', 'RET-4' },
-       { 'Pacific/Apia', 'WST11' },
+       { 'Pacific/Apia', 'WST-13' },
        { 'Pacific/Auckland', 'NZST-12NZDT,M9.5.0,M4.1.0/3' },
        { 'Pacific/Chatham', 'CHAST-12:45CHADT,M9.5.0/2:45,M4.1.0/3:45' },
+       { 'Pacific/Chuuk', 'CHUT-10' },
        { 'Pacific/Efate', 'VUT-11' },
        { 'Pacific/Enderbury', 'PHOT-13' },
        { 'Pacific/Fakaofo', 'TKT10' },
@@ -398,14 +408,13 @@ TZ = {
        { 'Pacific/Pago Pago', 'SST11' },
        { 'Pacific/Palau', 'PWT-9' },
        { 'Pacific/Pitcairn', 'PST8' },
-       { 'Pacific/Ponape', 'PONT-11' },
+       { 'Pacific/Pohnpei', 'PONT-11' },
        { 'Pacific/Port Moresby', 'PGT-10' },
        { 'Pacific/Rarotonga', 'CKT10' },
        { 'Pacific/Saipan', 'ChST-10' },
        { 'Pacific/Tahiti', 'TAHT10' },
        { 'Pacific/Tarawa', 'GILT-12' },
        { 'Pacific/Tongatapu', 'TOT-13' },
-       { 'Pacific/Truk', 'TRUT-10' },
        { 'Pacific/Wake', 'WAKT-12' },
        { 'Pacific/Wallis', 'WFT-12' },
 }

diff --git a/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua b/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua
index 593492ace6e96d0636414a2b44580913e738e32c..bbe75d5a47b1e6e8db392653e5b4c8792930ea71 100644 (file)
--- a/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua
+++ b/libs/sys/luasrc/sys/zoneinfo/tzoffset.lua
@@ -31,6 +31,7 @@ OFFSET = {
        pyst  = -10800, -- PYST
        est   = -18000, -- EST
        cst   = -21600, -- CST
+       cdt   = -18000, -- CDT
        amt   = -14400, -- AMT
        cot   = -18000, -- COT
        mst   = -25200, -- MST
@@ -64,8 +65,7 @@ OFFSET = {
        syot  =  10800, -- SYOT
        vost  =  21600, -- VOST
        almt  =  21600, -- ALMT
-       anat  =  39600, -- ANAT
-       anast =  43200, -- ANAST
+       anat  =  43200, -- ANAT
        aqtt  =  18000, -- AQTT
        tmt   =  18000, -- TMT
        azt   =  14400, -- AZT
@@ -81,44 +81,34 @@ OFFSET = {
        tjt   =  18000, -- TJT
        hkt   =  28800, -- HKT
        hovt  =  25200, -- HOVT
-       irkt  =  28800, -- IRKT
-       irkst =  32400, -- IRKST
+       irkt  =  32400, -- IRKT
        wit   =  25200, -- WIT
        eit   =  32400, -- EIT
        aft   =  16200, -- AFT
-       pett  =  39600, -- PETT
-       petst =  43200, -- PETST
+       pett  =  43200, -- PETT
        pkt   =  18000, -- PKT
        npt   =  20700, -- NPT
-       krat  =  25200, -- KRAT
-       krast =  28800, -- KRAST
+       krat  =  28800, -- KRAT
        myt   =  28800, -- MYT
-       magt  =  39600, -- MAGT
-       magst =  43200, -- MAGST
+       magt  =  43200, -- MAGT
        cit   =  28800, -- CIT
        pht   =  28800, -- PHT
-       novt  =  21600, -- NOVT
-       novst =  25200, -- NOVST
-       omst  =  21600, -- OMST
-       omsst =  25200, -- OMSST
+       novt  =  25200, -- NOVT
+       omst  =  25200, -- OMST
        orat  =  18000, -- ORAT
        kst   =  32400, -- KST
        qyzt  =  21600, -- QYZT
        mmt   =  23400, -- MMT
-       sakt  =  36000, -- SAKT
-       sakst =  39600, -- SAKST
+       sakt  =  39600, -- SAKT
        uzt   =  18000, -- UZT
        sgt   =  28800, -- SGT
        get   =  14400, -- GET
        btt   =  21600, -- BTT
        jst   =  32400, -- JST
        ulat  =  28800, -- ULAT
-       vlat  =  36000, -- VLAT
-       vlast =  39600, -- VLAST
-       yakt  =  32400, -- YAKT
-       yakst =  36000, -- YAKST
-       yekt  =  18000, -- YEKT
-       yekst =  21600, -- YEKST
+       vlat  =  39600, -- VLAT
+       yakt  =  36000, -- YAKT
+       yekt  =  21600, -- YEKT
        azot  =  -3600, -- AZOT
        azost =      0, -- AZOST
        cvt   =  -3600, -- CVT
@@ -127,12 +117,10 @@ OFFSET = {
        cwst  =  31500, -- CWST
        lhst  =  37800, -- LHST
        lhst  =  39600, -- LHST
-       msk   =  10800, -- MSK
-       msd   =  14400, -- MSD
-       samt  =  10800, -- SAMT
-       samst =  14400, -- SAMST
-       volt  =  10800, -- VOLT
-       volst =  14400, -- VOLST
+       fet   =  10800, -- FET
+       msk   =  14400, -- MSK
+       samt  =  14400, -- SAMT
+       volt  =  14400, -- VOLT
        iot   =  21600, -- IOT
        cxt   =  25200, -- CXT
        cct   =  23400, -- CCT
@@ -143,6 +131,7 @@ OFFSET = {
        ret   =  14400, -- RET
        chast =  45900, -- CHAST
        chadt =  49500, -- CHADT
+       chut  =  36000, -- CHUT
        vut   =  39600, -- VUT
        phot  =  46800, -- PHOT
        tkt   = -36000, -- TKT
@@ -168,7 +157,6 @@ OFFSET = {
        taht  = -36000, -- TAHT
        gilt  =  43200, -- GILT
        tot   =  46800, -- TOT
-       trut  =  36000, -- TRUT
        wakt  =  43200, -- WAKT
        wft   =  43200, -- WFT
 }