tzinfo 0.3.12 → 0.3.13

data/CHANGES

@@ -1,3 +1,12 @@
+== Version 0.3.13 (tzdata v2009f) - 15-Apr-2009
+
+* Updated to tzdata version 2009f
+  (http://article.gmane.org/gmane.comp.time.tz/2668).
+* Untaint the timezone module filename after validation to allow use
+  with $SAFE == 1 (e.g. under mod_ruby). Thanks to Dmitry Borodaenko for
+  the suggestion. Closes #25349.
+
+
 == Version 0.3.12 (tzdata v2008i) - 12-Nov-2008
 
 * Updated to tzdata version 2008i

data/Rakefile

@@ -16,7 +16,7 @@ require 'rake/rdoctask'
 require 'rake/gempackagetask'
 require 'fileutils'
 
-PKG_VERSION = "0.3.12"
+PKG_VERSION = "0.3.13"
 PKG_FILES = FileList[
   'CHANGES',
   'LICENSE',

data/lib/tzinfo/definitions/Africa/Casablanca.rb

@@ -33,6 +33,8 @@ module TZInfo
           tz.transition 1985, 12, :o1, 504918000
           tz.transition 2008, 6, :o2, 1212278400
           tz.transition 2008, 8, :o1, 1220223600
+          tz.transition 2009, 6, :o2, 1243814400
+          tz.transition 2009, 8, :o1, 1250809200
         end
       end
     end

data/lib/tzinfo/definitions/Africa/Tunis.rb

@@ -46,8 +46,6 @@ module TZInfo
           tz.transition 2007, 10, :o2, 1193533200
           tz.transition 2008, 3, :o3, 1206838800
           tz.transition 2008, 10, :o2, 1224982800
-          tz.transition 2009, 3, :o3, 1238288400
-          tz.transition 2009, 10, :o2, 1256432400
           tz.transition 2010, 3, :o3, 1269738000
           tz.transition 2010, 10, :o2, 1288486800
           tz.transition 2011, 3, :o3, 1301187600

data/lib/tzinfo/definitions/America/Argentina/San_Luis.rb

@@ -75,6 +75,89 @@ module TZInfo
             tz.transition 2004, 7, :o4, 1090728000
             tz.transition 2007, 12, :o5, 1198983600
             tz.transition 2008, 1, :o4, 1200880800
+            tz.transition 2009, 3, :o6, 1237086000
+            tz.transition 2009, 10, :o7, 1255838400
+            tz.transition 2010, 3, :o6, 1269140400
+            tz.transition 2010, 10, :o7, 1287288000
+            tz.transition 2011, 3, :o6, 1300590000
+            tz.transition 2011, 10, :o7, 1318737600
+            tz.transition 2012, 3, :o6, 1332039600
+            tz.transition 2012, 10, :o7, 1350792000
+            tz.transition 2013, 3, :o6, 1363489200
+            tz.transition 2013, 10, :o7, 1382241600
+            tz.transition 2014, 3, :o6, 1394938800
+            tz.transition 2014, 10, :o7, 1413691200
+            tz.transition 2015, 3, :o6, 1426388400
+            tz.transition 2015, 10, :o7, 1445140800
+            tz.transition 2016, 3, :o6, 1458442800
+            tz.transition 2016, 10, :o7, 1476590400
+            tz.transition 2017, 3, :o6, 1489892400
+            tz.transition 2017, 10, :o7, 1508040000
+            tz.transition 2018, 3, :o6, 1521342000
+            tz.transition 2018, 10, :o7, 1540094400
+            tz.transition 2019, 3, :o6, 1552791600
+            tz.transition 2019, 10, :o7, 1571544000
+            tz.transition 2020, 3, :o6, 1584241200
+            tz.transition 2020, 10, :o7, 1602993600
+            tz.transition 2021, 3, :o6, 1616295600
+            tz.transition 2021, 10, :o7, 1634443200
+            tz.transition 2022, 3, :o6, 1647745200
+            tz.transition 2022, 10, :o7, 1665892800
+            tz.transition 2023, 3, :o6, 1679194800
+            tz.transition 2023, 10, :o7, 1697342400
+            tz.transition 2024, 3, :o6, 1710644400
+            tz.transition 2024, 10, :o7, 1729396800
+            tz.transition 2025, 3, :o6, 1742094000
+            tz.transition 2025, 10, :o7, 1760846400
+            tz.transition 2026, 3, :o6, 1773543600
+            tz.transition 2026, 10, :o7, 1792296000
+            tz.transition 2027, 3, :o6, 1805598000
+            tz.transition 2027, 10, :o7, 1823745600
+            tz.transition 2028, 3, :o6, 1837047600
+            tz.transition 2028, 10, :o7, 1855195200
+            tz.transition 2029, 3, :o6, 1868497200
+            tz.transition 2029, 10, :o7, 1887249600
+            tz.transition 2030, 3, :o6, 1899946800
+            tz.transition 2030, 10, :o7, 1918699200
+            tz.transition 2031, 3, :o6, 1931396400
+            tz.transition 2031, 10, :o7, 1950148800
+            tz.transition 2032, 3, :o6, 1963450800
+            tz.transition 2032, 10, :o7, 1981598400
+            tz.transition 2033, 3, :o6, 1994900400
+            tz.transition 2033, 10, :o7, 2013048000
+            tz.transition 2034, 3, :o6, 2026350000
+            tz.transition 2034, 10, :o7, 2044497600
+            tz.transition 2035, 3, :o6, 2057799600
+            tz.transition 2035, 10, :o7, 2076552000
+            tz.transition 2036, 3, :o6, 2089249200
+            tz.transition 2036, 10, :o7, 2108001600
+            tz.transition 2037, 3, :o6, 2120698800
+            tz.transition 2037, 10, :o7, 2139451200
+            tz.transition 2038, 3, :o6, 19724029, 8
+            tz.transition 2038, 10, :o7, 7397141, 3
+            tz.transition 2039, 3, :o6, 19726941, 8
+            tz.transition 2039, 10, :o7, 7398233, 3
+            tz.transition 2040, 3, :o6, 19729853, 8
+            tz.transition 2040, 10, :o7, 7399346, 3
+            tz.transition 2041, 3, :o6, 19732765, 8
+            tz.transition 2041, 10, :o7, 7400438, 3
+            tz.transition 2042, 3, :o6, 19735677, 8
+            tz.transition 2042, 10, :o7, 7401530, 3
+            tz.transition 2043, 3, :o6, 19738589, 8
+            tz.transition 2043, 10, :o7, 7402622, 3
+            tz.transition 2044, 3, :o6, 19741557, 8
+            tz.transition 2044, 10, :o7, 7403714, 3
+            tz.transition 2045, 3, :o6, 19744469, 8
+            tz.transition 2045, 10, :o7, 7404806, 3
+            tz.transition 2046, 3, :o6, 19747381, 8
+            tz.transition 2046, 10, :o7, 7405919, 3
+            tz.transition 2047, 3, :o6, 19750293, 8
+            tz.transition 2047, 10, :o7, 7407011, 3
+            tz.transition 2048, 3, :o6, 19753205, 8
+            tz.transition 2048, 10, :o7, 7408103, 3
+            tz.transition 2049, 3, :o6, 19756173, 8
+            tz.transition 2049, 10, :o7, 7409195, 3
+            tz.transition 2050, 3, :o6, 19759085, 8
           end
         end
       end

data/lib/tzinfo/definitions/America/Havana.rb

@@ -110,89 +110,89 @@ module TZInfo
           tz.transition 2007, 10, :o2, 1193547600
           tz.transition 2008, 3, :o3, 1205643600
           tz.transition 2008, 10, :o2, 1224997200
-          tz.transition 2009, 3, :o3, 1237093200
+          tz.transition 2009, 3, :o3, 1236488400
           tz.transition 2009, 10, :o2, 1256446800
-          tz.transition 2010, 3, :o3, 1269147600
+          tz.transition 2010, 3, :o3, 1268542800
           tz.transition 2010, 10, :o2, 1288501200
-          tz.transition 2011, 3, :o3, 1300597200
+          tz.transition 2011, 3, :o3, 1299992400
           tz.transition 2011, 10, :o2, 1319950800
-          tz.transition 2012, 3, :o3, 1332046800
+          tz.transition 2012, 3, :o3, 1331442000
           tz.transition 2012, 10, :o2, 1351400400
-          tz.transition 2013, 3, :o3, 1363496400
+          tz.transition 2013, 3, :o3, 1362891600
           tz.transition 2013, 10, :o2, 1382850000
-          tz.transition 2014, 3, :o3, 1394946000
+          tz.transition 2014, 3, :o3, 1394341200
           tz.transition 2014, 10, :o2, 1414299600
-          tz.transition 2015, 3, :o3, 1426395600
+          tz.transition 2015, 3, :o3, 1425790800
           tz.transition 2015, 10, :o2, 1445749200
-          tz.transition 2016, 3, :o3, 1458450000
+          tz.transition 2016, 3, :o3, 1457845200
           tz.transition 2016, 10, :o2, 1477803600
-          tz.transition 2017, 3, :o3, 1489899600
+          tz.transition 2017, 3, :o3, 1489294800
           tz.transition 2017, 10, :o2, 1509253200
-          tz.transition 2018, 3, :o3, 1521349200
+          tz.transition 2018, 3, :o3, 1520744400
           tz.transition 2018, 10, :o2, 1540702800
-          tz.transition 2019, 3, :o3, 1552798800
+          tz.transition 2019, 3, :o3, 1552194000
           tz.transition 2019, 10, :o2, 1572152400
-          tz.transition 2020, 3, :o3, 1584248400
+          tz.transition 2020, 3, :o3, 1583643600
           tz.transition 2020, 10, :o2, 1603602000
-          tz.transition 2021, 3, :o3, 1616302800
+          tz.transition 2021, 3, :o3, 1615698000
           tz.transition 2021, 10, :o2, 1635656400
-          tz.transition 2022, 3, :o3, 1647752400
+          tz.transition 2022, 3, :o3, 1647147600
           tz.transition 2022, 10, :o2, 1667106000
-          tz.transition 2023, 3, :o3, 1679202000
+          tz.transition 2023, 3, :o3, 1678597200
           tz.transition 2023, 10, :o2, 1698555600
-          tz.transition 2024, 3, :o3, 1710651600
+          tz.transition 2024, 3, :o3, 1710046800
           tz.transition 2024, 10, :o2, 1730005200
-          tz.transition 2025, 3, :o3, 1742101200
+          tz.transition 2025, 3, :o3, 1741496400
           tz.transition 2025, 10, :o2, 1761454800
-          tz.transition 2026, 3, :o3, 1773550800
+          tz.transition 2026, 3, :o3, 1772946000
           tz.transition 2026, 10, :o2, 1792904400
-          tz.transition 2027, 3, :o3, 1805605200
+          tz.transition 2027, 3, :o3, 1805000400
           tz.transition 2027, 10, :o2, 1824958800
-          tz.transition 2028, 3, :o3, 1837054800
+          tz.transition 2028, 3, :o3, 1836450000
           tz.transition 2028, 10, :o2, 1856408400
-          tz.transition 2029, 3, :o3, 1868504400
+          tz.transition 2029, 3, :o3, 1867899600
           tz.transition 2029, 10, :o2, 1887858000
-          tz.transition 2030, 3, :o3, 1899954000
+          tz.transition 2030, 3, :o3, 1899349200
           tz.transition 2030, 10, :o2, 1919307600
-          tz.transition 2031, 3, :o3, 1931403600
+          tz.transition 2031, 3, :o3, 1930798800
           tz.transition 2031, 10, :o2, 1950757200
-          tz.transition 2032, 3, :o3, 1963458000
+          tz.transition 2032, 3, :o3, 1962853200
           tz.transition 2032, 10, :o2, 1982811600
-          tz.transition 2033, 3, :o3, 1994907600
+          tz.transition 2033, 3, :o3, 1994302800
           tz.transition 2033, 10, :o2, 2014261200
-          tz.transition 2034, 3, :o3, 2026357200
+          tz.transition 2034, 3, :o3, 2025752400
           tz.transition 2034, 10, :o2, 2045710800
-          tz.transition 2035, 3, :o3, 2057806800
+          tz.transition 2035, 3, :o3, 2057202000
           tz.transition 2035, 10, :o2, 2077160400
-          tz.transition 2036, 3, :o3, 2089256400
+          tz.transition 2036, 3, :o3, 2088651600
           tz.transition 2036, 10, :o2, 2108610000
-          tz.transition 2037, 3, :o3, 2120706000
+          tz.transition 2037, 3, :o3, 2120101200
           tz.transition 2037, 10, :o2, 2140059600
-          tz.transition 2038, 3, :o3, 59172089, 24
+          tz.transition 2038, 3, :o3, 59171921, 24
           tz.transition 2038, 10, :o2, 59177465, 24
-          tz.transition 2039, 3, :o3, 59180825, 24
+          tz.transition 2039, 3, :o3, 59180657, 24
           tz.transition 2039, 10, :o2, 59186201, 24
-          tz.transition 2040, 3, :o3, 59189561, 24
+          tz.transition 2040, 3, :o3, 59189393, 24
           tz.transition 2040, 10, :o2, 59194937, 24
-          tz.transition 2041, 3, :o3, 59198297, 24
+          tz.transition 2041, 3, :o3, 59198129, 24
           tz.transition 2041, 10, :o2, 59203673, 24
-          tz.transition 2042, 3, :o3, 59207033, 24
+          tz.transition 2042, 3, :o3, 59206865, 24
           tz.transition 2042, 10, :o2, 59212409, 24
-          tz.transition 2043, 3, :o3, 59215769, 24
+          tz.transition 2043, 3, :o3, 59215601, 24
           tz.transition 2043, 10, :o2, 59221145, 24
-          tz.transition 2044, 3, :o3, 59224673, 24
+          tz.transition 2044, 3, :o3, 59224505, 24
           tz.transition 2044, 10, :o2, 59230049, 24
-          tz.transition 2045, 3, :o3, 59233409, 24
+          tz.transition 2045, 3, :o3, 59233241, 24
           tz.transition 2045, 10, :o2, 59238785, 24
-          tz.transition 2046, 3, :o3, 59242145, 24
+          tz.transition 2046, 3, :o3, 59241977, 24
           tz.transition 2046, 10, :o2, 59247521, 24
-          tz.transition 2047, 3, :o3, 59250881, 24
+          tz.transition 2047, 3, :o3, 59250713, 24
           tz.transition 2047, 10, :o2, 59256257, 24
-          tz.transition 2048, 3, :o3, 59259617, 24
+          tz.transition 2048, 3, :o3, 59259449, 24
           tz.transition 2048, 10, :o2, 59264993, 24
-          tz.transition 2049, 3, :o3, 59268521, 24
+          tz.transition 2049, 3, :o3, 59268353, 24
           tz.transition 2049, 10, :o2, 59273897, 24
-          tz.transition 2050, 3, :o3, 59277257, 24
+          tz.transition 2050, 3, :o3, 59277089, 24
           tz.transition 2050, 10, :o2, 59282633, 24
         end
       end

data/lib/tzinfo/definitions/America/Resolute.rb

@@ -12,6 +12,7 @@ module TZInfo
           tz.offset :o2, -21600, 7200, :CDDT
           tz.offset :o3, -21600, 3600, :CDT
           tz.offset :o4, -18000, 0, :EST
+          tz.offset :o5, -18000, 0, :CDT
           
           tz.transition 1947, 8, :o1, 4864857, 2
           tz.transition 1965, 4, :o2, 9755503, 4
@@ -70,6 +71,94 @@ module TZInfo
           tz.transition 2005, 10, :o1, 1130655600
           tz.transition 2006, 4, :o3, 1143964800
           tz.transition 2006, 10, :o4, 1162105200
+          tz.transition 2007, 3, :o5, 1173596400
+          tz.transition 2007, 11, :o4, 1194159600
+          tz.transition 2008, 3, :o5, 1205046000
+          tz.transition 2008, 11, :o4, 1225609200
+          tz.transition 2009, 3, :o5, 1236495600
+          tz.transition 2009, 11, :o4, 1257058800
+          tz.transition 2010, 3, :o5, 1268550000
+          tz.transition 2010, 11, :o4, 1289113200
+          tz.transition 2011, 3, :o5, 1299999600
+          tz.transition 2011, 11, :o4, 1320562800
+          tz.transition 2012, 3, :o5, 1331449200
+          tz.transition 2012, 11, :o4, 1352012400
+          tz.transition 2013, 3, :o5, 1362898800
+          tz.transition 2013, 11, :o4, 1383462000
+          tz.transition 2014, 3, :o5, 1394348400
+          tz.transition 2014, 11, :o4, 1414911600
+          tz.transition 2015, 3, :o5, 1425798000
+          tz.transition 2015, 11, :o4, 1446361200
+          tz.transition 2016, 3, :o5, 1457852400
+          tz.transition 2016, 11, :o4, 1478415600
+          tz.transition 2017, 3, :o5, 1489302000
+          tz.transition 2017, 11, :o4, 1509865200
+          tz.transition 2018, 3, :o5, 1520751600
+          tz.transition 2018, 11, :o4, 1541314800
+          tz.transition 2019, 3, :o5, 1552201200
+          tz.transition 2019, 11, :o4, 1572764400
+          tz.transition 2020, 3, :o5, 1583650800
+          tz.transition 2020, 11, :o4, 1604214000
+          tz.transition 2021, 3, :o5, 1615705200
+          tz.transition 2021, 11, :o4, 1636268400
+          tz.transition 2022, 3, :o5, 1647154800
+          tz.transition 2022, 11, :o4, 1667718000
+          tz.transition 2023, 3, :o5, 1678604400
+          tz.transition 2023, 11, :o4, 1699167600
+          tz.transition 2024, 3, :o5, 1710054000
+          tz.transition 2024, 11, :o4, 1730617200
+          tz.transition 2025, 3, :o5, 1741503600
+          tz.transition 2025, 11, :o4, 1762066800
+          tz.transition 2026, 3, :o5, 1772953200
+          tz.transition 2026, 11, :o4, 1793516400
+          tz.transition 2027, 3, :o5, 1805007600
+          tz.transition 2027, 11, :o4, 1825570800
+          tz.transition 2028, 3, :o5, 1836457200
+          tz.transition 2028, 11, :o4, 1857020400
+          tz.transition 2029, 3, :o5, 1867906800
+          tz.transition 2029, 11, :o4, 1888470000
+          tz.transition 2030, 3, :o5, 1899356400
+          tz.transition 2030, 11, :o4, 1919919600
+          tz.transition 2031, 3, :o5, 1930806000
+          tz.transition 2031, 11, :o4, 1951369200
+          tz.transition 2032, 3, :o5, 1962860400
+          tz.transition 2032, 11, :o4, 1983423600
+          tz.transition 2033, 3, :o5, 1994310000
+          tz.transition 2033, 11, :o4, 2014873200
+          tz.transition 2034, 3, :o5, 2025759600
+          tz.transition 2034, 11, :o4, 2046322800
+          tz.transition 2035, 3, :o5, 2057209200
+          tz.transition 2035, 11, :o4, 2077772400
+          tz.transition 2036, 3, :o5, 2088658800
+          tz.transition 2036, 11, :o4, 2109222000
+          tz.transition 2037, 3, :o5, 2120108400
+          tz.transition 2037, 11, :o4, 2140671600
+          tz.transition 2038, 3, :o5, 59171923, 24
+          tz.transition 2038, 11, :o4, 59177635, 24
+          tz.transition 2039, 3, :o5, 59180659, 24
+          tz.transition 2039, 11, :o4, 59186371, 24
+          tz.transition 2040, 3, :o5, 59189395, 24
+          tz.transition 2040, 11, :o4, 59195107, 24
+          tz.transition 2041, 3, :o5, 59198131, 24
+          tz.transition 2041, 11, :o4, 59203843, 24
+          tz.transition 2042, 3, :o5, 59206867, 24
+          tz.transition 2042, 11, :o4, 59212579, 24
+          tz.transition 2043, 3, :o5, 59215603, 24
+          tz.transition 2043, 11, :o4, 59221315, 24
+          tz.transition 2044, 3, :o5, 59224507, 24
+          tz.transition 2044, 11, :o4, 59230219, 24
+          tz.transition 2045, 3, :o5, 59233243, 24
+          tz.transition 2045, 11, :o4, 59238955, 24
+          tz.transition 2046, 3, :o5, 59241979, 24
+          tz.transition 2046, 11, :o4, 59247691, 24
+          tz.transition 2047, 3, :o5, 59250715, 24
+          tz.transition 2047, 11, :o4, 59256427, 24
+          tz.transition 2048, 3, :o5, 59259451, 24
+          tz.transition 2048, 11, :o4, 59265163, 24
+          tz.transition 2049, 3, :o5, 59268355, 24
+          tz.transition 2049, 11, :o4, 59274067, 24
+          tz.transition 2050, 3, :o5, 59277091, 24
+          tz.transition 2050, 11, :o4, 59282803, 24
         end
       end
     end

data/lib/tzinfo/definitions/Asia/Amman.rb

@@ -53,108 +53,108 @@ module TZInfo
           tz.transition 1998, 4, :o2, 891554400
           tz.transition 1998, 9, :o1, 906069600
           tz.transition 1999, 6, :o2, 930780000
-          tz.transition 1999, 9, :o1, 938642400
+          tz.transition 1999, 9, :o1, 938124000
           tz.transition 2000, 3, :o2, 954367200
-          tz.transition 2000, 9, :o1, 970092000
+          tz.transition 2000, 9, :o1, 970178400
           tz.transition 2001, 3, :o2, 985816800
-          tz.transition 2001, 9, :o1, 1001541600
-          tz.transition 2002, 3, :o2, 1017266400
-          tz.transition 2002, 9, :o1, 1032991200
-          tz.transition 2003, 3, :o2, 1048716000
+          tz.transition 2001, 9, :o1, 1001628000
+          tz.transition 2002, 3, :o2, 1017352800
+          tz.transition 2002, 9, :o1, 1033077600
+          tz.transition 2003, 3, :o2, 1048802400
           tz.transition 2003, 10, :o1, 1066946400
-          tz.transition 2004, 3, :o2, 1080165600
+          tz.transition 2004, 3, :o2, 1080252000
           tz.transition 2004, 10, :o1, 1097791200
-          tz.transition 2005, 3, :o2, 1112220000
+          tz.transition 2005, 3, :o2, 1111701600
           tz.transition 2005, 9, :o1, 1128031200
-          tz.transition 2006, 3, :o2, 1143669600
+          tz.transition 2006, 3, :o2, 1143756000
           tz.transition 2006, 10, :o1, 1161900000
-          tz.transition 2007, 3, :o2, 1175119200
+          tz.transition 2007, 3, :o2, 1175205600
           tz.transition 2007, 10, :o1, 1193349600
-          tz.transition 2008, 3, :o2, 1206568800
+          tz.transition 2008, 3, :o2, 1206655200
           tz.transition 2008, 10, :o1, 1225404000
-          tz.transition 2009, 3, :o2, 1238018400
+          tz.transition 2009, 3, :o2, 1238104800
           tz.transition 2009, 10, :o1, 1256853600
-          tz.transition 2010, 3, :o2, 1269468000
+          tz.transition 2010, 3, :o2, 1269554400
           tz.transition 2010, 10, :o1, 1288303200
-          tz.transition 2011, 3, :o2, 1301522400
+          tz.transition 2011, 3, :o2, 1301004000
           tz.transition 2011, 10, :o1, 1319752800
-          tz.transition 2012, 3, :o2, 1332972000
+          tz.transition 2012, 3, :o2, 1333058400
           tz.transition 2012, 10, :o1, 1351202400
-          tz.transition 2013, 3, :o2, 1364421600
+          tz.transition 2013, 3, :o2, 1364508000
           tz.transition 2013, 10, :o1, 1382652000
-          tz.transition 2014, 3, :o2, 1395871200
+          tz.transition 2014, 3, :o2, 1395957600
           tz.transition 2014, 10, :o1, 1414706400
-          tz.transition 2015, 3, :o2, 1427320800
+          tz.transition 2015, 3, :o2, 1427407200
           tz.transition 2015, 10, :o1, 1446156000
-          tz.transition 2016, 3, :o2, 1459375200
+          tz.transition 2016, 3, :o2, 1458856800
           tz.transition 2016, 10, :o1, 1477605600
-          tz.transition 2017, 3, :o2, 1490824800
+          tz.transition 2017, 3, :o2, 1490911200
           tz.transition 2017, 10, :o1, 1509055200
-          tz.transition 2018, 3, :o2, 1522274400
+          tz.transition 2018, 3, :o2, 1522360800
           tz.transition 2018, 10, :o1, 1540504800
-          tz.transition 2019, 3, :o2, 1553724000
+          tz.transition 2019, 3, :o2, 1553810400
           tz.transition 2019, 10, :o1, 1571954400
-          tz.transition 2020, 3, :o2, 1585173600
+          tz.transition 2020, 3, :o2, 1585260000
           tz.transition 2020, 10, :o1, 1604008800
-          tz.transition 2021, 3, :o2, 1616623200
+          tz.transition 2021, 3, :o2, 1616709600
           tz.transition 2021, 10, :o1, 1635458400
-          tz.transition 2022, 3, :o2, 1648677600
+          tz.transition 2022, 3, :o2, 1648159200
           tz.transition 2022, 10, :o1, 1666908000
-          tz.transition 2023, 3, :o2, 1680127200
+          tz.transition 2023, 3, :o2, 1680213600
           tz.transition 2023, 10, :o1, 1698357600
-          tz.transition 2024, 3, :o2, 1711576800
+          tz.transition 2024, 3, :o2, 1711663200
           tz.transition 2024, 10, :o1, 1729807200
-          tz.transition 2025, 3, :o2, 1743026400
+          tz.transition 2025, 3, :o2, 1743112800
           tz.transition 2025, 10, :o1, 1761861600
-          tz.transition 2026, 3, :o2, 1774476000
+          tz.transition 2026, 3, :o2, 1774562400
           tz.transition 2026, 10, :o1, 1793311200
-          tz.transition 2027, 3, :o2, 1805925600
+          tz.transition 2027, 3, :o2, 1806012000
           tz.transition 2027, 10, :o1, 1824760800
-          tz.transition 2028, 3, :o2, 1837980000
+          tz.transition 2028, 3, :o2, 1838066400
           tz.transition 2028, 10, :o1, 1856210400
-          tz.transition 2029, 3, :o2, 1869429600
+          tz.transition 2029, 3, :o2, 1869516000
           tz.transition 2029, 10, :o1, 1887660000
-          tz.transition 2030, 3, :o2, 1900879200
+          tz.transition 2030, 3, :o2, 1900965600
           tz.transition 2030, 10, :o1, 1919109600
-          tz.transition 2031, 3, :o2, 1932328800
+          tz.transition 2031, 3, :o2, 1932415200
           tz.transition 2031, 10, :o1, 1951164000
-          tz.transition 2032, 3, :o2, 1963778400
+          tz.transition 2032, 3, :o2, 1963864800
           tz.transition 2032, 10, :o1, 1982613600
-          tz.transition 2033, 3, :o2, 1995832800
+          tz.transition 2033, 3, :o2, 1995314400
           tz.transition 2033, 10, :o1, 2014063200
-          tz.transition 2034, 3, :o2, 2027282400
+          tz.transition 2034, 3, :o2, 2027368800
           tz.transition 2034, 10, :o1, 2045512800
-          tz.transition 2035, 3, :o2, 2058732000
+          tz.transition 2035, 3, :o2, 2058818400
           tz.transition 2035, 10, :o1, 2076962400
-          tz.transition 2036, 3, :o2, 2090181600
+          tz.transition 2036, 3, :o2, 2090268000
           tz.transition 2036, 10, :o1, 2109016800
-          tz.transition 2037, 3, :o2, 2121631200
+          tz.transition 2037, 3, :o2, 2121717600
           tz.transition 2037, 10, :o1, 2140466400
-          tz.transition 2038, 3, :o2, 29586089, 12
+          tz.transition 2038, 3, :o2, 29586101, 12
           tz.transition 2038, 10, :o1, 29588705, 12
-          tz.transition 2039, 3, :o2, 29590541, 12
+          tz.transition 2039, 3, :o2, 29590469, 12
           tz.transition 2039, 10, :o1, 29593073, 12
-          tz.transition 2040, 3, :o2, 29594909, 12
+          tz.transition 2040, 3, :o2, 29594921, 12
           tz.transition 2040, 10, :o1, 29597441, 12
-          tz.transition 2041, 3, :o2, 29599277, 12
+          tz.transition 2041, 3, :o2, 29599289, 12
           tz.transition 2041, 10, :o1, 29601809, 12
-          tz.transition 2042, 3, :o2, 29603645, 12
+          tz.transition 2042, 3, :o2, 29603657, 12
           tz.transition 2042, 10, :o1, 29606261, 12
-          tz.transition 2043, 3, :o2, 29608013, 12
+          tz.transition 2043, 3, :o2, 29608025, 12
           tz.transition 2043, 10, :o1, 29610629, 12
-          tz.transition 2044, 3, :o2, 29612465, 12
+          tz.transition 2044, 3, :o2, 29612393, 12
           tz.transition 2044, 10, :o1, 29614997, 12
-          tz.transition 2045, 3, :o2, 29616833, 12
+          tz.transition 2045, 3, :o2, 29616845, 12
           tz.transition 2045, 10, :o1, 29619365, 12
-          tz.transition 2046, 3, :o2, 29621201, 12
+          tz.transition 2046, 3, :o2, 29621213, 12
           tz.transition 2046, 10, :o1, 29623733, 12
-          tz.transition 2047, 3, :o2, 29625569, 12
+          tz.transition 2047, 3, :o2, 29625581, 12
           tz.transition 2047, 10, :o1, 29628101, 12
-          tz.transition 2048, 3, :o2, 29629937, 12
+          tz.transition 2048, 3, :o2, 29629949, 12
           tz.transition 2048, 10, :o1, 29632553, 12
-          tz.transition 2049, 3, :o2, 29634305, 12
+          tz.transition 2049, 3, :o2, 29634317, 12
           tz.transition 2049, 10, :o1, 29636921, 12
-          tz.transition 2050, 3, :o2, 29638757, 12
+          tz.transition 2050, 3, :o2, 29638685, 12
           tz.transition 2050, 10, :o1, 29641289, 12
         end
       end

data/lib/tzinfo/definitions/Asia/Damascus.rb

@@ -104,89 +104,89 @@ module TZInfo
           tz.transition 2007, 11, :o1, 1193950800
           tz.transition 2008, 4, :o2, 1207260000
           tz.transition 2008, 10, :o1, 1225486800
-          tz.transition 2009, 4, :o2, 1238709600
+          tz.transition 2009, 3, :o2, 1238104800
           tz.transition 2009, 10, :o1, 1257022800
-          tz.transition 2010, 4, :o2, 1270159200
+          tz.transition 2010, 3, :o2, 1269554400
           tz.transition 2010, 10, :o1, 1288558800
-          tz.transition 2011, 3, :o2, 1301608800
+          tz.transition 2011, 3, :o2, 1301004000
           tz.transition 2011, 10, :o1, 1320094800
-          tz.transition 2012, 4, :o2, 1333663200
+          tz.transition 2012, 3, :o2, 1333058400
           tz.transition 2012, 10, :o1, 1351717200
-          tz.transition 2013, 4, :o2, 1365112800
+          tz.transition 2013, 3, :o2, 1364508000
           tz.transition 2013, 10, :o1, 1383253200
-          tz.transition 2014, 4, :o2, 1396562400
+          tz.transition 2014, 3, :o2, 1395957600
           tz.transition 2014, 10, :o1, 1414789200
-          tz.transition 2015, 4, :o2, 1428012000
+          tz.transition 2015, 3, :o2, 1427407200
           tz.transition 2015, 10, :o1, 1446325200
-          tz.transition 2016, 3, :o2, 1459461600
+          tz.transition 2016, 3, :o2, 1458856800
           tz.transition 2016, 10, :o1, 1477947600
-          tz.transition 2017, 4, :o2, 1491516000
+          tz.transition 2017, 3, :o2, 1490911200
           tz.transition 2017, 10, :o1, 1509483600
-          tz.transition 2018, 4, :o2, 1522965600
+          tz.transition 2018, 3, :o2, 1522360800
           tz.transition 2018, 10, :o1, 1541019600
-          tz.transition 2019, 4, :o2, 1554415200
+          tz.transition 2019, 3, :o2, 1553810400
           tz.transition 2019, 10, :o1, 1572555600
-          tz.transition 2020, 4, :o2, 1585864800
+          tz.transition 2020, 3, :o2, 1585260000
           tz.transition 2020, 10, :o1, 1604178000
-          tz.transition 2021, 4, :o2, 1617314400
+          tz.transition 2021, 3, :o2, 1616709600
           tz.transition 2021, 10, :o1, 1635714000
-          tz.transition 2022, 3, :o2, 1648764000
+          tz.transition 2022, 3, :o2, 1648159200
           tz.transition 2022, 10, :o1, 1667250000
-          tz.transition 2023, 4, :o2, 1680818400
+          tz.transition 2023, 3, :o2, 1680213600
           tz.transition 2023, 10, :o1, 1698786000
-          tz.transition 2024, 4, :o2, 1712268000
+          tz.transition 2024, 3, :o2, 1711663200
           tz.transition 2024, 10, :o1, 1730408400
-          tz.transition 2025, 4, :o2, 1743717600
+          tz.transition 2025, 3, :o2, 1743112800
           tz.transition 2025, 10, :o1, 1761944400
-          tz.transition 2026, 4, :o2, 1775167200
+          tz.transition 2026, 3, :o2, 1774562400
           tz.transition 2026, 10, :o1, 1793480400
-          tz.transition 2027, 4, :o2, 1806616800
+          tz.transition 2027, 3, :o2, 1806012000
           tz.transition 2027, 10, :o1, 1825016400
-          tz.transition 2028, 4, :o2, 1838671200
+          tz.transition 2028, 3, :o2, 1838066400
           tz.transition 2028, 10, :o1, 1856638800
-          tz.transition 2029, 4, :o2, 1870120800
+          tz.transition 2029, 3, :o2, 1869516000
           tz.transition 2029, 10, :o1, 1888174800
-          tz.transition 2030, 4, :o2, 1901570400
+          tz.transition 2030, 3, :o2, 1900965600
           tz.transition 2030, 10, :o1, 1919710800
-          tz.transition 2031, 4, :o2, 1933020000
+          tz.transition 2031, 3, :o2, 1932415200
           tz.transition 2031, 10, :o1, 1951246800
-          tz.transition 2032, 4, :o2, 1964469600
+          tz.transition 2032, 3, :o2, 1963864800
           tz.transition 2032, 10, :o1, 1982869200
-          tz.transition 2033, 3, :o2, 1995919200
+          tz.transition 2033, 3, :o2, 1995314400
           tz.transition 2033, 10, :o1, 2014405200
-          tz.transition 2034, 4, :o2, 2027973600
+          tz.transition 2034, 3, :o2, 2027368800
           tz.transition 2034, 10, :o1, 2045941200
-          tz.transition 2035, 4, :o2, 2059423200
+          tz.transition 2035, 3, :o2, 2058818400
           tz.transition 2035, 10, :o1, 2077477200
-          tz.transition 2036, 4, :o2, 2090872800
+          tz.transition 2036, 3, :o2, 2090268000
           tz.transition 2036, 10, :o1, 2109099600
-          tz.transition 2037, 4, :o2, 2122322400
+          tz.transition 2037, 3, :o2, 2121717600
           tz.transition 2037, 10, :o1, 2140635600
-          tz.transition 2038, 4, :o2, 29586185, 12
+          tz.transition 2038, 3, :o2, 29586101, 12
           tz.transition 2038, 10, :o1, 19725827, 8
-          tz.transition 2039, 3, :o2, 29590553, 12
+          tz.transition 2039, 3, :o2, 29590469, 12
           tz.transition 2039, 10, :o1, 19728747, 8
-          tz.transition 2040, 4, :o2, 29595005, 12
+          tz.transition 2040, 3, :o2, 29594921, 12
           tz.transition 2040, 10, :o1, 19731675, 8
-          tz.transition 2041, 4, :o2, 29599373, 12
+          tz.transition 2041, 3, :o2, 29599289, 12
           tz.transition 2041, 10, :o1, 19734595, 8
-          tz.transition 2042, 4, :o2, 29603741, 12
+          tz.transition 2042, 3, :o2, 29603657, 12
           tz.transition 2042, 10, :o1, 19737515, 8
-          tz.transition 2043, 4, :o2, 29608109, 12
+          tz.transition 2043, 3, :o2, 29608025, 12
           tz.transition 2043, 10, :o1, 19740435, 8
-          tz.transition 2044, 3, :o2, 29612477, 12
+          tz.transition 2044, 3, :o2, 29612393, 12
           tz.transition 2044, 10, :o1, 19743363, 8
-          tz.transition 2045, 4, :o2, 29616929, 12
+          tz.transition 2045, 3, :o2, 29616845, 12
           tz.transition 2045, 10, :o1, 19746283, 8
-          tz.transition 2046, 4, :o2, 29621297, 12
+          tz.transition 2046, 3, :o2, 29621213, 12
           tz.transition 2046, 10, :o1, 19749203, 8
-          tz.transition 2047, 4, :o2, 29625665, 12
+          tz.transition 2047, 3, :o2, 29625581, 12
           tz.transition 2047, 10, :o1, 19752123, 8
-          tz.transition 2048, 4, :o2, 29630033, 12
+          tz.transition 2048, 3, :o2, 29629949, 12
           tz.transition 2048, 10, :o1, 19755051, 8
-          tz.transition 2049, 4, :o2, 29634401, 12
+          tz.transition 2049, 3, :o2, 29634317, 12
           tz.transition 2049, 10, :o1, 19757971, 8
-          tz.transition 2050, 3, :o2, 29638769, 12
+          tz.transition 2050, 3, :o2, 29638685, 12
           tz.transition 2050, 10, :o1, 19760891, 8
         end
       end

data/lib/tzinfo/definitions/Asia/Gaza.rb

@@ -99,91 +99,91 @@ module TZInfo
           tz.transition 2007, 3, :o3, 1175378400
           tz.transition 2007, 9, :o1, 1189638000
           tz.transition 2008, 3, :o3, 1207000800
-          tz.transition 2008, 8, :o1, 1219878000
-          tz.transition 2009, 3, :o3, 1238536800
-          tz.transition 2009, 8, :o1, 1251327600
-          tz.transition 2010, 3, :o3, 1270072800
-          tz.transition 2010, 8, :o1, 1282777200
-          tz.transition 2011, 3, :o3, 1301608800
-          tz.transition 2011, 8, :o1, 1314226800
-          tz.transition 2012, 3, :o3, 1333231200
-          tz.transition 2012, 8, :o1, 1346281200
-          tz.transition 2013, 3, :o3, 1364767200
-          tz.transition 2013, 8, :o1, 1377730800
-          tz.transition 2014, 3, :o3, 1396303200
-          tz.transition 2014, 8, :o1, 1409180400
-          tz.transition 2015, 3, :o3, 1427839200
-          tz.transition 2015, 8, :o1, 1440630000
-          tz.transition 2016, 3, :o3, 1459461600
-          tz.transition 2016, 8, :o1, 1472079600
-          tz.transition 2017, 3, :o3, 1490997600
-          tz.transition 2017, 8, :o1, 1504134000
-          tz.transition 2018, 3, :o3, 1522533600
-          tz.transition 2018, 8, :o1, 1535583600
-          tz.transition 2019, 3, :o3, 1554069600
-          tz.transition 2019, 8, :o1, 1567033200
-          tz.transition 2020, 3, :o3, 1585692000
-          tz.transition 2020, 8, :o1, 1598482800
-          tz.transition 2021, 3, :o3, 1617228000
-          tz.transition 2021, 8, :o1, 1629932400
-          tz.transition 2022, 3, :o3, 1648764000
-          tz.transition 2022, 8, :o1, 1661382000
-          tz.transition 2023, 3, :o3, 1680300000
-          tz.transition 2023, 8, :o1, 1693436400
-          tz.transition 2024, 3, :o3, 1711922400
-          tz.transition 2024, 8, :o1, 1724886000
-          tz.transition 2025, 3, :o3, 1743458400
-          tz.transition 2025, 8, :o1, 1756335600
-          tz.transition 2026, 3, :o3, 1774994400
-          tz.transition 2026, 8, :o1, 1787785200
-          tz.transition 2027, 3, :o3, 1806530400
-          tz.transition 2027, 8, :o1, 1819234800
-          tz.transition 2028, 3, :o3, 1838152800
-          tz.transition 2028, 8, :o1, 1851289200
-          tz.transition 2029, 3, :o3, 1869688800
-          tz.transition 2029, 8, :o1, 1882738800
-          tz.transition 2030, 3, :o3, 1901224800
-          tz.transition 2030, 8, :o1, 1914188400
-          tz.transition 2031, 3, :o3, 1932760800
-          tz.transition 2031, 8, :o1, 1945638000
-          tz.transition 2032, 3, :o3, 1964383200
-          tz.transition 2032, 8, :o1, 1977087600
-          tz.transition 2033, 3, :o3, 1995919200
-          tz.transition 2033, 8, :o1, 2008537200
-          tz.transition 2034, 3, :o3, 2027455200
-          tz.transition 2034, 8, :o1, 2040591600
-          tz.transition 2035, 3, :o3, 2058991200
-          tz.transition 2035, 8, :o1, 2072041200
-          tz.transition 2036, 3, :o3, 2090613600
-          tz.transition 2036, 8, :o1, 2103490800
-          tz.transition 2037, 3, :o3, 2122149600
-          tz.transition 2037, 8, :o1, 2134940400
-          tz.transition 2038, 3, :o3, 29586173, 12
-          tz.transition 2038, 8, :o1, 59175875, 24
-          tz.transition 2039, 3, :o3, 29590553, 12
-          tz.transition 2039, 8, :o1, 59184611, 24
-          tz.transition 2040, 3, :o3, 29594945, 12
-          tz.transition 2040, 8, :o1, 59193515, 24
-          tz.transition 2041, 3, :o3, 29599325, 12
-          tz.transition 2041, 8, :o1, 59202251, 24
-          tz.transition 2042, 3, :o3, 29603705, 12
-          tz.transition 2042, 8, :o1, 59210987, 24
-          tz.transition 2043, 3, :o3, 29608085, 12
-          tz.transition 2043, 8, :o1, 59219723, 24
-          tz.transition 2044, 3, :o3, 29612477, 12
-          tz.transition 2044, 8, :o1, 59228459, 24
-          tz.transition 2045, 3, :o3, 29616857, 12
-          tz.transition 2045, 8, :o1, 59237363, 24
-          tz.transition 2046, 3, :o3, 29621237, 12
-          tz.transition 2046, 8, :o1, 59246099, 24
-          tz.transition 2047, 3, :o3, 29625617, 12
-          tz.transition 2047, 8, :o1, 59254835, 24
-          tz.transition 2048, 3, :o3, 29630009, 12
-          tz.transition 2048, 8, :o1, 59263571, 24
-          tz.transition 2049, 3, :o3, 29634389, 12
-          tz.transition 2049, 8, :o1, 59272307, 24
-          tz.transition 2050, 3, :o3, 29638769, 12
-          tz.transition 2050, 8, :o1, 59281043, 24
+          tz.transition 2008, 8, :o1, 1219964400
+          tz.transition 2009, 3, :o3, 1238104800
+          tz.transition 2009, 9, :o1, 1254092400
+          tz.transition 2010, 3, :o3, 1269554400
+          tz.transition 2010, 9, :o1, 1285542000
+          tz.transition 2011, 3, :o3, 1301004000
+          tz.transition 2011, 9, :o1, 1316991600
+          tz.transition 2012, 3, :o3, 1333058400
+          tz.transition 2012, 9, :o1, 1348441200
+          tz.transition 2013, 3, :o3, 1364508000
+          tz.transition 2013, 9, :o1, 1380495600
+          tz.transition 2014, 3, :o3, 1395957600
+          tz.transition 2014, 9, :o1, 1411945200
+          tz.transition 2015, 3, :o3, 1427407200
+          tz.transition 2015, 9, :o1, 1443394800
+          tz.transition 2016, 3, :o3, 1458856800
+          tz.transition 2016, 9, :o1, 1474844400
+          tz.transition 2017, 3, :o3, 1490911200
+          tz.transition 2017, 9, :o1, 1506294000
+          tz.transition 2018, 3, :o3, 1522360800
+          tz.transition 2018, 9, :o1, 1537743600
+          tz.transition 2019, 3, :o3, 1553810400
+          tz.transition 2019, 9, :o1, 1569798000
+          tz.transition 2020, 3, :o3, 1585260000
+          tz.transition 2020, 9, :o1, 1601247600
+          tz.transition 2021, 3, :o3, 1616709600
+          tz.transition 2021, 9, :o1, 1632697200
+          tz.transition 2022, 3, :o3, 1648159200
+          tz.transition 2022, 9, :o1, 1664146800
+          tz.transition 2023, 3, :o3, 1680213600
+          tz.transition 2023, 9, :o1, 1695596400
+          tz.transition 2024, 3, :o3, 1711663200
+          tz.transition 2024, 9, :o1, 1727650800
+          tz.transition 2025, 3, :o3, 1743112800
+          tz.transition 2025, 9, :o1, 1759100400
+          tz.transition 2026, 3, :o3, 1774562400
+          tz.transition 2026, 9, :o1, 1790550000
+          tz.transition 2027, 3, :o3, 1806012000
+          tz.transition 2027, 9, :o1, 1821999600
+          tz.transition 2028, 3, :o3, 1838066400
+          tz.transition 2028, 9, :o1, 1853449200
+          tz.transition 2029, 3, :o3, 1869516000
+          tz.transition 2029, 9, :o1, 1884898800
+          tz.transition 2030, 3, :o3, 1900965600
+          tz.transition 2030, 9, :o1, 1916953200
+          tz.transition 2031, 3, :o3, 1932415200
+          tz.transition 2031, 9, :o1, 1948402800
+          tz.transition 2032, 3, :o3, 1963864800
+          tz.transition 2032, 9, :o1, 1979852400
+          tz.transition 2033, 3, :o3, 1995314400
+          tz.transition 2033, 9, :o1, 2011302000
+          tz.transition 2034, 3, :o3, 2027368800
+          tz.transition 2034, 9, :o1, 2042751600
+          tz.transition 2035, 3, :o3, 2058818400
+          tz.transition 2035, 9, :o1, 2074201200
+          tz.transition 2036, 3, :o3, 2090268000
+          tz.transition 2036, 9, :o1, 2106255600
+          tz.transition 2037, 3, :o3, 2121717600
+          tz.transition 2037, 9, :o1, 2137705200
+          tz.transition 2038, 3, :o3, 29586101, 12
+          tz.transition 2038, 9, :o1, 59176643, 24
+          tz.transition 2039, 3, :o3, 29590469, 12
+          tz.transition 2039, 9, :o1, 59185379, 24
+          tz.transition 2040, 3, :o3, 29594921, 12
+          tz.transition 2040, 9, :o1, 59194115, 24
+          tz.transition 2041, 3, :o3, 29599289, 12
+          tz.transition 2041, 9, :o1, 59203019, 24
+          tz.transition 2042, 3, :o3, 29603657, 12
+          tz.transition 2042, 9, :o1, 59211755, 24
+          tz.transition 2043, 3, :o3, 29608025, 12
+          tz.transition 2043, 9, :o1, 59220491, 24
+          tz.transition 2044, 3, :o3, 29612393, 12
+          tz.transition 2044, 9, :o1, 59229227, 24
+          tz.transition 2045, 3, :o3, 29616845, 12
+          tz.transition 2045, 9, :o1, 59237963, 24
+          tz.transition 2046, 3, :o3, 29621213, 12
+          tz.transition 2046, 9, :o1, 59246699, 24
+          tz.transition 2047, 3, :o3, 29625581, 12
+          tz.transition 2047, 9, :o1, 59255603, 24
+          tz.transition 2048, 3, :o3, 29629949, 12
+          tz.transition 2048, 9, :o1, 59264339, 24
+          tz.transition 2049, 3, :o3, 29634317, 12
+          tz.transition 2049, 9, :o1, 59273075, 24
+          tz.transition 2050, 3, :o3, 29638685, 12
+          tz.transition 2050, 9, :o1, 59281811, 24
         end
       end
     end

data/lib/tzinfo/definitions/Asia/Karachi.rb

@@ -23,6 +23,8 @@ module TZInfo
           tz.transition 2002, 10, :o4, 1033840860
           tz.transition 2008, 5, :o5, 1212260400
           tz.transition 2008, 10, :o4, 1225476000
+          tz.transition 2009, 4, :o5, 1239735600
+          tz.transition 2009, 10, :o4, 1257012000
         end
       end
     end

data/lib/tzinfo/definitions/Asia/Kathmandu.rb

@@ -0,0 +1,20 @@
+require 'tzinfo/timezone_definition'
+
+module TZInfo
+  module Definitions
+    module Asia
+      module Kathmandu
+        include TimezoneDefinition
+        
+        timezone 'Asia/Kathmandu' do |tz|
+          tz.offset :o0, 20476, 0, :LMT
+          tz.offset :o1, 19800, 0, :IST
+          tz.offset :o2, 20700, 0, :NPT
+          
+          tz.transition 1919, 12, :o1, 52322204081, 21600
+          tz.transition 1985, 12, :o2, 504901800
+        end
+      end
+    end
+  end
+end

data/lib/tzinfo/definitions/Asia/Katmandu.rb

@@ -6,14 +6,7 @@ module TZInfo
       module Katmandu
         include TimezoneDefinition
         
-        timezone 'Asia/Katmandu' do |tz|
-          tz.offset :o0, 20476, 0, :LMT
-          tz.offset :o1, 19800, 0, :IST
-          tz.offset :o2, 20700, 0, :NPT
-          
-          tz.transition 1919, 12, :o1, 52322204081, 21600
-          tz.transition 1985, 12, :o2, 504901800
-        end
+        linked_timezone 'Asia/Katmandu', 'Asia/Kathmandu'
       end
     end
   end

data/lib/tzinfo/definitions/Europe/Zurich.rb

@@ -14,12 +14,10 @@ module TZInfo
           
           tz.transition 1848, 9, :o1, 3234981343, 1350
           tz.transition 1894, 5, :o2, 26060189177, 10800
-          tz.transition 1940, 11, :o3, 58318451, 24
-          tz.transition 1940, 12, :o2, 29159933, 12
-          tz.transition 1941, 5, :o3, 58322845, 24
-          tz.transition 1941, 10, :o2, 29163269, 12
-          tz.transition 1942, 5, :o3, 58331581, 24
-          tz.transition 1942, 10, :o2, 29167637, 12
+          tz.transition 1941, 5, :o3, 4860239, 2
+          tz.transition 1941, 10, :o2, 4860547, 2
+          tz.transition 1942, 5, :o3, 4860967, 2
+          tz.transition 1942, 10, :o2, 4861275, 2
           tz.transition 1981, 3, :o3, 354675600
           tz.transition 1981, 9, :o2, 370400400
           tz.transition 1982, 3, :o3, 386125200

data/lib/tzinfo/indexes/countries.rb

@@ -173,7 +173,7 @@ module TZInfo
         c.timezone 'America/Thunder_Bay', 2903, 60, -357, 4, 'Eastern Time - Thunder Bay, Ontario'
         c.timezone 'America/Iqaluit', 956, 15, -1027, 15, 'Eastern Time - east Nunavut - most locations'
         c.timezone 'America/Pangnirtung', 992, 15, -986, 15, 'Eastern Time - Pangnirtung, Nunavut'
-        c.timezone 'America/Resolute', 33613, 450, -22759, 240, 'Eastern Time - Resolute, Nunavut'
+        c.timezone 'America/Resolute', 33613, 450, -22759, 240, 'Eastern Standard Time - Resolute, Nunavut'
         c.timezone 'America/Atikokan', 175531, 3600, -54973, 600, 'Eastern Standard Time - Atikokan, Ontario and Southampton I, Nunavut'
         c.timezone 'America/Rankin_Inlet', 3769, 60, -331499, 3600, 'Central Time - central Nunavut'
         c.timezone 'America/Winnipeg', 2993, 60, -1943, 20, 'Central Time - Manitoba & west Ontario'
@@ -606,7 +606,7 @@ module TZInfo
         c.timezone 'Europe/Oslo', 719, 12, 43, 4
       end
       country 'NP', 'Nepal' do |c|
-        c.timezone 'Asia/Katmandu', 1663, 60, 5119, 60
+        c.timezone 'Asia/Kathmandu', 1663, 60, 5119, 60
       end
       country 'NR', 'Nauru' do |c|
         c.timezone 'Pacific/Nauru', -31, 60, 2003, 12

data/lib/tzinfo/indexes/timezones.rb

@@ -263,7 +263,8 @@ module TZInfo
       timezone 'Asia/Kamchatka'
       timezone 'Asia/Karachi'
       timezone 'Asia/Kashgar'
-      timezone 'Asia/Katmandu'
+      timezone 'Asia/Kathmandu'
+      linked_timezone 'Asia/Katmandu'
       timezone 'Asia/Kolkata'
       timezone 'Asia/Krasnoyarsk'
       timezone 'Asia/Kuala_Lumpur'

data/lib/tzinfo/timezone.rb

@@ -82,7 +82,7 @@ module TZInfo
         identifier = identifier.gsub(/-/, '__m__').gsub(/\+/, '__p__')
         begin
           # Use a temporary variable to avoid an rdoc warning
-          file = "tzinfo/definitions/#{identifier}"
+          file = "tzinfo/definitions/#{identifier}".untaint
           require file
           
           m = Definitions

data/test/tc_timezone.rb

@@ -1,5 +1,6 @@
 $:.unshift File.join(File.dirname(__FILE__), "..", "lib")
 require 'test/unit'
+require File.join(File.dirname(__FILE__), 'test_utils')
 require 'tzinfo/data_timezone'
 require 'tzinfo/linked_timezone'
 require 'tzinfo/time_or_datetime'
@@ -122,6 +123,27 @@ class TCTimezone < Test::Unit::TestCase
     assert_equal('../Invalid/Identifier', proxy.identifier)
   end
   
+  def test_get_tainted_loaded
+    Timezone.get('Europe/Andorra')
+  
+    safe_test do
+      tz = Timezone.get('Europe/Andorra'.taint)
+      assert_equal('Europe/Andorra', tz.identifier)
+    end
+  end
+  
+  # Disable test in Ruby 1.9. See:
+  # http://groups.google.com/group/ruby-talk-google/browse_thread/thread/170a7205555cedfc
+  # It doesn't appear to be possible to require a file from the load path in Ruby 1.9.
+  if RUBY_VERSION !~ /^1.9/
+    def test_get_tainted_not_loaded
+      safe_test do
+        tz = Timezone.get('Europe/Amsterdam'.taint)
+        assert_equal('Europe/Amsterdam', tz.identifier)
+      end
+    end
+  end
+  
   def test_new_no_args
     tz = Timezone.new
     

data/test/test_utils.rb

@@ -9,4 +9,13 @@ module Kernel
       $-v = old_verbose
     end
   end
+  
+  def safe_test(level = 1)
+    thread = Thread.new do
+      $SAFE = level
+      yield
+    end
+    
+    thread.join
+  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification 
 name: tzinfo
 version: !ruby/object:Gem::Version 
-  version: 0.3.12
+  version: 0.3.13
 platform: ruby
 authors: 
 - Philip Ross
@@ -9,7 +9,7 @@ autorequire:
 bindir: bin
 cert_chain: []
 
-date: 2008-11-12 00:00:00 +00:00
+date: 2009-04-15 00:00:00 +01:00
 default_executable: 
 dependencies: []
 
@@ -302,6 +302,7 @@ files:
 - lib/tzinfo/definitions/Asia/Kamchatka.rb
 - lib/tzinfo/definitions/Asia/Karachi.rb
 - lib/tzinfo/definitions/Asia/Kashgar.rb
+- lib/tzinfo/definitions/Asia/Kathmandu.rb
 - lib/tzinfo/definitions/Asia/Katmandu.rb
 - lib/tzinfo/definitions/Asia/Kolkata.rb
 - lib/tzinfo/definitions/Asia/Krasnoyarsk.rb
@@ -690,7 +691,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
 requirements: []
 
 rubyforge_project: tzinfo
-rubygems_version: 1.2.0
+rubygems_version: 1.3.1
 signing_key: 
 specification_version: 2
 summary: Daylight-savings aware timezone library