Author: philip
Date: Tue Jul  2 01:12:23 2019
New Revision: 349592
URL: https://svnweb.freebsd.org/changeset/base/349592

Log:
  Import tzdata 2019b
  
  Changes: https://github.com/eggert/tz/blob/2019b/NEWS
  
  MFC after:    1 day

Modified:
  head/contrib/tzdata/Makefile
  head/contrib/tzdata/NEWS
  head/contrib/tzdata/africa
  head/contrib/tzdata/antarctica
  head/contrib/tzdata/asia
  head/contrib/tzdata/australasia
  head/contrib/tzdata/backzone
  head/contrib/tzdata/checktab.awk
  head/contrib/tzdata/europe
  head/contrib/tzdata/factory
  head/contrib/tzdata/northamerica
  head/contrib/tzdata/pacificnew
  head/contrib/tzdata/southamerica
  head/contrib/tzdata/systemv
  head/contrib/tzdata/theory.html
  head/contrib/tzdata/version
  head/contrib/tzdata/zishrink.awk
  head/contrib/tzdata/zone.tab
  head/contrib/tzdata/zone1970.tab
  head/contrib/tzdata/zoneinfo2tdf.pl
Directory Properties:
  head/contrib/tzdata/   (props changed)

Modified: head/contrib/tzdata/Makefile
==============================================================================
--- head/contrib/tzdata/Makefile        Tue Jul  2 01:06:39 2019        
(r349591)
+++ head/contrib/tzdata/Makefile        Tue Jul  2 01:12:23 2019        
(r349592)
@@ -35,11 +35,13 @@ DATAFORM=           main
 
 LOCALTIME=     GMT
 
-# If you want something other than Eastern United States time as a template
-# for handling ruleless POSIX-style timezone environment variables,
+# The POSIXRULES macro controls interpretation of nonstandard and obsolete
+# POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules.
+# In the reference implementation, if you want something other than Eastern
+# United States time as a template for handling these settings, you can
 # change the line below (after finding the timezone you want in the
 # one of the $(TDATA) source files, or adding it to a source file).
-# A ruleless environment setting like TZ='CST6CDT' uses the rules in the
+# A setting like TZ='EET-2EEST' is supposed to use the rules in the
 # template file to determine "spring forward" and "fall back" days and
 # times; the environment variable itself specifies UT offsets of standard and
 # daylight saving time.
@@ -49,6 +51,17 @@ LOCALTIME=   GMT
 # Use the command
 #      make zonenames
 # to get a list of the values you can use for POSIXRULES.
+#
+# If POSIXRULES is empty, no template is installed; this is the intended
+# future default for POSIXRULES.
+#
+# Nonempty POSIXRULES is obsolete and should not be relied on, because:
+# * It does not work correctly in popular implementations such as GNU/Linux.
+# * It does not work in the tzdb implementation for timestamps after 2037.
+# * It is incompatible with 'zic -b slim' if POSIXRULES specifies transitions
+#   at standard time or UT rather than at local time.
+# In short, software should avoid ruleless settings like TZ='EET-2EEST'
+# and so should not depend on the value of POSIXRULES.
 
 POSIXRULES=    America/New_York
 
@@ -231,6 +244,13 @@ LDLIBS=
 #      other than simply getting garbage data
 #  -DUSE_LTZ=0 to build zdump with the system time zone library
 #      Also set TZDOBJS=zdump.o and CHECK_TIME_T_ALTERNATIVES= below.
+#  -DZIC_BLOAT_DEFAULT=\"slim\" to default zic's -b option to "slim", and
+#      similarly for "fat".  Fat TZif files work around incompatibilities
+#      and bugs in some TZif readers, notably readers that mishandle 64-bit
+#      data in TZif files.  Slim TZif files are more efficient and do not
+#      work around these incompatibilities and bugs.  If not given, the
+#      current default is "fat" but this is intended to change as readers
+#      requiring fat files often mishandle timestamps after 2037 anyway.
 #  -DZIC_MAX_ABBR_LEN_WO_WARN=3
 #      (or some other number) to set the maximum time zone abbreviation length
 #      that zic will accept without a warning (the default is 6)
@@ -364,7 +384,9 @@ ZIC=                $(zic) $(ZFLAGS)
 
 # To shrink the size of installed TZif files,
 # append "-r @N" to omit data before N-seconds-after-the-Epoch.
-# See the zic man page for more about -r.
+# You can also append "-b slim" if that is not already the default;
+# see ZIC_BLOAT_DEFAULT above.
+# See the zic man page for more about -b and -r.
 ZFLAGS=
 
 # How to use zic to install TZif files.
@@ -388,6 +410,9 @@ KSHELL=             /bin/bash
 # Name of curl <https://curl.haxx.se/>, used for HTML validation.
 CURL=          curl
 
+# Name of GNU Privacy Guard <https://gnupg.org/>, used to sign distributions.
+GPG=           gpg
+
 # The path where SGML DTDs are kept and the catalog file(s) to use when
 # validating HTML 4.01.  The default should work on both Debian and Red Hat.
 SGML_TOPDIR= /usr
@@ -562,7 +587,9 @@ install:    all $(DATA) $(REDO) $(MANS)
                        '$(DESTDIR)$(LIBDIR)' \
                        '$(DESTDIR)$(MANDIR)/man3' '$(DESTDIR)$(MANDIR)/man5' \
                        '$(DESTDIR)$(MANDIR)/man8'
-               $(ZIC_INSTALL) -l $(LOCALTIME) -p $(POSIXRULES) \
+               $(ZIC_INSTALL) -l $(LOCALTIME) \
+                       `case '$(POSIXRULES)' in ?*) echo '-p';; esac \
+                       ` $(POSIXRULES) \
                        -t '$(DESTDIR)$(TZDEFAULT)'
                cp -f $(TABDATA) '$(DESTDIR)$(TZDIR)/.'
                cp tzselect '$(DESTDIR)$(BINDIR)/.'
