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: +