tzinfo 0.3.60 → 0.3.61

data/CHANGES

@@ -1,3 +1,13 @@
+== 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

data/LICENSE

@@ -1,4 +1,4 @@
-Copyright (c) 2005-2021 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,75 +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.offset :o3, 1800, 0, :'+0030'
-          tz.offset :o4, 0, 1800, :'+0030'
-          
-          tz.transition 1915, 11, :o1, 52289355613, 21600
-          tz.transition 1919, 11, :o2, 4844573, 2
-          tz.transition 1920, 1, :o1, 174407369, 72
-          tz.transition 1920, 9, :o2, 29070823, 12
-          tz.transition 1921, 1, :o1, 174433721, 72
-          tz.transition 1921, 9, :o2, 29075203, 12
-          tz.transition 1922, 1, :o1, 174460001, 72
-          tz.transition 1922, 9, :o2, 29079583, 12
-          tz.transition 1923, 1, :o1, 174486281, 72
-          tz.transition 1923, 9, :o2, 29083963, 12
-          tz.transition 1924, 1, :o1, 174512561, 72
-          tz.transition 1924, 9, :o2, 29088355, 12
-          tz.transition 1925, 1, :o1, 174538913, 72
-          tz.transition 1925, 9, :o2, 29092735, 12
-          tz.transition 1926, 1, :o1, 174565193, 72
-          tz.transition 1926, 9, :o2, 29097115, 12
-          tz.transition 1927, 1, :o1, 174591473, 72
-          tz.transition 1927, 9, :o2, 29101495, 12
-          tz.transition 1928, 1, :o1, 174617753, 72
-          tz.transition 1928, 9, :o2, 29105887, 12
-          tz.transition 1929, 1, :o1, 174644105, 72
-          tz.transition 1929, 9, :o2, 29110267, 12
-          tz.transition 1930, 1, :o1, 174670385, 72
-          tz.transition 1930, 9, :o2, 29114647, 12
-          tz.transition 1931, 1, :o1, 174696665, 72
-          tz.transition 1931, 9, :o2, 29119027, 12
-          tz.transition 1932, 1, :o1, 174722945, 72
-          tz.transition 1932, 9, :o2, 29123419, 12
-          tz.transition 1933, 1, :o1, 174749297, 72
-          tz.transition 1933, 9, :o2, 29127799, 12
-          tz.transition 1934, 1, :o1, 174775577, 72
-          tz.transition 1934, 9, :o2, 29132179, 12
-          tz.transition 1935, 1, :o1, 174801857, 72
-          tz.transition 1935, 9, :o2, 29136559, 12
-          tz.transition 1936, 1, :o1, 174828137, 72
-          tz.transition 1936, 9, :o2, 29140951, 12
-          tz.transition 1937, 1, :o1, 174854489, 72
-          tz.transition 1937, 9, :o2, 29145331, 12
-          tz.transition 1938, 1, :o1, 174880769, 72
-          tz.transition 1938, 9, :o2, 29149711, 12
-          tz.transition 1939, 1, :o1, 174907049, 72
-          tz.transition 1939, 9, :o2, 29154091, 12
-          tz.transition 1940, 1, :o1, 174933329, 72
-          tz.transition 1940, 5, :o2, 29157007, 12
-          tz.transition 1941, 1, :o1, 174959681, 72
-          tz.transition 1941, 5, :o2, 29161387, 12
-          tz.transition 1942, 1, :o1, 174985961, 72
-          tz.transition 1942, 2, :o3, 4860797, 2
-          tz.transition 1946, 1, :o1, 116727671, 48
-          tz.transition 1950, 9, :o4, 29202307, 12
-          tz.transition 1951, 1, :o1, 38938361, 16
-          tz.transition 1951, 9, :o4, 29206687, 12
-          tz.transition 1952, 1, :o1, 38944201, 16
-          tz.transition 1952, 9, :o4, 29211079, 12
-          tz.transition 1953, 1, :o1, 38950057, 16
-          tz.transition 1953, 9, :o4, 29215459, 12
-          tz.transition 1954, 1, :o1, 38955897, 16
-          tz.transition 1954, 9, :o4, 29219839, 12
-          tz.transition 1955, 1, :o1, 38961737, 16
-          tz.transition 1955, 9, :o4, 29224219, 12
-          tz.transition 1956, 1, :o1, 38967577, 16
-        end
+        linked_timezone 'Africa/Accra', 'Africa/Abidjan'
       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/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/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

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

