From 10fb2fbac95d2fb214d75a48aa36d9c6dfbeda44 Mon Sep 17 00:00:00 2001 From: SuperSix173 Date: Wed, 21 Oct 2020 12:12:25 +0800 Subject: [PATCH] backport community patches --- backport-Cite-Tom-Scott-on-Danish-time.patch | 29 ++++++ backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch | 48 +++++++++ ...t-Improve-TZUpdater-and-Python-links.patch | 98 +++++++++++++++++++ ...ort-Palestine-ends-DST-on-2020-10-24.patch | 98 +++++++++++++++++++ ...ort-make-rearguard_tarballs-to-macOS.patch | 35 +++++++ backport-Release-2020c.patch | 25 +++++ backport-Update-Danish-URLs.patch | 53 ++++++++++ tzdata.spec | 15 ++- 8 files changed, 400 insertions(+), 1 deletion(-) create mode 100644 backport-Cite-Tom-Scott-on-Danish-time.patch create mode 100644 backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch create mode 100644 backport-Improve-TZUpdater-and-Python-links.patch create mode 100644 backport-Palestine-ends-DST-on-2020-10-24.patch create mode 100644 backport-Port-make-rearguard_tarballs-to-macOS.patch create mode 100644 backport-Release-2020c.patch create mode 100644 backport-Update-Danish-URLs.patch diff --git a/backport-Cite-Tom-Scott-on-Danish-time.patch b/backport-Cite-Tom-Scott-on-Danish-time.patch new file mode 100644 index 0000000..0817577 --- /dev/null +++ b/backport-Cite-Tom-Scott-on-Danish-time.patch @@ -0,0 +1,29 @@ +From 43dda7dbe5ec831e2f0f14626e707200dd421239 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 16 Oct 2020 19:11:47 -0700 +Subject: [PATCH] Cite Tom Scott on Danish time + +* tz-art.html (Documentaries): Add "Why Denmark is .17 Seconds +Behind The World" (thanks to Jim Eggert). +--- + tz-art.html | 4 ++++ + 1 file changed, 4 insertions(+) + +diff --git a/tz-art.html b/tz-art.html +index 5de546a..72b9654 100644 +--- a/tz-art.html ++++ b/tz-art.html +@@ -22,6 +22,10 @@ into problems that programmers have with timekeeping. + Explaining The Mysteries Of Time Zones" (2017; 2:15) + briefly says why France has more time zones than Russia. +
  • ++"Why Denmark is ++.17 Seconds Behind The World" (2019; 6:29) explains why Denmark and ++the United Kingdom don't exactly follow their own law about civil time. ++
  • + "About Time" (1962; 59 minutes) is part of the + Bell Science extravaganza, with Frank Baxter, Richard Deacon, and Les Tremayne. + Its advisor was Richard Feynman, and it was voiced by Mel Blanc. +-- +1.8.3.1 + diff --git a/backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch b/backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch new file mode 100644 index 0000000..2747ed1 --- /dev/null +++ b/backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch @@ -0,0 +1,48 @@ +From 103e7868cf8fa91146c1b46012650a16ce29f9b0 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sun, 18 Oct 2020 13:34:30 -0700 +Subject: [PATCH] Fail on ZIC_BLOAT_DEFAULT typo + +Also, try to pacify Coverity. Problem reported by Tom Lane in: +https://mm.icann.org/pipermail/tz/2020-October/029370.html +* zic.c (main): Use a static constant to try to pacify Coverity. +Also, check that the default is either "slim" or "fat". +--- + zic.c | 14 +++++++++++--- + 1 file changed, 11 insertions(+), 3 deletions(-) + +diff --git a/zic.c b/zic.c +index a47c052..a902b34 100644 +--- a/zic.c ++++ b/zic.c +@@ -658,7 +658,8 @@ static const char * leapsec; + static const char * tzdefault; + + /* -1 if the TZif output file should be slim, 0 if default, 1 if the +- output should be fat for backward compatibility. The default is slim. */ ++ output should be fat for backward compatibility. ZIC_BLOAT_DEFAULT ++ determines the default. */ + static int bloat; + + static bool +@@ -795,8 +796,15 @@ _("%s: invalid time range: %s\n"), + } + if (optind == argc - 1 && strcmp(argv[optind], "=") == 0) + usage(stderr, EXIT_FAILURE); /* usage message by request */ +- if (bloat == 0) +- bloat = strcmp(ZIC_BLOAT_DEFAULT, "slim") == 0 ? -1 : 1; ++ if (bloat == 0) { ++ static char const bloat_default[] = ZIC_BLOAT_DEFAULT; ++ if (strcmp(bloat_default, "slim") == 0) ++ bloat = -1; ++ else if (strcmp(bloat_default, "fat") == 0) ++ bloat = 1; ++ else ++ abort(); /* Configuration error. */ ++ } + if (directory == NULL) + directory = TZDIR; + if (tzdefault == NULL) +-- +1.8.3.1 + diff --git a/backport-Improve-TZUpdater-and-Python-links.patch b/backport-Improve-TZUpdater-and-Python-links.patch new file mode 100644 index 0000000..6a7dc42 --- /dev/null +++ b/backport-Improve-TZUpdater-and-Python-links.patch @@ -0,0 +1,98 @@ +From 980306471fee903863c399741a38aa898c335979 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sat, 17 Oct 2020 17:56:33 -0700 +Subject: [PATCH] Improve TZUpdater and Python links + +* tz-link.html: Improve URLs to TZUpdater (thanks to +Brian Inglis) and modernize the discussion of TZUpdater +and some of its competitors. Likewise for Python. +--- + tz-link.html | 35 ++++++++++++++++++++--------------- + 1 file changed, 20 insertions(+), 15 deletions(-) + +diff --git a/tz-link.html b/tz-link.html +index 606a83b..a0e35a0 100644 +--- a/tz-link.html ++++ b/tz-link.html +@@ -245,13 +245,12 @@ href="https://play.google.com/store/apps/details?id=com.google.android.timezone. + ICU, +-IBM +-and Oracle +-Java, Joda-Time, IBM ++JDK, ++Joda-Time, MySQL, +-and Noda Time (see below). ++Noda Time, and OpenJDK/Oracle JDK. +

    +

    Sources for the tz database are + MIT license.

    • +
  • Java-based compilers and libraries include: +
      +
    • The TZUpdater ++href="https://www.oracle.com/java/technologies/javase/tzupdater-readme.html">TZUpdater + tool compiles tz source into the format used by +-Oracle Java.
      • ++OpenJDK and ++Oracle JDK. ++Although its source code is proprietary, its executable is available under the ++Java SE ++Timezone Updater License Agreement. +
    • The Java + SE 8 Date and Time API can be supplemented by API contains a class + Java 8 java.time, which its users should migrate to once + they can assume Java 8 or later. It is available under the Apache License.
      • +-
    • IANA Updater, +-tzdbgen, and IANA Updater and ZIUpdater +-are other alternatives to TZUpdater. IANA Updater's license is unclear; +-the others are licensed under the GPL.
      • ++are alternatives to TZUpdater. IANA Updater's license is unclear; ++ZIUpdater is licensed under the GPL. +
    • Time4A: Advanced date and + time library for Android and + Time4J: Advanced date, +@@ -515,7 +517,10 @@ It is freely available under a BSD-style license.
      • +
    • pytz – World Timezone + Definitions for Python compiles tz source into + Python. +-It is freely available under a BSD-style license.
      • ++It is freely available under a BSD-style license. ++In code that can assume Python 3.9 or later it is superseded by ++zoneinfo.ZoneInfo ++and the tzdata Python package. +
    • TZInfo – + Ruby Timezone Library + compiles tz source into +@@ -579,14 +584,14 @@ DateTime::TimeZone::Tzfile + is a TZif file reader written in Perl. + It is freely available under the same terms as Perl + (dual GPL and Artistic license).
      • +-
    • Python has a Python has a zoneinfo.ZoneInfo + class that reads TZif data and creates objects + that represent tzdb timezones. + Python is freely available under the + Python Software Foundation + License. +-A companion PyPI module ++A companion href="https://pypi.org/">PyPI module + tzdata + supplies TZif data if the underlying system data cannot be found; + it is freely available under the Apache License.
      • +-- +1.8.3.1 + diff --git a/backport-Palestine-ends-DST-on-2020-10-24.patch b/backport-Palestine-ends-DST-on-2020-10-24.patch new file mode 100644 index 0000000..f6c2376 --- /dev/null +++ b/backport-Palestine-ends-DST-on-2020-10-24.patch @@ -0,0 +1,98 @@ +From efd0231aa7a68ec431ce99251d2496a0eed624ec Mon Sep 17 00:00:00 2001 +From: Tim Parenti +Date: Tue, 20 Oct 2020 10:53:09 -0400 +Subject: [PATCH] Palestine ends DST on 2020-10-24 + +(Thanks to Sharef Mustafa.) +* asia (Palestine): Assume future fall transitions will be on the +Saturday preceding October's last Sunday at 01:00, with the recent +exception of the 2019-10-26 fall-back, which was at 00:00. +(Thanks to Steffen Thorsen.) +* NEWS: Mention this. +--- + NEWS | 18 ++++++++++++++++++ + asia | 28 ++++++++++++++++++++++++---- + 2 files changed, 42 insertions(+), 4 deletions(-) + +diff --git a/NEWS b/NEWS +index 25cf8cb..4d653dc 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,23 @@ + News for the tz database + ++Unreleased, experimental changes ++ ++ Briefly: ++ Palestine ends DST earlier than predicted, on 2020-10-24. ++ ++ Changes to future timestamps ++ ++ Palestine ends DST on 2020-10-24 at 01:00, instead of 2020-10-31 as ++ previously predicted. (Thanks to Sharef Mustafa.) This affects ++ Asia/Gaza and Asia/Hebron. Assume future fall transitions will be ++ on the Saturday preceding October's last Sunday. ++ ++ Changes to past timestamps ++ ++ Palestine's 2019-10-26 fall-back was at 00:00, not 01:00. (Thanks ++ to Steffen Thorsen.) ++ ++ + Release 2020c - 2020-10-16 11:15:53 -0700 + + Briefly: +diff --git a/asia b/asia +index e4d84e9..1c2d3eb 100644 +--- a/asia ++++ b/asia +@@ -3221,13 +3221,31 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 + + # From Sharef Mustafa (2019-10-18): + # Palestine summer time will end on midnight Oct 26th 2019 ... +-# http://www.palestinecabinet.gov.ps/website/ar/ViewDetails?ID=43948 + # ++# From Steffen Thorsen (2020-10-20): ++# Some sources such as these say, and display on clocks, that DST ended at ++# midnight last year... ++# https://www.amad.ps/ar/post/320006 ++# ++# From Tim Parenti (2020-10-20): ++# The report of the Palestinian Cabinet meeting of 2019-10-14 confirms ++# a decision on (translated): "The start of the winter time in Palestine, by ++# delaying the clock by sixty minutes, starting from midnight on Friday / ++# Saturday corresponding to 26/10/2019." ++# http://www.palestinecabinet.gov.ps/portal/meeting/details/43948 ++ ++# From Sharef Mustafa (2020-10-20): ++# As per the palestinian cabinet announcement yesterday , the day light saving ++# shall [end] on Oct 24th 2020 at 01:00AM by delaying the clock by 60 minutes. ++# http://www.palestinecabinet.gov.ps/portal/Meeting/Details/51584 ++ + # From Paul Eggert (2019-04-10): + # For now, guess spring-ahead transitions are March's last Friday at 00:00. + # +-# From Tim Parenti (2016-10-19): +-# Predict fall transitions on October's last Saturday at 01:00 from now on. ++# From Tim Parenti (2020-10-20): ++# Predict future fall transitions at 01:00 on the Saturday preceding October's ++# last Sunday (i.e., Sat>=24). This is consistent with our predictions since ++# 2016, although the time of the change differed slightly in 2019. + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule EgyptAsia 1957 only - May 10 0:00 1:00 S +@@ -3259,8 +3277,10 @@ Rule Palestine 2013 only - Sep Fri>=21 0:00 0 - + Rule Palestine 2014 2015 - Oct Fri>=21 0:00 0 - + Rule Palestine 2015 only - Mar lastFri 24:00 1:00 S + Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S +-Rule Palestine 2016 max - Oct lastSat 1:00 0 - ++Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 - + Rule Palestine 2019 max - Mar lastFri 0:00 1:00 S ++Rule Palestine 2019 only - Oct Sat>=24 0:00 0 - ++Rule Palestine 2020 max - Oct Sat>=24 1:00 0 - + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Asia/Gaza 2:17:52 - LMT 1900 Oct +-- +1.8.3.1 + diff --git a/backport-Port-make-rearguard_tarballs-to-macOS.patch b/backport-Port-make-rearguard_tarballs-to-macOS.patch new file mode 100644 index 0000000..86bafea --- /dev/null +++ b/backport-Port-make-rearguard_tarballs-to-macOS.patch @@ -0,0 +1,35 @@ +From ce89cbaa436f336dca4b239fa528405abd7d84b7 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 16 Oct 2020 19:52:24 -0700 +Subject: [PATCH] =?UTF-8?q?Port=20=E2=80=98make=20rearguard=5Ftarballs?= + =?UTF-8?q?=E2=80=99=20to=20macOS?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Problem reported by Deborah Goldsmith in: +https://mm.icann.org/pipermail/tz/2020-October/029355.html +* Makefile (tzdata$(VERSION)-rearguard.tar.gz): +Use ‘TZ=UTC0 touch -t 202010122253.00’ instead of ‘touch -md +2020-10-12T22:53:00Z’, as ‘touch -d’ was added to POSIX in 2008 +and macOS is still behind the times. +--- + Makefile | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/Makefile b/Makefile +index 95f0a06..40b81d1 100644 +--- a/Makefile ++++ b/Makefile +@@ -1023,7 +1023,7 @@ tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out + sed '1s/$$/-rearguard/' \ + tzdata$(VERSION)-rearguard.dir/version + : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier. +- touch -md 2020-10-12T22:53:00Z \ ++ TZ=UTC0 touch -mt 202010122253.00 \ + tzdata$(VERSION)-rearguard.dir/pacificnew + touch -cmr version tzdata$(VERSION)-rearguard.dir/version + LC_ALL=C && export LC_ALL && \ +-- +1.8.3.1 + diff --git a/backport-Release-2020c.patch b/backport-Release-2020c.patch new file mode 100644 index 0000000..867b93d --- /dev/null +++ b/backport-Release-2020c.patch @@ -0,0 +1,25 @@ +From ab21ad9710b88f28995b7ed47c6efda47ffb1be5 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 16 Oct 2020 11:15:53 -0700 +Subject: [PATCH] Release 2020c + +* NEWS: Increase version to 2020c. +--- + NEWS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/NEWS b/NEWS +index 87d68d9..25cf8cb 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,6 +1,6 @@ + News for the tz database + +-Unreleased, experimental changes ++Release 2020c - 2020-10-16 11:15:53 -0700 + + Briefly: + Fiji starts DST later than usual, on 2020-12-20. +-- +1.8.3.1 + diff --git a/backport-Update-Danish-URLs.patch b/backport-Update-Danish-URLs.patch new file mode 100644 index 0000000..84525aa --- /dev/null +++ b/backport-Update-Danish-URLs.patch @@ -0,0 +1,53 @@ +From 40e0dc322dda0d94807e422e337888f1da7a7f82 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 16 Oct 2020 19:11:31 -0700 +Subject: [PATCH] Update Danish URLs +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* europe: Update Danish URLs since the old ones no longer work. +No need to refer to the now-vanished page of poe (Peter Øhrstrøm) +since it was a secondary source anyway. +--- + europe | 11 +++++------ + 1 file changed, 5 insertions(+), 6 deletions(-) + +diff --git a/europe b/europe +index af6c628..ea23736 100644 +--- a/europe ++++ b/europe +@@ -1029,17 +1029,16 @@ Zone Europe/Prague 0:57:44 - LMT 1850 + # Denmark, Faroe Islands, and Greenland + + # From Jesper Nørgaard Welen (2005-04-26): +-# http://www.hum.aau.dk/~poe/tid/tine/DanskTid.htm says that the law +-# [introducing standard time] was in effect from 1894-01-01.... +-# The page http://www.retsinfo.dk/_GETDOCI_/ACCN/A18930008330-REGL ++# the law [introducing standard time] was in effect from 1894-01-01.... ++# The page https://www.retsinformation.dk/eli/lta/1893/83 + # confirms this, and states that the law was put forth 1893-03-29. + # + # The EU [actually, EEC and Euratom] treaty with effect from 1973: +-# http://www.retsinfo.dk/_GETDOCI_/ACCN/A19722110030-REGL ++# https://www.retsinformation.dk/eli/lta/1972/21100 + # + # This provoked a new law from 1974 to make possible summer time changes + # in subsequent decrees with the law +-# http://www.retsinfo.dk/_GETDOCI_/ACCN/A19740022330-REGL ++# https://www.retsinformation.dk/eli/lta/1974/223 + # + # It seems however that no decree was set forward until 1980. I have + # not found any decree, but in another related law, the effecting DST +@@ -1051,7 +1050,7 @@ Zone Europe/Prague 0:57:44 - LMT 1850 + # The law is about the management of the extra hour, concerning + # working hours reported and effect on obligatory-rest rules (which + # was suspended on that night): +-# http://www.retsinfo.dk/_GETDOCI_/ACCN/C19801120554-REGL ++# https://web.archive.org/web/20140104053304/https://www.retsinformation.dk/Forms/R0710.aspx?id=60267 + + # From Jesper Nørgaard Welen (2005-06-11): + # The Herning Folkeblad (1980-09-26) reported that the night between +-- +1.8.3.1 + diff --git a/tzdata.spec b/tzdata.spec index 7609295..8b95403 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2020a -Release: 3 +Release: 4 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -58,6 +58,13 @@ Patch6048: backport-europe-Hungary-URL-comments-thanks-to-Michael-Decker.patch Patch6049: backport-ziguard.awk-Add-limitations-commentary.patch Patch6050: backport-Put-dummy-pacificnew-into-rearguard-tarball.patch Patch6051: backport-europe-Hungary-Add-more-URLs-thanks-to-G-za-Ny-ry.patch +Patch6052: backport-Release-2020c.patch +Patch6053: backport-Update-Danish-URLs.patch +Patch6054: backport-Cite-Tom-Scott-on-Danish-time.patch +Patch6055: backport-Port-make-rearguard_tarballs-to-macOS.patch +Patch6056: backport-Improve-TZUpdater-and-Python-links.patch +Patch6057: backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch +Patch6058: backport-Palestine-ends-DST-on-2020-10-24.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch @@ -155,6 +162,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Oct 21 2020 liuchao - 2020a-4 +- Type:recommended +- CVE:NA +- SUG:NA +- DESC:backport community patches + * Wed Oct 14 2020 liuchao - 2020a-3 - Type:recommended - CVE:NA