Skip to content

Commit ce9cf46

Browse files
author
GitHub Actions
committed
Update tzdata and zoneinfo to version 2018e.
1 parent bbdfe73 commit ce9cf46

File tree

13 files changed

+386
-144
lines changed

13 files changed

+386
-144
lines changed

tzdata/Makefile

Lines changed: 43 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ DATAFORM= main
2121

2222
# Change the line below for your time zone (after finding the zone you want in
2323
# the time zone files, or adding it to a time zone file).
24-
# Alternately, if you discover you've got the wrong time zone, you can just
24+
# Alternatively, if you discover you've got the wrong time zone, you can just
2525
# zic -l rightzone
2626
# to correct things.
2727
# Use the command
@@ -38,7 +38,7 @@ LOCALTIME= GMT
3838
# template file are used to determine "spring forward" and "fall back" days and
3939
# times; the environment variable itself specifies UT offsets of standard and
4040
# daylight saving time.
41-
# Alternately, if you discover you've got the wrong time zone, you can just
41+
# Alternatively, if you discover you've got the wrong time zone, you can just
4242
# zic -p rightzone
4343
# to correct things.
4444
# Use the command
@@ -236,14 +236,16 @@ GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \
236236
$(GCC_INSTRUMENT) \
237237
-Wall -Wextra \
238238
-Walloc-size-larger-than=100000 -Warray-bounds=2 \
239-
-Wbad-function-cast -Wcast-align -Wdate-time \
239+
-Wbad-function-cast -Wcast-align=strict -Wdate-time \
240240
-Wdeclaration-after-statement -Wdouble-promotion \
241241
-Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \
242242
-Winit-self -Wjump-misses-init -Wlogical-op \
243243
-Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
244244
-Wold-style-definition -Woverlength-strings -Wpointer-arith \
245-
-Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=5 \
245+
-Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=4 \
246+
-Wstringop-truncation -Wsuggest-attribute=cold \
246247
-Wsuggest-attribute=const -Wsuggest-attribute=format \
248+
-Wsuggest-attribute=malloc \
247249
-Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \
248250
-Wtrampolines -Wundef -Wuninitialized -Wunused \
249251
-Wvariadic-macros -Wvla -Wwrite-strings \
@@ -514,6 +516,7 @@ VERSION_DEPS= \
514516
tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
515517
workman.sh yearistype.sh \
516518
zdump.8 zdump.c zic.8 zic.c \
519+
ziguard.awk zishrink.awk \
517520
zone.tab zone1970.tab zoneinfo2tdf.pl
518521
519522
# And for the benefit of csh users on systems that assume the user
@@ -559,8 +562,8 @@ version: $(VERSION_DEPS)
559562
560563
# These files can be tailored by setting BACKWARD, PACKRATDATA, etc.
561564
vanguard.zi main.zi rearguard.zi: $(DSTDATA_ZI_DEPS)
562-
$(AWK) -v outfile='$@' -f ziguard.awk $(TDATA) $(PACKRATDATA) \
563-
>$@.out
565+
$(AWK) -v DATAFORM=`expr $@ : '\(.*\).zi'` -f ziguard.awk \
566+
$(TDATA) $(PACKRATDATA) >$@.out
564567
mv $@.out $@
565568
tzdata.zi: $(DATAFORM).zi version
566569
version=`sed 1q version` && \
@@ -900,19 +903,27 @@ check_time_t_alternatives:
900903
done
901904
rm -fr time_t.dir
902905
906+
TRADITIONAL_ASC = \
907+
tzcode$(VERSION).tar.gz.asc \
908+
tzdata$(VERSION).tar.gz.asc
909+
ALL_ASC = $(TRADITIONAL_ASC) \
910+
tzdata$(VERSION)-rearguard.tar.gz.asc \
911+
tzdb-$(VERSION).tar.lz.asc
912+
903913
tarballs traditional_tarballs signatures traditional_signatures: version
904914
VERSION=`cat version` && \
905915
$(MAKE) VERSION="$$VERSION" $@_version
906916
907917
# These *_version rules are intended for use if VERSION is set by some
908918
# other means. Ordinarily these rules are used only by the above
909919
# non-_version rules, which set VERSION on the 'make' command line.
910-
tarballs_version: traditional_tarballs_version tzdb-$(VERSION).tar.lz
920+
tarballs_version: traditional_tarballs_version \
921+
tzdata$(VERSION)-rearguard.tar.gz \
922+
tzdb-$(VERSION).tar.lz
911923
traditional_tarballs_version: \
912924
tzcode$(VERSION).tar.gz tzdata$(VERSION).tar.gz
913-
signatures_version: traditional_signatures_version tzdb-$(VERSION).tar.lz.asc
914-
traditional_signatures_version: \
915-
tzcode$(VERSION).tar.gz.asc tzdata$(VERSION).tar.gz.asc \
925+
signatures_version: $(ALL_ASC)
926+
traditional_signatures_version: $(TRADITIONAL_ASC)
916927
917928
tzcode$(VERSION).tar.gz: set-timestamps.out
918929
LC_ALL=C && export LC_ALL && \
@@ -927,6 +938,26 @@ tzdata$(VERSION).tar.gz: set-timestamps.out
927938
gzip $(GZIPFLAGS) >[email protected]
928939
929940
941+
tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out
942+
rm -fr tzdata$(VERSION)-rearguard.dir
943+
mkdir tzdata$(VERSION)-rearguard.dir
944+
ln $(COMMON) $(DATA) $(MISC) tzdata$(VERSION)-rearguard.dir
945+
cd tzdata$(VERSION)-rearguard.dir && \
946+
rm -f $(TDATA) $(PACKRATDATA) version
947+
for f in $(TDATA) $(PACKRATDATA); do \
948+
rearf=tzdata$(VERSION)-rearguard.dir/$$f; \
949+
$(AWK) -v DATAFORM=rearguard -f ziguard.awk $$f >$$rearf && \
950+
touch -cmr `ls -t ziguard.awk $$f` $$rearf || exit; \
951+
done
952+
sed '1s/$$/-rearguard/' \
953+
<version >tzdata$(VERSION)-rearguard.dir/version
954+
touch -cmr version tzdata$(VERSION)-rearguard.dir/version
955+
LC_ALL=C && export LC_ALL && \
956+
(cd tzdata$(VERSION)-rearguard.dir && \
957+
tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
958+
gzip $(GZIPFLAGS)) >[email protected]
959+
960+
930961
tzdb-$(VERSION).tar.lz: set-timestamps.out
931962
rm -fr tzdb-$(VERSION)
932963
mkdir tzdb-$(VERSION)
@@ -937,12 +968,10 @@ tzdb-$(VERSION).tar.lz: set-timestamps.out
937968
938969
939970
tzcode$(VERSION).tar.gz.asc: tzcode$(VERSION).tar.gz
940-
gpg --armor --detach-sign $?
941-
942971
tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
943-
gpg --armor --detach-sign $?
944-
972+
tzdata$(VERSION)-rearguard.tar.gz.asc: tzdata$(VERSION)-rearguard.tar.gz
945973
tzdb-$(VERSION).tar.lz.asc: tzdb-$(VERSION).tar.lz
974+
$(ALL_ASC):
946975
gpg --armor --detach-sign $?
947976
948977
typecheck:

tzdata/NEWS

Lines changed: 65 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,69 @@
11
News for the tz database
22

3+
Release 2018e - 2018-05-01 23:42:51 -0700
4+
5+
Briefly:
6+
7+
North Korea switches back to +09 on 2018-05-05.
8+
The main format uses negative DST again, for Ireland etc.
9+
'make tarballs' now also builds a rearguard tarball.
10+
New 's' and 'd' suffixes in SAVE columns of Rule and Zone lines.
11+
12+
Changes to past and future time stamps
13+
14+
North Korea switches back from +0830 to +09 on 2018-05-05.
15+
(Thanks to Kang Seonghoon, Arthur David Olson, Seo Sanghyeon,
16+
and Tim Parenti.)
17+
18+
Bring back the negative-DST changes of 2018a, except be more
19+
compatible with data parsers that do not support negative DST.
20+
Also, this now affects historical time stamps in Namibia and the
21+
former Czechoslovakia, not just Ireland. The main format now uses
22+
negative DST to model time stamps in Europe/Dublin (from 1971 on),
23+
Europe/Prague (1946/7), and Africa/Windhoek (1994/2017). This
24+
does not affect UT offsets, only time zone abbreviations and the
25+
tm_isdst flag. Also, this does not affect rearguard or vanguard
26+
formats; effectively the main format now uses vanguard instead of
27+
rearguard format. Data parsers that do not support negative DST
28+
can still use data from the rearguard tarball described below.
29+
30+
Changes to build procedure
31+
32+
The command 'make tarballs' now also builds the tarball
33+
tzdataVERSION-rearguard.tar.gz, which is like tzdataVERSION.tar.gz
34+
except that it uses rearguard format intended for trailing-edge
35+
data parsers.
36+
37+
Changes to data format and to code
38+
39+
The SAVE column of Rule and Zone lines can now have an 's' or 'd'
40+
suffix, which specifies whether the adjusted time is standard time
41+
or daylight saving time. If no suffix is given, daylight saving
42+
time is used if and only if the SAVE column is nonzero; this is
43+
the longstanding behavior. Although this new feature is not used
44+
in tzdata, it could be used to specify the legal time in Namibia
45+
1994-2017, as opposed to the popular time (see below).
46+
47+
Changes to past time stamps
48+
49+
From 1994 through 2017 Namibia observed DST in winter, not summer.
50+
That is, it used negative DST, as Ireland still does. This change
51+
does not affect UTC offsets; it affects only the tm_isdst flag and
52+
the abbreviation used during summer, which is now CAT, not WAST.
53+
Although (as noted by Michael Deckers) summer and winter time were
54+
both simply called "standard time" in Namibian law, in common
55+
practice winter time was considered to be DST (as noted by Stephen
56+
Colebourne). The full effect of this change is only in vanguard
57+
format; in rearguard and main format, the tm_isdst flag is still
58+
zero in winter and nonzero in summer.
59+
60+
In 1946/7 Czechoslovakia also observed negative DST in winter.
61+
The full effect of this change is only in vanguard format; in
62+
rearguard and main formats, it is modeled as plain GMT without
63+
daylight saving. Also, the dates of some 1944/5 DST transitions
64+
in Czechoslovakia have been changed.
65+
66+
367
Release 2018d - 2018-03-22 07:05:46 -0700
468