@@ -6,194 +6,7 @@ module TZInfo
       module Nassau
         include TimezoneDefinition
         
-        timezone 'America/Nassau' do |tz|
-          tz.offset :o0, -18570, 0, :LMT
-          tz.offset :o1, -18000, 0, :EST
-          tz.offset :o2, -18000, 3600, :EWT
-          tz.offset :o3, -18000, 3600, :EPT
-          tz.offset :o4, -18000, 3600, :EDT
-          
-          tz.transition 1912, 3, :o1, 6968055499, 2880
-          tz.transition 1942, 5, :o2, 58331561, 24
-          tz.transition 1945, 1, :o1, 7294370, 3
-          tz.transition 1945, 2, :o2, 58355705, 24
-          tz.transition 1945, 8, :o3, 58360379, 24
-          tz.transition 1945, 10, :o1, 7295240, 3
-          tz.transition 1964, 4, :o4, 58524283, 24
-          tz.transition 1964, 10, :o1, 9754775, 4
-          tz.transition 1965, 4, :o4, 58533019, 24
-          tz.transition 1965, 10, :o1, 9756259, 4
-          tz.transition 1966, 4, :o4, 58541755, 24
-          tz.transition 1966, 10, :o1, 9757715, 4
-          tz.transition 1967, 4, :o4, 58550659, 24
-          tz.transition 1967, 10, :o1, 9759171, 4
-          tz.transition 1968, 4, :o4, 58559395, 24
-          tz.transition 1968, 10, :o1, 9760627, 4
-          tz.transition 1969, 4, :o4, 58568131, 24
-          tz.transition 1969, 10, :o1, 9762083, 4
-          tz.transition 1970, 4, :o4, 9961200
-          tz.transition 1970, 10, :o1, 25682400
-          tz.transition 1971, 4, :o4, 41410800
-          tz.transition 1971, 10, :o1, 57736800
-          tz.transition 1972, 4, :o4, 73465200
-          tz.transition 1972, 10, :o1, 89186400
-          tz.transition 1973, 4, :o4, 104914800
-          tz.transition 1973, 10, :o1, 120636000
-          tz.transition 1974, 4, :o4, 136364400
-          tz.transition 1974, 10, :o1, 152085600
-          tz.transition 1975, 4, :o4, 167814000
-          tz.transition 1975, 10, :o1, 183535200
-          tz.transition 1976, 4, :o4, 199263600
-          tz.transition 1976, 10, :o1, 215589600
-          tz.transition 1977, 4, :o4, 230713200
-          tz.transition 1977, 10, :o1, 247039200
-          tz.transition 1978, 4, :o4, 262767600
-          tz.transition 1978, 10, :o1, 278488800
-          tz.transition 1979, 4, :o4, 294217200
-          tz.transition 1979, 10, :o1, 309938400
-          tz.transition 1980, 4, :o4, 325666800
-          tz.transition 1980, 10, :o1, 341388000
-          tz.transition 1981, 4, :o4, 357116400
-          tz.transition 1981, 10, :o1, 372837600
-          tz.transition 1982, 4, :o4, 388566000
-          tz.transition 1982, 10, :o1, 404892000
-          tz.transition 1983, 4, :o4, 420015600
-          tz.transition 1983, 10, :o1, 436341600
-          tz.transition 1984, 4, :o4, 452070000
-          tz.transition 1984, 10, :o1, 467791200
-          tz.transition 1985, 4, :o4, 483519600
-          tz.transition 1985, 10, :o1, 499240800
-          tz.transition 1986, 4, :o4, 514969200
-          tz.transition 1986, 10, :o1, 530690400
-          tz.transition 1987, 4, :o4, 544604400
-          tz.transition 1987, 10, :o1, 562140000
-          tz.transition 1988, 4, :o4, 576054000
-          tz.transition 1988, 10, :o1, 594194400
-          tz.transition 1989, 4, :o4, 607503600
-          tz.transition 1989, 10, :o1, 625644000
-          tz.transition 1990, 4, :o4, 638953200
-          tz.transition 1990, 10, :o1, 657093600
-          tz.transition 1991, 4, :o4, 671007600
-          tz.transition 1991, 10, :o1, 688543200
-          tz.transition 1992, 4, :o4, 702457200
-          tz.transition 1992, 10, :o1, 719992800
-          tz.transition 1993, 4, :o4, 733906800
-          tz.transition 1993, 10, :o1, 752047200
-          tz.transition 1994, 4, :o4, 765356400
-          tz.transition 1994, 10, :o1, 783496800
-          tz.transition 1995, 4, :o4, 796806000
-          tz.transition 1995, 10, :o1, 814946400
-          tz.transition 1996, 4, :o4, 828860400
-          tz.transition 1996, 10, :o1, 846396000
-          tz.transition 1997, 4, :o4, 860310000
-          tz.transition 1997, 10, :o1, 877845600
-          tz.transition 1998, 4, :o4, 891759600
-          tz.transition 1998, 10, :o1, 909295200
-          tz.transition 1999, 4, :o4, 923209200
-          tz.transition 1999, 10, :o1, 941349600
-          tz.transition 2000, 4, :o4, 954658800
-          tz.transition 2000, 10, :o1, 972799200
-          tz.transition 2001, 4, :o4, 986108400
-          tz.transition 2001, 10, :o1, 1004248800
-          tz.transition 2002, 4, :o4, 1018162800
-          tz.transition 2002, 10, :o1, 1035698400
-          tz.transition 2003, 4, :o4, 1049612400
-          tz.transition 2003, 10, :o1, 1067148000
-          tz.transition 2004, 4, :o4, 1081062000
-          tz.transition 2004, 10, :o1, 1099202400
-          tz.transition 2005, 4, :o4, 1112511600
-          tz.transition 2005, 10, :o1, 1130652000
-          tz.transition 2006, 4, :o4, 1143961200
-          tz.transition 2006, 10, :o1, 1162101600
-          tz.transition 2007, 3, :o4, 1173596400
-          tz.transition 2007, 11, :o1, 1194156000
-          tz.transition 2008, 3, :o4, 1205046000
-          tz.transition 2008, 11, :o1, 1225605600
-          tz.transition 2009, 3, :o4, 1236495600
-          tz.transition 2009, 11, :o1, 1257055200
-          tz.transition 2010, 3, :o4, 1268550000
-          tz.transition 2010, 11, :o1, 1289109600
-          tz.transition 2011, 3, :o4, 1299999600
-          tz.transition 2011, 11, :o1, 1320559200
-          tz.transition 2012, 3, :o4, 1331449200
-          tz.transition 2012, 11, :o1, 1352008800
-          tz.transition 2013, 3, :o4, 1362898800
-          tz.transition 2013, 11, :o1, 1383458400
-          tz.transition 2014, 3, :o4, 1394348400
-          tz.transition 2014, 11, :o1, 1414908000
-          tz.transition 2015, 3, :o4, 1425798000
-          tz.transition 2015, 11, :o1, 1446357600
-          tz.transition 2016, 3, :o4, 1457852400
-          tz.transition 2016, 11, :o1, 1478412000
-          tz.transition 2017, 3, :o4, 1489302000
-          tz.transition 2017, 11, :o1, 1509861600
-          tz.transition 2018, 3, :o4, 1520751600
-          tz.transition 2018, 11, :o1, 1541311200
-          tz.transition 2019, 3, :o4, 1552201200
-          tz.transition 2019, 11, :o1, 1572760800
-          tz.transition 2020, 3, :o4, 1583650800
-          tz.transition 2020, 11, :o1, 1604210400
-          tz.transition 2021, 3, :o4, 1615705200
-          tz.transition 2021, 11, :o1, 1636264800
-          tz.transition 2022, 3, :o4, 1647154800
-          tz.transition 2022, 11, :o1, 1667714400
-          tz.transition 2023, 3, :o4, 1678604400
-          tz.transition 2023, 11, :o1, 1699164000
-          tz.transition 2024, 3, :o4, 1710054000
-          tz.transition 2024, 11, :o1, 1730613600
-          tz.transition 2025, 3, :o4, 1741503600
-          tz.transition 2025, 11, :o1, 1762063200
-          tz.transition 2026, 3, :o4, 1772953200
-          tz.transition 2026, 11, :o1, 1793512800
-          tz.transition 2027, 3, :o4, 1805007600
-          tz.transition 2027, 11, :o1, 1825567200
-          tz.transition 2028, 3, :o4, 1836457200
-          tz.transition 2028, 11, :o1, 1857016800
-          tz.transition 2029, 3, :o4, 1867906800
-          tz.transition 2029, 11, :o1, 1888466400
-          tz.transition 2030, 3, :o4, 1899356400
-          tz.transition 2030, 11, :o1, 1919916000
-          tz.transition 2031, 3, :o4, 1930806000
-          tz.transition 2031, 11, :o1, 1951365600
-          tz.transition 2032, 3, :o4, 1962860400
-          tz.transition 2032, 11, :o1, 1983420000
-          tz.transition 2033, 3, :o4, 1994310000
-          tz.transition 2033, 11, :o1, 2014869600
-          tz.transition 2034, 3, :o4, 2025759600
-          tz.transition 2034, 11, :o1, 2046319200
-          tz.transition 2035, 3, :o4, 2057209200
-          tz.transition 2035, 11, :o1, 2077768800
-          tz.transition 2036, 3, :o4, 2088658800
-          tz.transition 2036, 11, :o1, 2109218400
-          tz.transition 2037, 3, :o4, 2120108400
-          tz.transition 2037, 11, :o1, 2140668000
-          tz.transition 2038, 3, :o4, 59171923, 24
-          tz.transition 2038, 11, :o1, 9862939, 4
-          tz.transition 2039, 3, :o4, 59180659, 24
-          tz.transition 2039, 11, :o1, 9864395, 4
-          tz.transition 2040, 3, :o4, 59189395, 24
-          tz.transition 2040, 11, :o1, 9865851, 4
-          tz.transition 2041, 3, :o4, 59198131, 24
-          tz.transition 2041, 11, :o1, 9867307, 4
-          tz.transition 2042, 3, :o4, 59206867, 24
-          tz.transition 2042, 11, :o1, 9868763, 4
-          tz.transition 2043, 3, :o4, 59215603, 24
-          tz.transition 2043, 11, :o1, 9870219, 4
-          tz.transition 2044, 3, :o4, 59224507, 24
-          tz.transition 2044, 11, :o1, 9871703, 4
-          tz.transition 2045, 3, :o4, 59233243, 24
-          tz.transition 2045, 11, :o1, 9873159, 4
-          tz.transition 2046, 3, :o4, 59241979, 24
-          tz.transition 2046, 11, :o1, 9874615, 4
-          tz.transition 2047, 3, :o4, 59250715, 24
-          tz.transition 2047, 11, :o1, 9876071, 4
-          tz.transition 2048, 3, :o4, 59259451, 24
-          tz.transition 2048, 11, :o1, 9877527, 4
-          tz.transition 2049, 3, :o4, 59268355, 24
-          tz.transition 2049, 11, :o1, 9879011, 4
-          tz.transition 2050, 3, :o4, 59277091, 24
-          tz.transition 2050, 11, :o1, 9880467, 4
-        end
+        linked_timezone 'America/Nassau', 'America/Toronto'
       end
     end
   end

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