@@ -781,12 +808,6 @@ CHECK_CC_LIST = { n = split($$1,a,/,/); for (i=2; i<=n
 check_sorted: backward backzone iso3166.tab zone.tab zone1970.tab
                $(AWK) '/^Link/ {print $$3}' backward | LC_ALL=C sort -cu
                $(AWK) '/^Zone/ {print $$2}' backzone | LC_ALL=C sort -cu
-               $(AWK) '/^[^#]/ {print $$1}' iso3166.tab | LC_ALL=C sort -cu
-               $(AWK) '/^[^#]/ {print $$1}' zone.tab | LC_ALL=C sort -c
-               $(AWK) '/^[^#]/ {print substr($$0, 1, 2)}' zone1970.tab | \
-                 LC_ALL=C sort -c
-               $(AWK) '/^[^#]/ $(CHECK_CC_LIST)' zone1970.tab | \
-                 LC_ALL=C sort -cu
                touch $@
 
 check_links:   checklinks.awk $(TDATA_TO_CHECK) tzdata.zi
@@ -1051,7 +1072,7 @@ tzdata$(VERSION).tar.gz.asc: tzdata$(VERSION).tar.gz
 tzdata$(VERSION)-rearguard.tar.gz.asc: tzdata$(VERSION)-rearguard.tar.gz
 tzdb-$(VERSION).tar.lz.asc: tzdb-$(VERSION).tar.lz
 $(ALL_ASC):
-               gpg2 --armor --detach-sign $?
+               $(GPG) --armor --detach-sign $?
 
 TYPECHECK_CFLAGS = $(CFLAGS) -DTYPECHECK -D__time_t_defined -D_TIME_T
 typecheck: typecheck_long_long typecheck_unsigned

Modified: head/contrib/tzdata/NEWS
==============================================================================
--- head/contrib/tzdata/NEWS    Tue Jul  2 01:06:39 2019        (r349591)
+++ head/contrib/tzdata/NEWS    Tue Jul  2 01:12:23 2019        (r349592)
@@ -1,8 +1,102 @@
 News for the tz database
 
-Release 20198 - 2019-03-25 22:01:33 -0700
+Release 2019b - 2019-07-01 00:09:53 -0700
 
   Briefly:
+    Brazil no longer observes DST.
+    'zic -b slim' outputs smaller TZif files; please try it out.
+    Palestine's 2019 spring-forward transition was on 03-29, not 03-30.
+
+  Changes to future timestamps
+
+    Brazil has canceled DST and will stay on standard time indefinitely.
+    (Thanks to Steffen Thorsen, Marcus Diniz, and Daniel Soares de
+    Oliveira.)
+
+    Predictions for Morocco now go through 2087 instead of 2037, to
+    work around a problem on newlib when using TZif files output by
+    zic 2019a or earlier.  (Problem reported by David Gauchard.)
+
+  Changes to past and future timestamps
+
+    Palestine's 2019 spring transition was 03-29 at 00:00, not 03-30
+    at 01:00.  (Thanks to Sharef Mustafa and Even Scharning.)  Guess
+    future transitions to be March's last Friday at 00:00.
+
+  Changes to past timestamps
+
+    Hong Kong's 1941-06-15 spring-forward transition was at 03:00, not
+    03:30.  Its 1945 transition from JST to HKT was on 11-18 at 02:00,
+    not 09-15 at 00:00.  In 1946 its spring-forward transition was on
+    04-21 at 00:00, not the previous day at 03:30.  From 1946 through
+    1952 its fall-back transitions occurred at 04:30, not at 03:30.
+    In 1947 its fall-back transition was on 11-30, not 12-30.
+    (Thanks to P Chan.)
+
+  Changes to past time zone abbreviations
+
+    Italy's 1866 transition to Rome Mean Time was on December 12, not
+    September 22.  This affects only the time zone abbreviation for
+    Europe/Rome between those dates.  (Thanks to Stephen Trainor and
+    Luigi Rosa.)
+
+  Changes affecting metadata only
+
+    Add info about the Crimea situation in zone1970.tab and zone.tab.
+    (Problem reported by Serhii Demediuk.)
+
+  Changes to code
+
+    zic's new -b option supports a way to control data bloat and to
+    test for year-2038 bugs in software that reads TZif files.
+    'zic -b fat' and 'zic -b slim' generate larger and smaller output;
+    for example, changing from fat to slim shrinks the Europe/London
+    file from 3648 to 1599 bytes, saving about 56%.  Fat and slim
+    files represent the same set of timestamps and use the same TZif
+    format as documented in tzfile(5) and in Internet RFC 8536.
+    Fat format attempts to work around bugs or incompatibilities in
+    older software, notably software that mishandles 64-bit TZif data
+    or uses obsolete TZ strings like "EET-2EEST" that lack DST rules.
+    Slim format is more efficient and does not work around 64-bit bugs
+    or obsolete TZ strings.  Currently zic defaults to fat format
+    unless you compile with -DZIC_BLOAT_DEFAULT=\"slim\"; this
+    out-of-the-box default is intended to change in future releases
+    as the buggy software often mishandles timestamps anyway.
+
+    zic no longer treats a set of rules ending in 2037 specially.
+    Previously, zic assumed that such a ruleset meant that future
+    timestamps could not be predicted, and therefore omitted a
+    POSIX-like TZ string in the TZif output.  The old behavior is no
+    longer needed for current tzdata, and caused problems with newlib
+    when used with older tzdata (reported by David Gauchard).
+
+    zic no longer generates some artifact transitions.  For example,
+    Europe/London no longer has a no-op transition in January 1996.
+
+  Changes to build procedure
+
+    tzdata.zi now assumes zic 2017c or later.  This shrinks tzdata.zi
+    by a percent or so.
+
+  Changes to documentation and commentary
+
+    The Makefile now documents the POSIXRULES macro as being obsolete,
+    and similarly, zic's -p POSIXRULES option is now documented as
+    being obsolete.  Although the POSIXRULES feature still exists and
+    works as before, in practice it is rarely used for its intended
+    purpose, and it does not work either in the default reference
+    implementation (for timestamps after 2037) or in common
+    implementations such as GNU/Linux (for contemporary timestamps).
+    Since POSIXRULES was designed primarily as a temporary transition
+    facility for System V platforms that died off decades ago, it is
+    being decommissioned rather than institutionalized.
+
+    New info on Bonin Islands and Marcus (thanks to Wakaba and Phake Nick).
+
+
+Release 2019a - 2019-03-25 22:01:33 -0700
+
+  Briefly:
     Palestine "springs forward" on 2019-03-30 instead of 2019-03-23.
     Metlakatla "fell back" to rejoin Alaska Time on 2019-01-20 at 02:00.
 
@@ -481,7 +575,7 @@ Release 2018d - 2018-03-22 07:05:46 -0700
     The code is a bit more portable to MS-Windows.  Installers can
     compile with -DRESERVE_STD_EXT_IDS on MS-Windows platforms that
     reserve identifiers like 'localtime'.  (Thanks to Manuela
-    Friedrich).
+    Friedrich.)
 
   Changes to documentation and commentary
 
@@ -2276,7 +2370,7 @@ Release 2014f - 2014-08-05 17:42:36 -0700
     warlord Jin Shuren in the data.
 
     Commentary about the coverage of each Russian zone has been standardized.
-    (Thanks to Tim Parenti).
+    (Thanks to Tim Parenti.)
 
     There is new commentary about contemporary timekeeping in Ethiopia.
 
@@ -2724,7 +2818,7 @@ Release 2013e - 2013-09-19 23:50:04 -0700
 
     Change the UT offset of Bern Mean Time from 0:29:44 to 0:29:46.
     This affects Europe/Zurich timestamps from 1853 to 1894.  (Thanks
-    to Alois Treindl).
+    to Alois Treindl.)
 
     Change the date of the circa-1850 Zurich transition from 1849-09-12
     to 1853-07-16, overriding Shanks with data from Messerli about
@@ -3034,7 +3128,7 @@ Release 2013a - 2013-02-27 09:20:35 -0800
     (Thanks to Arthur David Olson.)
 
     Improve the commentary about which districts observe what times
-    in Russia.  (Thanks to Oscar van Vlijmen and Arthur David Olson).
+    in Russia.  (Thanks to Oscar van Vlijmen and Arthur David Olson.)
 
     Add web page links to tz.js.
 

