Author: gordon
Date: Wed Mar  7 06:01:44 2018
New Revision: 330568
URL: https://svnweb.freebsd.org/changeset/base/330568

Log:
  Update timezone database information. [EN-18:01.tzdata]
  
  Approved by:  so
  Security:     FreeBSD-EN-18:01.tzdata

Modified:
  releng/10.3/contrib/tzdata/Makefile
  releng/10.3/contrib/tzdata/NEWS
  releng/10.3/contrib/tzdata/README
  releng/10.3/contrib/tzdata/africa
  releng/10.3/contrib/tzdata/asia
  releng/10.3/contrib/tzdata/australasia
  releng/10.3/contrib/tzdata/backzone
  releng/10.3/contrib/tzdata/europe
  releng/10.3/contrib/tzdata/leap-seconds.list
  releng/10.3/contrib/tzdata/leapseconds
  releng/10.3/contrib/tzdata/northamerica
  releng/10.3/contrib/tzdata/southamerica
  releng/10.3/contrib/tzdata/theory.html
  releng/10.3/contrib/tzdata/version
  releng/10.3/contrib/tzdata/zishrink.awk
  releng/10.3/contrib/tzdata/zone.tab
  releng/10.3/contrib/tzdata/zone1970.tab
  releng/10.4/contrib/tzdata/Makefile
  releng/10.4/contrib/tzdata/NEWS
  releng/10.4/contrib/tzdata/README
  releng/10.4/contrib/tzdata/africa
  releng/10.4/contrib/tzdata/asia
  releng/10.4/contrib/tzdata/australasia
  releng/10.4/contrib/tzdata/backzone
  releng/10.4/contrib/tzdata/europe
  releng/10.4/contrib/tzdata/leap-seconds.list
  releng/10.4/contrib/tzdata/leapseconds
  releng/10.4/contrib/tzdata/northamerica
  releng/10.4/contrib/tzdata/southamerica
  releng/10.4/contrib/tzdata/theory.html
  releng/10.4/contrib/tzdata/version
  releng/10.4/contrib/tzdata/zishrink.awk
  releng/10.4/contrib/tzdata/zone.tab
  releng/10.4/contrib/tzdata/zone1970.tab
  releng/11.1/contrib/tzdata/Makefile
  releng/11.1/contrib/tzdata/NEWS
  releng/11.1/contrib/tzdata/README
  releng/11.1/contrib/tzdata/africa
  releng/11.1/contrib/tzdata/asia
  releng/11.1/contrib/tzdata/australasia
  releng/11.1/contrib/tzdata/backzone
  releng/11.1/contrib/tzdata/europe
  releng/11.1/contrib/tzdata/leap-seconds.list
  releng/11.1/contrib/tzdata/leapseconds
  releng/11.1/contrib/tzdata/northamerica
  releng/11.1/contrib/tzdata/southamerica
  releng/11.1/contrib/tzdata/theory.html
  releng/11.1/contrib/tzdata/version
  releng/11.1/contrib/tzdata/zishrink.awk
  releng/11.1/contrib/tzdata/zone.tab
  releng/11.1/contrib/tzdata/zone1970.tab

Modified: releng/10.3/contrib/tzdata/Makefile
==============================================================================
--- releng/10.3/contrib/tzdata/Makefile Wed Mar  7 05:58:24 2018        
(r330567)
+++ releng/10.3/contrib/tzdata/Makefile Wed Mar  7 06:01:44 2018        
(r330568)
@@ -42,37 +42,64 @@ POSIXRULES= America/New_York
 # Also see TZDEFRULESTRING below, which takes effect only
 # if the time zone files cannot be accessed.
 
-# Everything gets put in subdirectories of. . .
 
-TOPDIR=                /usr/local
+# Installation locations.
+#
+# The defaults are suitable for Debian, except that if REDO is
+# posix_right or right_posix then files that Debian puts under
+# /usr/share/zoneinfo/posix and /usr/share/zoneinfo/right are instead
+# put under /usr/share/zoneinfo-posix and /usr/share/zoneinfo-leaps,
+# respectively.  Problems with the Debian approach are discussed in
+# the commentary for the right_posix rule (below).
 
+# Destination directory, which can be used for staging.
+# 'make DESTDIR=/stage install' installs under /stage (e.g., to
+# /stage/etc/localtime instead of to /etc/localtime).  Files under
+# /stage are not intended to work as-is, but can be copied by hand to
+# the root directory later.  If DESTDIR is empty, 'make install' does
+# not stage, but installs directly into production locations.
+DESTDIR =
+
+# Everything is installed into subdirectories of TOPDIR, and used there.
+# TOPDIR should be empty (meaning the root directory),
+# or a directory name that does not end in "/".
+# TOPDIR should be empty or an absolute name unless you're just testing.
+TOPDIR =
+
+# The default local time zone is taken from the file TZDEFAULT.
+TZDEFAULT = $(TOPDIR)/etc/localtime
+
+# The subdirectory containing installed program and data files, and
+# likewise for installed files that can be shared among architectures.
+# These should be relative file names.
+USRDIR = usr
+USRSHAREDIR = $(USRDIR)/share
+
 # "Compiled" time zone information is placed in the "TZDIR" directory
 # (and subdirectories).
-# Use an absolute path name for TZDIR unless you're just testing the software.
 # TZDIR_BASENAME should not contain "/" and should not be ".", ".." or empty.
-
 TZDIR_BASENAME=        zoneinfo
-TZDIR=         $(TOPDIR)/etc/$(TZDIR_BASENAME)
+TZDIR = $(TOPDIR)/$(USRSHAREDIR)/$(TZDIR_BASENAME)
 
-# Types to try, as an alternative to time_t.  int64_t should be first.
-TIME_T_ALTERNATIVES= int64_t int32_t uint32_t uint64_t
+# The "tzselect" and (if you do "make INSTALL") "date" commands go in:
+BINDIR = $(TOPDIR)/$(USRDIR)/bin
 
-# The "tzselect", "zic", and "zdump" commands get installed in. . .
+# The "zdump" command goes in:
+ZDUMPDIR = $(BINDIR)
 
