Skip to content

Commit 49c686b

Browse files
author
GitHub Actions
committed
Update tzdata and zoneinfo to version 2018c.
1 parent d4d9e1e commit 49c686b

File tree

7 files changed

+103
-52
lines changed

7 files changed

+103
-52
lines changed

tzdata/NEWS

Lines changed: 37 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,15 +1,49 @@
11
News for the tz database
22

3+
Release 2018c - 2018-01-22 23:00:44 -0800
4+
5+
Briefly:
6+
Revert Irish changes that relied on negative DST offsets.
7+
8+
Changes to tm_isdst
9+
10+
Revert the 2018a change to Europe/Dublin. As before, this change
11+
does not affect UT offsets or abbreviations; it affects only
12+
whether timestamps are considered to be standard time or
13+
daylight-saving time, as expressed in the tm_isdst flag of C's
14+
struct tm type. This reversion is intended to be a temporary
15+
workaround for problems discovered with downstream uses of
16+
releases 2018a and 2018b, which implemented Irish time by using
17+
negative DST offsets in the Eire rules of the 'europe' file.
18+
Although negative DST offsets have been part of tzcode for many
19+
years and are supported by many platforms, they were not
20+
documented before 2018a and ICU and OpenJDK do not currently
21+
support them. A mechanism to export data to platforms lacking
22+
support for negative DST is planned to be developed before the
23+
change is reapplied. (Problems reported by Deborah Goldsmith and
24+
Stephen Colebourne.)
25+
26+
Changes to past time stamps
27+
28+
Japanese DST transitions (1948-1951) were Sundays at 00:00, not
29+
Saturdays or Sundays at 02:00. (Thanks to Takayuki Nikai.)
30+
31+
Changes to build procedure
32+
33+
The build procedure now works around mawk 1.3.3's lack of support
34+
for character class expressions. (Problem reported by Ohyama.)
35+
36+
337
Release 2018b - 2018-01-17 23:24:48 -0800
438

539
Briefly:
640
Fix a packaging problem in tz2018a, which was missing 'pacificnew'.
741

842
Changes to build procedure
943

10-
The distribution now contains the file 'pacificnew' again.
11-
This file was inadvertantly omitted in the 2018a distribution.
12-
(Problem reported by Matias Fonzo.)
44+
The distribution now contains the file 'pacificnew' again.
45+
This file was inadvertantly omitted in the 2018a distribution.
46+
(Problem reported by Matias Fonzo.)
1347

1448

1549
Release 2018a - 2018-01-12 22:29:21 -0800

tzdata/asia

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1464,17 +1464,17 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880
14641464
# of the Japanese wanted to scrap daylight-saving time, as opposed to 30% who
14651465
# wanted to keep it.)
14661466

1467-
# From Paul Eggert (2006-03-22):
1468-
# Shanks & Pottenger write that DST in Japan during those years was as follows:
1467+
# From Takayuki Nikai (2018-01-19):
1468+
# The source of information is Japanese law.
1469+
# http://www.shugiin.go.jp/internet/itdb_housei.nsf/html/houritsu/00219480428029.htm
1470+
# http://www.shugiin.go.jp/internet/itdb_housei.nsf/html/houritsu/00719500331039.htm
1471+
# ... In summary, it is written as follows. From 24:00 on the first Saturday
1472+
# in May, until 0:00 on the day after the second Saturday in September.
14691473
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
1470-
Rule Japan 1948 only - May Sun>=1 2:00 1:00 D
1471-
Rule Japan 1948 1951 - Sep Sat>=8 2:00 0 S
1472-
Rule Japan 1949 only - Apr Sun>=1 2:00 1:00 D
1473-
Rule Japan 1950 1951 - May Sun>=1 2:00 1:00 D
1474-
# but the only locations using it (for birth certificates, presumably, since
1475-
# their audience is astrologers) were US military bases. For now, assume
1476-
# that for most purposes daylight-saving time was observed; otherwise, what
1477-
# would have been the point of the 1951 poll?
1474+
Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
1475+
Rule Japan 1948 1951 - Sep Sun>=9 0:00 0 S
1476+
Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
1477+
Rule Japan 1950 1951 - May Sat>=1 24:00 1:00 D
14781478

14791479
# From Hideyuki Suzuki (1998-11-09):
14801480
# 'Tokyo' usually stands for the former location of Tokyo Astronomical

tzdata/europe

Lines changed: 29 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -508,16 +508,19 @@ Link Europe/London Europe/Jersey
508508
Link Europe/London Europe/Guernsey
509509
Link Europe/London Europe/Isle_of_Man
510510