Modified: head/contrib/tzdata/africa
==============================================================================
--- head/contrib/tzdata/africa  Tue Jul  2 01:06:39 2019        (r349591)
+++ head/contrib/tzdata/africa  Tue Jul  2 01:12:23 2019        (r349592)
@@ -89,7 +89,7 @@ Rule  Algeria 1980    only    -       Apr     25       0:00   
1:00    S
 Rule   Algeria 1980    only    -       Oct     31       2:00   0       -
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Algiers  0:12:12 -       LMT     1891 Mar 15  0:01
                        0:09:21 -       PMT     1911 Mar 11 # Paris Mean Time
                        0:00    Algeria WE%sT   1940 Feb 25  2:00
@@ -124,7 +124,7 @@ Zone        Africa/Algiers  0:12:12 -       LMT     1891 
Mar 15  0:01
 # For now, ignore that and follow the 1911-05-26 Portuguese decree
 # (see Europe/Lisbon).
 #
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone Atlantic/Cape_Verde -1:34:04 -    LMT     1912 Jan 01  2:00u # Praia
                        -2:00   -       -02     1942 Sep
                        -2:00   1:00    -01     1945 Oct 15
@@ -135,7 +135,7 @@ Zone Atlantic/Cape_Verde -1:34:04 - LMT     1912 Jan 01  2
 # See Africa/Lagos.
 
 # Chad
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Ndjamena 1:00:12 -       LMT     1912        # N'Djamena
                        1:00    -       WAT     1979 Oct 14
                        1:00    1:00    WAST    1980 Mar  8
@@ -151,7 +151,7 @@ Zone        Africa/Ndjamena 1:00:12 -       LMT     1912    
    # N'Dja
 # See Africa/Lagos.
 
 # Côte d'Ivoire / Ivory Coast
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Abidjan  -0:16:08 -      LMT     1912
                         0:00   -       GMT
 Link Africa/Abidjan Africa/Bamako      # Mali
@@ -356,7 +356,7 @@ Rule        Egypt   2014    only    -       Jun     26      
24:00   0       -
 Rule   Egypt   2014    only    -       Jul     31      24:00   1:00    S
 Rule   Egypt   2014    only    -       Sep     lastThu 24:00   0       -
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Cairo    2:05:09 -       LMT     1900 Oct
                        2:00    Egypt   EE%sT
 
@@ -414,7 +414,7 @@ Zone        Africa/Cairo    2:05:09 -       LMT     1900 Oct
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
 Rule   Ghana   1920    1942    -       Sep      1      0:00    0:20    -
 Rule   Ghana   1920    1942    -       Dec     31      0:00    0       -
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Accra    -0:00:52 -      LMT     1918
                         0:00   Ghana   GMT/+0020
 
@@ -428,13 +428,13 @@ Zone      Africa/Accra    -0:00:52 -      LMT     1918
 # evidently confusing the date of the Portuguese decree
 # (see Europe/Lisbon) with the date that it took effect.
 #
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Bissau   -1:02:20 -      LMT     1912 Jan  1  1:00u
                        -1:00   -       -01     1975
                         0:00   -       GMT
 
 # Kenya
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Nairobi  2:27:16 -       LMT     1928 Jul
                        3:00    -       EAT     1930
                        2:30    -       +0230   1940
@@ -469,7 +469,7 @@ Link Africa/Nairobi Indian/Mayotte
 # Use the abbreviation "MMT" before 1972, as the more-accurate numeric
 # abbreviation "-004430" would be one byte over the POSIX limit.
 #
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Monrovia -0:43:08 -      LMT     1882
                        -0:43:08 -      MMT     1919 Mar # Monrovia Mean Time
                        -0:44:30 -      MMT     1972 Jan 7 # approximately MMT
@@ -519,7 +519,7 @@ Rule        Libya   1997    only    -       Apr      4      
0:00    1:00    S
 Rule   Libya   1997    only    -       Oct      4      0:00    0       -
 Rule   Libya   2013    only    -       Mar     lastFri 1:00    1:00    S
 Rule   Libya   2013    only    -       Oct     lastFri 2:00    0       -
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Tripoli  0:52:44 -       LMT     1920
                        1:00    Libya   CE%sT   1959
                        2:00    -       EET     1982
@@ -629,7 +629,7 @@ Rule Mauritius      1982    only    -       Oct     10      
0:00    1:00    -
 Rule Mauritius 1983    only    -       Mar     21      0:00    0       -
 Rule Mauritius 2008    only    -       Oct     lastSun 2:00    1:00    -
 Rule Mauritius 2009    only    -       Mar     lastSun 2:00    0       -
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone Indian/Mauritius  3:50:00 -       LMT     1907 # Port Louis
                        4:00 Mauritius  +04/+05
 # Agalega Is, Rodriguez
@@ -860,18 +860,24 @@ Zone Indian/Mauritius     3:50:00 -       LMT     1907 # 
Port Louis
 # the week end after....  The government does not announce yet the decision
 # about this temporary change.  But it s 99% sure that it will be the case,
 # as in previous years.  An unofficial survey was done these days, showing
-# that 64% of asked peopke are ok for moving from +1 to +0 during Ramadan.
+# that 64% of asked people are ok for moving from +1 to +0 during Ramadan.
 # 
https://leconomiste.com/article/1035870-enquete-l-economiste-sunergia-64-des-marocains-plebiscitent-le-gmt-pendant-ramadan
+
+# From Naoufal Semlali (2019-04-16):
+# Morocco will be on GMT starting from Sunday, May 5th 2019 at 3am.
+# The switch to GMT+1 will occur on Sunday, June 9th 2019 at 2am....
+# 
http://fr.le360.ma/societe/voici-la-date-du-retour-a-lheure-legale-au-maroc-188222
 #
-# From Paul Eggert (2018-11-01):
-# For now, guess that Morocco will fall back at 03:00 the last Sunday
-# before Ramadan, and spring forward at 02:00 the first Sunday after
+# From Paul Eggert (2019-05-20):
+# This agrees with our 2018-11-01 guess that the Moroccan government
+# would continue the practice of falling back at 03:00 the last Sunday
+# before Ramadan, and of springing forward at 02:00 the first Sunday after
 # Ramadan, as this has been the practice since 2012.  To implement this,
-# transition dates for 2019 through 2037 were determined by running the
-# following program under GNU Emacs 26.1.
+# transition dates for 2019 through 2087 were determined by running the
+# following program under GNU Emacs 26.2.
 # (let ((islamic-year 1440))
 #   (require 'cal-islam)
-#   (while (< islamic-year 1460)
+#   (while (< islamic-year 1511)
 #     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
 #           (b (calendar-islamic-to-absolute (list 10 1 islamic-year)))
 #           (sunday 0))
@@ -970,8 +976,114 @@ Rule      Morocco 2036    only    -       Oct     19      
 3:00   -1:00   -
 Rule   Morocco 2036    only    -       Nov     23       2:00   0       -
 Rule   Morocco 2037    only    -       Oct      4       3:00   -1:00   -
 Rule   Morocco 2037    only    -       Nov     15       2:00   0       -