-ETCDIR=                $(TOPDIR)/etc
+# The "zic" command goes in:
+ZICDIR = $(TOPDIR)/$(USRDIR)/sbin
 
-# If you "make INSTALL", the "date" command gets installed in. . .
-
-BINDIR=                $(TOPDIR)/bin
-
 # Manual pages go in subdirectories of. . .
+MANDIR = $(TOPDIR)/$(USRSHAREDIR)/man
 
-MANDIR=                $(TOPDIR)/man
-
 # Library functions are put in an archive in LIBDIR.
+LIBDIR = $(TOPDIR)/$(USRDIR)/lib
 
-LIBDIR=                $(TOPDIR)/lib
 
+# Types to try, as an alternative to time_t.  int64_t should be first.
+TIME_T_ALTERNATIVES = int64_t int32_t uint32_t uint64_t
+
 # If you want only POSIX time, with time values interpreted as
 # seconds since the epoch (not counting leap seconds), use
 #      REDO=           posix_only
@@ -105,11 +132,14 @@ REDO=             posix_right
 TZDATA_TEXT=   leapseconds tzdata.zi
 
 # For backward-compatibility links for old zone names, use
+#      BACKWARD=       backward
+# If you also want the link US/Pacific-New, even though it is confusing
+# and is planned to be removed from the database eventually, use
 #      BACKWARD=       backward pacificnew
 # To omit these links, use
 #      BACKWARD=
 
-BACKWARD=      backward pacificnew
+BACKWARD=      backward
 
 # If you want out-of-scope and often-wrong data from the file 'backzone', use
 #      PACKRATDATA=    backzone
@@ -313,7 +343,7 @@ ZFLAGS=
 
 # How to use zic to install tz binary files.
 
-ZIC_INSTALL=   $(ZIC) -d $(DESTDIR)$(TZDIR) $(LEAPSECONDS)
+ZIC_INSTALL=   $(ZIC) -d '$(DESTDIR)$(TZDIR)' $(LEAPSECONDS)
 
 # The name of a Posix-compliant 'awk' on your system.
 AWK=           awk
@@ -341,8 +371,8 @@ SGML_CATALOG_FILES= \
 VALIDATE = nsgmls
 VALIDATE_FLAGS = -s -B -wall -wno-unused-param
 VALIDATE_ENV = \
-  SGML_CATALOG_FILES=$(SGML_CATALOG_FILES) \
-  SGML_SEARCH_PATH=$(SGML_SEARCH_PATH) \
+  SGML_CATALOG_FILES='$(SGML_CATALOG_FILES)' \
+  SGML_SEARCH_PATH='$(SGML_SEARCH_PATH)' \
   SP_CHARSET_FIXED=YES \
   SP_ENCODING=UTF-8
 
@@ -396,7 +426,7 @@ GZIPFLAGS=  -9n
 #MAKE=         make
 
 cc=            cc
-CC=            $(cc) -DTZDIR=\"$(TZDIR)\"
+CC=            $(cc) -DTZDIR='"$(TZDIR)"'
 
 AR=            ar
 
@@ -421,18 +451,19 @@ MANTXTS=  newctime.3.txt newstrftime.3.txt newtzset.3.t
                        date.1.txt
 COMMON=                calendars CONTRIBUTING LICENSE Makefile \
                        NEWS README theory.html version
-WEB_PAGES=     tz-art.htm tz-how-to.html tz-link.htm
+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 $(TDATA) $(PACKRATDATA)
-DATA=          $(YDATA) $(NDATA) backzone iso3166.tab leap-seconds.list \
+TZDATA_ZI_DEPS=        zishrink.awk version $(TDATA) $(PACKRATDATA)
+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
@@ -457,7 +488,7 @@ VERSION_DEPS= \
                newctime.3 newstrftime.3 newtzset.3 northamerica \
                pacificnew private.h \
                southamerica strftime.c systemv theory.html \
-               time2posix.3 tz-art.htm tz-how-to.html tz-link.htm \
+               time2posix.3 tz-art.html tz-how-to.html tz-link.html \
                tzfile.5 tzfile.h tzselect.8 tzselect.ksh \
                workman.sh yearistype.sh \
                zdump.8 zdump.c zic.8 zic.c \
@@ -473,35 +504,41 @@ all:              tzselect yearistype zic zdump libtz.a 
$(TABDATA)
 ALL:           all date $(ENCHILADA)
 
 install:       all $(DATA) $(REDO) $(MANS)
-               mkdir -p $(DESTDIR)$(ETCDIR) $(DESTDIR)$(TZDIR) \
-                       $(DESTDIR)$(LIBDIR) \
-                       $(DESTDIR)$(MANDIR)/man3 $(DESTDIR)$(MANDIR)/man5 \
-                       $(DESTDIR)$(MANDIR)/man8
-               $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES)
-               cp -f $(TABDATA) $(DESTDIR)$(TZDIR)/.
-               cp tzselect zic zdump $(DESTDIR)$(ETCDIR)/.
-               cp libtz.a $(DESTDIR)$(LIBDIR)/.
-               $(RANLIB) $(DESTDIR)$(LIBDIR)/libtz.a
-               cp -f newctime.3 newtzset.3 $(DESTDIR)$(MANDIR)/man3/.
-               cp -f tzfile.5 $(DESTDIR)$(MANDIR)/man5/.
-               cp -f tzselect.8 zdump.8 zic.8 $(DESTDIR)$(MANDIR)/man8/.
+               mkdir -p '$(DESTDIR)$(BINDIR)' \
+                       '$(DESTDIR)$(ZDUMPDIR)' '$(DESTDIR)$(ZICDIR)' \
+                       '$(DESTDIR)$(LIBDIR)' \
+                       '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \
+                       '$(DESTDIR)$(MANDIR)/man8'
+               $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) \
+                       -t '$(DESTDIR)$(TZDEFAULT)'
+               cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.'
+               cp tzselect '$(DESTDIR)$(BINDIR)/.'
+               cp zdump '$(DESTDIR)$(ZDUMPDIR)/.'
+               cp zic '$(DESTDIR)$(ZICDIR)/.'
+               cp libtz.a '$(DESTDIR)$(LIBDIR)/.'
+               $(RANLIB) '$(DESTDIR)$(LIBDIR)/libtz.a'
+               cp -f newctime.3 newtzset.3 '$(DESTDIR)$(MANDIR)/man3/.'
+               cp -f tzfile.5 '$(DESTDIR)$(MANDIR)/man5/.'
+               cp -f tzselect.8 zdump.8 zic.8 '$(DESTDIR)$(MANDIR)/man8/.'
 
 INSTALL:       ALL install date.1
