From 58964298c4c99c4c94f8c5b156a78c8dfb6f11c6 Mon Sep 17 00:00:00 2001 From: SuperSix173 Date: Wed, 21 Oct 2020 10:00:56 +0800 Subject: [PATCH] upgrade to 2020c and backport community patches --- backport-Cite-Tom-Scott-on-Danish-time.patch | 29 ++++++ backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch | 48 +++++++++ ...es-DST-from-2020-12-20-to-2021-01-17.patch | 74 ------------- ...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 +++++++ ...my-pacificnew-into-rearguard-tarball.patch | 62 ----------- backport-Update-Danish-URLs.patch | 53 ++++++++++ ...y-Add-more-URLs-thanks-to-G-za-Ny-ry.patch | 48 --------- ...RL-comments-thanks-to-Michael-Decker.patch | 45 -------- ...guard.awk-Add-limitations-commentary.patch | 39 ------- tzcode2020b.tar.gz | Bin 259438 -> 0 bytes tzcode2020c.tar.gz | Bin 0 -> 259690 bytes tzdata.spec | 18 ++-- tzdata2020b.tar.gz | Bin 400017 -> 0 bytes tzdata2020c.tar.gz | Bin 0 -> 400801 bytes 16 files changed, 372 insertions(+), 275 deletions(-) create mode 100644 backport-Cite-Tom-Scott-on-Danish-time.patch create mode 100644 backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch delete mode 100644 backport-Fiji-observes-DST-from-2020-12-20-to-2021-01-17.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 delete mode 100644 backport-Put-dummy-pacificnew-into-rearguard-tarball.patch create mode 100644 backport-Update-Danish-URLs.patch delete mode 100644 backport-europe-Hungary-Add-more-URLs-thanks-to-G-za-Ny-ry.patch delete mode 100644 backport-europe-Hungary-URL-comments-thanks-to-Michael-Decker.patch delete mode 100644 backport-ziguard.awk-Add-limitations-commentary.patch delete mode 100644 tzcode2020b.tar.gz create mode 100644 tzcode2020c.tar.gz delete mode 100644 tzdata2020b.tar.gz create mode 100644 tzdata2020c.tar.gz 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..f3c9b2e --- /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 2/6] 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..1eef2df --- /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 5/6] 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-Fiji-observes-DST-from-2020-12-20-to-2021-01-17.patch b/backport-Fiji-observes-DST-from-2020-12-20-to-2021-01-17.patch deleted file mode 100644 index 16672b0..0000000 --- a/backport-Fiji-observes-DST-from-2020-12-20-to-2021-01-17.patch +++ /dev/null @@ -1,74 +0,0 @@ -From d5c1b97cd1eb0af1711af415bbd677b0510c718b Mon Sep 17 00:00:00 2001 -From: Tim Parenti -Date: Thu, 8 Oct 2020 17:52:53 -0400 -Subject: [PATCH] Fiji observes DST from 2020-12-20 to 2021-01-17 - -* australasia (Fiji): Guess that the later-than-usual start date is a -one-time departure from the recent pattern. -* NEWS: Mention this. ---- - NEWS | 13 +++++++++++++ - australasia | 17 ++++++++++++++++- - 2 files changed, 29 insertions(+), 1 deletion(-) - -diff --git a/NEWS b/NEWS -index c77f76d..298ad4d 100644 ---- a/NEWS -+++ b/NEWS -@@ -1,5 +1,18 @@ - News for the tz database - -+Unreleased, experimental changes -+ -+ Briefly: -+ Fiji starts DST later than usual, on 2020-12-20. -+ -+ Changes to future timestamps -+ Fiji will start DST on 2020-12-20, instead of 2020-11-08 as -+ previously predicted. DST will still end on 2021-01-17. -+ (Thanks to Raymond Kumar and Alan Mintz.) Assume for now that -+ the later-than-usual start date is a one-time departure from the -+ recent pattern. -+ -+ - Release 2020b - 2020-10-06 18:35:04 -0700 - - Briefly: -diff --git a/australasia b/australasia -index a8886ff..aa7ab7f 100644 ---- a/australasia -+++ b/australasia -@@ -381,6 +381,19 @@ Zone Indian/Cocos 6:27:40 - LMT 1900 - # From Michael Deckers (2019-08-06): - # https://www.laws.gov.fj/LawsAsMade/downloadfile/848 - -+# From Raymond Kumar (2020-10-08): -+# [DST in Fiji] is from December 20th 2020, till 17th January 2021. -+# From Alan Mintz (2020-10-08): -+# https://www.laws.gov.fj/LawsAsMade/GetFile/1071 -+# From Tim Parenti (2020-10-08): -+# https://www.fijivillage.com/news/Daylight-saving-from-Dec-20th-this-year-to-Jan-17th-2021-8rf4x5/ -+# "Minister for Employment, Parveen Bala says they had never thought of -+# stopping daylight saving. He says it was just to decide on when it should -+# start and end. Bala says it is a short period..." -+# Since the end date is still in line with our ongoing predictions, assume for -+# now that the later-than-usual start date is a one-time departure from the -+# recent second Sunday in November pattern. -+ - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule Fiji 1998 1999 - Nov Sun>=1 2:00 1:00 - - Rule Fiji 1999 2000 - Feb lastSun 3:00 0 - -@@ -392,7 +405,9 @@ Rule Fiji 2012 2013 - Jan Sun>=18 3:00 0 - - Rule Fiji 2014 only - Jan Sun>=18 2:00 0 - - Rule Fiji 2014 2018 - Nov Sun>=1 2:00 1:00 - - Rule Fiji 2015 max - Jan Sun>=12 3:00 0 - --Rule Fiji 2019 max - Nov Sun>=8 2:00 1:00 - -+Rule Fiji 2019 only - Nov Sun>=8 2:00 1:00 - -+Rule Fiji 2020 only - Dec 20 2:00 1:00 - -+Rule Fiji 2021 max - Nov Sun>=8 2:00 1:00 - - # Zone NAME STDOFF RULES FORMAT [UNTIL] - Zone Pacific/Fiji 11:55:44 - LMT 1915 Oct 26 # Suva - 12:00 Fiji +12/+13 --- -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..b624264 --- /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 4/6] 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: +