@@ -6,12 +6,7 @@ module TZInfo
       module Port_of_Spain
         include TimezoneDefinition
         
-        timezone 'America/Port_of_Spain' do |tz|
-          tz.offset :o0, -14764, 0, :LMT
-          tz.offset :o1, -14400, 0, :AST
-          
-          tz.transition 1912, 3, :o1, 52260415291, 21600
-        end
+        linked_timezone 'America/Port_of_Spain', 'America/Puerto_Rico'
       end
     end
   end

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

@@ -8,7 +8,7 @@ module TZInfo
         
         timezone 'America/Punta_Arenas' do |tz|
           tz.offset :o0, -17020, 0, :LMT
-          tz.offset :o1, -16966, 0, :SMT
+          tz.offset :o1, -16965, 0, :SMT
           tz.offset :o2, -18000, 0, :'-05'
           tz.offset :o3, -14400, 0, :'-04'
           tz.offset :o4, -18000, 3600, :'-04'
@@ -16,11 +16,11 @@ module TZInfo
           tz.offset :o6, -10800, 0, :'-03'
           
           tz.transition 1890, 1, :o1, 10417112771, 4320
-          tz.transition 1910, 1, :o2, 104487049283, 43200
+          tz.transition 1910, 1, :o2, 4643868857, 1920
           tz.transition 1916, 7, :o1, 58105097, 24
