Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src Pull up the following, requested by kre in ticket #1546:



details:   https://anonhg.NetBSD.org/src/rev/6845a6c95fb3
branches:  netbsd-9
changeset: 371957:6845a6c95fb3
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Oct 20 13:18:53 2022 +0000

description:
Pull up the following, requested by kre in ticket #1546:
Catch up to -current of external/public-domain/tz/dist and apply corresponding
patches to distrib/sets/lists/base/mi and doc/3RDPARTY:

        external/public-domain/tz/dist/SECURITY         up to 1.1.1.1
        external/public-domain/tz/dist/CONTRIBUTING     up to 1.1.1.7
        external/public-domain/tz/dist/Makefile         up to 1.1.1.33
        external/public-domain/tz/dist/NEWS             up to 1.1.1.38
        external/public-domain/tz/dist/README           up to 1.1.1.10
        external/public-domain/tz/dist/TZDATA_VERSION   up to 1.30
        external/public-domain/tz/dist/africa           up to 1.1.1.28
        external/public-domain/tz/dist/antarctica       up to 1.1.1.15
        external/public-domain/tz/dist/asia             up to 1.5
        external/public-domain/tz/dist/australasia      up to 1.5
        external/public-domain/tz/dist/backward         up to 1.5
        external/public-domain/tz/dist/backzone         up to 1.1.1.23
        external/public-domain/tz/dist/calendars        up to 1.1.1.2
        external/public-domain/tz/dist/checktab.awk     up to 1.1.1.11
        external/public-domain/tz/dist/etcetera         up to 1.1.1.6
        external/public-domain/tz/dist/europe           up to 1.1.1.34
        external/public-domain/tz/dist/leap-seconds.list up to 1.4
        external/public-domain/tz/dist/leapseconds      up to 1.4
        external/public-domain/tz/dist/northamerica     up to 1.1.1.30
        external/public-domain/tz/dist/southamerica     up to 1.1.1.20
        external/public-domain/tz/dist/theory.html      up to 1.1.1.15
        external/public-domain/tz/dist/version          up to 1.5
        external/public-domain/tz/dist/ziguard.awk      up to 1.1.1.9
        external/public-domain/tz/dist/zishrink.awk     up to 1.1.1.8
        external/public-domain/tz/dist/zone.tab         up to 1.1.1.22
        external/public-domain/tz/dist/zone1970.tab     up to 1.1.1.23
        distrib/sets/lists/base/mi                      (apply patch)
        doc/3RDPARTY                                    (apply patch)

Update timezone data to 2022e.

diffstat:

 distrib/sets/lists/base/mi                       |    4 +-
 doc/3RDPARTY                                     |    6 +-
 external/public-domain/tz/dist/CONTRIBUTING      |   73 +-
 external/public-domain/tz/dist/Makefile          |  233 +++-
 external/public-domain/tz/dist/NEWS              |  538 ++++++++++++-
 external/public-domain/tz/dist/README            |   15 +
 external/public-domain/tz/dist/SECURITY          |   15 +
 external/public-domain/tz/dist/TZDATA_VERSION    |    2 +-
 external/public-domain/tz/dist/africa            |  338 ++++---
 external/public-domain/tz/dist/antarctica        |   44 +-
 external/public-domain/tz/dist/asia              |  406 +++++----
 external/public-domain/tz/dist/australasia       |  217 +++-
 external/public-domain/tz/dist/backward          |   23 +-
 external/public-domain/tz/dist/backzone          |  952 +++++++++++++++++-----
 external/public-domain/tz/dist/calendars         |    4 +-
 external/public-domain/tz/dist/checktab.awk      |   50 +-
 external/public-domain/tz/dist/etcetera          |    8 +-
 external/public-domain/tz/dist/europe            |  500 ++++-------
 external/public-domain/tz/dist/leap-seconds.list |    8 +-
 external/public-domain/tz/dist/leapseconds       |    8 +-
 external/public-domain/tz/dist/northamerica      |  382 +++-----
 external/public-domain/tz/dist/southamerica      |  194 +++-
 external/public-domain/tz/dist/theory.html       |  102 +-
 external/public-domain/tz/dist/version           |    2 +-
 external/public-domain/tz/dist/ziguard.awk       |  258 +++++-
 external/public-domain/tz/dist/zishrink.awk      |   62 +-
 external/public-domain/tz/dist/zone.tab          |   15 +-
 external/public-domain/tz/dist/zone1970.tab      |  102 +-
 28 files changed, 2979 insertions(+), 1582 deletions(-)