+Rule   Morocco 2038    only    -       Sep     26       3:00   -1:00   -
+Rule   Morocco 2038    only    -       Oct     31       2:00   0       -
+Rule   Morocco 2039    only    -       Sep     18       3:00   -1:00   -
+Rule   Morocco 2039    only    -       Oct     23       2:00   0       -
+Rule   Morocco 2040    only    -       Sep      2       3:00   -1:00   -
+Rule   Morocco 2040    only    -       Oct     14       2:00   0       -
+Rule   Morocco 2041    only    -       Aug     25       3:00   -1:00   -
+Rule   Morocco 2041    only    -       Sep     29       2:00   0       -
+Rule   Morocco 2042    only    -       Aug     10       3:00   -1:00   -
+Rule   Morocco 2042    only    -       Sep     21       2:00   0       -
+Rule   Morocco 2043    only    -       Aug      2       3:00   -1:00   -
+Rule   Morocco 2043    only    -       Sep      6       2:00   0       -
+Rule   Morocco 2044    only    -       Jul     24       3:00   -1:00   -
+Rule   Morocco 2044    only    -       Aug     28       2:00   0       -
+Rule   Morocco 2045    only    -       Jul      9       3:00   -1:00   -
+Rule   Morocco 2045    only    -       Aug     20       2:00   0       -
+Rule   Morocco 2046    only    -       Jul      1       3:00   -1:00   -
+Rule   Morocco 2046    only    -       Aug      5       2:00   0       -
+Rule   Morocco 2047    only    -       Jun     23       3:00   -1:00   -
+Rule   Morocco 2047    only    -       Jul     28       2:00   0       -
+Rule   Morocco 2048    only    -       Jun      7       3:00   -1:00   -
+Rule   Morocco 2048    only    -       Jul     19       2:00   0       -
+Rule   Morocco 2049    only    -       May     30       3:00   -1:00   -
+Rule   Morocco 2049    only    -       Jul      4       2:00   0       -
+Rule   Morocco 2050    only    -       May     15       3:00   -1:00   -
+Rule   Morocco 2050    only    -       Jun     26       2:00   0       -
+Rule   Morocco 2051    only    -       May      7       3:00   -1:00   -
+Rule   Morocco 2051    only    -       Jun     11       2:00   0       -
+Rule   Morocco 2052    only    -       Apr     28       3:00   -1:00   -
+Rule   Morocco 2052    only    -       Jun      2       2:00   0       -
+Rule   Morocco 2053    only    -       Apr     13       3:00   -1:00   -
+Rule   Morocco 2053    only    -       May     25       2:00   0       -
+Rule   Morocco 2054    only    -       Apr      5       3:00   -1:00   -
+Rule   Morocco 2054    only    -       May     10       2:00   0       -
+Rule   Morocco 2055    only    -       Mar     28       3:00   -1:00   -
+Rule   Morocco 2055    only    -       May      2       2:00   0       -
+Rule   Morocco 2056    only    -       Mar     12       3:00   -1:00   -
+Rule   Morocco 2056    only    -       Apr     23       2:00   0       -
+Rule   Morocco 2057    only    -       Mar      4       3:00   -1:00   -
+Rule   Morocco 2057    only    -       Apr      8       2:00   0       -
+Rule   Morocco 2058    only    -       Feb     17       3:00   -1:00   -
+Rule   Morocco 2058    only    -       Mar     31       2:00   0       -
+Rule   Morocco 2059    only    -       Feb      9       3:00   -1:00   -
+Rule   Morocco 2059    only    -       Mar     16       2:00   0       -
+Rule   Morocco 2060    only    -       Feb      1       3:00   -1:00   -
+Rule   Morocco 2060    only    -       Mar      7       2:00   0       -
+Rule   Morocco 2061    only    -       Jan     16       3:00   -1:00   -
+Rule   Morocco 2061    only    -       Feb     27       2:00   0       -
+Rule   Morocco 2062    only    -       Jan      8       3:00   -1:00   -
+Rule   Morocco 2062    only    -       Feb     12       2:00   0       -
+Rule   Morocco 2062    only    -       Dec     31       3:00   -1:00   -
+Rule   Morocco 2063    only    -       Feb      4       2:00   0       -
+Rule   Morocco 2063    only    -       Dec     16       3:00   -1:00   -
+Rule   Morocco 2064    only    -       Jan     20       2:00   0       -
+Rule   Morocco 2064    only    -       Dec      7       3:00   -1:00   -
+Rule   Morocco 2065    only    -       Jan     11       2:00   0       -
+Rule   Morocco 2065    only    -       Nov     22       3:00   -1:00   -
+Rule   Morocco 2066    only    -       Jan      3       2:00   0       -
+Rule   Morocco 2066    only    -       Nov     14       3:00   -1:00   -
+Rule   Morocco 2066    only    -       Dec     19       2:00   0       -
+Rule   Morocco 2067    only    -       Nov      6       3:00   -1:00   -
+Rule   Morocco 2067    only    -       Dec     11       2:00   0       -
+Rule   Morocco 2068    only    -       Oct     21       3:00   -1:00   -
+Rule   Morocco 2068    only    -       Dec      2       2:00   0       -
+Rule   Morocco 2069    only    -       Oct     13       3:00   -1:00   -
+Rule   Morocco 2069    only    -       Nov     17       2:00   0       -
+Rule   Morocco 2070    only    -       Oct      5       3:00   -1:00   -
+Rule   Morocco 2070    only    -       Nov      9       2:00   0       -
+Rule   Morocco 2071    only    -       Sep     20       3:00   -1:00   -
+Rule   Morocco 2071    only    -       Oct     25       2:00   0       -
+Rule   Morocco 2072    only    -       Sep     11       3:00   -1:00   -
+Rule   Morocco 2072    only    -       Oct     16       2:00   0       -
+Rule   Morocco 2073    only    -       Aug     27       3:00   -1:00   -
+Rule   Morocco 2073    only    -       Oct      8       2:00   0       -
+Rule   Morocco 2074    only    -       Aug     19       3:00   -1:00   -
+Rule   Morocco 2074    only    -       Sep     23       2:00   0       -
+Rule   Morocco 2075    only    -       Aug     11       3:00   -1:00   -
+Rule   Morocco 2075    only    -       Sep     15       2:00   0       -
+Rule   Morocco 2076    only    -       Jul     26       3:00   -1:00   -
+Rule   Morocco 2076    only    -       Sep      6       2:00   0       -
+Rule   Morocco 2077    only    -       Jul     18       3:00   -1:00   -
+Rule   Morocco 2077    only    -       Aug     22       2:00   0       -
+Rule   Morocco 2078    only    -       Jul     10       3:00   -1:00   -
+Rule   Morocco 2078    only    -       Aug     14       2:00   0       -
+Rule   Morocco 2079    only    -       Jun     25       3:00   -1:00   -
+Rule   Morocco 2079    only    -       Jul     30       2:00   0       -
+Rule   Morocco 2080    only    -       Jun     16       3:00   -1:00   -
+Rule   Morocco 2080    only    -       Jul     21       2:00   0       -
+Rule   Morocco 2081    only    -       Jun      1       3:00   -1:00   -
+Rule   Morocco 2081    only    -       Jul     13       2:00   0       -
+Rule   Morocco 2082    only    -       May     24       3:00   -1:00   -
+Rule   Morocco 2082    only    -       Jun     28       2:00   0       -
+Rule   Morocco 2083    only    -       May     16       3:00   -1:00   -
+Rule   Morocco 2083    only    -       Jun     20       2:00   0       -
+Rule   Morocco 2084    only    -       Apr     30       3:00   -1:00   -
+Rule   Morocco 2084    only    -       Jun     11       2:00   0       -
+Rule   Morocco 2085    only    -       Apr     22       3:00   -1:00   -
+Rule   Morocco 2085    only    -       May     27       2:00   0       -
+Rule   Morocco 2086    only    -       Apr     14       3:00   -1:00   -
+Rule   Morocco 2086    only    -       May     19       2:00   0       -
+Rule   Morocco 2087    only    -       Mar     30       3:00   -1:00   -
+Rule   Morocco 2087    only    -       May      4       2:00   0       -
+# For dates after the somewhat-arbitrary cutoff of 2087, assume that
+# Morocco will no longer observe DST.  At some point this table will
+# need to be extended, though quite possibly Morocco will change the
+# rules first.
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone Africa/Casablanca -0:30:20 -      LMT     1913 Oct 26
                         0:00   Morocco +00/+01 1984 Mar 16
                         1:00   -       +01     1986