569
Briefly:
@@ -39,7 +103,7 @@ Release 2018d - 2018-03-22 07:05:46 -0700
39103
Enderbury and Kiritimati skipped New Year's Eve 1994, not
40104
New Year's Day 1995. (Thanks to Kerry Shetline.)
41105

42-
Fix the 1912-01-01 transition for Portugual and its colonies.
106+
Fix the 1912-01-01 transition for Portugal and its colonies.
43107
This transition was at 00:00 according to the new UT offset, not
44108
according to the old one. Also assume that Cape Verde switched on
45109
the same date as the rest, not in 1907. This affects

tzdata/africa

Lines changed: 35 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66
# [email protected] for general use in the future). For more, please see
77
# the file CONTRIBUTING in the tz distribution.
88

9-
# From Paul Eggert (2017-02-20):
9+
# From Paul Eggert (2017-04-09):
1010
#
1111
# Unless otherwise specified, the source for data through 1990 is:
1212
# Thomas G. Shanks and Rique Pottenger, The International Atlas (6th edition),
@@ -52,7 +52,7 @@
5252
# cannot now come up with solid citations.
5353
#
5454
# I invented the following abbreviations; corrections are welcome!
55-
# +02 WAST West Africa Summer Time
55+
# +02 WAST West Africa Summer Time (no longer used)
5656
# +03 CAST Central Africa Summer Time (no longer used)
5757
# +03 SAST South Africa Summer Time (no longer used)
5858
# +03 EAT East Africa Time
@@ -967,6 +967,10 @@ Link Africa/Maputo Africa/Lusaka # Zambia
967967
# commence at OOhOO on Monday 21 March 1994 and shall end at 02h00 on
968968
# Sunday 4 September 1994.
969969

