rpms/tzdata
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Resolves: #1434206 - Haiti began observing DST on March 12, 2017. fed_hash: 1d1164b40e

Browse Source
This commit is contained in:
Troy Dawson 2017-07-13 15:26:47 -07:00
parent 4cb88e9dec
commit 6096fdafe8
12 changed files with 1694 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

158
.gitignore vendored
View File

@ -0,0 +1,158 @@
tzdata-base-0.tar.bz2
javazic.tar.gz
tzcode2007j.tar.gz
tzdata2007j.tar.gz
tzdata2007k.tar.gz
tzcode2007k.tar.gz
tzcode2008a.tar.gz
tzdata2008b.tar.gz
tzdata2008c.tar.gz
tzdata2008d.tar.gz
tzdata2008e.tar.gz
tzcode2008e.tar.gz
tzdata2008f.tar.gz
tzdata2008g.tar.gz
tzcode2008g.tar.gz
tzdata2008h.tar.gz
tzcode2008h.tar.gz
tzdata2008i.tar.gz
tzdata2009a.tar.gz
tzcode2009a.tar.gz
tzdata2009d.tar.gz
tzcode2009d.tar.gz
tzdata2009e.tar.gz
tzcode2009e.tar.gz
tzdata2009f.tar.gz
tzdata2009h.tar.gz
tzcode2009h.tar.gz
tzdata2009i.tar.gz
tzcode2009i.tar.gz
tzdata2009j.tar.gz
tzdata2009k.tar.gz
tzcode2009k.tar.gz
tzdata2009m.tar.gz
tzdata2009u.tar.gz
tzcode2009t.tar.gz
tzdata2010c.tar.gz
tzcode2010c.tar.gz
tzdata2010e.tar.gz
tzcode2010f.tar.gz
tzdata2010f.tar.gz
tzdata2010h.tar.gz
tzdata2010i.tar.gz
tzdata2010j.tar.gz
tzcode2010j.tar.gz
tzdata2010k.tar.gz
tzcode2010k.tar.gz
tzcode2010l.tar.gz
tzdata2010l.tar.gz
/tzdata2010n.tar.gz
/tzcode2010n.tar.gz
/tzdata2010o.tar.gz
/tzdata2011a.tar.gz
/tzcode2011a.tar.gz
/tzdata2011b.tar.gz
/tzcode2011b.tar.gz
tzdata/
/tzdata-*/
*.rpm
/tzdata2011d.tar.gz
/tzcode2011d.tar.gz
/tzdata2011f.tar.gz
/tzcode2011e.tar.gz
/tzdata2011g.tar.gz
/tzcode2011g.tar.gz
noarch/
.build-*
/tzdata2011h.tar.gz
/tzdata2011i.tar.gz
/tzcode2011i.tar.gz
/tzdata2011j.tar.gz
/tzdata2011l.tar.gz
/tzdata2011n.tar.gz
/tzdata2012b.tar.gz
/tzcode2012b.tar.gz
/tzdata2012c.tar.gz
/tzcode2012c.tar.gz
/tzdata2012d.tar.gz
/tzdata2012e.tar.gz
/tzcode2012e.tar.gz
/tzdata2012f.tar.gz
/tzcode2012f.tar.gz
/tzdata2012g.tar.gz
/tzcode2012g.tar.gz
/tzdata2012h.tar.gz
/tzcode2012h.tar.gz
/tzdata2012i.tar.gz
/tzcode2012i.tar.gz
/tzdata2012j.tar.gz
/tzcode2012j.tar.gz
/tzdata2013b.tar.gz
/tzcode2013b.tar.gz
/tzdata2013c.tar.gz
/tzcode2013c.tar.gz
/tzdata2013d.tar.gz
/tzcode2013d.tar.gz
/tzdata2013g.tar.gz
/tzcode2013g.tar.gz
/tzcode2013h.tar.gz
/tzdata2013h.tar.gz
/tzcode2013i.tar.gz
/tzdata2013i.tar.gz
/tzdata2014a.tar.gz
/tzcode2014a.tar.gz
/tzcode2014b.tar.gz
/tzdata2014b.tar.gz
/tzcode2014c.tar.gz
/tzdata2014c.tar.gz
/javazic-1.8-37392f2f5d59.tar.xz
/tzcode2014e.tar.gz
/tzdata2014e.tar.gz
/tzcode2014f.tar.gz
/tzdata2014f.tar.gz
/tzcode2014g.tar.gz
/tzdata2014g.tar.gz
/tzcode2014h.tar.gz
/tzdata2014h.tar.gz
/tzcode2014i.tar.gz
/tzdata2014i.tar.gz
/tzcode2014j.tar.gz
/tzdata2014j.tar.gz
/tzdata2015a.tar.gz
/tzcode2015a.tar.gz
/tzdata2015b.tar.gz
/tzcode2015b.tar.gz
/tzcode2015c.tar.gz
/tzdata2015c.tar.gz
/tzcode2015d.tar.gz
/tzdata2015d.tar.gz
/tzcode2015e.tar.gz
/tzdata2015e.tar.gz
/tzcode2015f.tar.gz
/tzdata2015f.tar.gz
/tzcode2015g.tar.gz
/tzdata2015g.tar.gz
/tzcode2016a.tar.gz
/tzdata2016a.tar.gz
/tzcode2016b.tar.gz
/tzdata2016b.tar.gz
/tzdata2016c.tar.gz
/tzcode2016c.tar.gz
/tzcode2016d.tar.gz
/tzdata2016d.tar.gz
/tzdata2016e.tar.gz
/tzcode2016e.tar.gz
/tzcode2016f.tar.gz
/tzdata2016f.tar.gz
/tzdata2016g.tar.gz
/tzcode2016g.tar.gz
/tzcode2016h.tar.gz
/tzdata2016h.tar.gz
/tzcode2016i.tar.gz
/tzdata2016i.tar.gz
/tzcode2016j.tar.gz
/tzdata2016j.tar.gz
/tzdata2017a.tar.gz
/tzcode2017a.tar.gz
/tzcode2017b.tar.gz
/tzdata2017b.tar.gz

