tzinfo 0.3.58 → 0.3.61

data/CHANGES

@@ -1,3 +1,25 @@
+== Version 0.3.61 (tzdata v2022a) - 19-Jul-2022
+
+* Fixed a relative path traversal bug that could cause arbitrary files to be
+  loaded with require from the Ruby load path. Please refer to
+  https://github.com/tzinfo/tzinfo/security/advisories/GHSA-5cm2-9h8c-rvfx for
+  details. CVE-2022-31163.
+* Updated to tzdata version 2022a
+  (https://mm.icann.org/pipermail/tz-announce/2022-March/000070.html).
+
+
+== Version 0.3.60 (tzdata v2021a) - 6-Feb-2021
+
+* Updated to tzdata version 2021a
+  (https://mm.icann.org/pipermail/tz-announce/2021-January/000065.html).
+
+
+== Version 0.3.59 (tzdata v2020e) - 24-Dec-2020
+
+* Updated to tzdata version 2020e
+  (https://mm.icann.org/pipermail/tz-announce/2020-December/000063.html).
+
+
 == Version 0.3.58 (tzdata v2020d) - 8-Nov-2020
 
 * Updated to tzdata version 2020d

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2020 Philip Ross
+Copyright (c) 2005-2022 Philip Ross
 
 Permission is hereby granted, free of charge, to any person obtaining a copy of 
 this software and associated documentation files (the "Software"), to deal in 

data/lib/tzinfo/country.rb

@@ -137,7 +137,10 @@ module TZInfo
         
     # Compare two Countries based on their code. Returns -1 if c is less
     # than self, 0 if c is equal to self and +1 if c is greater than self.
+    #
+    # Returns nil if c is not comparable with Country instances.
     def <=>(c)
+      return nil unless c.is_a?(Country)
       code <=> c.code
     end
     

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

@@ -6,59 +6,7 @@ module TZInfo
       module Accra
         include TimezoneDefinition
         
-        timezone 'Africa/Accra' do |tz|
-          tz.offset :o0, -52, 0, :LMT
-          tz.offset :o1, 0, 0, :GMT
-          tz.offset :o2, 0, 1200, :'+0020'
-          
-          tz.transition 1918, 1, :o1, 52306441213, 21600
-          tz.transition 1920, 9, :o2, 4845137, 2
-          tz.transition 1920, 12, :o1, 174433643, 72
-          tz.transition 1921, 9, :o2, 4845867, 2
-          tz.transition 1921, 12, :o1, 174459923, 72
-          tz.transition 1922, 9, :o2, 4846597, 2
-          tz.transition 1922, 12, :o1, 174486203, 72
-          tz.transition 1923, 9, :o2, 4847327, 2
-          tz.transition 1923, 12, :o1, 174512483, 72
-          tz.transition 1924, 9, :o2, 4848059, 2
-          tz.transition 1924, 12, :o1, 174538835, 72
-          tz.transition 1925, 9, :o2, 4848789, 2
-          tz.transition 1925, 12, :o1, 174565115, 72
-          tz.transition 1926, 9, :o2, 4849519, 2
-          tz.transition 1926, 12, :o1, 174591395, 72
-          tz.transition 1927, 9, :o2, 4850249, 2
-          tz.transition 1927, 12, :o1, 174617675, 72
-          tz.transition 1928, 9, :o2, 4850981, 2
-          tz.transition 1928, 12, :o1, 174644027, 72
-          tz.transition 1929, 9, :o2, 4851711, 2
-          tz.transition 1929, 12, :o1, 174670307, 72
-          tz.transition 1930, 9, :o2, 4852441, 2
-          tz.transition 1930, 12, :o1, 174696587, 72
-          tz.transition 1931, 9, :o2, 4853171, 2
-          tz.transition 1931, 12, :o1, 174722867, 72
-          tz.transition 1932, 9, :o2, 4853903, 2
-          tz.transition 1932, 12, :o1, 174749219, 72
-          tz.transition 1933, 9, :o2, 4854633, 2
-          tz.transition 1933, 12, :o1, 174775499, 72
-          tz.transition 1934, 9, :o2, 4855363, 2
-          tz.transition 1934, 12, :o1, 174801779, 72
-          tz.transition 1935, 9, :o2, 4856093, 2
-          tz.transition 1935, 12, :o1, 174828059, 72
-          tz.transition 1936, 9, :o2, 4856825, 2
-          tz.transition 1936, 12, :o1, 174854411, 72
-          tz.transition 1937, 9, :o2, 4857555, 2
-          tz.transition 1937, 12, :o1, 174880691, 72
-          tz.transition 1938, 9, :o2, 4858285, 2
-          tz.transition 1938, 12, :o1, 174906971, 72
-          tz.transition 1939, 9, :o2, 4859015, 2
-          tz.transition 1939, 12, :o1, 174933251, 72
-          tz.transition 1940, 9, :o2, 4859747, 2
-          tz.transition 1940, 12, :o1, 174959603, 72
-          tz.transition 1941, 9, :o2, 4860477, 2
-          tz.transition 1941, 12, :o1, 174985883, 72
-          tz.transition 1942, 9, :o2, 4861207, 2
-          tz.transition 1942, 12, :o1, 175012163, 72
-        end
+        linked_timezone 'Africa/Accra', 'Africa/Abidjan'
       end
     end
   end

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

@@ -46,6 +46,7 @@ module TZInfo
           tz.transition 1985, 4, :o2, 483487200
           tz.transition 1985, 10, :o1, 498171600
           tz.transition 2000, 1, :o3, 947930400
+          tz.transition 2021, 1, :o1, 1612126800
         end
       end
     end

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

@@ -7,10 +7,15 @@ module TZInfo
         include TimezoneDefinition
         
         timezone 'Africa/Lagos' do |tz|
-          tz.offset :o0, 816, 0, :LMT
-          tz.offset :o1, 3600, 0, :WAT
+          tz.offset :o0, 815, 0, :LMT
+          tz.offset :o1, 0, 0, :GMT
+          tz.offset :o2, 1800, 0, :'+0030'
+          tz.offset :o3, 3600, 0, :WAT
           
-          tz.transition 1919, 8, :o1, 4359964483, 1800
+          tz.transition 1905, 6, :o1, 41766235037, 17280
+          tz.transition 1908, 7, :o0, 4836247, 2
+          tz.transition 1913, 12, :o2, 41819906717, 17280
+          tz.transition 1919, 8, :o3, 116265719, 48
         end
       end
     end

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

@@ -8,14 +8,15 @@ module TZInfo
         
         timezone 'Africa/Nairobi' do |tz|
           tz.offset :o0, 8836, 0, :LMT
-          tz.offset :o1, 10800, 0, :EAT
-          tz.offset :o2, 9000, 0, :'+0230'
+          tz.offset :o1, 9000, 0, :'+0230'
+          tz.offset :o2, 10800, 0, :EAT
           tz.offset :o3, 9900, 0, :'+0245'
           
-          tz.transition 1928, 6, :o1, 52389253391, 21600
-          tz.transition 1929, 12, :o2, 19407819, 8
-          tz.transition 1939, 12, :o3, 116622211, 48
-          tz.transition 1959, 12, :o1, 233945701, 96
+          tz.transition 1908, 4, :o1, 52230147791, 21600
+          tz.transition 1928, 6, :o2, 116420563, 48
+          tz.transition 1930, 1, :o1, 19407851, 8
+          tz.transition 1936, 12, :o3, 116569651, 48
+          tz.transition 1942, 7, :o2, 233334949, 96
         end
       end
     end

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

@@ -6,7 +6,7 @@ module TZInfo
       module Anguilla
         include TimezoneDefinition
         
-        linked_timezone 'America/Anguilla', 'America/Port_of_Spain'
+        linked_timezone 'America/Anguilla', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -6,7 +6,7 @@ module TZInfo
       module Antigua
         include TimezoneDefinition
         
-        linked_timezone 'America/Antigua', 'America/Port_of_Spain'
+        linked_timezone 'America/Antigua', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -6,7 +6,7 @@ module TZInfo
       module Aruba
         include TimezoneDefinition
         
-        linked_timezone 'America/Aruba', 'America/Curacao'
+        linked_timezone 'America/Aruba', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -6,22 +6,7 @@ module TZInfo
       module Atikokan
         include TimezoneDefinition
         
-        timezone 'America/Atikokan' do |tz|
-          tz.offset :o0, -21988, 0, :LMT
-          tz.offset :o1, -21600, 0, :CST
-          tz.offset :o2, -21600, 3600, :CDT
-          tz.offset :o3, -21600, 3600, :CWT
-          tz.offset :o4, -21600, 3600, :CPT
-          tz.offset :o5, -18000, 0, :EST
-          
-          tz.transition 1895, 1, :o1, 52125006697, 21600
-          tz.transition 1918, 4, :o2, 14530187, 6
-          tz.transition 1918, 10, :o1, 58125451, 24
-          tz.transition 1940, 9, :o2, 9719607, 4
-          tz.transition 1942, 2, :o3, 14582399, 6
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o5, 58361491, 24
-        end
+        linked_timezone 'America/Atikokan', 'America/Panama'
       end
     end
   end

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

@@ -8,20 +8,25 @@ module TZInfo
         
         timezone 'America/Barbados' do |tz|
           tz.offset :o0, -14309, 0, :LMT
-          tz.offset :o1, -14309, 0, :BMT
-          tz.offset :o2, -14400, 0, :AST
-          tz.offset :o3, -14400, 3600, :ADT
+          tz.offset :o1, -14400, 0, :AST
+          tz.offset :o2, -14400, 3600, :ADT
+          tz.offset :o3, -14400, 1800, :'-0330'
           
-          tz.transition 1924, 1, :o1, 209415081509, 86400
-          tz.transition 1932, 1, :o2, 209667542309, 86400
-          tz.transition 1977, 6, :o3, 234943200
-          tz.transition 1977, 10, :o2, 244616400
-          tz.transition 1978, 4, :o3, 261554400
-          tz.transition 1978, 10, :o2, 276066000
-          tz.transition 1979, 4, :o3, 293004000
-          tz.transition 1979, 9, :o2, 307515600
-          tz.transition 1980, 4, :o3, 325058400
-          tz.transition 1980, 9, :o2, 338706000
+          tz.transition 1911, 8, :o1, 209025503909, 86400
+          tz.transition 1942, 4, :o2, 58331249, 24
+          tz.transition 1942, 8, :o1, 9722411, 4
+          tz.transition 1943, 5, :o2, 58340321, 24
+          tz.transition 1943, 9, :o1, 9723891, 4
+          tz.transition 1944, 4, :o3, 58348577, 24
+          tz.transition 1944, 9, :o1, 9725375, 4
+          tz.transition 1977, 6, :o2, 234943200
+          tz.transition 1977, 10, :o1, 244616400
+          tz.transition 1978, 4, :o2, 261554400
+          tz.transition 1978, 10, :o1, 276066000
+          tz.transition 1979, 4, :o2, 293004000
+          tz.transition 1979, 9, :o1, 307515600
+          tz.transition 1980, 4, :o2, 325058400
+          tz.transition 1980, 9, :o1, 338706000
         end
       end
     end

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

@@ -10,7 +10,9 @@ module TZInfo
           tz.offset :o0, -21168, 0, :LMT
           tz.offset :o1, -21600, 0, :CST
           tz.offset :o2, -21600, 1800, :'-0530'
-          tz.offset :o3, -21600, 3600, :CDT
+          tz.offset :o3, -21600, 3600, :CWT
+          tz.offset :o4, -21600, 3600, :CPT
+          tz.offset :o5, -21600, 3600, :CDT
           
           tz.transition 1912, 4, :o1, 483898749, 200
           tz.transition 1918, 10, :o2, 9687491, 4
@@ -61,11 +63,54 @@ module TZInfo
           tz.transition 1941, 2, :o1, 116641667, 48
           tz.transition 1941, 10, :o2, 9721091, 4
           tz.transition 1942, 2, :o1, 116659475, 48
-          tz.transition 1942, 10, :o2, 9722547, 4
-          tz.transition 1943, 2, :o1, 116676947, 48
-          tz.transition 1973, 12, :o3, 123919200
+          tz.transition 1942, 6, :o3, 9722155, 4
+          tz.transition 1945, 8, :o4, 58360379, 24
+          tz.transition 1945, 12, :o1, 58363337, 24
+          tz.transition 1947, 10, :o2, 9729855, 4
+          tz.transition 1948, 2, :o1, 116764643, 48
+          tz.transition 1948, 10, :o2, 9731311, 4
+          tz.transition 1949, 2, :o1, 116782115, 48
+          tz.transition 1949, 10, :o2, 9732767, 4
+          tz.transition 1950, 2, :o1, 116799587, 48
+          tz.transition 1950, 10, :o2, 9734251, 4
+          tz.transition 1951, 2, :o1, 116817059, 48
+          tz.transition 1951, 10, :o2, 9735707, 4
+          tz.transition 1952, 2, :o1, 116834531, 48
+          tz.transition 1952, 10, :o2, 9737163, 4
+          tz.transition 1953, 2, :o1, 116852339, 48
+          tz.transition 1953, 10, :o2, 9738619, 4
+          tz.transition 1954, 2, :o1, 116869811, 48
+          tz.transition 1954, 10, :o2, 9740075, 4
+          tz.transition 1955, 2, :o1, 116887283, 48
+          tz.transition 1955, 10, :o2, 9741531, 4
+          tz.transition 1956, 2, :o1, 116904755, 48
+          tz.transition 1956, 10, :o2, 9743015, 4
+          tz.transition 1957, 2, :o1, 116922227, 48
+          tz.transition 1957, 10, :o2, 9744471, 4
+          tz.transition 1958, 2, :o1, 116939699, 48
+          tz.transition 1958, 10, :o2, 9745927, 4
+          tz.transition 1959, 2, :o1, 116957507, 48
+          tz.transition 1959, 10, :o2, 9747383, 4
+          tz.transition 1960, 2, :o1, 116974979, 48
+          tz.transition 1960, 10, :o2, 9748839, 4
+          tz.transition 1961, 2, :o1, 116992451, 48
+          tz.transition 1961, 10, :o2, 9750323, 4
+          tz.transition 1962, 2, :o1, 117009923, 48
+          tz.transition 1962, 10, :o2, 9751779, 4
+          tz.transition 1963, 2, :o1, 117027395, 48
+          tz.transition 1963, 10, :o2, 9753235, 4
+          tz.transition 1964, 2, :o1, 117044867, 48
+          tz.transition 1964, 10, :o2, 9754691, 4
+          tz.transition 1965, 2, :o1, 117062675, 48
+          tz.transition 1965, 10, :o2, 9756147, 4
+          tz.transition 1966, 2, :o1, 117080147, 48
+          tz.transition 1966, 10, :o2, 9757603, 4
+          tz.transition 1967, 2, :o1, 117097619, 48
+          tz.transition 1967, 10, :o2, 9759087, 4
+          tz.transition 1968, 2, :o1, 117115091, 48
+          tz.transition 1973, 12, :o5, 123919200
           tz.transition 1974, 2, :o1, 129618000
-          tz.transition 1982, 12, :o3, 409039200
+          tz.transition 1982, 12, :o5, 409039200
           tz.transition 1983, 2, :o1, 413874000
         end
       end

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

@@ -6,20 +6,7 @@ module TZInfo
       module Blanc__m__Sablon
         include TimezoneDefinition
         
-        timezone 'America/Blanc-Sablon' do |tz|
-          tz.offset :o0, -13708, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          tz.offset :o2, -14400, 3600, :ADT
-          tz.offset :o3, -14400, 3600, :AWT
-          tz.offset :o4, -14400, 3600, :APT
-          
-          tz.transition 1884, 1, :o1, 52038215827, 21600
-          tz.transition 1918, 4, :o2, 9686791, 4
-          tz.transition 1918, 10, :o1, 58125449, 24
-          tz.transition 1942, 2, :o3, 9721599, 4
-          tz.transition 1945, 8, :o4, 58360379, 24
-          tz.transition 1945, 9, :o1, 58361489, 24
-        end
+        linked_timezone 'America/Blanc-Sablon', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -6,7 +6,7 @@ module TZInfo
       module Coral_Harbour
         include TimezoneDefinition
         
-        linked_timezone 'America/Coral_Harbour', 'America/Atikokan'
+        linked_timezone 'America/Coral_Harbour', 'America/Panama'
       end
     end
   end

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

@@ -6,15 +6,7 @@ module TZInfo
       module Creston
         include TimezoneDefinition
         
-        timezone 'America/Creston' do |tz|
-          tz.offset :o0, -27964, 0, :LMT
-          tz.offset :o1, -25200, 0, :MST
-          tz.offset :o2, -28800, 0, :PST
-          
-          tz.transition 1884, 1, :o1, 52038219391, 21600
-          tz.transition 1916, 10, :o2, 58107307, 24
-          tz.transition 1918, 6, :o1, 14530481, 6
-        end
+        linked_timezone 'America/Creston', 'America/Phoenix'
       end
     end
   end

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

@@ -6,14 +6,7 @@ module TZInfo
       module Curacao
         include TimezoneDefinition
         
-        timezone 'America/Curacao' do |tz|
-          tz.offset :o0, -16547, 0, :LMT
-          tz.offset :o1, -16200, 0, :'-0430'
-          tz.offset :o2, -14400, 0, :AST
-          
-          tz.transition 1912, 2, :o1, 209040021347, 86400
-          tz.transition 1965, 1, :o2, 39020187, 16
-        end
+        linked_timezone 'America/Curacao', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -6,7 +6,7 @@ module TZInfo
       module Dominica
         include TimezoneDefinition
         
-        linked_timezone 'America/Dominica', 'America/Port_of_Spain'
+        linked_timezone 'America/Dominica', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -87,8 +87,7 @@ module TZInfo
           tz.transition 2013, 11, :o2, 1383458400
           tz.transition 2014, 3, :o3, 1394348400
           tz.transition 2014, 11, :o2, 1414908000
-          tz.transition 2015, 3, :o3, 1425798000
-          tz.transition 2015, 11, :o4, 1446357600
+          tz.transition 2015, 3, :o4, 1425798000
           tz.transition 2018, 3, :o3, 1520751600
           tz.transition 2018, 11, :o2, 1541311200
           tz.transition 2019, 3, :o3, 1552201200

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

@@ -6,7 +6,7 @@ module TZInfo
       module Grenada
         include TimezoneDefinition
         
-        linked_timezone 'America/Grenada', 'America/Port_of_Spain'
+        linked_timezone 'America/Grenada', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -6,7 +6,7 @@ module TZInfo
       module Guadeloupe
         include TimezoneDefinition
         
-        linked_timezone 'America/Guadeloupe', 'America/Port_of_Spain'
+        linked_timezone 'America/Guadeloupe', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -7,14 +7,15 @@ module TZInfo
         include TimezoneDefinition
         
         timezone 'America/Guyana' do |tz|
-          tz.offset :o0, -13960, 0, :LMT
-          tz.offset :o1, -13500, 0, :'-0345'
-          tz.offset :o2, -10800, 0, :'-03'
-          tz.offset :o3, -14400, 0, :'-04'
+          tz.offset :o0, -13959, 0, :LMT
+          tz.offset :o1, -14400, 0, :'-04'
+          tz.offset :o2, -13500, 0, :'-0345'
+          tz.offset :o3, -10800, 0, :'-03'
           
-          tz.transition 1915, 3, :o1, 5228404549, 2160
-          tz.transition 1975, 7, :o2, 176010300
-          tz.transition 1991, 1, :o3, 662698800
+          tz.transition 1911, 8, :o1, 7741598917, 3200
+          tz.transition 1915, 3, :o2, 7261673, 3
+          tz.transition 1975, 8, :o3, 176096700
+          tz.transition 1992, 3, :o1, 701841600
         end
       end
     end

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

@@ -6,7 +6,7 @@ module TZInfo
       module Kralendijk
         include TimezoneDefinition
         
-        linked_timezone 'America/Kralendijk', 'America/Curacao'
+        linked_timezone 'America/Kralendijk', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -6,7 +6,7 @@ module TZInfo
       module Lower_Princes
         include TimezoneDefinition
         
-        linked_timezone 'America/Lower_Princes', 'America/Curacao'
+        linked_timezone 'America/Lower_Princes', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -6,7 +6,7 @@ module TZInfo
       module Marigot
         include TimezoneDefinition
         
-        linked_timezone 'America/Marigot', 'America/Port_of_Spain'
+        linked_timezone 'America/Marigot', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -6,7 +6,7 @@ module TZInfo
       module Montserrat
         include TimezoneDefinition
         
-        linked_timezone 'America/Montserrat', 'America/Port_of_Spain'
+        linked_timezone 'America/Montserrat', 'America/Puerto_Rico'
       end
     end
   end