diffs (truncated from 7735 to 300 lines):

diff -r 6ced79c6c1f8 -r 6845a6c95fb3 distrib/sets/lists/base/mi
--- a/distrib/sets/lists/base/mi        Sat Oct 15 10:31:45 2022 +0000
+++ b/distrib/sets/lists/base/mi        Thu Oct 20 13:18:53 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.1209.2.7 2022/05/14 11:37:07 martin Exp $
+# $NetBSD: mi,v 1.1209.2.8 2022/10/20 13:18:54 martin Exp $
 #
 # Note:        Don't delete entries from here - mark them as "obsolete" instead,
 #      unless otherwise stated below.
@@ -5779,6 +5779,7 @@
 ./usr/share/zoneinfo/Europe/Kiev               base-sys-share          share
 ./usr/share/zoneinfo/Europe/Kirov              base-sys-share          share
 ./usr/share/zoneinfo/Europe/Kuybyshev          base-obsolete           obsolete
+./usr/share/zoneinfo/Europe/Kyiv               base-sys-share          share
 ./usr/share/zoneinfo/Europe/Lisbon             base-sys-share          share
 ./usr/share/zoneinfo/Europe/Ljubljana          base-sys-share          share
 ./usr/share/zoneinfo/Europe/London             base-sys-share          share
@@ -5920,6 +5921,7 @@
 ./usr/share/zoneinfo/Pacific/Guam              base-sys-share          share
 ./usr/share/zoneinfo/Pacific/Honolulu          base-sys-share          share
 ./usr/share/zoneinfo/Pacific/Johnston          base-sys-share          share
+./usr/share/zoneinfo/Pacific/Kanton            base-sys-share          share
 ./usr/share/zoneinfo/Pacific/Kiritimati                base-sys-share          share
 ./usr/share/zoneinfo/Pacific/Kosrae            base-sys-share          share
 ./usr/share/zoneinfo/Pacific/Kwajalein         base-sys-share          share
diff -r 6ced79c6c1f8 -r 6845a6c95fb3 doc/3RDPARTY
--- a/doc/3RDPARTY      Sat Oct 15 10:31:45 2022 +0000
+++ b/doc/3RDPARTY      Thu Oct 20 13:18:53 2022 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: 3RDPARTY,v 1.1640.2.24 2021/04/06 18:01:21 martin Exp $
+#      $NetBSD: 3RDPARTY,v 1.1640.2.25 2022/10/20 13:18:53 martin Exp $
 #
 # This file contains a list of the software that has been integrated into
 # NetBSD where we are not the primary maintainer.
@@ -1398,8 +1398,8 @@
 Added changes from a5 -> a12 manually.
 
 Package:       tz
-Version:       tzcode2019b / tzdata2021a
-Current Vers:  tzcode2021a / tzdata2021a
+Version:       tzcode2019b / tzdata2022e
+Current Vers:  tzcode2022e / tzdata2022e
 Maintainer:    Paul Eggert <eggert%cs.ucla.edu@localhost>
 Archive Site:  ftp://ftp.iana.org/tz/releases/
 Archive Site:  ftp://munnari.oz.au/pub/oldtz/