@@ -1001,7 +1113,7 @@ Zone Africa/El_Aaiun      -0:52:48 -      LMT     1934 
Jan # El Aai�
 # https://dre.pt/pdf1sdip/1911/05/12500/23132313.pdf
 # merely made it official?
 #
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Maputo   2:10:20 -       LMT     1903 Mar
                        2:00    -       CAT
 Link Africa/Maputo Africa/Blantyre     # Malawi
@@ -1073,7 +1185,7 @@ Rule      Namibia 1995    2017    -       Apr     Sun>=1  
2:00    -1:00   WAT
 #Rule  Namibia 1995    2017    -       Apr     Sun>=1  2:00    0       WAT
 # End of rearguard section.
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Windhoek 1:08:24 -       LMT     1892 Feb 8
                        1:30    -       +0130   1903 Mar
                        2:00    -       SAST    1942 Sep 20  2:00
@@ -1094,7 +1206,7 @@ Zone      Africa/Windhoek 1:08:24 -       LMT     1892 
Feb 8
 # See Africa/Lagos.
 
 # Nigeria
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Lagos    0:13:36 -       LMT     1919 Sep
                        1:00    -       WAT
 Link Africa/Lagos Africa/Bangui             # Central African Republic
@@ -1108,7 +1220,7 @@ Link Africa/Lagos Africa/Niamey        # Niger
 Link Africa/Lagos Africa/Porto-Novo  # Benin
 
 # Réunion
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Indian/Reunion  3:41:52 -       LMT     1911 Jun # Saint-Denis
                        4:00    -       +04
 #
@@ -1168,7 +1280,7 @@ Zone      Africa/Sao_Tome  0:26:56 -      LMT     1884
 # See Africa/Abidjan.
 
 # Seychelles
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Indian/Mahe     3:41:48 -       LMT     1906 Jun # Victoria
                        4:00    -       +04
 # From Paul Eggert (2001-05-30):
@@ -1188,7 +1300,7 @@ Zone      Indian/Mahe     3:41:48 -       LMT     1906 
Jun # Victoria
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
 Rule   SA      1942    1943    -       Sep     Sun>=15 2:00    1:00    -
 Rule   SA      1943    1944    -       Mar     Sun>=15 2:00    0       -
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone Africa/Johannesburg 1:52:00 -     LMT     1892 Feb 8
                        1:30    -       SAST    1903 Mar
                        2:00    SA      SAST
@@ -1223,14 +1335,14 @@ Rule    Sudan   1970    only    -       May      1      
0:00    1:00    S
 Rule   Sudan   1970    1985    -       Oct     15      0:00    0       -
 Rule   Sudan   1971    only    -       Apr     30      0:00    1:00    S
 Rule   Sudan   1972    1985    -       Apr     lastSun 0:00    1:00    S
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Khartoum 2:10:08 -       LMT     1931
                        2:00    Sudan   CA%sT   2000 Jan 15 12:00
                        3:00    -       EAT     2017 Nov  1
                        2:00    -       CAT
 
 # South Sudan
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Juba     2:06:28 -       LMT     1931
                        2:00    Sudan   CA%sT   2000 Jan 15 12:00
                        3:00    -       EAT
@@ -1336,7 +1448,7 @@ Rule      Tunisia 2006    2008    -       Oct     lastSun 
 2:00s  0       -
 # Shanks & Pottenger give 0:09:20 for Paris Mean Time; go with Howse's
 # more precise 0:09:21.
 # Shanks & Pottenger say the 1911 switch was on Mar 9; go with Howse's Mar 11.
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Africa/Tunis    0:40:44 -       LMT     1881 May 12
                        0:09:21 -       PMT     1911 Mar 11 # Paris Mean Time
                        1:00    Tunisia CE%sT

Modified: head/contrib/tzdata/antarctica
==============================================================================
--- head/contrib/tzdata/antarctica      Tue Jul  2 01:06:39 2019        
(r349591)
+++ head/contrib/tzdata/antarctica      Tue Jul  2 01:12:23 2019        
(r349592)
@@ -13,7 +13,7 @@
 # for information.
 # Unless otherwise specified, we have no time zone information.
 
-# FORMAT is '-00' and GMTOFF is 0 for locations while uninhabited.
+# FORMAT is '-00' and STDOFF is 0 for locations while uninhabited.
 
 # Argentina - year-round bases
 # Belgrano II, Confin Coast, -770227-0343737, since 1972-02-05
@@ -70,7 +70,7 @@
 # Australian Antarctica Division informed us that Casey changed time
 # zone to UTC+11 in "the morning of 22nd October 2016".
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone Antarctica/Casey  0       -       -00     1969
                        8:00    -       +08     2009 Oct 18  2:00
                        11:00   -       +11     2010 Mar  5  2:00
@@ -142,7 +142,7 @@ Zone Antarctica/Mawson      0       -       -00     1954 
Feb 13
 # St Paul Island - near Amsterdam, uninhabited
 #      fishing stations operated variously 1819/1931
 #
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone Indian/Kerguelen  0       -       -00     1950 # Port-aux-Français
                        5:00    -       +05
 #
@@ -153,7 +153,7 @@ Zone Indian/Kerguelen       0       -       -00     1950 # 
Port-aux-Françai
 # Another base at Port-Martin, 50km east, began operation in 1947.
 # It was destroyed by fire on 1952-01-14.
 #
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone Antarctica/DumontDUrville 0 -     -00     1947
                        10:00   -       +10     1952 Jan 14
                        0       -       -00     1956 Nov
@@ -181,7 +181,7 @@ Zone Antarctica/DumontDUrville 0 -  -00     1947
 # Syowa station, which is the first antarctic station of Japan,
 # was established on 1957-01-29.  Since Syowa station is still the main
 # station of Japan, it's appropriate for the principal location.
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone Antarctica/Syowa  0       -       -00     1957 Jan 29
                        3:00    -       +03
 # See:
@@ -231,7 +231,7 @@ Rule        Troll   2005    max     -       Mar     lastSun 
1:00u   2:00    +02
 #Rule  Troll   2004    max     -       Nov      7      1:00u   0:00    +00
 # Remove the following line when uncommenting the above '#Rule' lines.
 Rule   Troll   2004    max     -       Oct     lastSun 1:00u   0:00    +00
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone Antarctica/Troll  0       -       -00     2005 Feb 12
                        0:00    Troll   %s
 