-               mkdir -p $(DESTDIR)$(BINDIR) $(DESTDIR)$(MANDIR)/man1
-               cp date $(DESTDIR)$(BINDIR)/.
-               cp -f date.1 $(DESTDIR)$(MANDIR)/man1/.
+               mkdir -p '$(DESTDIR)$(BINDIR)' '$(DESTDIR)$(MANDIR)/man1'
+               cp date '$(DESTDIR)$(BINDIR)/.'
+               cp -f date.1 '$(DESTDIR)$(MANDIR)/man1/.'
 
 version:       $(VERSION_DEPS)
                { (type git) >/dev/null 2>&1 && \
                  V=`git describe --match '[0-9][0-9][0-9][0-9][a-z]*' \
                                --abbrev=7 --dirty` || \
-                 V=$(VERSION); } && \
+                 V='$(VERSION)'; } && \
                printf '%s\n' "$$V" >$@.out
                mv $@.out $@
 
 # This file can be tailored by setting BACKWARD, PACKRATDATA, etc.
 tzdata.zi:     $(TZDATA_ZI_DEPS)
-               LC_ALL=C $(AWK) -f zishrink.awk $(TDATA) $(PACKRATDATA) >$@.out
+               version=`sed 1q version` && \
+                 LC_ALL=C $(AWK) -v version="$$version" -f zishrink.awk \
+                   $(TDATA) $(PACKRATDATA) >$@.out
                mv $@.out $@
 
 version.h:     version
@@ -529,12 +566,13 @@ leapseconds:      $(LEAP_DEPS)
 # Arguments to pass to submakes of install_data.
 # They can be overridden by later submake arguments.
 INSTALLARGS = \
- BACKWARD=$(BACKWARD) \
- DESTDIR=$(DESTDIR) \
+ BACKWARD='$(BACKWARD)' \
+ DESTDIR='$(DESTDIR)' \
  LEAPSECONDS='$(LEAPSECONDS)' \
  PACKRATDATA='$(PACKRATDATA)' \
- TZDIR=$(TZDIR) \
- YEARISTYPE=$(YEARISTYPE) \
+ TZDEFAULT='$(TZDEFAULT)' \
+ TZDIR='$(TZDIR)' \
+ YEARISTYPE='$(YEARISTYPE)' \
  ZIC='$(ZIC)'
 
 # 'make install_data' installs one set of tz binary files.
@@ -558,16 +596,16 @@ right_only:
 # You must replace all of $(TZDIR) to switch from not using leap seconds
 # to using them, or vice versa.
 right_posix:   right_only
-               rm -fr $(DESTDIR)$(TZDIR)-leaps
-               ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-leaps || \
-                 $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
-               $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
+               rm -fr '$(DESTDIR)$(TZDIR)-leaps'
+               ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-leaps' || \
+                 $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
+               $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
 
 posix_right:   posix_only
-               rm -fr $(DESTDIR)$(TZDIR)-posix
-               ln -s $(TZDIR_BASENAME) $(DESTDIR)$(TZDIR)-posix || \
-                 $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-posix posix_only
-               $(MAKE) $(INSTALLARGS) TZDIR=$(TZDIR)-leaps right_only
+               rm -fr '$(DESTDIR)$(TZDIR)-posix'
+               ln -s '$(TZDIR_BASENAME)' '$(DESTDIR)$(TZDIR)-posix' || \
+                 $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-posix' posix_only
+               $(MAKE) $(INSTALLARGS) TZDIR='$(TZDIR)-leaps' right_only
 
 # This obsolescent rule is present for backwards compatibility with
 # tz releases 2014g through 2015g.  It should go away eventually.
@@ -633,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); \
        }
@@ -641,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]; 
}
 
@@ -662,8 +702,8 @@ check_sorted: backward backzone iso3166.tab zone.tab z
                $(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)
@@ -764,12 +804,12 @@ set-timestamps.out: $(ENCHILADA)
 
 check_public:
                $(MAKE) maintainer-clean
-               $(MAKE) "CFLAGS=$(GCC_DEBUG_FLAGS)" ALL
+               $(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
@@ -790,8 +830,11 @@ check_time_t_alternatives:
                    REDO='$(REDO)' \
                    install && \
                  diff $$quiet_option -r \
-                   time_t.dir/int64_t/etc/zoneinfo \
-                   time_t.dir/$$type/etc/zoneinfo && \
+                   time_t.dir/int64_t/etc \
+                   time_t.dir/$$type/etc && \
+                 diff $$quiet_option -r \
+                   time_t.dir/int64_t/usr/share \
+                   time_t.dir/$$type/usr/share && \
                  case $$type in \
                  int32_t) range=-2147483648,2147483647;; \
                  uint32_t) range=0,4294967296;; \
@@ -800,9 +843,9 @@ check_time_t_alternatives:
                  *) range=-10000000000,10000000000;; \
                  esac && \
                  echo checking $$type zones ... && \
-                 time_t.dir/int64_t/etc/zdump -V -t $$range $$zones \
+                 time_t.dir/int64_t/usr/bin/zdump -V -t $$range $$zones \
                      >time_t.dir/int64_t.out && \
-                 time_t.dir/$$type/etc/zdump -V -t $$range $$zones \
+                 time_t.dir/$$type/usr/bin/zdump -V -t $$range $$zones \
                      >time_t.dir/$$type.out && \
                  diff -u time_t.dir/int64_t.out time_t.dir/$$type.out \
                    || exit; \