970+
# From Michael Deckers (2017-04-06):
971+
# ... both summer and winter time are called "standard"
972+
# (which differs from the use in Ireland) ...
973+
970974
# From Petronella Sibeene (2007-03-30):
971975
# http://allafrica.com/stories/200703300178.html
972976
# While the entire country changes its time, Katima Mulilo and other
@@ -992,19 +996,42 @@ Link Africa/Maputo Africa/Lusaka # Zambia
992996
# the same time they would normally start DST, the first Sunday in September:
993997
# https://www.timeanddate.com/news/time/namibia-new-time-zone.html
994998

999+
# From Paul Eggert (2017-04-09):
1000+
# Before the change, summer and winter time were both standard time legally.
1001+
# However in common parlance, winter time was considered to be DST. See, e.g.:
1002+
# http://www.nbc.na/news/namibias-winter-time-could-be-scrapped.2706
1003+
# https://zone.my.na/news/times-are-changing-in-namibia
1004+
# https://www.newera.com.na/2017/02/23/namibias-winter-time-might-be-repealed/
1005+
# Use plain "WAT" and "CAT" for the time zone abbreviations, to be compatible
1006+
# with Namibia's neighbors.
1007+
9951008
# RULE NAME FROM TO TYPE IN ON AT SAVE LETTER/S
996-
Rule Namibia 1994 only - Mar 21 0:00 0 -
997-
Rule Namibia 1994 2016 - Sep Sun>=1 2:00 1:00 S
998-
Rule Namibia 1995 2017 - Apr Sun>=1 2:00 0 -
1009+
# Vanguard section, for zic and other parsers that support negative DST.
1010+
Rule Namibia 1994 only - Mar 21 0:00 -1:00 WAT
1011+
Rule Namibia 1994 2017 - Sep Sun>=1 2:00 0 CAT
1012+
Rule Namibia 1995 2017 - Apr Sun>=1 2:00 -1:00 WAT
1013+
# Rearguard section, for parsers that do not support negative DST.
1014+
#Rule Namibia 1994 only - Mar 21 0:00 0 WAT
1015+
#Rule Namibia 1994 2017 - Sep Sun>=1 2:00 1:00 CAT
1016+
#Rule Namibia 1995 2017 - Apr Sun>=1 2:00 0 WAT
1017+
# End of rearguard section.
1018+
9991019
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
10001020
Zone Africa/Windhoek 1:08:24 - LMT 1892 Feb 8
10011021
1:30 - +0130 1903 Mar
10021022
2:00 - SAST 1942 Sep 20 2:00
10031023
2:00 1:00 SAST 1943 Mar 21 2:00
10041024
2:00 - SAST 1990 Mar 21 # independence
1005-
2:00 - CAT 1994 Mar 21 0:00
1006-
1:00 Namibia WA%sT 2017 Sep 3 2:00
1007-
2:00 - CAT
1025+
# Vanguard section, for zic and other parsers that support negative DST.
1026+
2:00 Namibia %s
1027+
# Rearguard section, for parsers that do not support negative DST.
1028+
# 2:00 - CAT 1994 Mar 21 0:00
1029+
# From Paul Eggert (2017-04-07):
1030+
# The official date of the 2017 rule change was 2017-10-24. See:
1031+
# http://www.lac.org.na/laws/annoSTAT/Namibian%20Time%20Act%209%20of%202017.pdf
1032+
# 1:00 Namibia %s 2017 Oct 24
1033+
# 2:00 - CAT
1034+
# End of rearguard section.
10081035