@@ -305,7 +305,7 @@ Zone Antarctica/Vostok      0       -       -00     1957 
Dec 16
 # From Paul Eggert (2002-10-22)
 # <http://webexhibits.org/daylightsaving/g.html> says Rothera is -03 all year.
 #
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone Antarctica/Rothera        0       -       -00     1976 Dec  1
                        -3:00   -       -03
 

Modified: head/contrib/tzdata/asia
==============================================================================
--- head/contrib/tzdata/asia    Tue Jul  2 01:06:39 2019        (r349591)
+++ head/contrib/tzdata/asia    Tue Jul  2 01:12:23 2019        (r349592)
@@ -84,7 +84,7 @@ Rule RussiaAsia       1985    2010    -       Mar     lastSun 
 2:00s  1:00    -
 Rule RussiaAsia        1996    2010    -       Oct     lastSun  2:00s  0       
-
 
 # Afghanistan
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Kabul      4:36:48 -       LMT     1890
                        4:00    -       +04     1945
                        4:30    -       +0430
@@ -117,7 +117,7 @@ Zone        Asia/Kabul      4:36:48 -       LMT     1890
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
 Rule Armenia   2011    only    -       Mar     lastSun  2:00s  1:00    -
 Rule Armenia   2011    only    -       Oct     lastSun  2:00s  0       -
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Yerevan    2:58:00 -       LMT     1924 May  2
                        3:00    -       +03     1957 Mar
                        4:00 RussiaAsia +04/+05 1991 Mar 31  2:00s
@@ -143,7 +143,7 @@ Zone        Asia/Yerevan    2:58:00 -       LMT     1924 
May  2
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
 Rule   Azer    1997    2015    -       Mar     lastSun  4:00   1:00    -
 Rule   Azer    1997    2015    -       Oct     lastSun  5:00   0       -
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Baku       3:19:24 -       LMT     1924 May  2
                        3:00    -       +03     1957 Mar
                        4:00 RussiaAsia +04/+05 1991 Mar 31  2:00s
@@ -231,7 +231,7 @@ Zone        Asia/Baku       3:19:24 -       LMT     1924 
May  2
 Rule   Dhaka   2009    only    -       Jun     19      23:00   1:00    -
 Rule   Dhaka   2009    only    -       Dec     31      24:00   0       -
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Dhaka      6:01:40 -       LMT     1890
                        5:53:20 -       HMT     1941 Oct    # Howrah Mean Time?
                        6:30    -       +0630   1942 May 15
@@ -241,7 +241,7 @@ Zone        Asia/Dhaka      6:01:40 -       LMT     1890
                        6:00    Dhaka   +06/+07
 
 # Bhutan
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Thimphu    5:58:36 -       LMT     1947 Aug 15 # or Thimbu
                        5:30    -       +0530   1987 Oct
                        6:00    -       +06
@@ -252,13 +252,13 @@ Zone      Asia/Thimphu    5:58:36 -       LMT     1947 
Aug 15 # or Thimb
 # We have no information as to when standard time was introduced;
 # assume it occurred in 1907, the same year as Mauritius (which
 # then contained the Chagos Archipelago).
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Indian/Chagos   4:49:40 -       LMT     1907
                        5:00    -       +05     1996
                        6:00    -       +06
 
 # Brunei
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Brunei     7:39:40 -       LMT     1926 Mar # Bandar Seri Begawan
                        7:30    -       +0730   1933
                        8:00    -       +08
@@ -273,7 +273,7 @@ Zone        Asia/Brunei     7:39:40 -       LMT     1926 
Mar # Bandar Seri 
 # of Greenwich."  This refers to the period before Burma's transition to +0630,
 # a transition for which Shanks is the only source.
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Yangon     6:24:47 -       LMT     1880        # or Rangoon
                        6:24:47 -       RMT     1920        # Rangoon local time
                        6:30    -       +0630   1942 May
@@ -561,7 +561,7 @@ Rule        PRC     1987    1991    -       Apr     Sun>=11 
 2:00   1:00    D
 # that the sort of users who prefer Asia/Urumqi now typically ignored the
 # +08 mandate back then.
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 # Beijing time, used throughout China; represented by Shanghai.
 Zone   Asia/Shanghai   8:05:43 -       LMT     1901
                        8:00    Shang   C%sT    1949 May 28
@@ -652,11 +652,41 @@ Zone      Asia/Urumqi     5:50:20 -       LMT     1928
 #   https://i.imgur.com/05KkvtC.png
 # * 1941-09-30, Hong Kong Daily Press, Winter Time Warning.
 #   https://i.imgur.com/dge4kFJ.png
-# Also, the Liberation day of Hong Kong after WWII which British rule
-# over the territory resumed was August 30, 1945, which I think should
-# be the termination date for the use of JST in the territory....
 
-# From Paul Eggert (2018-11-17):
+# From P Chan (2018-12-31):
+# * According to the Hong Kong Daylight-Saving Regulations, 1941, the
+#   1941 spring-forward transition was at 03:00.
+#      http://sunzi.lib.hku.hk/hkgro/view/g1941/304271.pdf
+#      http://sunzi.lib.hku.hk/hkgro/view/g1941/305516.pdf
+# * According to some articles from South China Morning Post, +08 was
+#   resumed on 1945-11-18 at 02:00.
+#      https://i.imgur.com/M2IsZ3c.png
+#      https://i.imgur.com/iOPqrVo.png
+#      https://i.imgur.com/fffcGDs.png
+# * Some newspapers ... said the 1946 spring-forward transition was on
+#   04-21 at 00:00.  The Kung Sheung Evening News 1946-04-20 (Chinese)
+#      https://i.imgur.com/ZSzent0.png
+#      
https://mmis.hkpl.gov.hk///c/portal/cover?c=QF757YsWv5%2FH7zGe%2FKF%2BFLYsuqGhRBfe
 p.4
+#   The Kung Sheung Daily News 1946-04-21 (Chinese)
+#      https://i.imgur.com/7ecmRlcm.png
+#      
https://mmis.hkpl.gov.hk///c/portal/cover?c=QF757YsWv5%2BQBGt1%2BwUj5qG2GqtwR3Wh
 p.4
+# * According to the Summer Time Ordinance (1946), the fallback
+#   transitions between 1946 and 1952 were at 03:30 Standard Time (+08)
+#      
http://oelawhk.lib.hku.hk/archive/files/bb74b06a74d5294620a15de560ab33c6.pdf
+# * Some other laws and regulations related to DST from 1953 to 1979
+#   Summer Time Ordinance 1953
+#      https://i.imgur.com/IOlJMav.jpg
+#   Summer Time (Amendment) Ordinance 1965
+#      https://i.imgur.com/8rofeLa.jpg
+#   Interpretation and General Clauses Ordinance (1966)
+#      https://i.imgur.com/joy3msj.jpg
+#   Emergency (Summer Time) Regulation 1973 <https://i.imgur.com/OpRWrKz.jpg>
+#   Interpretation and General Clauses (Amendment) Ordinance 1977
+#      https://i.imgur.com/RaNqnc4.jpg
+#   Resolution of the Legislative Council passed on 9 May 1979
+#      
https://www.legco.gov.hk/yr78-79/english/lc_sitg/hansard/h790509.pdf#page=39
+
+# From Paul Eggert (2019-05-31):
 # Here are the dates given at
 # https://www.hko.gov.hk/gts/time/Summertime.htm
 # as of 2014-06-19:
@@ -667,7 +697,7 @@ Zone        Asia/Urumqi     5:50:20 -       LMT     1928
 # 1944        Whole year
 # 1945        Whole year
 # 1946        20 Apr to 1 Dec
-# 1947        13 Apr to 30 Dec
+# 1947        13 Apr to 30 Nov
 # 1948        2 May to 31 Oct
 # 1949        3 Apr to 30 Oct
 # 1950        2 Apr to 29 Oct
@@ -704,36 +734,28 @@ Zone      Asia/Urumqi     5:50:20 -       LMT     1928
 # The page does not give times of day for transitions,
 # or dates for the 1942 and 1945 transitions.
 # The Japanese occupation of Hong Kong began 1941-12-25.
-# The Japanese surrender of Hong Kong was signed 1945-09-16; see:
-# Heaver S. The days after the Pacific war ended: unsettling times
-# in Hong Kong. Post Magazine. 2016-06-13.
-# 
https://www.scmp.com/magazines/post-magazine/article/1852990/days-after-pacific-war-ended-unsettling-times-hong-kong
-# For lack of anything better, use start of those days as the
-# transition times.
 
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
-Rule   HK      1946    only    -       Apr     20      3:30    1:00    S
-Rule   HK      1946    only    -       Dec     1       3:30    0       -
-Rule   HK      1947    only    -       Apr     13      3:30    1:00    S
-Rule   HK      1947    only    -       Dec     30      3:30    0       -
-Rule   HK      1948    only    -       May     2       3:30    1:00    S
-Rule   HK      1948    1951    -       Oct     lastSun 3:30    0       -
-Rule   HK      1952    1953    -       Nov     Sun>=1  3:30    0       -
+Rule   HK      1946    only    -       Apr     21      0:00    1:00    S
+Rule   HK      1946    only    -       Dec     1       3:30s   0       -
+Rule   HK      1947    only    -       Apr     13      3:30s   1:00    S
+Rule   HK      1947    only    -       Nov     30      3:30s   0       -
+Rule   HK      1948    only    -       May     2       3:30s   1:00    S
+Rule   HK      1948    1952    -       Oct     Sun>=28 3:30s   0       -
 Rule   HK      1949    1953    -       Apr     Sun>=1  3:30    1:00    S
+Rule   HK      1953    1964    -       Oct     Sun>=31 3:30    0       -
 Rule   HK      1954    1964    -       Mar     Sun>=18 3:30    1:00    S
-Rule   HK      1954    only    -       Oct     31      3:30    0       -
-Rule   HK      1955    1964    -       Nov     Sun>=1  3:30    0       -
 Rule   HK      1965    1976    -       Apr     Sun>=16 3:30    1:00    S
 Rule   HK      1965    1976    -       Oct     Sun>=16 3:30    0       -
 Rule   HK      1973    only    -       Dec     30      3:30    1:00    S
-Rule   HK      1979    only    -       May     Sun>=8  3:30    1:00    S
-Rule   HK      1979    only    -       Oct     Sun>=16 3:30    0       -
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+Rule   HK      1979    only    -       May     13      3:30    1:00    S
+Rule   HK      1979    only    -       Oct     21      3:30    0       -
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Hong_Kong  7:36:42 -       LMT     1904 Oct 30  0:36:42
-                       8:00    -       HKT     1941 Jun 15  3:30
+                       8:00    -       HKT     1941 Jun 15  3:00
                        8:00    1:00    HKST    1941 Oct  1  4:00
                        8:30    -       HKT     1941 Dec 25
-                       9:00    -       JST     1945 Sep 16
+                       9:00    -       JST     1945 Nov 18  2:00
                        8:00    HK      HK%sT
 
 ###############################################################################
@@ -857,7 +879,7 @@ Rule        Taiwan  1974    1975    -       Oct     1       
0:00    0       S
 Rule   Taiwan  1979    only    -       Jul     1       0:00    1:00    D
 Rule   Taiwan  1979    only    -       Oct     1       0:00    0       S
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 # Taipei or Taibei or T'ai-pei
 Zone   Asia/Taipei     8:06:00 -       LMT     1896 Jan  1
                        8:00    -       CST     1937 Oct  1
@@ -995,7 +1017,7 @@ Rule       Macau   1975    1976    -       Apr     Sun>=16 
03:30   1:00    D
 Rule   Macau   1979    only    -       May     13      03:30   1:00    D
 Rule   Macau   1979    only    -       Oct     Sun>=16 03:30   0       S
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Macau      7:34:10 -       LMT     1904 Oct 30
                        8:00    -       CST     1941 Dec 21 23:00
                        9:00    Macau   +09/+10 1945 Sep 30 24:00
@@ -1034,7 +1056,7 @@ Rule      Cyprus  1977    only    -       Sep     25      
0:00    0       -
 Rule   Cyprus  1978    only    -       Oct     2       0:00    0       -
 Rule   Cyprus  1979    1997    -       Sep     lastSun 0:00    0       -
 Rule   Cyprus  1981    1998    -       Mar     lastSun 0:00    1:00    S
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Nicosia    2:13:28 -       LMT     1921 Nov 14
                        2:00    Cyprus  EE%sT   1998 Sep
                        2:00    EUAsia  EE%sT
@@ -1083,7 +1105,7 @@ Link      Asia/Nicosia    Europe/Nicosia
 # Byalokoz 1919 says Georgia was 2:59:11.
 # Go with Byalokoz.
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Tbilisi    2:59:11 -       LMT     1880
                        2:59:11 -       TBMT    1924 May  2 # Tbilisi Mean Time
                        3:00    -       +03     1957 Mar
@@ -1120,7 +1142,7 @@ Zone      Asia/Tbilisi    2:59:11 -       LMT     1880
 # which will be permanent, with no seasonal adjustment, will happen at
 # midnight on Saturday, September 16.
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Dili       8:22:20 -       LMT     1912 Jan  1
                        8:00    -       +08     1942 Feb 21 23:00
                        9:00    -       +09     1976 May  3
@@ -1186,7 +1208,7 @@ Zone      Asia/Dili       8:22:20 -       LMT     1912 
Jan  1
 # time for 1870-1941.  Shanks is our only (and dubious) source for the
 # 1941-1945 data.
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Kolkata    5:53:28 -       LMT     1854 Jun 28 # Kolkata
                        5:53:20 -       HMT     1870        # Howrah Mean Time?
                        5:21:10 -       MMT     1906 Jan  1 # Madras local time
@@ -1238,7 +1260,7 @@ Zone      Asia/Kolkata    5:53:28 -       LMT     1854 
Jun 28 # Kolkata
 # WITA - +08 - Waktu Indonesia Tengah (Indonesia central time)
 # WIT  - +09 - Waktu Indonesia Timur (Indonesia eastern time)
 #
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 # Java, Sumatra
 Zone Asia/Jakarta      7:07:12 -       LMT     1867 Aug 10
 # Shanks & Pottenger say the next transition was at 1924 Jan 1 0:13,
