Skip to content

Commit b65ff60

Browse files
Kiran Sidhartha Ravikumarcoffeys
authored andcommitted
8255226: (tz) Upgrade time-zone data to tzdata2020d
Reviewed-by: naoto
1 parent 2b78a43 commit b65ff60

File tree

4 files changed

+59
-23
lines changed

4 files changed

+59
-23
lines changed

make/data/tzdata/VERSION

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,4 +21,4 @@
2121
# or visit www.oracle.com if you need additional information or have any
2222
# questions.
2323
#
24-
tzdata2020c
24+
tzdata2020d

make/data/tzdata/asia

Lines changed: 43 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -3244,13 +3244,40 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
32443244

32453245
# From Sharef Mustafa (2019-10-18):
32463246
# Palestine summer time will end on midnight Oct 26th 2019 ...
3247-
# http://www.palestinecabinet.gov.ps/website/ar/ViewDetails?ID=43948
32483247
#
3249-
# From Paul Eggert (2019-04-10):
3250-
# For now, guess spring-ahead transitions are March's last Friday at 00:00.
3248+
# From Steffen Thorsen (2020-10-20):
3249+
# Some sources such as these say, and display on clocks, that DST ended at
3250+
# midnight last year...
3251+
# https://www.amad.ps/ar/post/320006
3252+
#
3253+
# From Tim Parenti (2020-10-20):
3254+
# The report of the Palestinian Cabinet meeting of 2019-10-14 confirms
3255+
# a decision on (translated): "The start of the winter time in Palestine, by
3256+
# delaying the clock by sixty minutes, starting from midnight on Friday /
3257+
# Saturday corresponding to 26/10/2019."
3258+
# http://www.palestinecabinet.gov.ps/portal/meeting/details/43948
3259+
3260+
# From Sharef Mustafa (2020-10-20):
3261+
# As per the palestinian cabinet announcement yesterday , the day light saving
3262+
# shall [end] on Oct 24th 2020 at 01:00AM by delaying the clock by 60 minutes.
3263+
# http://www.palestinecabinet.gov.ps/portal/Meeting/Details/51584
3264+
3265+
# From Tim Parenti (2020-10-20):
3266+
# Predict future fall transitions at 01:00 on the Saturday preceding October's
3267+
# last Sunday (i.e., Sat>=24). This is consistent with our predictions since
3268+
# 2016, although the time of the change differed slightly in 2019.
3269+
3270+
# From Pierre Cashon (2020-10-20):
3271+
# The summer time this year started on March 28 at 00:00.
3272+
# https://wafa.ps/ar_page.aspx?id=GveQNZa872839351758aGveQNZ
3273+
# http://www.palestinecabinet.gov.ps/portal/meeting/details/50284
3274+
# The winter time in 2015 started on October 23 at 01:00.
3275+
# https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY
3276+
# http://www.palestinecabinet.gov.ps/portal/meeting/details/27583
32513277
#
3252-
# From Tim Parenti (2016-10-19):
3253-
# Predict fall transitions on October's last Saturday at 01:00 from now on.
3278+
# From Paul Eggert (2019-04-10):
3279+
# For now, guess spring-ahead transitions are at 00:00 on the Saturday
3280+
# preceding March's last Sunday (i.e., Sat>=24).
32543281

32553282
# Rule NAME FROM TO - IN ON AT SAVE LETTER/S
32563283
Rule EgyptAsia 1957 only - May 10 0:00 1:00 S
@@ -3266,10 +3293,10 @@ Rule Palestine 2004 only - Oct 1 1:00 0 -
32663293
Rule Palestine 2005 only - Oct 4 2:00 0 -
32673294
Rule Palestine 2006 2007 - Apr 1 0:00 1:00 S
32683295
Rule Palestine 2006 only - Sep 22 0:00 0 -
3269-
Rule Palestine 2007 only - Sep Thu>=8 2:00 0 -
3296+
Rule Palestine 2007 only - Sep 13 2:00 0 -
32703297
Rule Palestine 2008 2009 - Mar lastFri 0:00 1:00 S
32713298
Rule Palestine 2008 only - Sep 1 0:00 0 -
3272-
Rule Palestine 2009 only - Sep Fri>=1 1:00 0 -
3299+
Rule Palestine 2009 only - Sep 4 1:00 0 -
32733300
Rule Palestine 2010 only - Mar 26 0:00 1:00 S
32743301
Rule Palestine 2010 only - Aug 11 0:00 0 -
32753302
Rule Palestine 2011 only - Apr 1 0:01 1:00 S
@@ -3278,12 +3305,16 @@ Rule Palestine 2011 only - Aug 30 0:00 1:00 S
32783305
Rule Palestine 2011 only - Sep 30 0:00 0 -
32793306
Rule Palestine 2012 2014 - Mar lastThu 24:00 1:00 S
32803307
Rule Palestine 2012 only - Sep 21 1:00 0 -
3281-
Rule Palestine 2013 only - Sep Fri>=21 0:00 0 -
3282-
Rule Palestine 2014 2015 - Oct Fri>=21 0:00 0 -
3283-
Rule Palestine 2015 only - Mar lastFri 24:00 1:00 S
3308+
Rule Palestine 2013 only - Sep 27 0:00 0 -
3309+
Rule Palestine 2014 only - Oct 24 0:00 0 -
3310+
Rule Palestine 2015 only - Mar 28 0:00 1:00 S
3311+
Rule Palestine 2015 only - Oct 23 1:00 0 -
32843312
Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S
3285-
Rule Palestine 2016 max - Oct lastSat 1:00 0 -
3286-
Rule Palestine 2019 max - Mar lastFri 0:00 1:00 S
3313+
Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 -
3314+
Rule Palestine 2019 only - Mar 29 0:00 1:00 S
3315+
Rule Palestine 2019 only - Oct Sat>=24 0:00 0 -
3316+
Rule Palestine 2020 max - Mar Sat>=24 0:00 1:00 S
3317+
Rule Palestine 2020 max - Oct Sat>=24 1:00 0 -
32873318

