hughesjr / rpms / tzdata

Forked from rpms/tzdata 2 years ago
Clone
b7aae5
commit 401c42d991d4277cd606933fc9f5d9a13d1ac228
b7aae5
Author: Paul Eggert <eggert@cs.ucla.edu>
b7aae5
Date:   Thu Oct 18 11:06:07 2018 -0700
b7aae5
b7aae5
    Avoid 25:00 in rearguard format
b7aae5
    
b7aae5
    (Problem reported by Christos Zoulas.)
b7aae5
    * NEWS: Mention this.
b7aae5
    * ziguard.awk: Change "Rule ... Sat>=8 25:00" to "Rule ... Sun>=9 1:00".
b7aae5
b7aae5
diff --git a/NEWS b/NEWS
b7aae5
index aeeef10..16f0947 100644
b7aae5
--- a/NEWS
b7aae5
+++ b/NEWS
b7aae5
@@ -1,5 +1,16 @@
b7aae5
 News for the tz database
b7aae5
 
b7aae5
+Unreleased, experimental changes
b7aae5
+
b7aae5
+  Changes to code
b7aae5
+
b7aae5
+    The translator to rearguard format now rewrites the line
b7aae5
+    "Rule Japan 1948 1951 - Sep Sat>=8 25:00 0 S" to
b7aae5
+    "Rule Japan 1948 1951 - Sep Sun>=9  1:00 0 S".
b7aae5
+    This caters to zic before 2007 and to at least one Java-based zi
b7aae5
+    compiler of uncertain vintage.  (Reported by Christos Zoulas.)
b7aae5
+
b7aae5
+
b7aae5
 Release 2018f - 2018-10-18 00:14:18 -0700
b7aae5
 
b7aae5
   Briefly:
b7aae5
diff --git a/ziguard.awk b/ziguard.awk
b7aae5
index 42e2910..e3c7298 100644
b7aae5
--- a/ziguard.awk
b7aae5
+++ b/ziguard.awk
b7aae5
@@ -80,6 +80,13 @@ DATAFORM != "main" {
b7aae5
   if (comment_out) {
b7aae5
     sub(/^/, "#")
b7aae5
   }
b7aae5
+
b7aae5
+  # In rearguard format, change the Japan rule line with "Sat>=8 25:00"
b7aae5
+  # to "Sun>=9 1:00", to cater to zic before 2007 and to older Java.
b7aae5
+  if (!vanguard && $1 == "Rule" && $7 == "Sat>=8" && $8 == "25:00") {
b7aae5
+    sub(/Sat>=8/, "Sun>=9")
b7aae5
+    sub(/25:00/, " 1:00")
b7aae5
+  }
b7aae5
 }
b7aae5
 
b7aae5
 # If a Link line is followed by a Zone line for the same data, comment