-          tz.transition 1918, 9, :o3, 104623777283, 43200
+          tz.transition 1918, 9, :o3, 4649945657, 1920
           tz.transition 1919, 7, :o1, 7266422, 3
-          tz.transition 1927, 9, :o4, 104765386883, 43200
+          tz.transition 1927, 9, :o4, 4656239417, 1920
           tz.transition 1928, 4, :o2, 7276013, 3
           tz.transition 1928, 9, :o4, 58211777, 24
           tz.transition 1929, 4, :o2, 7277108, 3

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

@@ -7,19 +7,19 @@ module TZInfo
         include TimezoneDefinition
         
         timezone 'America/Santiago' do |tz|
-          tz.offset :o0, -16966, 0, :LMT
-          tz.offset :o1, -16966, 0, :SMT
+          tz.offset :o0, -16965, 0, :LMT
+          tz.offset :o1, -16965, 0, :SMT
           tz.offset :o2, -18000, 0, :'-05'
           tz.offset :o3, -14400, 0, :'-04'
           tz.offset :o4, -18000, 3600, :'-04'
           tz.offset :o5, -14400, 3600, :'-03'
           
-          tz.transition 1890, 1, :o1, 104171127683, 43200
-          tz.transition 1910, 1, :o2, 104487049283, 43200
+          tz.transition 1890, 1, :o1, 4629827897, 1920
+          tz.transition 1910, 1, :o2, 4643868857, 1920
           tz.transition 1916, 7, :o1, 58105097, 24
-          tz.transition 1918, 9, :o3, 104623777283, 43200
+          tz.transition 1918, 9, :o3, 4649945657, 1920
           tz.transition 1919, 7, :o1, 7266422, 3
-          tz.transition 1927, 9, :o4, 104765386883, 43200
+          tz.transition 1927, 9, :o4, 4656239417, 1920
           tz.transition 1928, 4, :o2, 7276013, 3
           tz.transition 1928, 9, :o4, 58211777, 24
           tz.transition 1929, 4, :o2, 7277108, 3

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

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

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

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