# HG changeset patch # User Andrew John Hughes # Date 1377794521 -3600 # Node ID e319de2968f38620248b675cc7bf2de315f7bdad # Parent f47f5152f6ac54241324c19de9011d0adacf6ff8 Add latest tzdata updates. 2013-08-29 Andrew John Hughes * Makefile.am: (ICEDTEA_PATCHES): Add new timezone data patches. * patches/openjdk/8014469-tzdata2013c.patch, * patches/openjdk/8020054-tzdata2013d.patch: Latest tzdata updates. diff -r f47f5152f6ac -r e319de2968f3 ChangeLog --- a/ChangeLog Thu Aug 29 16:16:25 2013 +0100 +++ b/ChangeLog Thu Aug 29 17:42:01 2013 +0100 @@ -1,3 +1,11 @@ +2013-08-29 Andrew John Hughes + + * Makefile.am: + (ICEDTEA_PATCHES): Add new timezone data patches. + * patches/openjdk/8014469-tzdata2013c.patch, + * patches/openjdk/8020054-tzdata2013d.patch: + Latest tzdata updates. + 2013-08-06 Andrew John Hughes * 8013196-TimeZone_getDefault_throws_exception.patch: diff -r f47f5152f6ac -r e319de2968f3 Makefile.am --- a/Makefile.am Thu Aug 29 16:16:25 2013 +0100 +++ b/Makefile.am Thu Aug 29 17:42:01 2013 +0100 @@ -708,7 +708,9 @@ patches/openjdk/6893617-cnctx_always_uses_default_orb.patch \ patches/openjdk/7196533-timezone_bottleneck.patch \ patches/openjdk/6636370-appcontext_simplification.patch \ - patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch + patches/openjdk/6636331-appcontext_concurrentmodificationexception.patch \ + patches/openjdk/8014469-tzdata2013c.patch \ + patches/openjdk/8020054-tzdata2013d.patch if WITH_RHINO ICEDTEA_PATCHES += \ diff -r f47f5152f6ac -r e319de2968f3 patches/openjdk/8014469-tzdata2013c.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8014469-tzdata2013c.patch Thu Aug 29 17:42:01 2013 +0100 @@ -0,0 +1,276 @@ +# HG changeset patch +# User peytoia +# Date 1369892058 -32400 +# Thu May 30 14:34:18 2013 +0900 +# Node ID 1dad45fa401d88fd42b795a2bd0ca796f6842ba5 +# Parent a1ec65ac926d41ccca2545dbc3b62bb7c12282af +8014469: (tz) Support tzdata2013c +8015570: Use long comparison in Rule.getRules(). +Reviewed-by: okutsu + +diff --git a/make/sun/javazic/tzdata/VERSION b/make/sun/javazic/tzdata/VERSION +--- openjdk/jdk/make/sun/javazic/tzdata/VERSION ++++ openjdk/jdk/make/sun/javazic/tzdata/VERSION +@@ -21,4 +21,4 @@ + # or visit www.oracle.com if you need additional information or have any + # questions. + # +-tzdata2013b ++tzdata2013c +diff --git a/make/sun/javazic/tzdata/antarctica b/make/sun/javazic/tzdata/antarctica +--- openjdk/jdk/make/sun/javazic/tzdata/antarctica ++++ openjdk/jdk/make/sun/javazic/tzdata/antarctica +@@ -76,34 +76,6 @@ + Rule ChileAQ 2012 max - Apr Sun>=23 3:00u 0 - + Rule ChileAQ 2012 max - Sep Sun>=2 4:00u 1:00 S + +-# These rules are stolen from the `australasia' file. +-Rule AusAQ 1917 only - Jan 1 0:01 1:00 - +-Rule AusAQ 1917 only - Mar 25 2:00 0 - +-Rule AusAQ 1942 only - Jan 1 2:00 1:00 - +-Rule AusAQ 1942 only - Mar 29 2:00 0 - +-Rule AusAQ 1942 only - Sep 27 2:00 1:00 - +-Rule AusAQ 1943 1944 - Mar lastSun 2:00 0 - +-Rule AusAQ 1943 only - Oct 3 2:00 1:00 - +-Rule ATAQ 1967 only - Oct Sun>=1 2:00s 1:00 - +-Rule ATAQ 1968 only - Mar lastSun 2:00s 0 - +-Rule ATAQ 1968 1985 - Oct lastSun 2:00s 1:00 - +-Rule ATAQ 1969 1971 - Mar Sun>=8 2:00s 0 - +-Rule ATAQ 1972 only - Feb lastSun 2:00s 0 - +-Rule ATAQ 1973 1981 - Mar Sun>=1 2:00s 0 - +-Rule ATAQ 1982 1983 - Mar lastSun 2:00s 0 - +-Rule ATAQ 1984 1986 - Mar Sun>=1 2:00s 0 - +-Rule ATAQ 1986 only - Oct Sun>=15 2:00s 1:00 - +-Rule ATAQ 1987 1990 - Mar Sun>=15 2:00s 0 - +-Rule ATAQ 1987 only - Oct Sun>=22 2:00s 1:00 - +-Rule ATAQ 1988 1990 - Oct lastSun 2:00s 1:00 - +-Rule ATAQ 1991 1999 - Oct Sun>=1 2:00s 1:00 - +-Rule ATAQ 1991 2005 - Mar lastSun 2:00s 0 - +-Rule ATAQ 2000 only - Aug lastSun 2:00s 1:00 - +-Rule ATAQ 2001 max - Oct Sun>=1 2:00s 1:00 - +-Rule ATAQ 2006 only - Apr Sun>=1 2:00s 0 - +-Rule ATAQ 2007 only - Mar lastSun 2:00s 0 - +-Rule ATAQ 2008 max - Apr Sun>=1 2:00s 0 - +- + # Argentina - year-round bases + # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05 + # Esperanza, San Martin Land, -6323-05659, since 1952-12-17 +@@ -145,10 +117,7 @@ + # + + # From Steffen Thorsen (2010-03-10): +-# We got these changes from the Australian Antarctic Division: +-# - Macquarie Island will stay on UTC+11 for winter and therefore not +-# switch back from daylight savings time when other parts of Australia do +-# on 4 April. ++# We got these changes from the Australian Antarctic Division: ... + # + # - Casey station reverted to its normal time of UTC+8 on 5 March 2010. + # The change to UTC+11 is being considered as a regular summer thing but +@@ -159,9 +128,6 @@ + # + # - Mawson station stays on UTC+5. + # +-# In addition to the Rule changes for Casey/Davis, it means that Macquarie +-# will no longer be like Hobart and will have to have its own Zone created. +-# + # Background: + # + # http://www.timeanddate.com/news/time/antartica-time-changes-2010.html +@@ -188,12 +154,6 @@ + 6:00 - MAWT 2009 Oct 18 2:00 + # Mawson Time + 5:00 - MAWT +-Zone Antarctica/Macquarie 0 - zzz 1911 +- 10:00 - EST 1916 Oct 1 2:00 +- 10:00 1:00 EST 1917 Feb +- 10:00 AusAQ EST 1967 +- 10:00 ATAQ EST 2010 Apr 4 3:00 +- 11:00 - MIST # Macquarie Island Time + # References: + # + # Casey Weather (1998-02-26) +diff --git a/make/sun/javazic/tzdata/asia b/make/sun/javazic/tzdata/asia +--- openjdk/jdk/make/sun/javazic/tzdata/asia ++++ openjdk/jdk/make/sun/javazic/tzdata/asia +@@ -2314,11 +2314,20 @@ + # http://www.timeanddate.com/news/time/gaza-west-bank-dst-2012.html + # + +-# From Arthur David Olson (2012-03-27): +-# The timeanddate article for 2012 says that "the end date has not yet been +-# announced" and that "Last year, both...paused daylight saving time during... +-# Ramadan. It is not yet known [for] 2012." +-# For now, assume both switch back on the last Friday in September. XXX ++# From Steffen Thorsen (2013-03-26): ++# The following news sources tells that Palestine will "start daylight saving ++# time from midnight on Friday, March 29, 2013" (translated). ++# [These are in Arabic and are for Gaza and for Ramallah, respectively.] ++# http://www.samanews.com/index.php?act=Show&id=154120 ++# http://safa.ps/details/news/99844/%D8%B1%D8%A7%D9%85-%D8%A7%D9%84%D9%84%D9%87-%D8%A8%D8%AF%D8%A1-%D8%A7%D9%84%D8%AA%D9%88%D9%82%D9%8A%D8%AA-%D8%A7%D9%84%D8%B5%D9%8A%D9%81%D9%8A-29-%D8%A7%D9%84%D8%AC%D8%A7%D8%B1%D9%8A.html ++ ++# From Paul Eggert (2013-04-15): ++# For future dates, guess the last Thursday in March at 24:00 through ++# the first Friday on or after September 21 at 01:00. This is consistent with ++# the predictions in today's editions of the following URLs, ++# which are for Gaza and Hebron respectively: ++# http://www.timeanddate.com/worldclock/timezone.html?n=702 ++# http://www.timeanddate.com/worldclock/timezone.html?n=2364 + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule EgyptAsia 1957 only - May 10 0:00 1:00 S +@@ -2332,19 +2341,20 @@ + Rule Palestine 1999 2003 - Oct Fri>=15 0:00 0 - + Rule Palestine 2004 only - Oct 1 1:00 0 - + Rule Palestine 2005 only - Oct 4 2:00 0 - +-Rule Palestine 2006 2008 - Apr 1 0:00 1:00 S ++Rule Palestine 2006 2007 - Apr 1 0:00 1:00 S + Rule Palestine 2006 only - Sep 22 0:00 0 - + Rule Palestine 2007 only - Sep Thu>=8 2:00 0 - +-Rule Palestine 2008 only - Aug lastFri 0:00 0 - +-Rule Palestine 2009 only - Mar lastFri 0:00 1:00 S +-Rule Palestine 2009 only - Sep Fri>=1 2:00 0 - +-Rule Palestine 2010 only - Mar lastSat 0:01 1:00 S ++Rule Palestine 2008 2009 - Mar lastFri 0:00 1:00 S ++Rule Palestine 2008 only - Sep 1 0:00 0 - ++Rule Palestine 2009 only - Sep Fri>=1 1:00 0 - ++Rule Palestine 2010 only - Mar 26 0:00 1:00 S + Rule Palestine 2010 only - Aug 11 0:00 0 - +- +-# From Arthur David Olson (2011-09-20): +-# 2011 transitions per http://www.timeanddate.com as of 2011-09-20. +-# From Paul Eggert (2012-10-12): +-# 2012 transitions per http://www.timeanddate.com as of 2012-10-12. ++Rule Palestine 2011 only - Apr 1 0:01 1:00 S ++Rule Palestine 2011 only - Aug 1 0:00 0 - ++Rule Palestine 2011 only - Aug 30 0:00 1:00 S ++Rule Palestine 2011 only - Sep 30 0:00 0 - ++Rule Palestine 2012 max - Mar lastThu 24:00 1:00 S ++Rule Palestine 2012 max - Sep Fri>=21 1:00 0 - + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone Asia/Gaza 2:17:52 - LMT 1900 Oct +@@ -2352,26 +2362,20 @@ + 2:00 EgyptAsia EE%sT 1967 Jun 5 + 2:00 Zion I%sT 1996 + 2:00 Jordan EE%sT 1999 +- 2:00 Palestine EE%sT 2011 Apr 2 12:01 +- 2:00 1:00 EEST 2011 Aug 1 +- 2:00 - EET 2012 Mar 30 +- 2:00 1:00 EEST 2012 Sep 21 1:00 +- 2:00 - EET ++ 2:00 Palestine EE%sT 2008 Aug 29 0:00 ++ 2:00 - EET 2008 Sep ++ 2:00 Palestine EE%sT 2010 ++ 2:00 - EET 2010 Mar 27 0:01 ++ 2:00 Palestine EE%sT 2011 Aug 1 ++ 2:00 - EET 2012 ++ 2:00 Palestine EE%sT + + Zone Asia/Hebron 2:20:23 - LMT 1900 Oct + 2:00 Zion EET 1948 May 15 + 2:00 EgyptAsia EE%sT 1967 Jun 5 + 2:00 Zion I%sT 1996 + 2:00 Jordan EE%sT 1999 +- 2:00 Palestine EE%sT 2008 Aug +- 2:00 1:00 EEST 2008 Sep +- 2:00 Palestine EE%sT 2011 Apr 1 12:01 +- 2:00 1:00 EEST 2011 Aug 1 +- 2:00 - EET 2011 Aug 30 +- 2:00 1:00 EEST 2011 Sep 30 3:00 +- 2:00 - EET 2012 Mar 30 +- 2:00 1:00 EEST 2012 Sep 21 1:00 +- 2:00 - EET ++ 2:00 Palestine EE%sT + + # Paracel Is + # no information +diff --git a/make/sun/javazic/tzdata/australasia b/make/sun/javazic/tzdata/australasia +--- openjdk/jdk/make/sun/javazic/tzdata/australasia ++++ openjdk/jdk/make/sun/javazic/tzdata/australasia +@@ -241,9 +241,26 @@ + # no times are set + # + # Macquarie +-# permanent occupation (scientific station) since 1948; +-# sealing and penguin oil station operated 1888/1917 +-# like Australia/Hobart ++# Permanent occupation (scientific station) 1911-1915 and since 25 March 1948; ++# sealing and penguin oil station operated Nov 1899 to Apr 1919. See the ++# Tasmania Parks & Wildlife Service history of sealing at Macquarie Island ++# ++# . ++# Guess that it was like Australia/Hobart while inhabited before 2010. ++# ++# From Steffen Thorsen (2010-03-10): ++# We got these changes from the Australian Antarctic Division: ++# - Macquarie Island will stay on UTC+11 for winter and therefore not ++# switch back from daylight savings time when other parts of Australia do ++# on 4 April. ++Zone Antarctica/Macquarie 0 - zzz 1899 Nov ++ 10:00 - EST 1916 Oct 1 2:00 ++ 10:00 1:00 EST 1917 Feb ++ 10:00 Aus EST 1919 Apr ++ 0 - zzz 1948 Mar 25 ++ 10:00 Aus EST 1967 ++ 10:00 AT EST 2010 Apr 4 3:00 ++ 11:00 - MIST # Macquarie I Standard Time + + # Christmas + # Zone NAME GMTOFF RULES FORMAT [UNTIL] +diff --git a/make/sun/javazic/tzdata/southamerica b/make/sun/javazic/tzdata/southamerica +--- openjdk/jdk/make/sun/javazic/tzdata/southamerica ++++ openjdk/jdk/make/sun/javazic/tzdata/southamerica +@@ -1589,16 +1589,16 @@ + # forward 60 minutes, in all the territory of the Paraguayan Republic. + # ... + Rule Para 2010 max - Oct Sun>=1 0:00 1:00 S +-Rule Para 2010 max - Apr Sun>=8 0:00 0 - ++Rule Para 2010 2012 - Apr Sun>=8 0:00 0 - + # + # From Steffen Thorsen (2013-03-07): + # Paraguay will end DST on 2013-03-24 00:00.... +-# They do not tell if this will be a permanent change or just this year.... + # http://www.ande.gov.py/interna.php?id=1075 + # +-# From Paul Eggert (2013-03-07): +-# For now, assume it's just this year. +-Rule Para 2013 only - Mar 24 0:00 0 - ++# From Carlos Raul Perasso (2013-03-15): ++# The change in Paraguay is now final. Decree number 10780 ++# http://www.presidencia.gov.py/uploads/pdf/presidencia-3b86ff4b691c79d4f5927ca964922ec74772ce857c02ca054a52a37b49afc7fb.pdf ++Rule Para 2013 max - Mar Sun>=22 0:00 0 - + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] + Zone America/Asuncion -3:50:40 - LMT 1890 +diff --git a/make/sun/javazic/tzdata/zone.tab b/make/sun/javazic/tzdata/zone.tab +--- openjdk/jdk/make/sun/javazic/tzdata/zone.tab ++++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab +@@ -65,7 +65,6 @@ + AQ -7824+10654 Antarctica/Vostok Vostok Station, Lake Vostok + AQ -6640+14001 Antarctica/DumontDUrville Dumont-d'Urville Station, Terre Adelie + AQ -690022+0393524 Antarctica/Syowa Syowa Station, E Ongul I +-AQ -5430+15857 Antarctica/Macquarie Macquarie Island Station, Macquarie Island + AR -3436-05827 America/Argentina/Buenos_Aires Buenos Aires (BA, CF) + AR -3124-06411 America/Argentina/Cordoba most locations (CB, CC, CN, ER, FM, MN, SE, SF) + AR -2447-06525 America/Argentina/Salta (SA, LP, NQ, RN) +@@ -81,6 +80,7 @@ + AS -1416-17042 Pacific/Pago_Pago + AT +4813+01620 Europe/Vienna + AU -3133+15905 Australia/Lord_Howe Lord Howe Island ++AU -5430+15857 Antarctica/Macquarie Macquarie Island + AU -4253+14719 Australia/Hobart Tasmania - most locations + AU -3956+14352 Australia/Currie Tasmania - King Island + AU -3749+14458 Australia/Melbourne Victoria +diff --git a/make/tools/src/build/tools/javazic/Rule.java b/make/tools/src/build/tools/javazic/Rule.java +--- openjdk/jdk/make/tools/src/build/tools/javazic/Rule.java ++++ openjdk/jdk/make/tools/src/build/tools/javazic/Rule.java +@@ -119,7 +119,7 @@ + r1.getDay(), r1.getTime().getTime()); + long t2 = Time.getLocalTime(y, r2.getMonth(), + r2.getDay(), r2.getTime().getTime()); +- return (int)(t1 - t2); ++ return (t1 > t2) ? 1 : (t1 < t2) ? -1 : 0; + } + public boolean equals(Object o) { + return this == o; diff -r f47f5152f6ac -r e319de2968f3 patches/openjdk/8020054-tzdata2013d.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8020054-tzdata2013d.patch Thu Aug 29 17:42:01 2013 +0100 @@ -0,0 +1,314 @@ +# HG changeset patch +# User igerasim +# Date 1373612209 -14400 +# Fri Jul 12 10:56:49 2013 +0400 +# Node ID dbf9b854ae55750afe3c8b3e319e3ccf5cfd2901 +# Parent 1dad45fa401d88fd42b795a2bd0ca796f6842ba5 +8020054: (tz) Support tzdata2013d +Reviewed-by: coffeys, peytoia + +diff --git a/make/sun/javazic/tzdata/VERSION b/make/sun/javazic/tzdata/VERSION +--- openjdk/jdk/make/sun/javazic/tzdata/VERSION ++++ openjdk/jdk/make/sun/javazic/tzdata/VERSION +@@ -21,4 +21,4 @@ + # or visit www.oracle.com if you need additional information or have any + # questions. + # +-tzdata2013c ++tzdata2013d +diff --git a/make/sun/javazic/tzdata/africa b/make/sun/javazic/tzdata/africa +--- openjdk/jdk/make/sun/javazic/tzdata/africa ++++ openjdk/jdk/make/sun/javazic/tzdata/africa +@@ -875,12 +875,18 @@ + # announced that year's Ramadan daylight-saving transitions would be + # 2012-07-20 and 2012-08-20; see + # . +-# ++ ++# From Andrew Paprocki (2013-07-02): ++# Morocco announced that the year's Ramadan daylight-savings ++# transitions would be 2013-07-07 and 2013-08-10; see: ++# http://www.maroc.ma/en/news/morocco-suspends-daylight-saving-time-july-7-aug10 ++ ++# From Paul Eggert (2013-07-03): + # To estimate what the Moroccan government will do in future years, +-# transition dates for 2013 through 2021 were determined by running ++# transition dates for 2014 through 2021 were determined by running + # the following program under GNU Emacs 24.3: + # +-# (let ((islamic-year 1434)) ++# (let ((islamic-year 1435)) + # (while (< islamic-year 1444) + # (let ((a + # (calendar-gregorian-from-absolute +@@ -933,8 +939,8 @@ + Rule Morocco 2012 max - Sep lastSun 3:00 0 - + Rule Morocco 2012 only - Jul 20 3:00 0 - + Rule Morocco 2012 only - Aug 20 2:00 1:00 S +-Rule Morocco 2013 only - Jul 9 3:00 0 - +-Rule Morocco 2013 only - Aug 8 2:00 1:00 S ++Rule Morocco 2013 only - Jul 7 3:00 0 - ++Rule Morocco 2013 only - Aug 10 2:00 1:00 S + Rule Morocco 2014 only - Jun 29 3:00 0 - + Rule Morocco 2014 only - Jul 29 2:00 1:00 S + Rule Morocco 2015 only - Jun 18 3:00 0 - +diff --git a/make/sun/javazic/tzdata/asia b/make/sun/javazic/tzdata/asia +--- openjdk/jdk/make/sun/javazic/tzdata/asia ++++ openjdk/jdk/make/sun/javazic/tzdata/asia +@@ -1235,39 +1235,21 @@ + Rule Zion 2012 only - Mar Fri>=26 2:00 1:00 D + Rule Zion 2012 only - Sep 23 2:00 0 S + +-# From Ephraim Silverberg (2012-10-18): +-# Yesterday, the Interior Ministry Committee, after more than a year +-# past, approved sending the proposed June 2011 changes to the Time +-# Decree Law back to the Knesset for second and third (final) votes +-# before the upcoming elections on Jan. 22, 2013. Hence, although the +-# changes are not yet law, they are expected to be so before February 2013. ++# From Ephraim Silverberg (2013-06-27): ++# On June 23, 2013, the Israeli government approved changes to the ++# Time Decree Law. The next day, the changes passed the First Reading ++# in the Knesset. The law is expected to pass the Second and Third ++# (final) Readings by the beginning of September 2013. + # +-# As of 2013, DST starts at 02:00 on the Friday before the last Sunday in March. +-# DST ends at 02:00 on the first Sunday after October 1, unless it occurs on the +-# second day of the Jewish Rosh Hashana holiday, in which case DST ends a day +-# later (i.e. at 02:00 the first Monday after October 2). +-# [Rosh Hashana holidays are factored in until 2100.] +- +-# From Ephraim Silverberg (2012-11-05): +-# The Knesset passed today (in second and final readings) the amendment to the +-# Time Decree Law making the changes ... law. ++# As of 2013, DST starts at 02:00 on the Friday before the last Sunday ++# in March. DST ends at 02:00 on the last Sunday of October. + + # Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S + Rule Zion 2013 max - Mar Fri>=23 2:00 1:00 D +-Rule Zion 2013 2026 - Oct Sun>=2 2:00 0 S +-Rule Zion 2027 only - Oct Mon>=3 2:00 0 S +-Rule Zion 2028 max - Oct Sun>=2 2:00 0 S +-# The following rules are commented out for now, as they break older +-# versions of zic that support only signed 32-bit timestamps, i.e., +-# through 2038-01-19 03:14:07 UTC. +-#Rule Zion 2028 2053 - Oct Sun>=2 2:00 0 S +-#Rule Zion 2054 only - Oct Mon>=3 2:00 0 S +-#Rule Zion 2055 2080 - Oct Sun>=2 2:00 0 S +-#Rule Zion 2081 only - Oct Mon>=3 2:00 0 S +-#Rule Zion 2082 max - Oct Sun>=2 2:00 0 S ++Rule Zion 2013 max - Oct lastSun 2:00 0 S + + # Zone NAME GMTOFF RULES FORMAT [UNTIL] +-Zone Asia/Jerusalem 2:20:56 - LMT 1880 ++Zone Asia/Jerusalem 2:20:54 - LMT 1880 + 2:20:40 - JMT 1918 # Jerusalem Mean Time? + 2:00 Zion I%sT + +@@ -2570,8 +2552,8 @@ + Rule Syria 2007 only - Mar lastFri 0:00 1:00 S + # From Jesper Norgard (2007-10-27): + # The sister center ICARDA of my work CIMMYT is confirming that Syria DST will +-# not take place 1.st November at 0:00 o'clock but 1.st November at 24:00 or +-# rather Midnight between Thursday and Friday. This does make more sence than ++# not take place 1st November at 0:00 o'clock but 1st November at 24:00 or ++# rather Midnight between Thursday and Friday. This does make more sense than + # having it between Wednesday and Thursday (two workdays in Syria) since the + # weekend in Syria is not Saturday and Sunday, but Friday and Saturday. So now + # it is implemented at midnight of the last workday before weekend... +diff --git a/make/sun/javazic/tzdata/australasia b/make/sun/javazic/tzdata/australasia +--- openjdk/jdk/make/sun/javazic/tzdata/australasia ++++ openjdk/jdk/make/sun/javazic/tzdata/australasia +@@ -253,10 +253,16 @@ + # - Macquarie Island will stay on UTC+11 for winter and therefore not + # switch back from daylight savings time when other parts of Australia do + # on 4 April. ++# ++# From Arthur David Olson (2013-05-23): ++# The 1919 transition is overspecified below so pre-2013 zics ++# will produce a binary file with an EST-type as the first 32-bit type; ++# this is required for correct handling of times before 1916 by ++# pre-2013 versions of localtime. + Zone Antarctica/Macquarie 0 - zzz 1899 Nov + 10:00 - EST 1916 Oct 1 2:00 + 10:00 1:00 EST 1917 Feb +- 10:00 Aus EST 1919 Apr ++ 10:00 Aus EST 1919 Apr 1 0:00s + 0 - zzz 1948 Mar 25 + 10:00 Aus EST 1967 + 10:00 AT EST 2010 Apr 4 3:00 +@@ -1498,12 +1504,12 @@ + # From Paul Eggert (2000-01-08): + # IATA SSIM (1999-09) says DST ends 0100 local time. Go with McDow. + +-# From the BBC World Service (1998-10-31 11:32 UTC): ++# From the BBC World Service in ++# http://news.bbc.co.uk/2/hi/asia-pacific/205226.stm (1998-10-31 16:03 UTC): + # The Fijiian government says the main reasons for the time change is to +-# improve productivity and reduce road accidents. But correspondents say it +-# also hopes the move will boost Fiji's ability to compete with other pacific +-# islands in the effort to attract tourists to witness the dawning of the new +-# millenium. ++# improve productivity and reduce road accidents.... [T]he move is also ++# intended to boost Fiji's ability to attract tourists to witness the dawning ++# of the new millennium. + + # http://www.fiji.gov.fj/press/2000_09/2000_09_13-05.shtml (2000-09-13) + # reports that Fiji has discontinued DST. +@@ -1648,7 +1654,7 @@ + # Shanks & Pottenger say the transition was on 1968-10-01; go with Mundell. + + # From Eric Ulevik (1999-05-03): +-# Tonga's director of tourism, who is also secretary of the National Millenium ++# Tonga's director of tourism, who is also secretary of the National Millennium + # Committee, has a plan to get Tonga back in front. + # He has proposed a one-off move to tropical daylight saving for Tonga from + # October to March, which has won approval in principle from the Tongan +diff --git a/make/sun/javazic/tzdata/europe b/make/sun/javazic/tzdata/europe +--- openjdk/jdk/make/sun/javazic/tzdata/europe ++++ openjdk/jdk/make/sun/javazic/tzdata/europe +@@ -546,7 +546,7 @@ + # It seems that Paris, Monaco, Rule France, Rule Belgium all agree on + # 2:00 standard time, e.g. 3:00 local time. However there are no + # countries that use C-Eur rules in September 1945, so the only items +-# affected are apparently these ficticious zones that translates acronyms ++# affected are apparently these fictitious zones that translate acronyms + # CET and MET: + # + # Zone CET 1:00 C-Eur CE%sT +@@ -2802,9 +2802,9 @@ + + # Ukraine + # +-# From Igor Karpov, who works for the Ukranian Ministry of Justice, ++# From Igor Karpov, who works for the Ukrainian Ministry of Justice, + # via Garrett Wollman (2003-01-27): +-# BTW, I've found the official document on this matter. It's goverment ++# BTW, I've found the official document on this matter. It's government + # regulations number 509, May 13, 1996. In my poor translation it says: + # "Time in Ukraine is set to second timezone (Kiev time). Each last Sunday + # of March at 3am the time is changing to 4am and each last Sunday of +@@ -2838,7 +2838,7 @@ + # time this year after all. + # + # From Udo Schwedt (2011-10-18): +-# As far as I understand, the recent change to the Ukranian time zone ++# As far as I understand, the recent change to the Ukrainian time zone + # (Europe/Kiev) to introduce permanent daylight saving time (similar + # to Russia) was reverted today: + # +diff --git a/make/sun/javazic/tzdata/iso3166.tab b/make/sun/javazic/tzdata/iso3166.tab +--- openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab ++++ openjdk/jdk/make/sun/javazic/tzdata/iso3166.tab +@@ -26,14 +26,12 @@ + # 2009-05-17 by Arthur David Olson. + # ISO 3166 alpha-2 country codes + # +-# From Paul Eggert (2006-09-27): ++# From Paul Eggert (2013-05-27): + # + # This file contains a table with the following columns: + # 1. ISO 3166-1 alpha-2 country code, current as of +-# ISO 3166-1 Newsletter VI-1 (2007-09-21). See: +-# +-# ISO 3166 Maintenance agency (ISO 3166/MA) +-# . ++# ISO 3166-1 Newsletter VI-15 (2013-05-10). See: Updates on ISO 3166 ++# http://www.iso.org/iso/home/standards/country_codes/updates_on_iso_3166.htm + # 2. The usual English name for the country, + # chosen so that alphabetic sorting of subsets produces helpful lists. + # This is not the same as the English name in the ISO 3166 tables. +@@ -43,8 +41,9 @@ + # + # Lines beginning with `#' are comments. + # +-# From Arthur David Olson (2011-08-17): +-# Resynchronized today with the ISO 3166 site (adding SS for South Sudan). ++# This table is intended as an aid for users, to help them select time ++# zone data appropriate for their practical needs. It is not intended ++# to take or endorse any position on legal or territorial claims. + # + #country- + #code country name +@@ -77,7 +76,7 @@ + BM Bermuda + BN Brunei + BO Bolivia +-BQ Bonaire Sint Eustatius & Saba ++BQ Bonaire, St Eustatius & Saba + BR Brazil + BS Bahamas + BT Bhutan +@@ -258,7 +257,7 @@ + SS South Sudan + ST Sao Tome & Principe + SV El Salvador +-SX Sint Maarten ++SX St Maarten (Dutch part) + SY Syria + SZ Swaziland + TC Turks & Caicos Is +diff --git a/make/sun/javazic/tzdata/southamerica b/make/sun/javazic/tzdata/southamerica +--- openjdk/jdk/make/sun/javazic/tzdata/southamerica ++++ openjdk/jdk/make/sun/javazic/tzdata/southamerica +@@ -994,7 +994,7 @@ + # adopted by the same states as before. + Rule Brazil 2007 only - Oct Sun>=8 0:00 1:00 S + # From Frederico A. C. Neves (2008-09-10): +-# Acording to this decree ++# According to this decree + # + # http://www.planalto.gov.br/ccivil_03/_Ato2007-2010/2008/Decreto/D6558.htm + # +@@ -1226,7 +1226,7 @@ + # http://www.emol.com/noticias/nacional/detalle/detallenoticias.asp?idnoticia=467651 + # + # +-# This is not yet reflected in the offical "cambio de hora" site, but ++# This is not yet reflected in the official "cambio de hora" site, but + # probably will be soon: + # + # http://www.horaoficial.cl/cambio.htm +diff --git a/make/sun/javazic/tzdata/zone.tab b/make/sun/javazic/tzdata/zone.tab +--- openjdk/jdk/make/sun/javazic/tzdata/zone.tab ++++ openjdk/jdk/make/sun/javazic/tzdata/zone.tab +@@ -27,15 +27,19 @@ + # + # TZ zone descriptions + # +-# From Paul Eggert (1996-08-05): ++# From Paul Eggert (2013-05-27): + # + # This file contains a table with the following columns: + # 1. ISO 3166 2-character country code. See the file `iso3166.tab'. ++# This identifies a country that overlaps the zone. The country may ++# overlap other zones and the zone may overlap other countries. + # 2. Latitude and longitude of the zone's principal location + # in ISO 6709 sign-degrees-minutes-seconds format, + # either +-DDMM+-DDDMM or +-DDMMSS+-DDDMMSS, + # first latitude (+ is north), then longitude (+ is east). ++# This location need not lie within the column-1 country. + # 3. Zone name used in value of TZ environment variable. ++# Please see the 'Theory' file for how zone names are chosen. + # 4. Comments; present if and only if the country has multiple rows. + # + # Columns are separated by a single tab. +@@ -45,6 +49,10 @@ + # + # Lines beginning with `#' are comments. + # ++# This table is intended as an aid for users, to help them select time ++# zone data appropriate for their practical needs. It is not intended ++# to take or endorse any position on legal or territorial claims. ++# + #country- + #code coordinates TZ comments + AD +4230+00131 Europe/Andorra +@@ -239,7 +247,7 @@ + ID -0507+11924 Asia/Makassar east & south Borneo, Sulawesi (Celebes), Bali, Nusa Tengarra, west Timor + ID -0232+14042 Asia/Jayapura west New Guinea (Irian Jaya) & Malukus (Moluccas) + IE +5320-00615 Europe/Dublin +-IL +3146+03514 Asia/Jerusalem ++IL +314650+0351326 Asia/Jerusalem + IM +5409-00428 Europe/Isle_of_Man + IN +2232+08822 Asia/Kolkata + IO -0720+07225 Indian/Chagos