diff -r 6ced79c6c1f8 -r 6845a6c95fb3 external/public-domain/tz/dist/CONTRIBUTING
--- a/external/public-domain/tz/dist/CONTRIBUTING       Sat Oct 15 10:31:45 2022 +0000
+++ b/external/public-domain/tz/dist/CONTRIBUTING       Thu Oct 20 13:18:53 2022 +0000
@@ -1,50 +1,58 @@
-Contributing to the tz code and data
+# Contributing to the tz code and data
+
+Please do not create issues or pull requests on GitHub, as the
+proper procedure for proposing and distributing patches is via
+email as described below.
 
 The time zone database is by no means authoritative: governments
 change timekeeping rules erratically and sometimes with little
 warning, the data entries do not cover all of civil time before
 1970, and undoubtedly errors remain in the code and data.  Feel
 free to fill gaps or fix mistakes, and please email improvements
-to tz%iana.org@localhost for use in the future.  In your email, please give
+to <tz%iana.org@localhost> for use in the future.  In your email, please give
 reliable sources that reviewers can check.
 
------
-
-Developers can contribute technical changes to the source code and
-data as follows.
+## Contributing technical changes
 
 To email small changes, please run a POSIX shell command like
 'diff -u old/europe new/europe >myfix.patch', and attach
-myfix.patch to the email.
+'myfix.patch' to the email.
 
 For more-elaborate or possibly-controversial changes,
 such as renaming, adding or removing zones, please read
-<https://www.iana.org/time-zones/repository/theory.html> or the file
-theory.html.  It is also good to browse the mailing list archives
+"Theory and pragmatics of the tz code and data"
+<https://www.iana.org/time-zones/repository/theory.html>.
+It is also good to browse the mailing list archives
 <https://mm.icann.org/pipermail/tz/> for examples of patches that tend
 to work well.  Additions to data should contain commentary citing
-reliable sources as justification.  Citations should use https: URLs
+reliable sources as justification.  Citations should use "https:" URLs
 if available.
 
-Please submit changes against either the latest release in
-<https://www.iana.org/time-zones> or the master branch of the development
-repository.  The latter is preferred.  If you use Git the following
-workflow may be helpful:
+For changes that fix sensitive security-related bugs, please see the
+distribution's 'SECURITY' file.
+
+Please submit changes against either the latest release
+<https://www.iana.org/time-zones> or the main branch of the development
+repository.  The latter is preferred.
+
+## Sample Git workflow for developing contributions
+
+If you use Git the following workflow may be helpful:
 
   * Copy the development repository.
 
-      git clone https://github.com/eggert/tz.git
-      cd tz
+        git clone https://github.com/eggert/tz.git
+        cd tz
 
-  * Get current with the master branch.
+  * Get current with the main branch.
 
-      git checkout master
-      git pull
+        git checkout main
+        git pull
 
   * Switch to a new branch for the changes.  Choose a different
     branch name for each change set.
 
-      git checkout -b mybranch
+        git checkout -b mybranch
 
   * Sleuth by using 'git blame'.  For example, when fixing data for
     Africa/Sao_Tome, if the command 'git blame africa' outputs a line
@@ -57,36 +65,33 @@
 
   * Debug the changes, e.g.:
 
-      make check
-      make install
-      ./zdump -v America/Los_Angeles
+        make check
+        make install
+        ./zdump -v America/Los_Angeles
 
   * For each separable change, commit it in the new branch, e.g.:
 
-      git add northamerica
-      git commit
+        git add northamerica
+        git commit
 
     See recent 'git log' output for the commit-message style.
 
-  * Create patch files 0001-*, 0002-*, ...
+  * Create patch files 0001-..., 0002-..., ...
 
-      git format-patch master
+        git format-patch main
 
-  * After reviewing the patch files, send the patches to tz%iana.org@localhost
+  * After reviewing the patch files, send the patches to <tz%iana.org@localhost>
     for others to review.
 
-      git send-email master
+        git send-email main
 
     For an archived example of such an email, see
+    "[PROPOSED] Fix off-by-1 error for Jamaica and T&C before 1913"
     <https://mm.icann.org/pipermail/tz/2018-February/026122.html>.
 
