--- a/jdk/make/data/tzdata/VERSION Mon Apr 03 17:07:27 2017 -0700
+++ b/jdk/make/data/tzdata/VERSION Tue Apr 04 19:27:38 2017 +0530
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2017a
+tzdata2017b
--- a/jdk/make/data/tzdata/africa Mon Apr 03 17:07:27 2017 -0700
+++ b/jdk/make/data/tzdata/africa Tue Apr 04 19:27:38 2017 +0530
@@ -443,18 +443,25 @@
# See Africa/Johannesburg.
# Liberia
-# From Paul Eggert (2006-03-22):
-# In 1972 Liberia was the last country to switch
-# from a UTC offset that was not a multiple of 15 or 20 minutes.
-# Howse reports that it was in honor of their president's birthday.
-# Shank & Pottenger report the date as May 1, whereas Howse reports Jan;
-# go with Shanks & Pottenger.
-# For Liberia before 1972, Shanks & Pottenger report -0:44, whereas Howse and
-# Whitman each report -0:44:30; go with the more precise figure.
+#
+# From Paul Eggert (2017-03-02):
+#
+# The Nautical Almanac for the Year 1970, p 264, is the source for -0:44:30.
+#
+# In 1972 Liberia was the last country to switch from a UTC offset
+# that was not a multiple of 15 or 20 minutes. The 1972 change was on
+# 1972-01-07, according to an entry dated 1972-01-04 on p 330 of:
+# Presidential Papers: First year of the administration of
+# President William R. Tolbert, Jr., July 23, 1971-July 31, 1972.
+# Monrovia: Executive Mansion.
+#
+# Use the abbreviation "MMT" before 1972, as the more-accurate numeric
+# abbreviation "-004430" would be one byte over the POSIX limit.
+#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Monrovia -0:43:08 - LMT 1882
-0:43:08 - MMT 1919 Mar # Monrovia Mean Time
- -0:44:30 - -004430 1972 May
+ -0:44:30 - MMT 1972 Jan 7 # approximately MMT
0:00 - GMT
###############################################################################
--- a/jdk/make/data/tzdata/iso3166.tab Mon Apr 03 17:07:27 2017 -0700
+++ b/jdk/make/data/tzdata/iso3166.tab Tue Apr 04 19:27:38 2017 +0530
@@ -32,8 +32,8 @@
# All text uses UTF-8 encoding. The columns of the table are as follows:
#
# 1. ISO 3166-1 alpha-2 country code, current as of
-# ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166
-# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
+# ISO 3166-1 N905 (2016-11-15). See: Updates on ISO 3166-1
+# http://isotc.iso.org/livelink/livelink/Open/16944257
# 2. The usual English name for the coded region,
# chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables.
--- a/jdk/make/data/tzdata/northamerica Mon Apr 03 17:07:27 2017 -0700
+++ b/jdk/make/data/tzdata/northamerica Tue Apr 04 19:27:38 2017 +0530
@@ -3162,6 +3162,12 @@
# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
+# From Steffen Thorsen (2017-03-12):
+# We have received 4 mails from different people telling that Haiti
+# has started DST again today, and this source seems to confirm that,
+# I have not been able to find a more authoritative source:
+# https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-haiti.html
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Haiti 1983 only - May 8 0:00 1:00 D
Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D
@@ -3174,6 +3180,8 @@
Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S
Rule Haiti 2012 2015 - Mar Sun>=8 2:00 1:00 D
Rule Haiti 2012 2015 - Nov Sun>=1 2:00 0 S
+Rule Haiti 2017 max - Mar Sun>=8 2:00 1:00 D
+Rule Haiti 2017 max - Nov Sun>=1 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Port-au-Prince -4:49:20 - LMT 1890
-4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT
--- a/jdk/test/sun/util/calendar/zi/tzdata/VERSION Mon Apr 03 17:07:27 2017 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/VERSION Tue Apr 04 19:27:38 2017 +0530
@@ -21,4 +21,4 @@
# or visit www.oracle.com if you need additional information or have any
# questions.
#
-tzdata2017a
+tzdata2017b
--- a/jdk/test/sun/util/calendar/zi/tzdata/africa Mon Apr 03 17:07:27 2017 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/africa Tue Apr 04 19:27:38 2017 +0530
@@ -443,18 +443,25 @@
# See Africa/Johannesburg.
# Liberia
-# From Paul Eggert (2006-03-22):
-# In 1972 Liberia was the last country to switch
-# from a UTC offset that was not a multiple of 15 or 20 minutes.
-# Howse reports that it was in honor of their president's birthday.
-# Shank & Pottenger report the date as May 1, whereas Howse reports Jan;
-# go with Shanks & Pottenger.
-# For Liberia before 1972, Shanks & Pottenger report -0:44, whereas Howse and
-# Whitman each report -0:44:30; go with the more precise figure.
+#
+# From Paul Eggert (2017-03-02):
+#
+# The Nautical Almanac for the Year 1970, p 264, is the source for -0:44:30.
+#
+# In 1972 Liberia was the last country to switch from a UTC offset
+# that was not a multiple of 15 or 20 minutes. The 1972 change was on
+# 1972-01-07, according to an entry dated 1972-01-04 on p 330 of:
+# Presidential Papers: First year of the administration of
+# President William R. Tolbert, Jr., July 23, 1971-July 31, 1972.
+# Monrovia: Executive Mansion.
+#
+# Use the abbreviation "MMT" before 1972, as the more-accurate numeric
+# abbreviation "-004430" would be one byte over the POSIX limit.
+#
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Monrovia -0:43:08 - LMT 1882
-0:43:08 - MMT 1919 Mar # Monrovia Mean Time
- -0:44:30 - -004430 1972 May
+ -0:44:30 - MMT 1972 Jan 7 # approximately MMT
0:00 - GMT
###############################################################################
--- a/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab Mon Apr 03 17:07:27 2017 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/iso3166.tab Tue Apr 04 19:27:38 2017 +0530
@@ -32,8 +32,8 @@
# All text uses UTF-8 encoding. The columns of the table are as follows:
#
# 1. ISO 3166-1 alpha-2 country code, current as of
-# ISO 3166-1 Newsletter VI-16 (2013-07-11). See: Updates on ISO 3166
-# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm
+# ISO 3166-1 N905 (2016-11-15). See: Updates on ISO 3166-1
+# http://isotc.iso.org/livelink/livelink/Open/16944257
# 2. The usual English name for the coded region,
# chosen so that alphabetic sorting of subsets produces helpful lists.
# This is not the same as the English name in the ISO 3166 tables.
--- a/jdk/test/sun/util/calendar/zi/tzdata/northamerica Mon Apr 03 17:07:27 2017 -0700
+++ b/jdk/test/sun/util/calendar/zi/tzdata/northamerica Tue Apr 04 19:27:38 2017 +0530
@@ -3162,6 +3162,12 @@
# http://www.vantbefinfo.com/changement-dheure-pas-pour-haiti/
# http://news.anmwe.com/haiti-lheure-nationale-ne-sera-ni-avancee-ni-reculee-cette-annee/
+# From Steffen Thorsen (2017-03-12):
+# We have received 4 mails from different people telling that Haiti
+# has started DST again today, and this source seems to confirm that,
+# I have not been able to find a more authoritative source:
+# https://www.haitilibre.com/en/news-20319-haiti-notices-time-change-in-haiti.html
+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Haiti 1983 only - May 8 0:00 1:00 D
Rule Haiti 1984 1987 - Apr lastSun 0:00 1:00 D
@@ -3174,6 +3180,8 @@
Rule Haiti 2005 2006 - Oct lastSun 0:00 0 S
Rule Haiti 2012 2015 - Mar Sun>=8 2:00 1:00 D
Rule Haiti 2012 2015 - Nov Sun>=1 2:00 0 S
+Rule Haiti 2017 max - Mar Sun>=8 2:00 1:00 D
+Rule Haiti 2017 max - Nov Sun>=1 2:00 0 S
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone America/Port-au-Prince -4:49:20 - LMT 1890
-4:49 - PPMT 1917 Jan 24 12:00 # P-a-P MT