32883319
# Zone NAME STDOFF RULES FORMAT [UNTIL]
32893320
Zone Asia/Gaza 2:17:52 - LMT 1900 Oct

make/data/tzdata/europe

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1052,17 +1052,16 @@ Zone Europe/Prague 0:57:44 - LMT 1850
10521052
# Denmark, Faroe Islands, and Greenland
10531053

10541054
# From Jesper Nørgaard Welen (2005-04-26):
1055-
# http://www.hum.aau.dk/~poe/tid/tine/DanskTid.htm says that the law
1056-
# [introducing standard time] was in effect from 1894-01-01....
1057-
# The page http://www.retsinfo.dk/_GETDOCI_/ACCN/A18930008330-REGL
1055+
# the law [introducing standard time] was in effect from 1894-01-01....
1056+
# The page https://www.retsinformation.dk/eli/lta/1893/83
10581057
# confirms this, and states that the law was put forth 1893-03-29.
10591058
#
10601059
# The EU [actually, EEC and Euratom] treaty with effect from 1973:
1061-
# http://www.retsinfo.dk/_GETDOCI_/ACCN/A19722110030-REGL
1060+
# https://www.retsinformation.dk/eli/lta/1972/21100
10621061
#
10631062
# This provoked a new law from 1974 to make possible summer time changes
10641063
# in subsequent decrees with the law
1065-
# http://www.retsinfo.dk/_GETDOCI_/ACCN/A19740022330-REGL
1064+
# https://www.retsinformation.dk/eli/lta/1974/223
10661065
#
10671066
# It seems however that no decree was set forward until 1980. I have
10681067
# not found any decree, but in another related law, the effecting DST
@@ -1074,7 +1073,7 @@ Zone Europe/Prague 0:57:44 - LMT 1850
10741073
# The law is about the management of the extra hour, concerning
10751074
# working hours reported and effect on obligatory-rest rules (which
10761075
# was suspended on that night):
1077-
# http://www.retsinfo.dk/_GETDOCI_/ACCN/C19801120554-REGL
1076+
# https://web.archive.org/web/20140104053304/https://www.retsinformation.dk/Forms/R0710.aspx?id=60267
10781077

10791078
# From Jesper Nørgaard Welen (2005-06-11):
10801079
# The Herning Folkeblad (1980-09-26) reported that the night between

src/java.base/share/classes/sun/util/calendar/ZoneInfoFile.java

Lines changed: 10 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
/*
2-
* Copyright (c) 2012, 2019, Oracle and/or its affiliates. All rights reserved.
2+
* Copyright (c) 2012, 2020, Oracle and/or its affiliates. All rights reserved.
33
* DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
44
*
55
* This code is free software; you can redistribute it and/or modify it
@@ -573,8 +573,12 @@ private static ZoneInfo getZoneInfo(String zoneId,
573573
// we can then pass in the dom = -1, dow > 0 into ZoneInfo
574574
//
575575
// hacking, assume the >=24 is the result of ZRB optimization for
576-
// "last", it works for now.
577-
if (dom < 0 || dom >= 24) {
576+
// "last", it works for now. From tzdata2020d this hacking
577+
// will not work for Asia/Gaza and Asia/Hebron which follow
578+
// Palestine DST rules.
579+
if (dom < 0 || dom >= 24 &&
580+
!(zoneId.equals("Asia/Gaza") ||
581+
zoneId.equals("Asia/Hebron"))) {
578582
params[1] = -1;
579583
params[2] = toCalendarDOW[dow];
580584
} else {
@@ -596,7 +600,9 @@ private static ZoneInfo getZoneInfo(String zoneId,
596600
params[7] = 0;
597601
} else {
598602
// hacking: see comment above
599-
if (dom < 0 || dom >= 24) {
603+
if (dom < 0 || dom >= 24 &&
604+
!(zoneId.equals("Asia/Gaza") ||
605+
zoneId.equals("Asia/Hebron"))) {
600606
params[6] = -1;
601607
params[7] = toCalendarDOW[dow];
602608
} else {

0 commit comments

Comments
 (0)