32
0001-Morocco-Ramadan-suspension-commentary-update.patch Normal file
View File

@ -0,0 +1,32 @@
diff --git a/africa b/africa
index 560f0f2..a0b8657 100644
--- a/africa
+++ b/africa
@@ -788,17 +788,13 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# will resume again at 02:00 on Saturday, August 2, 2014....
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
-# From Milamber (2015-06-08):
-# (Google Translation) The current time of Morocco (GMT + 1) will be suspended
-# from next Sunday until July 19, announced Monday the Ministry of Civil
-# Service and Modernisation of Administration. The hour will thus be delayed
-# 60 minutes Sunday, June 14 at 3:00, the ministry said in a statement, adding
-# that the time will be advanced again 60 minutes Sunday, July 19, 2015 at
-# 2:00. The move comes under 2.12.126 Decree of 26 Jumada I 1433 (18 April
-# 2012) and the decision of the Head of Government of 16 N. 3-29-15 Chaaban
-# 1435 (4 June 2015).
-# Source (french):
-# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
+# From Milamber (2015-06-09):
+# http://www.mmsp.gov.ma/fr/actualites.aspx?id=863
+# (Google Translation): The Ministry of Civil Service and
+# Modernisation of Administration announced the return to the legal
+# time of the Kingdom (GMT). So the time will be delayed for 60
+# minutes from 3:00 am Sunday, June 14, 2015. She will be advanced by
+# 60 minutes (GMT + 1) from 3:00 am Sunday, July 19, 2015.
# From Paul Eggert (2015-06-08):
# For now, guess that later spring and fall transitions will use 2015's rules,
--
2.1.0

102
0001-Morocco-Ramadan-suspension-now-Sunday-to-Sunday.patch Normal file
View File