Modified: releng/10.3/contrib/tzdata/NEWS
==============================================================================
--- releng/10.3/contrib/tzdata/NEWS     Wed Mar  7 05:58:24 2018        
(r330567)
+++ releng/10.3/contrib/tzdata/NEWS     Wed Mar  7 06:01:44 2018        
(r330568)
@@ -1,5 +1,147 @@
 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:
+  São Tomé and Príncipe switched from +00 to +01.
+  Brazil's DST will now start on November's first Sunday.
+  Ireland's standard time is now in the summer, not the winter.
+  Use Debian-style installation locations, instead of 4.3BSD-style.
+  New zic option -t.
+
+  Changes to past and future time stamps
+
+    São Tomé and Príncipe switched from +00 to +01 on 2018-01-01 at
+    01:00.  (Thanks to Steffen Thorsen and Michael Deckers.)
+
+  Changes to future time stamps
+
+    Starting in 2018 southern Brazil will begin DST on November's
+    first Sunday instead of October's third Sunday.  (Thanks to
+    Steffen Thorsen.)
+
+  Changes to past time stamps
+
+    A discrepancy of 4 s in timestamps before 1931 in South Sudan has
+    been corrected.  The 'backzone' and 'zone.tab' files did not agree
+    with the 'africa' and 'zone1970.tab' files.  (Problem reported by
+    Michael Deckers.)
+
+    The abbreviation invented for Bolivia Summer Time (1931-2) is now
+    BST instead of BOST, to be more consistent with the convention
+    used for Latvian Summer Time (1918-9) and for British Summer Time.
+
+  Changes to tm_isdst
+
+    Change Europe/Dublin so that it observes Irish Standard Time (UT
+    +01) in summer and GMT (as negative daylight-saving) in winter,
+    instead of observing standard time (GMT) in winter and Irish
+    Summer Time (UT +01) in summer.  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.
+    (Discrepancy noted by Derick Rethans.)
+
+  Changes to build procedure
+
+    The default installation locations have been changed to mostly
+    match Debian circa 2017, instead of being designed as an add-on to
+    4.3BSD circa 1986.  This affects the Makefile macros TOPDIR,
+    TZDIR, MANDIR, and LIBDIR.  New Makefile macros TZDEFAULT, USRDIR,
+    USRSHAREDIR, BINDIR, ZDUMPDIR, and ZICDIR let installers tailor
+    locations more precisely.  (This responds to suggestions from
+    Brian Inglis and from Steve Summit.)
+
+    The default installation procedure no longer creates the
+    backward-compatibility link US/Pacific-New, which causes
+    confusion during user setup (e.g., see Debian bug 815200).
+    Use 'make BACKWARD="backward pacificnew"' to create the link
+    anyway, for now.  Eventually we plan to remove the link entirely.
+
+    tzdata.zi now contains a version-number comment.
+    (Suggested by Tom Lane.)
+
+    The Makefile now quotes values like BACKWARD more carefully when
+    passing them to the shell.  (Problem reported by Zefram.)
+
+    Builders no longer need to specify -DHAVE_SNPRINTF on platforms
+    that have snprintf and use pre-C99 compilers.  (Problem reported
+    by Jon Skeet.)
+
+  Changes to code
+
+    zic has a new option -t FILE that specifies the location of the
+    file that determines local time when TZ is unset.  The default for
+    this location can be configured via the new TZDEFAULT makefile
+    macro, which defaults to /etc/localtime.
+
+    Diagnostics and commentary now distinguish UT from UTC more
+    carefully; see theory.html for more information about UT vs UTC.
+
+    zic has been ported to GCC 8's -Wstringop-truncation option.
+    (Problem reported by Martin Sebor.)
+
+  Changes to documentation and commentary
+
+    The zic man page now documents the longstanding behavior that
+    times and years can be out of the usual range, with negative times
+    counting backwards from midnight and with year 0 preceding year 1.
+    (Problem reported by Michael Deckers.)
+
+    The theory.html file now mentions the POSIX limit of six chars
+    per abbreviation, and lists alphabetic abbreviations used.
+
+    The files tz-art.htm and tz-link.htm have been renamed to
+    tz-art.html and tz-link.html, respectively, for consistency with
+    other file names and to simplify web server configuration.
+
+
 Release 2017c - 2017-10-20 14:49:34 -0700
 
   Briefly:
@@ -895,8 +1037,8 @@ Release 2015f - 2015-08-10 18:06:56 -0700
     (Thanks to Jon Skeet and Arthur David Olson.)  Constraints on
     simultaneity are now documented.
 
-    The two characters '%z' in a zone format now stand for the UTC
-    offset, e.g., '-07' for seven hours behind UTC and '+0530' for
+    The two characters '%z' in a zone format now stand for the UT
+    offset, e.g., '-07' for seven hours behind UT and '+0530' for
     five hours and thirty minutes ahead.  This better supports time
     zone abbreviations conforming to POSIX.1-2001 and later.
 
@@ -1019,13 +1161,13 @@ Release 2015c - 2015-04-11 08:55:55 -0700
       The spring 1988 transition was 1988-10-09, not 1988-10-02.
       The fall 1990 transition was 1990-03-11, not 1990-03-18.
 
-      Assume no UTC offset change for Pacific/Easter on 1890-01-01,
+      Assume no UT offset change for Pacific/Easter on 1890-01-01,
       and omit all transitions on Pacific/Easter from 1942 through 1946
       since we have no data suggesting that they existed.
 
     One more zone has been turned into a link, as it differed
     from an existing zone only for older time stamps.  As usual,
-    this change affects UTC offsets in pre-1970 time stamps only.
+    this change affects UT offsets in pre-1970 time stamps only.
     The zone's old contents have been moved to the 'backzone' file.
     The affected zone is America/Montreal.
 
@@ -1055,7 +1197,7 @@ Release 2015b - 2015-03-19 23:28:11 -0700
 
     Some more zones have been turned into links, when they differed
     from existing zones only for older time stamps.  As usual,