511+
# From Paul Eggert (2018-01-19):
511512
# The following is like GB-Eire and EU, except with standard time in
512513
# summer and negative daylight saving time in winter.
514+
# Although currently commented out, this will need to become uncommented
515+
# once the ICU/OpenJDK workaround is removed; see below.
513516
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
514-
Rule Eire 1971 only - Oct 31 2:00u -1:00 GMT
515-
Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 IST
516-
Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 GMT
517-
Rule Eire 1981 max - Mar lastSun 1:00u 0 IST
518-
Rule Eire 1981 1989 - Oct Sun>=23 1:00u -1:00 GMT
519-
Rule Eire 1990 1995 - Oct Sun>=22 1:00u -1:00 GMT
520-
Rule Eire 1996 max - Oct lastSun 1:00u -1:00 GMT
517+
#Rule Eire 1971 only - Oct 31 2:00u -1:00 GMT
518+
#Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 IST
519+
#Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 GMT
520+
#Rule Eire 1981 max - Mar lastSun 1:00u 0 IST
521+
#Rule Eire 1981 1989 - Oct Sun>=23 1:00u -1:00 GMT
522+
#Rule Eire 1990 1995 - Oct Sun>=22 1:00u -1:00 GMT
523+
#Rule Eire 1996 max - Oct lastSun 1:00u -1:00 GMT
521524

522525
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
523526
Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2
@@ -530,7 +533,25 @@ Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2
530533
0:00 1:00 IST 1947 Nov 2 2:00s
531534
0:00 - GMT 1948 Apr 18 2:00s
532535
0:00 GB-Eire GMT/IST 1968 Oct 27
533-
1:00 Eire IST/GMT
536+
# From Paul Eggert (2018-01-18):
537+
# The next line should look like this:
538+
# 1:00 Eire IST/GMT
539+
# However, in January 2018 we discovered that the Eire rules cause
540+
# problems with tests for ICU:
541+
# https://mm.icann.org/pipermail/tz/2018-January/025825.html
542+
# and with tests for OpenJDK:
543+
# https://mm.icann.org/pipermail/tz/2018-January/025822.html
544+
# To work around this problem, use a traditional approximation for
545+
# time stamps after 1971-10-31 02:00 UTC, to give ICU and OpenJDK
546+
# developers breathing room to fix bugs. This approximation has
547+
# correct UTC offsets, but results in tm_isdst flags are the reverse
548+
# of what they should be. This workaround is temporary and should be
549+
# removed reasonably soon.
550+
1:00 - IST 1971 Oct 31 2:00u
551+
0:00 GB-Eire GMT/IST 1996
552+
0:00 EU GMT/IST
553+
# End of workaround for ICU and OpenJDK bugs.
554+
534555

535556
###############################################################################
536557

tzdata/version

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1 @@
1-
2018b
1+
2018c