-  * Start anew by getting current with the master branch again
+  * Start anew by getting current with the main branch again
     (the second step above).
 
-Please do not create issues or pull requests on GitHub, as the
-proper procedure for proposing and distributing patches is via
-email as illustrated above.
-
 -----
 
 This file is in the public domain.
diff -r 6ced79c6c1f8 -r 6845a6c95fb3 external/public-domain/tz/dist/Makefile
--- a/external/public-domain/tz/dist/Makefile   Sat Oct 15 10:31:45 2022 +0000
+++ b/external/public-domain/tz/dist/Makefile   Thu Oct 20 13:18:53 2022 +0000
@@ -33,7 +33,7 @@
 #      make zonenames
 # to get a list of the values you can use for LOCALTIME.
 
-LOCALTIME=     GMT
+LOCALTIME=     Factory
 
 # The POSIXRULES macro controls interpretation of nonstandard and obsolete
 # POSIX-like TZ settings like TZ='EET-2EEST' that lack DST transition rules.
@@ -45,9 +45,9 @@
 #
 # Any other value for POSIXRULES is obsolete and should not be relied on, as:
 # * 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.
+# * It does not work even in tzcode, except for historical timestamps
+#   that precede the last explicit transition in the POSIXRULES file.
+#   Hence it typically does not work for current and future timestamps.
 # In short, software should avoid ruleless settings like TZ='EET-2EEST'
 # and so should not depend on the value of POSIXRULES.
 #
@@ -122,8 +122,8 @@
 
 # Types to try, as an alternative to time_t.
 TIME_T_ALTERNATIVES = $(TIME_T_ALTERNATIVES_HEAD) $(TIME_T_ALTERNATIVES_TAIL)
-TIME_T_ALTERNATIVES_HEAD = int64_t
-TIME_T_ALTERNATIVES_TAIL = int32_t uint32_t uint64_t
+TIME_T_ALTERNATIVES_HEAD = int_least64_t
+TIME_T_ALTERNATIVES_TAIL = int_least32_t uint_least32_t uint_least64_t
 
 # What kind of TZif data files to generate.  (TZif is the binary time
 # zone data format that zic generates; see Internet RFC 8536.)
@@ -152,8 +152,10 @@
 # The EXPIRES_LINE value matters only if REDO's value contains "right".
 # If you change EXPIRES_LINE, remove the leapseconds file before running "make".
 # zic's support for the Expires line was introduced in tzdb 2020a,
-# and EXPIRES_LINE defaults to 0 for now so that the leapseconds file
-# can be given to older zic implementations.
+# and was modified in tzdb 2021b to generate version 4 TZif files.
+# EXPIRES_LINE defaults to 0 for now so that the leapseconds file
+# can be given to pre-2020a zic implementations and so that TZif files
+# built by newer zic implementations can be read by pre-2021b libraries.
 EXPIRES_LINE=  0
 
 # To install data in text form that has all the information of the TZif data,
@@ -174,12 +176,19 @@
 
 BACKWARD=      backward
 
-# If you want out-of-scope and often-wrong data from the file 'backzone', use
+# If you want out-of-scope and often-wrong data from the file 'backzone',
+# but only for entries listed in the backward-compatibility file zone.tab, use
 #      PACKRATDATA=    backzone
+#      PACKRATLIST=    zone.tab
+# If you want all the 'backzone' data, use
+#      PACKRATDATA=    backzone
+#      PACKRATLIST=
 # To omit this data, use
 #      PACKRATDATA=
+#      PACKRATLIST=
 
 PACKRATDATA=
+PACKRATLIST=
 
 # The name of a locale using the UTF-8 encoding, used during self-tests.
 # The tests are skipped if the name does not appear to work on this system.
@@ -210,6 +219,7 @@
 #  -DHAVE_LOCALTIME_R=0 if your system lacks a localtime_r function
 #  -DHAVE_LOCALTIME_RZ=0 if you do not want zdump to use localtime_rz
 #      localtime_rz can make zdump significantly faster, but is nonstandard.