@ -0,0 +1,102 @@
diff --git a/africa b/africa
index fd9c089..560f0f2 100644
--- a/africa
+++ b/africa
@@ -788,20 +788,33 @@ Zone Indian/Mauritius 3:50:00 - LMT 1907 # Port Louis
# will resume again at 02:00 on Saturday, August 2, 2014....
# http://www.mmsp.gov.ma/fr/actualites.aspx?id=586
-# From Paul Eggert (2014-06-05):
-# For now, guess that later spring and fall transitions will use 2014's rules,
+# From Milamber (2015-06-08):
+# (Google Translation) The current time of Morocco (GMT + 1) will be suspended
+# from next Sunday until July 19, announced Monday the Ministry of Civil
+# Service and Modernisation of Administration. The hour will thus be delayed
+# 60 minutes Sunday, June 14 at 3:00, the ministry said in a statement, adding
+# that the time will be advanced again 60 minutes Sunday, July 19, 2015 at
+# 2:00. The move comes under 2.12.126 Decree of 26 Jumada I 1433 (18 April
+# 2012) and the decision of the Head of Government of 16 N. 3-29-15 Chaaban
+# 1435 (4 June 2015).
+# Source (french):
+# http://lnt.ma/le-maroc-reculera-dune-heure-le-dimanche-14-juin/
+
+# From Paul Eggert (2015-06-08):
+# For now, guess that later spring and fall transitions will use 2015's rules,
# and guess that Morocco will switch to standard time at 03:00 the last
-# Saturday before Ramadan, and back to DST at 02:00 the first Saturday after
+# Sunday before Ramadan, and back to DST at 02:00 the first Sunday after
# Ramadan. To implement this, transition dates for 2015 through 2037 were
# determined by running the following program under GNU Emacs 24.3, with the
# results integrated by hand into the table below.
-# (let ((islamic-year 1436))
+# (let ((islamic-year 1437))
+# (require 'cal-islam)
# (while (< islamic-year 1460)
# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
# (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
-# (saturday 6))
-# (while (/= saturday (mod (setq a (1- a)) 7)))
-# (while (/= saturday (mod b 7))
+# (sunday 0))
+# (while (/= sunday (mod (setq a (1- a)) 7)))
+# (while (/= sunday (mod b 7))
# (setq b (1+ b)))
# (setq a (calendar-gregorian-from-absolute a))
# (setq b (calendar-gregorian-from-absolute b))
@@ -845,32 +858,30 @@ Rule Morocco 2012 only - Aug 20 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 2013 max - Oct lastSun 3:00 0 -
-Rule Morocco 2014 2022 - Mar lastSun 2:00 1:00 S
+Rule Morocco 2014 2021 - Mar lastSun 2:00 1:00 S
Rule Morocco 2014 only - Jun 28 3:00 0 -
Rule Morocco 2014 only - Aug 2 2:00 1:00 S
-Rule Morocco 2015 only - Jun 13 3:00 0 -
-Rule Morocco 2015 only - Jul 18 2:00 1:00 S
-Rule Morocco 2016 only - Jun 4 3:00 0 -
-Rule Morocco 2016 only - Jul 9 2:00 1:00 S
-Rule Morocco 2017 only - May 20 3:00 0 -
-Rule Morocco 2017 only - Jul 1 2:00 1:00 S
-Rule Morocco 2018 only - May 12 3:00 0 -
-Rule Morocco 2018 only - Jun 16 2:00 1:00 S
-Rule Morocco 2019 only - May 4 3:00 0 -
-Rule Morocco 2019 only - Jun 8 2:00 1:00 S
-Rule Morocco 2020 only - Apr 18 3:00 0 -
-Rule Morocco 2020 only - May 30 2:00 1:00 S
-Rule Morocco 2021 only - Apr 10 3:00 0 -
-Rule Morocco 2021 only - May 15 2:00 1:00 S
-Rule Morocco 2022 only - Apr 2 3:00 0 -
-Rule Morocco 2022 only - May 7 2:00 1:00 S
-Rule Morocco 2023 only - Apr 22 2:00 1:00 S
-Rule Morocco 2024 only - Apr 13 2:00 1:00 S
-Rule Morocco 2025 only - Apr 5 2:00 1:00 S
+Rule Morocco 2015 only - Jun 14 3:00 0 -
+Rule Morocco 2015 only - Jul 19 2:00 1:00 S
+Rule Morocco 2016 only - Jun 5 3:00 0 -
+Rule Morocco 2016 only - Jul 10 2:00 1:00 S
+Rule Morocco 2017 only - May 21 3:00 0 -
+Rule Morocco 2017 only - Jul 2 2:00 1:00 S
+Rule Morocco 2018 only - May 13 3:00 0 -
+Rule Morocco 2018 only - Jun 17 2:00 1:00 S
+Rule Morocco 2019 only - May 5 3:00 0 -
+Rule Morocco 2019 only - Jun 9 2:00 1:00 S
+Rule Morocco 2020 only - Apr 19 3:00 0 -
+Rule Morocco 2020 only - May 24 2:00 1:00 S
+Rule Morocco 2021 only - Apr 11 3:00 0 -
+Rule Morocco 2021 only - May 16 2:00 1:00 S
+Rule Morocco 2022 only - May 8 2:00 1:00 S
+Rule Morocco 2023 only - Apr 23 2:00 1:00 S
+Rule Morocco 2024 only - Apr 14 2:00 1:00 S
+Rule Morocco 2025 only - Apr 6 2:00 1:00 S
Rule Morocco 2026 max - Mar lastSun 2:00 1:00 S
-Rule Morocco 2035 only - Oct 27 3:00 0 -
-Rule Morocco 2036 only - Oct 18 3:00 0 -
-Rule Morocco 2037 only - Oct 10 3:00 0 -
+Rule Morocco 2036 only - Oct 19 3:00 0 -
+Rule Morocco 2037 only - Oct 4 3:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Africa/Casablanca -0:30:20 - LMT 1913 Oct 26
--
2.1.0