tzdata/zishrink.awk

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ function process_input_line(line, field, end, i, n, startdef)
3737
# Remove comments, normalize spaces, and append a space to each line.
3838
sub(/#.*/, "", line)
3939
line = line " "
40-
gsub(/[[:space:]]+/, " ", line)
40+
gsub(/[\f\r\t\v ]+/, " ", line)
4141

4242
# Abbreviate keywords. Do not abbreviate "Link" to just "L",
4343
# as pre-2017c zic erroneously diagnoses "Li" as ambiguous.
@@ -94,7 +94,7 @@ function process_input_line(line, field, end, i, n, startdef)
9494
sub(/ 0+$/, "", line)
9595

9696
# Remove unnecessary trailing days-of-month "1".
97-
if (match(line, /[[:alpha:]] 1$/))
97+
if (match(line, /[A-Za-z] 1$/))
9898
line = substr(line, 1, RSTART)
9999

100100
# Remove unnecessary trailing " Ja" (for January).
@@ -148,7 +148,7 @@ BEGIN {
148148
print "# This zic input file is in the public domain."
149149
}
150150

151-
/^[[:space:]]*[^#[:space:]]/ {
151+
/^[\f\r\t\v ]*[^#\f\r\t\v ]/ {
152152
process_input_line($0)
153153
}
154154

zoneinfo/Asia/Tokyo.ics

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ BEGIN:VCALENDAR
22
PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
33
VERSION:2.0
44
BEGIN:VTIMEZONE
5-
TZID:/github.com/libical/tzdbics/20221031_2017a/Asia/Tokyo
6-
LAST-MODIFIED:20221031T170926Z
5+
TZID:/github.com/libical/tzdbics/20221031_2018c/Asia/Tokyo
6+
LAST-MODIFIED:20221031T171445Z
77
X-LIC-LOCATION:Asia/Tokyo
88
X-PROLEPTIC-TZNAME:LMT
99
BEGIN:STANDARD
@@ -16,22 +16,22 @@ BEGIN:DAYLIGHT
1616
TZNAME:JDT
1717
TZOFFSETFROM:+0900
1818
TZOFFSETTO:+1000
19-
DTSTART:19480502T020000
20-
RDATE:19490403T020000
19+
DTSTART:19480502T000000
20+
RDATE:19490403T000000
2121
END:DAYLIGHT
2222
BEGIN:STANDARD
2323
TZNAME:JST
2424
TZOFFSETFROM:+1000
2525
TZOFFSETTO:+0900
26-
DTSTART:19480911T020000
27-
RRULE:FREQ=YEARLY;BYMONTH=9;BYDAY=2SA;UNTIL=19510907T160000Z
26+
DTSTART:19480912T000000
27+
RRULE:FREQ=YEARLY;BYMONTH=9;BYMONTHDAY=9,10,11,12,13,14,15;BYDAY=SU;UNTIL=19510908T140000Z
2828
END:STANDARD
2929
BEGIN:DAYLIGHT
3030
TZNAME:JDT
3131
TZOFFSETFROM:+0900
3232
TZOFFSETTO:+1000
33-
DTSTART:19500507T020000
34-
RRULE:FREQ=YEARLY;BYMONTH=5;BYDAY=1SU;UNTIL=19510505T170000Z
33+
DTSTART:19500507T000000
34+
RRULE:FREQ=YEARLY;BYMONTH=5;BYMONTHDAY=2,3,4,5,6,7,8;BYDAY=SU;UNTIL=19510505T150000Z
3535
END:DAYLIGHT
3636
END:VTIMEZONE
3737
END:VCALENDAR

zoneinfo/Europe/Dublin.ics

Lines changed: 15 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -2,8 +2,8 @@ BEGIN:VCALENDAR
22
PRODID:-//github.com/libical/vzic//NONSGML ICS//EN
33
VERSION:2.0
44
BEGIN:VTIMEZONE
5-
TZID:/github.com/libical/tzdbics/20221031_2018a/Europe/Dublin
6-
LAST-MODIFIED:20221031T171244Z
5+
TZID:/github.com/libical/tzdbics/20221031_2018c/Europe/Dublin
6+
LAST-MODIFIED:20221031T171445Z
77
X-LIC-LOCATION:Europe/Dublin
88
X-PROLEPTIC-TZNAME:LMT
99
BEGIN:STANDARD
@@ -49,12 +49,14 @@ RDATE:19461006T030000
4949
RDATE:19471102T030000
5050
RDATE:19481031T030000
5151
RDATE:19491030T030000
52+
RDATE:19711031T030000
5253
END:STANDARD
5354
BEGIN:STANDARD
5455
TZNAME:GMT
5556
TZOFFSETFROM:+0000
5657
TZOFFSETTO:+0000
5758
DTSTART:19211206T000000
59+
RDATE:19960101T000000
5860
END:STANDARD
5961
BEGIN:DAYLIGHT
6062
TZNAME:IST
@@ -185,52 +187,46 @@ TZOFFSETTO:+0100
185187
DTSTART:19681027T000000
186188
END:STANDARD
187189
BEGIN:DAYLIGHT
188-
TZNAME:GMT
189-
TZOFFSETFROM:+0100
190-
TZOFFSETTO:+0000
191-
DTSTART:19711031T030000
192-
END:DAYLIGHT
193-
BEGIN:STANDARD
194190
TZNAME:IST
195191
TZOFFSETFROM:+0000
196192
TZOFFSETTO:+0100
197193
DTSTART:19720319T020000
198194
RRULE:FREQ=YEARLY;BYMONTH=3;BYMONTHDAY=16,17,18,19,20,21,22;BYDAY=SU;UNTIL=19800316T020000Z
199-
END:STANDARD
200-
BEGIN:DAYLIGHT
195+
END:DAYLIGHT
196+
BEGIN:STANDARD
201197
TZNAME:GMT
202198
TZOFFSETFROM:+0100
203199
TZOFFSETTO:+0000
204200
DTSTART:19721029T030000
205201
RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19801026T020000Z
206-
END:DAYLIGHT
207-
BEGIN:STANDARD
202+
END:STANDARD
203+
BEGIN:DAYLIGHT
208204
TZNAME:IST
209205
TZOFFSETFROM:+0000
210206
TZOFFSETTO:+0100
211207
DTSTART:19810329T010000
212208
RRULE:FREQ=YEARLY;BYMONTH=3;BYDAY=-1SU
213-
END:STANDARD
214-
BEGIN:DAYLIGHT
209+
END:DAYLIGHT
210+
BEGIN:STANDARD
215211
TZNAME:GMT
216212
TZOFFSETFROM:+0100
217213
TZOFFSETTO:+0000
218214
DTSTART:19811025T020000
219215
RRULE:FREQ=YEARLY;BYMONTH=10;BYMONTHDAY=23,24,25,26,27,28,29;BYDAY=SU;UNTIL=19891029T010000Z
220-
END:DAYLIGHT
221-
BEGIN:DAYLIGHT
216+
END:STANDARD
217+
BEGIN:STANDARD
222218
TZNAME:GMT
223219
TZOFFSETFROM:+0100
224220
TZOFFSETTO:+0000
225221
DTSTART:19901028T020000
226222
RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=4SU;UNTIL=19951022T010000Z
227-
END:DAYLIGHT
228-
BEGIN:DAYLIGHT
223+
END:STANDARD
224+
BEGIN:STANDARD
229225
TZNAME:GMT
230226
TZOFFSETFROM:+0100
231227
TZOFFSETTO:+0000
232228
DTSTART:19961027T020000
233229
RRULE:FREQ=YEARLY;BYMONTH=10;BYDAY=-1SU
234-
END:DAYLIGHT
230+
END:STANDARD
235231
END:VTIMEZONE
236232
END:VCALENDAR

0 commit comments

Comments
 (0)