-    these changes affect UTC offsets in pre-1970 time stamps only.
+    these changes affect UT offsets in pre-1970 time stamps only.
     Their old contents have been moved to the 'backzone' file.
     The affected zones are: America/Antigua, America/Cayman,
     Pacific/Midway, and Pacific/Saipan.
@@ -1107,7 +1249,7 @@ Release 2015a - 2015-01-29 22:35:20 -0800
 
     Some more zones have been turned into links, when they differed
     from existing zones only for older time stamps.  As usual,
-    these changes affect UTC offsets in pre-1970 time stamps only.
+    these changes affect UT offsets in pre-1970 time stamps only.
     Their old contents have been moved to the 'backzone' file.
     The affected zones are: Asia/Aden, Asia/Bahrain, Asia/Kuwait,
     and Asia/Muscat.
@@ -1154,7 +1296,7 @@ Release 2014j - 2014-11-10 17:37:11 -0800
 
     Some more zones have been turned into links, when they differed
     from existing zones only for older time stamps.  As usual,
-    these changes affect UTC offsets in pre-1970 time stamps only.
+    these changes affect UT offsets in pre-1970 time stamps only.
     Their old contents have been moved to the 'backzone' file.
     The affected zones are: Africa/Addis_Ababa, Africa/Asmara,
     Africa/Dar_es_Salaam, Africa/Djibouti, Africa/Kampala,
@@ -1244,7 +1386,7 @@ Release 2014h - 2014-09-25 18:59:03 -0700
 
     Some more zones have been turned into links, when they differed
     from existing zones only for older timestamps.  As usual,
-    these changes affect UTC offsets in pre-1970 timestamps only.
+    these changes affect UT offsets in pre-1970 timestamps only.
     Their old contents have been moved to the 'backzone' file.
     The affected zones are: Africa/Blantyre, Africa/Bujumbura,
     Africa/Gaborone, Africa/Harare, Africa/Kigali, Africa/Lubumbashi,
@@ -1329,7 +1471,7 @@ Release 2014g - 2014-08-28 12:31:23 -0700
 
     Some more zones have been turned into links, when they differed
     from existing zones only for older timestamps.  As usual,
-    these changes affect UTC offsets in pre-1970 timestamps only.
+    these changes affect UT offsets in pre-1970 timestamps only.
     Their old contents have been moved to the 'backzone' file.
     The affected zones are: Africa/Bangui, Africa/Brazzaville,
     Africa/Douala, Africa/Kinshasa, Africa/Libreville, Africa/Luanda,
@@ -1479,7 +1621,7 @@ Release 2014f - 2014-08-05 17:42:36 -0700
     standard and daylight saving time the abbreviations are AEST and AEDT
     instead of the former EST for both; similarly, ACST/ACDT, ACWST/ACWDT,
     and AWST/AWDT are now used instead of the former CST, CWST, and WST.
-    This change does not affect UTC offsets, only time zone abbreviations.
+    This change does not affect UT offsets, only time zone abbreviations.
     (Thanks to Rich Tibbett and many others.)
 
     Asia/Novokuznetsk shifts from NOVT to KRAT (remaining on UT +07)
@@ -1516,8 +1658,8 @@ Release 2014f - 2014-08-05 17:42:36 -0700
     Treindl sent helpful translations of two papers by Guo Qingsheng.)
 
     Some zones have been turned into links, when they differed from existing
-    zones only for older UTC offsets where data entries were likely invented.
-    These changes affect UTC offsets in pre-1970 timestamps only.  This is
+    zones only for older UT offsets where data entries were likely invented.
+    These changes affect UT offsets in pre-1970 timestamps only.  This is
     similar to the change in release 2013e, except this time for western
     Africa.  The affected zones are: Africa/Bamako, Africa/Banjul,
     Africa/Conakry, Africa/Dakar, Africa/Freetown, Africa/Lome,

Modified: releng/10.3/contrib/tzdata/README
==============================================================================
--- releng/10.3/contrib/tzdata/README   Wed Mar  7 05:58:24 2018        
(r330567)
+++ releng/10.3/contrib/tzdata/README   Wed Mar  7 06:01:44 2018        
(r330568)
@@ -11,14 +11,14 @@ changes made by political bodies to time zone boundari
 and daylight-saving rules.
 
 See <https://www.iana.org/time-zones/repository/tz-link.html> or the
-file tz-link.htm for how to acquire the code and data.  Once acquired,
+file tz-link.html for how to acquire the code and data.  Once acquired,
 read the comments in the file 'Makefile' and make any changes needed
 to make things right for your system, especially if you are using some
 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:
 

Modified: releng/10.3/contrib/tzdata/africa
==============================================================================
--- releng/10.3/contrib/tzdata/africa   Wed Mar  7 05:58:24 2018        
(r330567)
+++ releng/10.3/contrib/tzdata/africa   Wed Mar  7 06:01:44 2018        
(r330568)
@@ -158,7 +158,6 @@ Link Africa/Abidjan Africa/Freetown # Sierra Leone
 Link Africa/Abidjan Africa/Lome                # Togo
 Link Africa/Abidjan Africa/Nouakchott  # Mauritania
 Link Africa/Abidjan Africa/Ouagadougou # Burkina Faso
-Link Africa/Abidjan Africa/Sao_Tome    # São Tomé and Príncipe
 Link Africa/Abidjan Atlantic/St_Helena # St Helena
 
 # Djibouti
@@ -425,7 +424,7 @@ Link Africa/Nairobi Indian/Mayotte
 #
 # The Nautical Almanac for the Year 1970, p 264, is the source for -0:44:30.
 #
-# In 1972 Liberia was the last country to switch from a UTC offset
+# In 1972 Liberia was the last country to switch from a UT offset
 # that was not a multiple of 15 or 20 minutes.  The 1972 change was on
 # 1972-01-07, according to an entry dated 1972-01-04 on p 330 of:
 # Presidential Papers: First year of the administration of