55
001-tzdata-fiji-dst.patch Normal file
View File

@ -0,0 +1,55 @@
diff -Nrup a/australasia b/australasia
--- a/australasia 2013-12-17 10:26:04.000000000 -0500
+++ b/australasia 2014-01-21 11:37:08.135130460 -0500
@@ -354,16 +354,18 @@ Zone Indian/Cocos 6:27:40 - LMT 1900
# http://www.fiji.gov.fj/index.php?option=com_content&view=article&id=6702&catid=71&Itemid=155
# From the Fijian Government Media Center (2013-08-30) via David Wheeler:
-# Fiji will start daylight savings on Sunday 27th October, 2013 and end at 3am
-# on Sunday 19th January, 2014.... move clocks forward by one hour from 2am
+# Fiji will start daylight savings on Sunday 27th October, 2013 ...
+# move clocks forward by one hour from 2am
# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVING-STARTS-ON-SUNDAY,-27th-OCTOBER-201.aspx
-#
-# From Paul Eggert (2013-09-09):
+
+# From Steffen Thorsen (2013-01-10):
+# Fiji will end DST on 2014-01-19 02:00:
+# http://www.fiji.gov.fj/Media-Center/Press-Releases/DAYLIGHT-SAVINGS-TO-END-THIS-MONTH-%281%29.aspx
+
+# From Paul Eggert (2014-10-10):
# For now, guess that Fiji springs forward the Sunday before the fourth
-# Monday in October. This matches both recent practice and
-# timeanddate.com's current spring-forward prediction.
-# For the January 2014 transition we guessed right while timeanddate.com
-# guessed wrong, so leave the fall-back prediction alone.
+# Monday in October, and springs back the penultimate Sunday in January.
+# This is ad hoc, but matches recent practice.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 S
@@ -372,7 +374,8 @@ Rule Fiji 2009 only - Nov 29 2:00 1:00 S
Rule Fiji 2010 only - Mar lastSun 3:00 0 -
Rule Fiji 2010 max - Oct Sun>=21 2:00 1:00 S
Rule Fiji 2011 only - Mar Sun>=1 3:00 0 -
-Rule Fiji 2012 max - Jan Sun>=18 3:00 0 -
+Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 -
+Rule Fiji 2014 max - Jan Sun>=18 2:00 0 -
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva
12:00 Fiji FJ%sT # Fiji Time
diff -Nrup a/NEWS b/NEWS
--- a/NEWS 2013-12-17 10:26:04.000000000 -0500
+++ b/NEWS 2014-01-21 11:37:08.136130469 -0500
@@ -13,6 +13,11 @@ Release 2013i - 2013-12-17 07:25:23 -080
In 2004, Cuba began DST on March 28, not April 4.
(Thanks to Steffen Thorsen.)
+ Changes affecting near-future time stamps
+
+ Fiji ends DST on 2014-01-19 at 02:00, not the previously-scheduled 03:00.
+ (Thanks to Steffen Thorsen.)
+
Changes affecting code
The compile-time flag NOSOLAR has been removed, as nowadays the

