aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorPhilip Paeps <philip@FreeBSD.org>2018-01-24 06:45:03 +0000
committerPhilip Paeps <philip@FreeBSD.org>2018-01-24 06:45:03 +0000
commitb6a2820ba92bea7acf4abeb38c198c71bcc554b8 (patch)
treeadc2c7216ca9ea3e72979642439b4b304761aad9
parent6477c267748c66d02503094e700ea2fdf89444eb (diff)
downloadsrc-b6a2820ba92bea7acf4abeb38c198c71bcc554b8.tar.gz
src-b6a2820ba92bea7acf4abeb38c198c71bcc554b8.zip
Import tzdata 2018cvendor/tzdata/tzdata2018c
Notes
Notes: svn path=/vendor/tzdata/dist/; revision=328316 svn path=/vendor/tzdata/tzdata2018c/; revision=328317; tag=vendor/tzdata/tzdata2018c
-rw-r--r--Makefile25
-rw-r--r--NEWS46
-rw-r--r--README2
-rw-r--r--asia20
-rw-r--r--europe37
-rw-r--r--leap-seconds.list15
-rw-r--r--leapseconds4
-rw-r--r--pacificnew27
-rw-r--r--theory.html2
-rw-r--r--version2
-rw-r--r--zishrink.awk6
11 files changed, 144 insertions, 42 deletions
diff --git a/Makefile b/Makefile
index 8b115b8d84b9..4f448d2b49c6 100644
--- a/Makefile
+++ b/Makefile
@@ -455,14 +455,15 @@ WEB_PAGES= tz-art.html tz-how-to.html tz-link.html
DOCS= $(MANS) date.1 $(MANTXTS) $(WEB_PAGES)
PRIMARY_YDATA= africa antarctica asia australasia \
europe northamerica southamerica
-YDATA= $(PRIMARY_YDATA) etcetera $(BACKWARD)
+YDATA= $(PRIMARY_YDATA) etcetera
NDATA= systemv factory
-TDATA= $(YDATA) $(NDATA)
+TDATA_TO_CHECK= $(YDATA) $(NDATA) backward pacificnew
+TDATA= $(YDATA) $(NDATA) $(BACKWARD)
ZONETABLES= zone1970.tab zone.tab
TABDATA= iso3166.tab $(TZDATA_TEXT) $(ZONETABLES)
LEAP_DEPS= leapseconds.awk leap-seconds.list
TZDATA_ZI_DEPS= zishrink.awk version $(TDATA) $(PACKRATDATA)
-DATA= $(YDATA) $(NDATA) backzone iso3166.tab leap-seconds.list \
+DATA= $(TDATA_TO_CHECK) backzone iso3166.tab leap-seconds.list \
leapseconds yearistype.sh $(ZONETABLES)
AWK_SCRIPTS= checklinks.awk checktab.awk leapseconds.awk zishrink.awk
MISC= $(AWK_SCRIPTS) zoneinfo2tdf.pl
@@ -670,7 +671,7 @@ check_character_set: $(ENCHILADA)
$(MISC) $(SOURCES) $(WEB_PAGES) \
CONTRIBUTING LICENSE Makefile README \
version tzdata.zi && \
- ! grep -Env $(SAFE_SHARP_LINE) $(TDATA) backzone \
+ ! grep -Env $(SAFE_SHARP_LINE) $(TDATA_TO_CHECK) backzone \
leapseconds yearistype.sh zone.tab && \
! grep -Env $(OK_LINE) $(ENCHILADA); \
}
@@ -678,14 +679,16 @@ check_character_set: $(ENCHILADA)
check_white_space: $(ENCHILADA)
patfmt=' \t|[\f\r\v]' && pat=`printf "$$patfmt\\n"` && \
! grep -En "$$pat" $(ENCHILADA)
- ! grep -n '[[:space:]]$$' $(ENCHILADA)
+ ! grep -n '[[:space:]]$$' \
+ $$(ls $(ENCHILADA) | grep -Fvx leap-seconds.list)
PRECEDES_FILE_NAME = ^(Zone|Link[[:space:]]+[^[:space:]]+)[[:space:]]+
FILE_NAME_COMPONENT_TOO_LONG = \
$(PRECEDES_FILE_NAME)[^[:space:]]*[^/[:space:]]{15}
-check_name_lengths: $(TDATA) backzone
- ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' $(TDATA) backzone
+check_name_lengths: $(TDATA_TO_CHECK) backzone
+ ! grep -En '$(FILE_NAME_COMPONENT_TOO_LONG)' \
+ $(TDATA_TO_CHECK) backzone
CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n; i++) print a[1], a[i]; }
@@ -699,8 +702,8 @@ check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
$(AWK) '/^[^#]/ $(CHECK_CC_LIST)' zone1970.tab | \
LC_ALL=C sort -cu
-check_links: checklinks.awk $(TDATA)
- $(AWK) -f checklinks.awk $(TDATA)
+check_links: checklinks.awk $(TDATA_TO_CHECK)
+ $(AWK) -f checklinks.awk $(TDATA_TO_CHECK)
$(AWK) -f checklinks.awk tzdata.zi
check_tables: checktab.awk $(PRIMARY_YDATA) $(ZONETABLES)
@@ -803,10 +806,10 @@ check_public:
$(MAKE) maintainer-clean
$(MAKE) CFLAGS='$(GCC_DEBUG_FLAGS)' ALL
mkdir -p public.dir
- for i in $(TDATA) tzdata.zi; do \
+ for i in $(TDATA_TO_CHECK) tzdata.zi; do \
$(zic) -v -d public.dir $$i 2>&1 || exit; \
done
- $(zic) -v -d public.dir $(TDATA)
+ $(zic) -v -d public.dir $(TDATA_TO_CHECK)
rm -fr public.dir
# Check that the code works under various alternative
diff --git a/NEWS b/NEWS
index c5b1bd15caa4..2bd0aa84143f 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,51 @@
News for the tz database
+Release 2018c - 2018-01-22 23:00:44 -0800
+
+ Briefly:
+ Revert Irish changes that relied on negative DST offsets.
+
+ Changes to tm_isdst
+
+ Revert the 2018a change to Europe/Dublin. As before, this change
+ does not affect UT offsets or abbreviations; it affects only
+ whether timestamps are considered to be standard time or
+ daylight-saving time, as expressed in the tm_isdst flag of C's
+ struct tm type. This reversion is intended to be a temporary
+ workaround for problems discovered with downstream uses of
+ releases 2018a and 2018b, which implemented Irish time by using
+ negative DST offsets in the Eire rules of the 'europe' file.
+ Although negative DST offsets have been part of tzcode for many
+ years and are supported by many platforms, they were not
+ documented before 2018a and ICU and OpenJDK do not currently
+ support them. A mechanism to export data to platforms lacking
+ support for negative DST is planned to be developed before the
+ change is reapplied. (Problems reported by Deborah Goldsmith and
+ Stephen Colebourne.)
+
+ Changes to past time stamps
+
+ Japanese DST transitions (1948-1951) were Sundays at 00:00, not
+ Saturdays or Sundays at 02:00. (Thanks to Takayuki Nikai.)
+
+ Changes to build procedure
+
+ The build procedure now works around mawk 1.3.3's lack of support
+ for character class expressions. (Problem reported by Ohyama.)
+
+
+Release 2018b - 2018-01-17 23:24:48 -0800
+
+ Briefly:
+ Fix a packaging problem in tz2018a, which was missing 'pacificnew'.
+
+ Changes to build procedure
+
+ The distribution now contains the file 'pacificnew' again.
+ This file was inadvertantly omitted in the 2018a distribution.
+ (Problem reported by Matias Fonzo.)
+
+
Release 2018a - 2018-01-12 22:29:21 -0800
Briefly:
diff --git a/README b/README
index 16d46d7f9e4b..ab8e47b63efb 100644
--- a/README
+++ b/README
@@ -18,7 +18,7 @@ platform other than GNU/Linux. Then run the following commands,
substituting your desired installation directory for "$HOME/tzdir":
make TOPDIR=$HOME/tzdir install
- $HOME/tzdir/etc/zdump -v America/Los_Angeles
+ $HOME/tzdir/usr/bin/zdump -v America/Los_Angeles
Historical local time information has been included here to:
diff --git a/asia b/asia
index 0c026318d4a1..3f6e95c20120 100644
--- a/asia
+++ b/asia
@@ -1464,17 +1464,17 @@ Zone Asia/Jerusalem 2:20:54 - LMT 1880
# of the Japanese wanted to scrap daylight-saving time, as opposed to 30% who
# wanted to keep it.)
-# From Paul Eggert (2006-03-22):
-# Shanks & Pottenger write that DST in Japan during those years was as follows:
+# From Takayuki Nikai (2018-01-19):
+# The source of information is Japanese law.
+# http://www.shugiin.go.jp/internet/itdb_housei.nsf/html/houritsu/00219480428029.htm
+# http://www.shugiin.go.jp/internet/itdb_housei.nsf/html/houritsu/00719500331039.htm
+# ... In summary, it is written as follows. From 24:00 on the first Saturday
+# in May, until 0:00 on the day after the second Saturday in September.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Japan 1948 only - May Sun>=1 2:00 1:00 D
-Rule Japan 1948 1951 - Sep Sat>=8 2:00 0 S
-Rule Japan 1949 only - Apr Sun>=1 2:00 1:00 D
-Rule Japan 1950 1951 - May Sun>=1 2:00 1:00 D
-# but the only locations using it (for birth certificates, presumably, since
-# their audience is astrologers) were US military bases. For now, assume
-# that for most purposes daylight-saving time was observed; otherwise, what
-# would have been the point of the 1951 poll?
+Rule Japan 1948 only - May Sat>=1 24:00 1:00 D
+Rule Japan 1948 1951 - Sep Sun>=9 0:00 0 S
+Rule Japan 1949 only - Apr Sat>=1 24:00 1:00 D
+Rule Japan 1950 1951 - May Sat>=1 24:00 1:00 D
# From Hideyuki Suzuki (1998-11-09):
# 'Tokyo' usually stands for the former location of Tokyo Astronomical
diff --git a/europe b/europe
index 8d10dde91a13..6c1ccbe455cd 100644
--- a/europe
+++ b/europe
@@ -508,16 +508,19 @@ Link Europe/London Europe/Jersey
Link Europe/London Europe/Guernsey
Link Europe/London Europe/Isle_of_Man
+# From Paul Eggert (2018-01-19):
# The following is like GB-Eire and EU, except with standard time in
# summer and negative daylight saving time in winter.
+# Although currently commented out, this will need to become uncommented
+# once the ICU/OpenJDK workaround is removed; see below.
# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
-Rule Eire 1971 only - Oct 31 2:00u -1:00 GMT
-Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 IST
-Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 GMT
-Rule Eire 1981 max - Mar lastSun 1:00u 0 IST
-Rule Eire 1981 1989 - Oct Sun>=23 1:00u -1:00 GMT
-Rule Eire 1990 1995 - Oct Sun>=22 1:00u -1:00 GMT
-Rule Eire 1996 max - Oct lastSun 1:00u -1:00 GMT
+#Rule Eire 1971 only - Oct 31 2:00u -1:00 GMT
+#Rule Eire 1972 1980 - Mar Sun>=16 2:00u 0 IST
+#Rule Eire 1972 1980 - Oct Sun>=23 2:00u -1:00 GMT
+#Rule Eire 1981 max - Mar lastSun 1:00u 0 IST
+#Rule Eire 1981 1989 - Oct Sun>=23 1:00u -1:00 GMT
+#Rule Eire 1990 1995 - Oct Sun>=22 1:00u -1:00 GMT
+#Rule Eire 1996 max - Oct lastSun 1:00u -1:00 GMT
# Zone NAME GMTOFF RULES FORMAT [UNTIL]
Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2
@@ -530,7 +533,25 @@ Zone Europe/Dublin -0:25:00 - LMT 1880 Aug 2
0:00 1:00 IST 1947 Nov 2 2:00s
0:00 - GMT 1948 Apr 18 2:00s
0:00 GB-Eire GMT/IST 1968 Oct 27
- 1:00 Eire IST/GMT
+# From Paul Eggert (2018-01-18):
+# The next line should look like this:
+# 1:00 Eire IST/GMT
+# However, in January 2018 we discovered that the Eire rules cause
+# problems with tests for ICU:
+# https://mm.icann.org/pipermail/tz/2018-January/025825.html
+# and with tests for OpenJDK:
+# https://mm.icann.org/pipermail/tz/2018-January/025822.html
+# To work around this problem, use a traditional approximation for
+# time stamps after 1971-10-31 02:00 UTC, to give ICU and OpenJDK
+# developers breathing room to fix bugs. This approximation has
+# correct UTC offsets, but results in tm_isdst flags are the reverse
+# of what they should be. This workaround is temporary and should be
+# removed reasonably soon.
+ 1:00 - IST 1971 Oct 31 2:00u
+ 0:00 GB-Eire GMT/IST 1996
+ 0:00 EU GMT/IST
+# End of workaround for ICU and OpenJDK bugs.
+
###############################################################################
diff --git a/leap-seconds.list b/leap-seconds.list
index 5d5001029667..eab6ab869c85 100644
--- a/leap-seconds.list
+++ b/leap-seconds.list
@@ -61,7 +61,12 @@
# or
# Terry Quinn, "The BIPM and the Accurate Measurement
# of Time," Proc. of the IEEE, Vol. 79, pp. 894-905,
-# July, 1991.
+# July, 1991. <http://dx.doi.org/10.1109/5.84965>
+# reprinted in:
+# Christine Hackman and Donald B Sullivan (eds.)
+# Time and Frequency Measurement
+# American Association of Physics Teachers (1996)
+# <http://tf.nist.gov/general/pdf/1168.pdf>, pp. 75-86
#
# 4. The decision to insert a leap second into UTC is currently
# the responsibility of the International Earth Rotation and
@@ -199,10 +204,10 @@
# current -- the update time stamp, the data and the name of the file
# will not change.
#
-# Updated through IERS Bulletin C54
-# File expires on: 28 June 2018
+# Updated through IERS Bulletin C55
+# File expires on: 28 December 2018
#
-#@ 3739132800
+#@ 3754944000
#
2272060800 10 # 1 Jan 1972
2287785600 11 # 1 Jul 1972
@@ -247,4 +252,4 @@
# the hash line is also ignored in the
# computation.
#
-#h 5101445a 69948b51 9153e2b 2086e3d8 d54561a3
+#h 44dcf58c e28d25aa b36612c8 f3d3e8b5 a8fdf478
diff --git a/leapseconds b/leapseconds
index a191d5f535a5..358e741052b5 100644
--- a/leapseconds
+++ b/leapseconds
@@ -57,5 +57,5 @@ Leap 2012 Jun 30 23:59:60 + S
Leap 2015 Jun 30 23:59:60 + S
Leap 2016 Dec 31 23:59:60 + S
-# Updated through IERS Bulletin C54
-# File expires on: 28 June 2018
+# Updated through IERS Bulletin C55
+# File expires on: 28 December 2018
diff --git a/pacificnew b/pacificnew
new file mode 100644
index 000000000000..734943486be0
--- /dev/null
+++ b/pacificnew
@@ -0,0 +1,27 @@
+# This file is in the public domain, so clarified as of
+# 2009-05-17 by Arthur David Olson.
+
+# From Arthur David Olson (1989-04-05):
+# On 1989-04-05, the U. S. House of Representatives passed (238-154) a bill
+# establishing "Pacific Presidential Election Time"; it was not acted on
+# by the Senate or signed into law by the President.
+# You might want to change the "PE" (Presidential Election) below to
+# "Q" (Quadrennial) to maintain three-character zone abbreviations.
+# If you're really conservative, you might want to change it to "D".
+# Avoid "L" (Leap Year), which won't be true in 2100.
+
+# If Presidential Election Time is ever established, replace "XXXX" below
+# with the year the law takes effect and uncomment the "##" lines.
+
+# Rule NAME FROM TO TYPE IN ON AT SAVE LETTER/S
+## Rule Twilite XXXX max - Apr Sun>=1 2:00 1:00 D
+## Rule Twilite XXXX max uspres Oct lastSun 2:00 1:00 PE
+## Rule Twilite XXXX max uspres Nov Sun>=7 2:00 0 S
+## Rule Twilite XXXX max nonpres Oct lastSun 2:00 0 S
+
+# Zone NAME GMTOFF RULES/SAVE FORMAT [UNTIL]
+## Zone America/Los_Angeles-PET -8:00 US P%sT XXXX
+## -8:00 Twilite P%sT
+
+# For now...
+Link America/Los_Angeles US/Pacific-New ##
diff --git a/theory.html b/theory.html
index e70a75de812a..ff85f537b4e6 100644
--- a/theory.html
+++ b/theory.html
@@ -1065,7 +1065,7 @@ Sources:
Michael Allison and Robert Schmunk,
"<a href="https://www.giss.nasa.gov/tools/mars24/help/notes.html">Technical
Notes on Mars Solar Time as Adopted by the Mars24 Sunclock</a>"
-(2012-08-08).
+(2015-06-30).
</li>
<li>
Jia-Rui Chong,
diff --git a/version b/version
index 7c23726d626a..f6a71fe2f67f 100644
--- a/version
+++ b/version
@@ -1 +1 @@
-2018a
+2018c
diff --git a/zishrink.awk b/zishrink.awk
index c629109f98f6..23d623e99d82 100644
--- a/zishrink.awk
+++ b/zishrink.awk
@@ -37,7 +37,7 @@ function process_input_line(line, field, end, i, n, startdef)
# Remove comments, normalize spaces, and append a space to each line.
sub(/#.*/, "", line)
line = line " "
- gsub(/[[:space:]]+/, " ", line)
+ gsub(/[\f\r\t\v ]+/, " ", line)
# Abbreviate keywords. Do not abbreviate "Link" to just "L",
# as pre-2017c zic erroneously diagnoses "Li" as ambiguous.
@@ -94,7 +94,7 @@ function process_input_line(line, field, end, i, n, startdef)
sub(/ 0+$/, "", line)
# Remove unnecessary trailing days-of-month "1".
- if (match(line, /[[:alpha:]] 1$/))
+ if (match(line, /[A-Za-z] 1$/))
line = substr(line, 1, RSTART)
# Remove unnecessary trailing " Ja" (for January).
@@ -148,7 +148,7 @@ BEGIN {
print "# This zic input file is in the public domain."
}
-/^[[:space:]]*[^#[:space:]]/ {
+/^[\f\r\t\v ]*[^#\f\r\t\v ]/ {
process_input_line($0)
}