Skip to content

Commit 2976053

Browse files
author
GitHub Actions
committed
Update tzdata and zoneinfo to version 2018b.
1 parent 7915eee commit 2976053

File tree

8 files changed

+68
-21
lines changed

8 files changed

+68
-21
lines changed

tzdata/Makefile

Lines changed: 14 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -455,14 +455,15 @@ WEB_PAGES= tz-art.html tz-how-to.html tz-link.html
455455
DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
456456
PRIMARY_YDATA= africa antarctica asia australasia \
457457
europe northamerica southamerica
458-
YDATA= $(PRIMARY_YDATA) etcetera $(BACKWARD)
458+
YDATA= $(PRIMARY_YDATA) etcetera
459459
NDATA= systemv factory
460-
TDATA= $(YDATA) $(NDATA)
460+
TDATA_TO_CHECK= $(YDATA) $(NDATA) backward pacificnew
461+
TDATA= $(YDATA) $(NDATA) $(BACKWARD)
461462
ZONETABLES= zone1970.tab zone.tab
462463
TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES)
463464
LEAP_DEPS= leapseconds.awk leap-seconds.list
464465
TZDATA_ZI_DEPS= zishrink.awk version $(TDATA) $(PACKRATDATA)
465-
DATA= $(YDATA) $(NDATA) backzone iso3166.tab leap-seconds.list \
466+
DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \
466467
leapseconds yearistype.sh $(ZONETABLES)
467468
AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk zishrink.awk
468469
MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl
@@ -670,22 +671,24 @@ check_character_set: $(ENCHILADA)
670671
$(MISC) $(SOURCES) $(WEB_PAGES) \
671672
CONTRIBUTING LICENSE Makefile README \
672673
version tzdata.zi && \
673-
! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \
674+
! grep -Env $(SAFE_SHARP_LINE) $(TDATA_TO_CHECK) backzone \
674675
leapseconds yearistype.sh zone.tab && \
675676
! grep -Env $(OK_LINE) $(ENCHILADA); \
676677
}
677678
678679
check_white_space: $(ENCHILADA)
679680
patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \
680681
! grep -En "$$pat" $(ENCHILADA)
681-
! grep -n '[[:space:]]$$' $(ENCHILADA)
682+
! grep -n '[[:space:]]$$' \
683+
$$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list)
682684
683685
PRECEDES_FILE_NAME = ^(Zone|Link[[:space:]]+[^[:space:]]+)[[:space:]]+
684686
FILE_NAME_COMPONENT_TOO_LONG = \
685687
$(PRECEDES_FILE_NAME)[^[:space:]]*[^/[:space:]]{15}
686688
687-
check_name_lengths: $(TDATA) backzone
688-
! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' $(TDATA) backzone
689+
check_name_lengths: $(TDATA_TO_CHECK) backzone
690+
! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' \
691+
$(TDATA_TO_CHECK) backzone
689692
690693
CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; }
691694
@@ -699,8 +702,8 @@ check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
699702
$(AWK) '/^[^#]/ $(CHECK_CC_LIST)' zone1970.tab | \
700703
LC_ALL=C sort -cu
701704
702-
check_links: checklinks.awk $(TDATA)
703-
$(AWK) -f checklinks.awk $(TDATA)
705+
check_links: checklinks.awk $(TDATA_TO_CHECK)
706+
$(AWK) -f checklinks.awk $(TDATA_TO_CHECK)
704707
$(AWK) -f checklinks.awk tzdata.zi
705708
706709
check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABLES)
@@ -803,10 +806,10 @@ check_public:
803806
$(MAKE) maintainer-clean
804807
$(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL
805808
mkdir -p public.dir
806-
for i in $(TDATA) tzdata.zi; do \
809+
for i in $(TDATA_TO_CHECK) tzdata.zi; do \
807810
$(zic) -v -d public.dir $$i 2>&1 || exit; \
808811
done
809-
$(zic) -v -d public.dir $(TDATA)
812+
$(zic) -v -d public.dir $(TDATA_TO_CHECK)
810813
rm -fr public.dir
811814
812815
# Check that the code works under various alternative

tzdata/NEWS

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,17 @@
11
News for the tz database
22

3+
Release 2018b - 2018-01-17 23:24:48 -0800
4+
5+
Briefly:
6+
Fix a packaging problem in tz2018a, which was missing 'pacificnew'.
7+
8+
Changes to build procedure
9+
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.)
13+
14+
315
Release 2018a - 2018-01-12 22:29:21 -0800
416