@@ -1037,6 +1036,19 @@ Zone     Indian/Reunion  3:41:52 -       LMT     1911 
Jun # Saint-Den
 #      Inaccessible, Nightingale: uninhabited
 
 # São Tomé and Príncipe
+
+# From Steffen Thorsen (2018-01-08):
+# Multiple sources tell that São Tomé changed from UTC to UTC+1 as
+# they entered the year 2018.
+# From Michael Deckers (2018-01-08):
+# the switch is from 01:00 to 02:00 ... [Decree No. 25/2017]
+# 
http://www.mnec.gov.st/index.php/publicacoes/documentos/file/90-decreto-lei-n-25-2017
+
+Zone   Africa/Sao_Tome  0:26:56 -      LMT     1884
+                       -0:36:45 -      LMT     1912 # Lisbon Mean Time
+                        0:00   -       GMT     2018 Jan  1 01:00
+                        1:00   -       WAT
+
 # Senegal
 # See Africa/Abidjan.
 

Modified: releng/10.3/contrib/tzdata/asia
==============================================================================
--- releng/10.3/contrib/tzdata/asia     Wed Mar  7 05:58:24 2018        
(r330567)
+++ releng/10.3/contrib/tzdata/asia     Wed Mar  7 06:01:44 2018        
(r330568)
@@ -50,7 +50,7 @@
 #      9:00 KST  KDT   Korea when at +09
 #      9:30 ACST       Australian Central Standard Time
 # Otherwise, these tables typically use numeric abbreviations like +03
-# and +0330 for integer hour and minute UTC offsets.  Although earlier
+# and +0330 for integer hour and minute UT offsets.  Although earlier
 # editions invented alphabetic time zone abbreviations for every
 # offset, this did not reflect common practice.
 #
@@ -647,17 +647,17 @@ Zone      Asia/Hong_Kong  7:36:42 -       LMT     1904 
Oct 30
 # time", in which abolished the adoption of Western Standard Time in
 # western islands (listed above), which means the whole Japan
 # territory, including later occupations, adopt Japan Central Time
-# (UTC+9). The adoption began on Oct 1, 1937. The original text can
+# (UT+9). The adoption began on Oct 1, 1937. The original text can
 # be found on Wikisource:
 # https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
 #
-# That is, the time zone of Taipei switched to UTC+9 on Oct 1, 1937.
+# That is, the time zone of Taipei switched to UT+9 on Oct 1, 1937.
 
 # From Yu-Cheng Chuang (2014-07-02):
-# I've found more evidence about when the time zone was switched from UTC+9
-# back to UTC+8 after WW2.  I believe it was on Sep 21, 1945.  In a document
+# I've found more evidence about when the time zone was switched from UT+9
+# back to UT+8 after WW2.  I believe it was on Sep 21, 1945.  In a document
 # during Japanese era [1] in which the officer told the staff to change time
-# zone back to Western Standard Time (UTC+8) on Sep 21.  And in another
+# zone back to Western Standard Time (UT+8) on Sep 21.  And in another
 # history page of National Cheng Kung University [2], on Sep 21 there is a
 # note "from today, switch back to Western Standard Time".  From these two
 # materials, I believe that the time zone change happened on Sep 21.  And
@@ -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
@@ -1505,7 +1505,7 @@ Rule      Japan   1950    1951    -       May     Sun>=1  
2:00    1:00    D
 #
 # ...the Showa Emperor announced Ordinance No. 529 of Showa Year 12 ... which
 # means the whole Japan territory, including later occupations, adopt Japan
-# Central Time (UTC+9). The adoption began on Oct 1, 1937.
+# Central Time (UT+9). The adoption began on Oct 1, 1937.
 # https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
 
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
@@ -2066,8 +2066,8 @@ Zone Asia/Kuching 7:21:20 -       LMT     1926 Mar
 
 # Maldives
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
-Zone   Indian/Maldives 4:54:00 -       LMT     1880 # Male
-                       4:54:00 -       MMT     1960 # Male Mean Time
+Zone   Indian/Maldives 4:54:00 -       LMT     1880 # Malé
+                       4:54:00 -       MMT     1960 # Malé Mean Time
                        5:00    -       +05
 
 # Mongolia

Modified: releng/10.3/contrib/tzdata/australasia
==============================================================================
--- releng/10.3/contrib/tzdata/australasia      Wed Mar  7 05:58:24 2018        
(r330567)
+++ releng/10.3/contrib/tzdata/australasia      Wed Mar  7 06:01:44 2018        
(r330568)
@@ -683,8 +683,8 @@ Zone Pacific/Guadalcanal 10:39:48 - LMT     1912 Oct # Hon
 # From Steffen Thorsen (2012-07-25)
 # ... we double checked by calling hotels and offices based in Tokelau asking
 # about the time there, and they all told a time that agrees with UTC+13....
-# Shanks says UTC-10 from 1901 [but] ... there is a good chance the change
-# actually was to UTC-11 back then.
+# Shanks says UT-10 from 1901 [but] ... there is a good chance the change
+# actually was to UT-11 back then.
 #
 # From Paul Eggert (2012-07-25)
 # A Google Books snippet of Appendix to the Journals of the House of
@@ -1450,7 +1450,7 @@ Zone      Pacific/Wallis  12:15:20 -      LMT     1901
 #
 # From Paul Eggert (2006-03-22):
 # The Department of Internal Affairs (DIA) maintains a brief history,
-# as does Carol Squires; see tz-link.htm for the full references.
+# as does Carol Squires; see tz-link.html for the full references.
 # Use these sources in preference to Shanks & Pottenger.
 #
 # For Chatham, IATA SSIM (1991/1999) gives the NZ rules but with

Modified: releng/10.3/contrib/tzdata/backzone
==============================================================================
--- releng/10.3/contrib/tzdata/backzone Wed Mar  7 05:58:24 2018        
(r330567)
+++ releng/10.3/contrib/tzdata/backzone Wed Mar  7 06:01:44 2018        
(r330568)
@@ -145,11 +145,6 @@ Zone       Africa/Gaborone 1:43:40 -       LMT     1885
 Zone   Africa/Harare   2:04:12 -       LMT     1903 Mar
                        2:00    -       CAT
 