10091036
# Niger
10101037
# See Africa/Lagos.

tzdata/asia

Lines changed: 16 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1983,6 +1983,19 @@ Rule ROK 1987 1988 - Oct Sun>=8 3:00 0 S
19831983
# There is no common English-language abbreviation for this time zone.
19841984
# Use KST, as that's what we already use for 1954-1961 in ROK.
19851985

1986+
# From Kang Seonghoon (2018-04-29):
1987+
# North Korea will revert its time zone from UTC+8:30 (PYT; Pyongyang
1988+
# Time) back to UTC+9 (KST; Korea Standard Time).
1989+
#
1990+
# From Seo Sanghyeon (2018-04-30):
1991+
# Rodong Sinmun 2018-04-30 announced Pyongyang Time transition plan.
1992+
# https://www.nknews.org/kcna/wp-content/uploads/sites/5/2018/04/rodong-2018-04-30.pdf
1993+
# ... the transition date is 2018-05-05 ... Citation should be Decree
1994+
# No. 2232 of April 30, 2018, of the Presidium of the Supreme People's
1995+
# Assembly, as published in Rodong Sinmun.
1996+
# From Tim Parenti (2018-04-29):
1997+
# It appears to be the front page story at the top in the right-most column.
1998+
19861999
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
19872000
Zone Asia/Seoul 8:27:52 - LMT 1908 Apr 1
19882001
8:30 - KST 1912 Jan 1
@@ -1994,7 +2007,8 @@ Zone Asia/Pyongyang 8:23:00 - LMT 1908 Apr 1
19942007
8:30 - KST 1912 Jan 1
19952008
9:00 - JST 1945 Aug 24
19962009
9:00 - KST 2015 Aug 15 00:00
1997-
8:30 - KST
2010+
8:30 - KST 2018 May 5
2011+
9:00 - KST
19982012

19992013
###############################################################################
20002014

@@ -2658,7 +2672,7 @@ Zone Asia/Karachi 4:28:12 - LMT 1907
26582672
# From Sharef Mustafa (2018-03-16):
26592673
# Palestine summer time will start on Mar 24th 2018 by advancing the
26602674
# clock by 60 minutes as per Palestinian cabinet decision published on
2661-
# the offical website, though the decree did not specify the exact
2675+
# the official website, though the decree did not specify the exact
26622676
# time of the time shift.
26632677
# http://www.palestinecabinet.gov.ps/Website/AR/NDecrees/ViewFile.ashx?ID=e7a42ab7-ee23-435a-b9c8-a4f7e81f3817
26642678
#

tzdata/australasia

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1085,6 +1085,15 @@ Zone Pacific/Wallis 12:15:20 - LMT 1901
10851085
# (1999-09-27) writes that Giles Meteorological Station uses
10861086
# South Australian time even though it's located in Western Australia.
10871087

1088+
# From Paul Eggert (2018-04-01):
1089+
# The Guardian Express of Perth, Australia reported today that the
1090+
# government decided to advance the clocks permanently on January 1,
1091+
# 2019, from UT +08 to UT +09. The article noted that an exemption
1092+
# would be made for people aged 61 and over, who "can apply in writing
1093+
# to have the extra hour of sunshine removed from their area." See:
1094+
# Daylight saving coming to WA in 2019. Guardian Express. 2018-04-01.
1095+
# https://www.communitynews.com.au/guardian-express/news/exclusive-daylight-savings-coming-wa-summer-2018/
1096+
10881097
# Queensland
10891098

10901099
# From Paul Eggert (2018-02-26):

0 commit comments

Comments
 (0)