44
7090844.patch Normal file
View File

@ -0,0 +1,44 @@
diff --git a/7090844.patch b/7090844.patch
new file mode 100644
index 0000000..fd5b531
--- /dev/null
+++ b/7090844.patch
@@ -0,0 +1,38 @@
+--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:42:30.000000000 -0400
++++ sun/tools/javazic/Mappings.java 2015-04-13 12:43:32.000000000 -0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -26,9 +26,6 @@
+ package sun.tools.javazic;
+
+ import java.util.ArrayList;
+-import java.util.HashMap;
+-import java.util.HashSet;
+-import java.util.Iterator;
+ import java.util.LinkedList;
+ import java.util.List;
+ import java.util.Map;
+@@ -79,8 +76,8 @@
+ // If the GMT offset of this Zone will change in some
+ // future time, this Zone is added to the exclude list.
+ boolean isExcluded = false;
+- if (zone.size() > 1) {
+- ZoneRec zrec = zone.get(zone.size()-2);
++ for (int i = 0; i < zone.size(); i++) {
++ ZoneRec zrec = zone.get(i);
+ if ((zrec.getGmtOffset() != rawOffset)
+ && (zrec.getUntilTime(0) > Time.getCurrentTime())) {
+ if (excludeList == null) {
+@@ -88,6 +85,7 @@
+ }
+ excludeList.add(zone.getName());
+ isExcluded = true;
++ break;
+ }
+ }
+

44
7133138.patch Normal file
View File

@ -0,0 +1,44 @@
diff --git a/7133138.patch b/7133138.patch
new file mode 100644
index 0000000..882f15f
--- /dev/null
+++ b/7133138.patch
@@ -0,0 +1,38 @@
+--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:44:10.000000000 -0400
++++ sun/tools/javazic/Mappings.java 2015-04-13 12:45:28.000000000 -0400
+@@ -1,5 +1,5 @@
+ /*
+- * Copyright (c) 2000, 2011, Oracle and/or its affiliates. All rights reserved.
++ * Copyright (c) 2000, 2012, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+@@ -26,6 +26,7 @@
+ package sun.tools.javazic;
+
+ import java.util.ArrayList;
++import java.util.HashMap;
+ import java.util.LinkedList;
+ import java.util.List;
+ import java.util.Map;
+@@ -162,6 +163,20 @@
+ for (String key : toBeRemoved) {
+ aliases.remove(key);
+ }
++ // Eliminate any alias-to-alias mappings. For example, if
++ // there are A->B and B->C, A->B is changed to A->C.
++ Map<String, String> newMap = new HashMap<String, String>();
++ for (String key : aliases.keySet()) {
++ String realid = aliases.get(key);
++ String leaf = realid;
++ while (aliases.get(leaf) != null) {
++ leaf = aliases.get(leaf);
++ }
++ if (!realid.equals(leaf)) {
++ newMap.put(key, leaf);
++ }
++ }
++ aliases.putAll(newMap);
+ }
+
+ Map<String,String> getAliases() {

42
javazic-exclusion-fix.patch Normal file
View File

@ -0,0 +1,42 @@
# Patch based on fix in JDK8 tree by Yuka Kamiya from Oracle:
# http://hg.openjdk.java.net/jdk8/tl/jdk/rev/f114bddac6d6
diff -up ./sun/tools/javazic/Mappings.java.sav ./sun/tools/javazic/Mappings.java
--- ./sun/tools/javazic/Mappings.java.sav 2011-11-03 16:31:53.000000000 -0400
+++ ./sun/tools/javazic/Mappings.java 2011-11-03 16:41:44.000000000 -0400
@@ -77,15 +77,17 @@ class Mappings {
int rawOffset = zone.get(zone.size()-1).getGmtOffset();
// If the GMT offset of this Zone will change in some
// future time, this Zone is added to the exclude list.
- if (zone.size() > 1) {
- ZoneRec zrec = zone.get(zone.size()-2);
+ boolean isExcluded = false;
+ for (int i = 0; i < zone.size(); i++) {
+ ZoneRec zrec = zone.get(i);
if ((zrec.getGmtOffset() != rawOffset)
&& (zrec.getUntilTime(0) > Time.getCurrentTime())) {
if (excludeList == null) {
excludeList = new ArrayList<String>();
}
excludeList.add(zone.getName());
- continue;
+ isExcluded = true;
+ break;
}
}
@@ -101,9 +103,13 @@ class Mappings {
rawOffsetsIndex.add(i, rawOffset);
Set<String> perRawOffset = new TreeSet<String>();
+ if (!isExcluded) {
+ perRawOffset = new TreeSet<String>();
+ }
+
perRawOffset.add(zonename);
rawOffsetsIndexTable.add(i, perRawOffset);
- } else {
+ } else if (!isExcluded) {
int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
perRawOffset.add(zonename);

34
javazic-fixup.patch Normal file
View File

@ -0,0 +1,34 @@
--- sun/util/calendar/LocalGregorianCalendar.java.keiths 2007-09-07 14:48:19.000000000 -0700
+++ sun/util/calendar/LocalGregorianCalendar.java 2007-09-07 14:52:58.000000000 -0700
@@ -120,8 +120,7 @@ public class LocalGregorianCalendar exte
static LocalGregorianCalendar getLocalGregorianCalendar(String name) {
Properties calendarProps = null;
try {
- String homeDir = (String) AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("java.home"));
+ String homeDir = (String) System.getProperty("java.home");
final String fname = homeDir + File.separator + "lib" + File.separator
+ "calendars.properties";
calendarProps = (Properties) AccessController.doPrivileged(new PrivilegedExceptionAction() {
--- sun/util/calendar/ZoneInfoFile.java.keiths 2007-09-07 14:54:58.000000000 -0700
+++ sun/util/calendar/ZoneInfoFile.java 2007-09-07 14:55:36.000000000 -0700
@@ -1021,8 +1021,7 @@ public class ZoneInfoFile {
byte[] buffer = null;
try {
- String zi_dir = (String) AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("user.zoneinfo.dir"));
+ String zi_dir = (String) System.getProperty("user.zoneinfo.dir");
File dir = null;
if (zi_dir != null)
dir = new File(zi_dir);
@@ -1035,8 +1034,7 @@ public class ZoneInfoFile {
}
if (dir == null) {
- String homeDir = (String) AccessController.doPrivileged(
- new sun.security.action.GetPropertyAction("java.home"));
+ String homeDir = (String) System.getProperty("java.home");
zi_dir = homeDir + File.separator + "lib" + File.separator
+ "zi";
}

37
rebase-01.patch Normal file
View File

@ -0,0 +1,37 @@
diff --git a/rebase-01.patch b/rebase-01.patch
new file mode 100644
index 0000000..bca6ed4
--- /dev/null
+++ b/rebase-01.patch
@@ -0,0 +1,31 @@
+--- sun/tools/javazic/Mappings.java.orig 2007-08-30 03:55:48.000000000 -0400
++++ sun/tools/javazic/Mappings.java 2015-04-13 12:39:44.000000000 -0400
+@@ -1,12 +1,12 @@
+ /*
+- * Copyright 2000-2004 Sun Microsystems, Inc. All Rights Reserved.
++ * Copyright (c) 2000, 2004, Oracle and/or its affiliates. All rights reserved.
+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
+ *
+ * This code is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU General Public License version 2 only, as
+- * published by the Free Software Foundation. Sun designates this
++ * published by the Free Software Foundation. Oracle designates this
+ * particular file as subject to the "Classpath" exception as provided
+- * by Sun in the LICENSE file that accompanied this code.
++ * by Oracle in the LICENSE file that accompanied this code.
+ *
+ * This code is distributed in the hope that it will be useful, but WITHOUT
+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
+@@ -18,9 +18,9 @@
+ * 2 along with this work; if not, write to the Free Software Foundation,
+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+- * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
+- * CA 95054 USA or visit www.sun.com if you need additional information or
+- * have any questions.
++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA
++ * or visit www.oracle.com if you need additional information or have any
++ * questions.
+ */
+
+ package sun.tools.javazic;

42
rebase-02.patch Normal file
View File

@ -0,0 +1,42 @@
diff --git a/rebase-02.patch b/rebase-02.patch
new file mode 100644
index 0000000..0f57125
--- /dev/null
+++ b/rebase-02.patch
@@ -0,0 +1,36 @@
+--- sun/tools/javazic/Mappings.java.orig 2015-04-13 12:40:26.000000000 -0400
++++ sun/tools/javazic/Mappings.java 2015-04-13 12:42:11.000000000 -0400
+@@ -75,8 +75,10 @@
+ Zone zone = zones.get(zoneName);
+ String zonename = zone.getName();
+ int rawOffset = zone.get(zone.size()-1).getGmtOffset();
++
+ // If the GMT offset of this Zone will change in some
+ // future time, this Zone is added to the exclude list.
++ boolean isExcluded = false;
+ if (zone.size() > 1) {
+ ZoneRec zrec = zone.get(zone.size()-2);
+ if ((zrec.getGmtOffset() != rawOffset)
+@@ -85,7 +87,7 @@
+ excludeList = new ArrayList<String>();
+ }
+ excludeList.add(zone.getName());
+- continue;
++ isExcluded = true;
+ }
+ }
+
+@@ -101,9 +103,11 @@
+ rawOffsetsIndex.add(i, rawOffset);
+
+ Set<String> perRawOffset = new TreeSet<String>();
+- perRawOffset.add(zonename);
++ if (!isExcluded) {
++ perRawOffset.add(zonename);
++ }
+ rawOffsetsIndexTable.add(i, perRawOffset);
+- } else {
++ } else if (!isExcluded) {
+ int i = rawOffsetsIndex.indexOf(new Integer(rawOffset));
+ Set<String> perRawOffset = rawOffsetsIndexTable.get(i);
+ perRawOffset.add(zonename);

4
sources Normal file
View File

@ -0,0 +1,4 @@
6a3392cd5f1594d13c12c1a836ac8d91 javazic.tar.gz
cfc79fbbb17f21052d3dd7634ec70bea javazic-1.8-37392f2f5d59.tar.xz
afaf15deb13759e8b543d86350385b16 tzcode2017b.tar.gz
50dc0dc50c68644c1f70804f2e7a1625 tzdata2017b.tar.gz

1100
tzdata.spec Normal file
View File

File diff suppressed because it is too large Load Diff