-# South Sudan
-Zone   Africa/Juba     2:06:24 -       LMT     1931
-                       2:00    Sudan   CA%sT   2000 Jan 15 12:00
-                       3:00    -       EAT
-
 # Uganda
 Zone   Africa/Kampala  2:09:40 -       LMT     1928 Jul
                        3:00    -       EAT     1930
@@ -241,11 +236,6 @@ Zone Africa/Ouagadougou    -0:06:04 -      LMT     1912
 Zone Africa/Porto-Novo 0:10:28 -       LMT     1912 Jan  1
                        0:00    -       GMT     1934 Feb 26
                        1:00    -       WAT
-
-# São Tomé and Príncipe
-Zone   Africa/Sao_Tome  0:26:56 -      LMT     1884
-                       -0:36:32 -      LMT     1912 # Lisbon Mean Time
-                        0:00   -       GMT
 
 # Mali (northern)
 Zone   Africa/Timbuktu -0:12:04 -      LMT     1912

Modified: releng/10.3/contrib/tzdata/europe
==============================================================================
--- releng/10.3/contrib/tzdata/europe   Wed Mar  7 05:58:24 2018        
(r330567)
+++ releng/10.3/contrib/tzdata/europe   Wed Mar  7 06:01:44 2018        
(r330568)
@@ -68,14 +68,15 @@
 #        0:00       WET  WEST WEMT  Western Europe
 #        0:19:32.13 AMT* NST*       Amsterdam, Netherlands Summer (1835-1937)
 #        1:00       BST             British Standard (1968-1971)
+#        1:00       IST  GMT        Irish Standard (1968-) with winter DST
 #        1:00       CET  CEST CEMT  Central Europe
 #        1:00:14    SET             Swedish (1879-1899)
 #        1:36:34    RMT* LST*       Riga, Latvian Summer (1880-1926)*
 #        2:00       EET  EEST       Eastern Europe
 #        3:00       MSK  MSD  MDST* Moscow
 
-# From Peter Ilieve (1994-12-04),
-# The original six [EU members]: Belgium, France, (West) Germany, Italy,
+# From Peter Ilieve (1994-12-04), re EEC/EC/EU members:
+# The original six: Belgium, France, (West) Germany, Italy,
 # Luxembourg, the Netherlands.
 # Plus, from 1 Jan 73: Denmark, Ireland, United Kingdom.
 # Plus, from 1 Jan 81: Greece.
@@ -278,16 +279,31 @@
 # The following claim by Shanks & Pottenger is possible though doubtful;
 # we'll ignore it for now.
 #     * Dublin's 1971-10-31 switch was at 02:00, even though London's was 
03:00.
+
+# From Paul Eggert (2017-12-04):
 #
+# Dunsink Observatory (8 km NW of Dublin's center) was to Dublin as
+# Greenwich was to London.  For example:
 #
-# Whitman says Dublin Mean Time was -0:25:21, which is more precise than
-# Shanks & Pottenger.
-# Perhaps this was Dunsink Observatory Time, as Dunsink Observatory
-# (8 km NW of Dublin's center) seemingly was to Dublin as Greenwich was
-# to London.  For example:
-#
 #   "Timeball on the ballast office is down.  Dunsink time."
 #   -- James Joyce, Ulysses
+#
+# The abbreviation DMT stood for "Dublin Mean Time" or "Dunsink Mean Time";
+# this being Ireland, opinions differed.
+#
+# Whitman says Dublin/Dunsink Mean Time was UT-00:25:21, which agrees
+# with measurements of recent visitors to the Meridian Room of Dunsink
+# Observatory; see Malone D. Dunsink and timekeeping. 2016-01-24.
+# <https://www.maths.tcd.ie/~dwmalone/time/dunsink.html>.  Malone
+# writes that the Nautical Almanac listed UT-00:25:22 until 1896, when
+# it moved to UT-00:25:21.1 (I confirmed that the 1893 edition used
+# the former and the 1896 edition used the latter).  Evidently the
+# news of this change propagated slowly, as Milne 1899 still lists
+# UT-00:25:22 and cites the International Telegraph Bureau.  As it is
+# not clear that there was any practical significance to the change
+# from UT-00:25:22 to UT-00:25:21.1 in civil timekeeping, omit this
+# transition for now and just use the latter value, omitting its
+# fraction since our format cannot represent fractions.
 
 # "Countess Markievicz ... claimed that the [1916] abolition of Dublin Mean 
Time
 # was among various actions undertaken by the 'English' government that
@@ -347,12 +363,28 @@
 # regulations. I spoke this morning with the Secretary of the Department of
 # Justice (tel +353 1 678 9711) who confirmed to me that the correct name is
 # "Irish Summer Time", abbreviated to "IST".
+#
+# From Paul Eggert (2017-12-07):
+# The 1996 anonymous contributor's goal was to determine the correct
+# abbreviation for summer time in Dublin and so the contributor
+# focused on the "IST", not on the "Irish Summer Time".  Though the
+# "IST" was correct, the "Irish Summer Time" appears to have been an
+# error, as Ireland's Standard Time (Amendment) Act, 1971 states that
+# standard time in Ireland remains at UT +01 and is observed in
+# summer, and that Greenwich mean time is observed in winter.  (Thanks
+# to Derick Rethans for pointing out the error.)  That is, when
+# Ireland amended the 1968 act that established UT +01 as Irish
+# Standard Time, it left standard time unchanged and established GMT
+# as a negative daylight saving time in winter.  So, in this database
+# IST stands for Irish Summer Time for timestamps before 1968, and for
+# Irish Standard Time after that.  See:
+# http://www.irishstatutebook.ie/eli/1971/act/17/enacted/en/print
 
 # Michael Deckers (2017-06-01) gave the following URLs for Ireland's
 # Summer Time Act, 1925 and Summer Time Orders, 1926 and 1947:
-# http://www.irishstatutebook.ie/eli/1925/act/8/enacted/en/print.html
-# http://www.irishstatutebook.ie/eli/1926/sro/919/made/en/print.html
-# http://www.irishstatutebook.ie/eli/1947/sro/71/made/en/print.html
+# http://www.irishstatutebook.ie/eli/1925/act/8/enacted/en/print
+# http://www.irishstatutebook.ie/eli/1926/sro/919/made/en/print
+# http://www.irishstatutebook.ie/eli/1947/sro/71/made/en/print
 
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
 # Summer Time Act, 1916
@@ -476,9 +508,23 @@ 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
+
 # Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
 Zone   Europe/Dublin   -0:25:00 -      LMT     1880 Aug  2
-                       -0:25:21 -      DMT     1916 May 21  2:00s # Dublin MT
+                       -0:25:21 -      DMT     1916 May 21  2:00s
                        -0:25:21 1:00   IST     1916 Oct  1  2:00s
                         0:00   GB-Eire %s      1921 Dec  6 # independence
                         0:00   GB-Eire GMT/IST 1940 Feb 25  2:00s
@@ -487,16 +533,33 @@ 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
+# 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.
 
+
 ###############################################################################
 
 # Europe
 
-# EU rules are for the European Union, previously known as the EC, EEC,
-# Common Market, etc.
+# The following rules are for the European Union and for its
+# predecessor organization, the European Communities.
+# For brevity they are called "EU rules" elsewhere in this file.
 
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
 Rule   EU      1977    1980    -       Apr     Sun>=1   1:00u  1:00    S
@@ -929,7 +992,7 @@ Zone        Europe/Prague   0:57:44 -       LMT     1850
 # The page http://www.retsinfo.dk/_GETDOCI_/ACCN/A18930008330-REGL
 # confirms this, and states that the law was put forth 1893-03-29.
 #
-# The EU treaty with effect from 1973:
+# The EU [actually, EEC and Euratom] treaty with effect from 1973:
 # http://www.retsinfo.dk/_GETDOCI_/ACCN/A19722110030-REGL
 #
 # This provoked a new law from 1974 to make possible summer time changes
@@ -985,9 +1048,10 @@ Zone Atlantic/Faroe       -0:27:04 -      LMT     1908 
Jan 11 # Tórs
 # East Greenland and Franz Josef Land, but we don't know their time zones.
 # My source for this is Wilhelm Dege's book mentioned under Svalbard.
 #
-# From Paul Eggert (2006-03-22):
-# Greenland joined the EU as part of Denmark, obtained home rule on 1979-05-01,
-# and left the EU on 1985-02-01.  It therefore should have been using EU
+# From Paul Eggert (2017-12-10):
+# Greenland joined the European Communities as part of Denmark,
+# obtained home rule on 1979-05-01, and left the European Communities
+# on 1985-02-01.  It therefore should have been using EU
 # rules at least through 1984.  Shanks & Pottenger say Scoresbysund and Godthåb
 # used C-Eur rules after 1980, but IATA SSIM (1991/1996) says they use EU
 # rules since at least 1991.  Assume EU rules since 1980.
@@ -1301,7 +1365,7 @@ Zone      Europe/Paris    0:09:21 -       LMT     1891 
Mar 15  0:01
 # From Markus Kuhn (1998-09-29):
 # The German time zone web site by the Physikalisch-Technische
 # Bundesanstalt contains DST information back to 1916.
-# [See tz-link.htm for the URL.]
+# [See tz-link.html for the URL.]
 
 # From Jörg Schilling (2002-10-23):
 # In 1945, Berlin was switched to Moscow Summer time (GMT+4) by
@@ -1398,7 +1462,7 @@ Zone      Europe/Athens   1:34:52 -       LMT     1895 
Sep 14
                        1:00    Greece  CE%sT   1944 Apr  4
                        2:00    Greece  EE%sT   1981
                        # Shanks & Pottenger say it switched to C-Eur in 1981;
-                       # go with EU instead, since Greece joined it on Jan 1.
+                       # go with EU rules instead, since Greece joined Jan 1.
                        2:00    EU      EE%sT
 
 # Hungary
@@ -2097,7 +2161,7 @@ Zone      Europe/Warsaw   1:24:00 -       LMT     1880
 # IATA SSIM (1991/1992) reports that the Azores were at -1:00.
 # IATA SSIM (1993-02) says +0:00; later issues (through 1996-09) say -1:00.
 # Guess that the Azores changed to EU rules in 1992 (since that's when Portugal
-# harmonized with the EU), and that they stayed +0:00 that winter.
+# harmonized with EU rules), and that they stayed +0:00 that winter.
 #
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
 # DSH writes that despite Decree 1,469 (1915), the change to the clocks was not
@@ -2772,9 +2836,9 @@ Zone Asia/Omsk             4:53:30 -      LMT     1919 
Nov 14
 #
 # https://regnum.ru/news/society/1957270.html
 # has some historical data for Altai Krai:
-# before 1957: west part on UTC+6, east on UTC+7
-# after 1957: UTC+7
-# since 1995: UTC+6
+# before 1957: west part on UT+6, east on UT+7
+# after 1957: UT+7
+# since 1995: UT+6
 # 
http://barnaul.rusplt.ru/index/pochemu_altajskij_kraj_okazalsja_v_neprivychnom_chasovom_pojase-17648.html
 # confirms that and provides more details including 1995-05-28 transition date.
 
@@ -3581,6 +3645,17 @@ Zone     Europe/Zurich   0:34:08 -       LMT     1853 
Jul 16 # See abo
 # From Paul Eggert (2016-09-07):
 # The change is permanent, so this is the new standard time in Turkey.
 # It takes effect today, which is not much notice.
+
+# From Kıvanç Yazan (2017-10-28):
+# Turkey will go back to Daylight Saving Time starting 2018-10.
+# http://www.resmigazete.gov.tr/eskiler/2017/10/20171028-5.pdf
+#
+# From Even Scharning (2017-11-08):

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
_______________________________________________
svn-src-all@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-all
To unsubscribe, send any mail to "svn-src-all-unsubscr...@freebsd.org"

Reply via email to