517
Briefly:

tzdata/README

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ platform other than GNU/Linux. Then run the following commands,
1818
substituting your desired installation directory for "$HOME/tzdir":
1919

2020
make TOPDIR=$HOME/tzdir install
21-
$HOME/tzdir/etc/zdump -v America/Los_Angeles
21+
$HOME/tzdir/usr/bin/zdump -v America/Los_Angeles
2222

2323
Historical local time information has been included here to:
2424

tzdata/leap-seconds.list

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,12 @@
6161
# or
6262
# Terry Quinn, "The BIPM and the Accurate Measurement
6363
# of Time," Proc. of the IEEE, Vol. 79, pp. 894-905,
64-
# July, 1991.
64+
# July, 1991. <http://dx.doi.org/10.1109/5.84965>
65+
# reprinted in:
66+
# Christine Hackman and Donald B Sullivan (eds.)
67+
# Time and Frequency Measurement
68+
# American Association of Physics Teachers (1996)
69+
# <http://tf.nist.gov/general/pdf/1168.pdf>, pp. 75-86
6570
#
6671
# 4. The decision to insert a leap second into UTC is currently
6772
# the responsibility of the International Earth Rotation and
@@ -199,10 +204,10 @@
199204
# current -- the update time stamp, the data and the name of the file
200205
# will not change.
201206
#
202-
# Updated through IERS Bulletin C54
203-
# File expires on: 28 June 2018
207+
# Updated through IERS Bulletin C55
208+
# File expires on: 28 December 2018
204209
#
205-
#@ 3739132800
210+
#@ 3754944000
206211
#
207212
2272060800 10 # 1 Jan 1972
208213
2287785600 11 # 1 Jul 1972
@@ -247,4 +252,4 @@
247252
# the hash line is also ignored in the
248253
# computation.
249254
#
250-
#h 5101445a 69948b51 9153e2b 2086e3d8 d54561a3
255+
#h 44dcf58c e28d25aa b36612c8 f3d3e8b5 a8fdf478

tzdata/leapseconds

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -57,5 +57,5 @@ Leap 2012 Jun 30 23:59:60 + S
5757
Leap 2015 Jun 30 23:59:60 + S
5858
Leap 2016 Dec 31 23:59:60 + S
5959

60-
# Updated through IERS Bulletin C54
61-
# File expires on: 28 June 2018
60+
# Updated through IERS Bulletin C55
61+
# File expires on: 28 December 2018

tzdata/pacificnew

Lines changed: 27 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
# This file is in the public domain, so clarified as of
2+
# 2009-05-17 by Arthur David Olson.
3+
4+
# From Arthur David Olson (1989-04-05):
5+
# On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
6+
# establishing "Pacific Presidential Election Time"; it was not acted on
7+
# by the Senate or signed into law by the President.
8+
# You might want to change the "PE" (Presidential Election) below to
9+
# "Q" (Quadrennial) to maintain three-character zone abbreviations.
10+
# If you're really conservative, you might want to change it to "D".
11+
# Avoid "L" (Leap Year), which won't be true in 2100.
12+
13+
# If Presidential Election Time is ever established, replace "XXXX" below
14+
# with the year the law takes effect and uncomment the "##" lines.
15+
16+
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
17+
## Rule Twilite XXXX max - Apr Sun>=1 2:00 1:00 D
18+
## Rule Twilite XXXX max uspres Oct lastSun 2:00 1:00 PE
19+
## Rule Twilite XXXX max uspres Nov Sun>=7 2:00 0 S
20+
## Rule Twilite XXXX max nonpres Oct lastSun 2:00 0 S
21+
22+
# Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL]
23+
## Zone America/Los_Angeles-PET -8:00 US P%sT XXXX
24+
## -8:00 Twilite P%sT
25+
26+
# For now...
27+
Link America/Los_Angeles US/Pacific-New ##

tzdata/theory.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1065,7 +1065,7 @@ <h2 id="planets">Time and time zones on other planets</h2>
10651065
Michael Allison and Robert Schmunk,
10661066
"<a href="https://www.giss.nasa.gov/tools/mars24/help/notes.html">Technical
10671067
Notes on Mars Solar Time as Adopted by the Mars24 Sunclock</a>"
1068-
(2012-08-08).
1068+
(2015-06-30).
10691069
</li>
10701070
<li>
10711071
Jia-Rui Chong,

tzdata/version

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

0 commit comments

Comments
 (0)