@@ -1314,9 +1336,9 @@ Zone Asia/Jayapura        9:22:48 -       LMT     1932 Nov
 # I used the following code in GNU Emacs 26.1 to generate the "Rule Iran"
 # lines from 2008 through 2087.  Emacs 26.1 uses Ed Reingold's
 # cal-persia implementation of Birashk's approximation, which in the
-# 2008-2087 range disagrees with the the astronomical Persian calendar
-# for Persian years 1404 (Gregorian 2025) and 1437 (Gregorian 2058),
-# so the following code special-case those years.  See Table 15.1, page 264, 
of:
+# 2008-2087 range disagrees with the astronomical Persian calendar
+# for Persian years 1404 (Gregorian 2025) and 1437 (Gregorian 2058), so
+# the following code special-cases those years.  See Table 15.1, page 264, of:
 # Edward M. Reingold and Nachum Dershowitz, Calendrical Calculations:
 # The Ultimate Edition, Cambridge University Press (2018).
 # 
https://www.cambridge.org/fr/academic/subjects/computer-science/computing-general-interest/calendrical-calculations-ultimate-edition-4th-edition
@@ -1510,7 +1532,7 @@ Rule      Iran    2087    only    -       Sep     21      
24:00   0       -
 Rule   Iran    2088    max     -       Mar     20      24:00   1:00    -
 Rule   Iran    2088    max     -       Sep     20      24:00   0       -
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Tehran     3:25:44 -       LMT     1916
                        3:25:44 -       TMT     1946     # Tehran Mean Time
                        3:30    -       +0330   1977 Nov
@@ -1555,7 +1577,7 @@ Rule      Iraq    1986    1990    -       Mar     lastSun 
1:00s   1:00    -
 #
 Rule   Iraq    1991    2007    -       Apr      1      3:00s   1:00    -
 Rule   Iraq    1991    2007    -       Oct      1      3:00s   0       -
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Baghdad    2:57:40 -       LMT     1890
                        2:57:36 -       BMT     1918     # Baghdad Mean Time?
                        3:00    -       +03     1982 May
@@ -1622,7 +1644,7 @@ Rule      Zion    1975    only    -       Apr     20      
0:00    1:00    D
 Rule   Zion    1975    only    -       Aug     31      0:00    0       S
 
 # From Alois Treindl (2019-03-06):
-# http://www.moin.gov.il/Documents/שעון קיץ/clock-50-years-7-2014.pdf
+# http://www.moin.gov.il/Documents/שעון%20קיץ/clock-50-years-7-2014.pdf
 # From Isaac Starkman (2019-03-06):
 # Summer time was in that period in 1980 and 1984, see
 # https://www.ynet.co.il/articles/0,7340,L-3951073,00.html
@@ -1760,32 +1782,15 @@ Rule    Zion    2004    only    -       Sep     22      
1:00    0       S
 #
 #      ftp://ftp.cs.huji.ac.il/pub/tz/announcements/2005+beyond.ps
 
-# From Paul Eggert (2012-10-26):
-# I used Ephraim Silverberg's dst-israel.el program
-# <ftp://ftp.cs.huji.ac.il/pub/tz/software/dst-israel.el> (2005-02-20)
-# along with Ed Reingold's cal-hebrew in GNU Emacs 21.4,
-# to generate the transitions from 2005 through 2012.
-# (I replaced "lastFri" with "Fri>=26" by hand.)
-# The spring transitions all correspond to the following Rule:
-#
-# Rule Zion    2005    2012    -       Mar     Fri>=26 2:00    1:00    D
-#
-# but older zic implementations (e.g., Solaris 8) do not support
-# "Fri>=26" to mean April 1 in years like 2005, so for now we list the
-# springtime transitions explicitly.
-
 # Rule NAME    FROM    TO      TYPE    IN      ON      AT      SAVE    LETTER/S
-Rule   Zion    2005    only    -       Apr      1      2:00    1:00    D
+Rule   Zion    2005    2012    -       Apr     Fri<=1  2:00    1:00    D
 Rule   Zion    2005    only    -       Oct      9      2:00    0       S
-Rule   Zion    2006    2010    -       Mar     Fri>=26 2:00    1:00    D
 Rule   Zion    2006    only    -       Oct      1      2:00    0       S
 Rule   Zion    2007    only    -       Sep     16      2:00    0       S
 Rule   Zion    2008    only    -       Oct      5      2:00    0       S
 Rule   Zion    2009    only    -       Sep     27      2:00    0       S
 Rule   Zion    2010    only    -       Sep     12      2:00    0       S
-Rule   Zion    2011    only    -       Apr      1      2:00    1:00    D
 Rule   Zion    2011    only    -       Oct      2      2:00    0       S
-Rule   Zion    2012    only    -       Mar     Fri>=26 2:00    1:00    D
 Rule   Zion    2012    only    -       Sep     23      2:00    0       S
 
 # From Ephraim Silverberg (2013-06-27):
@@ -1801,7 +1806,7 @@ Rule      Zion    2012    only    -       Sep     23      
2:00    0       S
 Rule   Zion    2013    max     -       Mar     Fri>=23 2:00    1:00    D
 Rule   Zion    2013    max     -       Oct     lastSun 2:00    0       S
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Jerusalem  2:20:54 -       LMT     1880
                        2:20:40 -       JMT     1918 # Jerusalem Mean Time?
                        2:00    Zion    I%sT
@@ -1893,7 +1898,7 @@ Rule      Japan   1950    1951    -       May     Sat>=1  
24:00   1:00    D
 # Central Time (UT+9). The adoption began on Oct 1, 1937.
 # https://ja.wikisource.org/wiki/明治二十八年勅令第百六十七號標準時ニ關スル件中改正ノ件
 
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Tokyo      9:18:59 -       LMT     1887 Dec 31 15:00u
                        9:00    Japan   J%sT
 # Since 1938, all Japanese possessions have been like Asia/Tokyo,
@@ -1996,7 +2001,7 @@ Rule      Jordan  2006    2011    -       Oct     lastFri 
0:00s   0       -
 Rule   Jordan  2013    only    -       Dec     20      0:00    0       -
 Rule   Jordan  2014    max     -       Mar     lastThu 24:00   1:00    S
 Rule   Jordan  2014    max     -       Oct     lastFri 0:00s   0       -
-# Zone NAME            GMTOFF  RULES   FORMAT  [UNTIL]
+# Zone NAME            STDOFF  RULES   FORMAT  [UNTIL]
 Zone   Asia/Amman      2:23:44 -       LMT     1931
                        2:00    Jordan  EE%sT
 
@@ -2037,8 +2042,8 @@ Zone      Asia/Amman      2:23:44 -       LMT     1931
 # text.
 #
 # According to Izvestia newspaper No. 68 (23334) from 1991-03-20
-# (page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
-# http://libinfo.org/index.php?id=58564) on 1991-03-31 at 2:00 during
+# -- page 6; available at http://libinfo.org/newsr/newsr2574.djvu via
+# http://libinfo.org/index.php?id=58564 -- on 1991-03-31 at 2:00 during
 # transition to "summer" time:
 # Republic of Georgia, Latvian SSR, Lithuanian SSR, SSR Moldova,
 # Estonian SSR; Komi ASSR; Kaliningrad oblast; Nenets autonomous okrug
@@ -2054,7 +2059,7 @@ Zone      Asia/Amman      2:23:44 -       LMT     1931

*** 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