+#  -DHAVE_MALLOC_ERRNO=0 if malloc etc. do not set errno on failure.
 #  -DHAVE_POSIX_DECLS=0 if your system's include files do not declare
 #      functions like 'link' or variables like 'tzname' required by POSIX
 #  -DHAVE_SNPRINTF=0 if your system lacks the snprintf function
@@ -220,7 +230,6 @@
 #  -DHAVE_STRTOLL=0 if your system lacks the strtoll function
 #  -DHAVE_SYMLINK=0 if your system lacks the symlink function
 #  -DHAVE_SYS_STAT_H=0 if your compiler lacks a <sys/stat.h>
-#  -DHAVE_SYS_WAIT_H=0 if your compiler lacks a <sys/wait.h>
 #  -DHAVE_TZSET=0 if your system lacks a tzset function
 #  -DHAVE_UNISTD_H=0 if your compiler lacks a <unistd.h>
 #  -Dlocale_t=XXX if your system uses XXX instead of locale_t
@@ -257,22 +266,26 @@
 GCC_INSTRUMENT = \
   -fsanitize=undefined -fsanitize-address-use-after-scope \
   -fsanitize-undefined-trap-on-error -fstack-protector
+# Omit -fanalyzer from GCC_DEBUG_FLAGS, as it makes GCC too slow.
 GCC_DEBUG_FLAGS = -DGCC_LINT -g3 -O3 -fno-common \
   $(GCC_INSTRUMENT) \
   -Wall -Wextra \
   -Walloc-size-larger-than=100000 -Warray-bounds=2 \
-  -Wbad-function-cast -Wcast-align=strict -Wdate-time \
+  -Wbad-function-cast -Wbidi-chars=any,ucn -Wcast-align=strict -Wdate-time \
   -Wdeclaration-after-statement -Wdouble-promotion \
+  -Wduplicated-branches -Wduplicated-cond \
   -Wformat=2 -Wformat-overflow=2 -Wformat-signedness -Wformat-truncation \
-  -Winit-self -Wjump-misses-init -Wlogical-op \
+  -Winit-self -Wlogical-op \
   -Wmissing-declarations -Wmissing-prototypes -Wnested-externs \
+  -Wnull-dereference \
   -Wold-style-definition -Woverlength-strings -Wpointer-arith \
-  -Wshadow -Wshift-overflow=2 -Wstrict-prototypes -Wstringop-overflow=4 \
+  -Wshadow -Wshift-overflow=2 -Wstrict-overflow \
+  -Wstrict-prototypes -Wstringop-overflow=4 \
   -Wstringop-truncation -Wsuggest-attribute=cold \
   -Wsuggest-attribute=const -Wsuggest-attribute=format \
   -Wsuggest-attribute=malloc \
   -Wsuggest-attribute=noreturn -Wsuggest-attribute=pure \
-  -Wtrampolines -Wundef -Wuninitialized -Wunused \
+  -Wtrampolines -Wundef -Wuninitialized -Wunused-macros -Wuse-after-free=3 \
   -Wvariadic-macros -Wvla -Wwrite-strings \
   -Wno-address -Wno-format-nonliteral -Wno-sign-compare \
   -Wno-type-limits -Wno-unused-parameter
@@ -285,8 +298,9 @@
 # guess TM_GMTOFF from other macros; define NO_TM_GMTOFF to suppress this.
 # Similarly, if your system has a "zone abbreviation" field, define
 #      -DTM_ZONE=tm_zone
-# and define NO_TM_ZONE to suppress any guessing.  These two fields are not
-# required by POSIX, but are widely available on GNU/Linux and BSD systems.
+# and define NO_TM_ZONE to suppress any guessing.  Although these two fields
+# not required by POSIX, a future version of POSIX is planned to require them



Home | Main Index | Thread Index | Old Index