upgrade to 2020c and backport community patches
This commit is contained in:
SuperSix173
parent
caafbf6809
commit
58964298c4
29
backport-Cite-Tom-Scott-on-Danish-time.patch
Normal file
29
backport-Cite-Tom-Scott-on-Danish-time.patch
Normal file
@ -0,0 +1,29 @@
|
||||
From 43dda7dbe5ec831e2f0f14626e707200dd421239 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
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.</li>
|
||||
Explaining The Mysteries Of Time Zones</a>" (2017; 2:15)
|
||||
briefly says why France has more time zones than Russia.
|
||||
<li>
|
||||
+"<a href="https://www.youtube.com/watch?v=yRz-Dl60Lfc">Why Denmark is
|
||||
+.17 Seconds Behind The World</a>" (2019; 6:29) explains why Denmark and
|
||||
+the United Kingdom don't exactly follow their own law about civil time.
|
||||
+<li>
|
||||
"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
|
||||
|
||||
48
backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch
Normal file
48
backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch
Normal file
@ -0,0 +1,48 @@
|
||||
From 103e7868cf8fa91146c1b46012650a16ce29f9b0 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
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
|
||||
|
||||
@ -1,74 +0,0 @@
|
||||
From d5c1b97cd1eb0af1711af415bbd677b0510c718b Mon Sep 17 00:00:00 2001
|
||||
From: Tim Parenti <tim@timtimeonline.com>
|
||||
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
|
||||
|
||||
98
backport-Improve-TZUpdater-and-Python-links.patch
Normal file
98
backport-Improve-TZUpdater-and-Python-links.patch
Normal file
@ -0,0 +1,98 @@
|
||||
From 980306471fee903863c399741a38aa898c335979 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
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.
|
||||
<a
|
||||
href="http://userguide.icu-project.org/datetime/timezone"><abbr
|
||||
title="International Components for Unicode">ICU</abbr></a>,
|
||||
-<a href="https://developer.ibm.com/javasdk/support/dst/jtzu/"><abbr>IBM</abbr></a>
|
||||
-and <a
|
||||
-href="https://www.oracle.com/technetwork/java/javase/tzupdater-readme-136440.html">Oracle</a>
|
||||
-Java, <a href="https://www.joda.org/joda-time/tz_update.html">Joda-Time</a>, <a
|
||||
+<a href="https://developer.ibm.com/javasdk/support/dst/jtzu/"><abbr>IBM</abbr>
|
||||
+JDK</a>,
|
||||
+<a href="https://www.joda.org/joda-time/tz_update.html">Joda-Time</a>, <a
|
||||
href="https://dev.mysql.com/doc/refman/en/time-zone-support.html">MySQL</a>,
|
||||
-and <a
|
||||
-href="https://nodatime.org/userguide/tzdb">Noda Time</a> (see below).
|
||||
+<a href="https://nodatime.org/userguide/tzdb">Noda Time</a>, and <a
|
||||
+href="https://www.oracle.com/java/technologies/javase/tzupdater-readme.html#usage">OpenJDK/Oracle JDK</a>.
|
||||
</p>
|
||||
<p>Sources for the <code><abbr>tz</abbr></code> database are
|
||||
<a href="https://en.wikipedia.org/wiki/UTF-8"><abbr
|
||||
@@ -436,9 +435,13 @@ freely available under the <abbr>MIT</abbr> license.</li>
|
||||
<li>Java-based compilers and libraries include:
|
||||
<ul>
|
||||
<li>The <a
|
||||
-href="https://www.oracle.com/technetwork/java/javase/tzupdater-readme-136440.html">TZUpdater
|
||||
+href="https://www.oracle.com/java/technologies/javase/tzupdater-readme.html">TZUpdater
|
||||
tool</a> compiles <code><abbr>tz</abbr></code> source into the format used by
|
||||
-Oracle Java.</li>
|
||||
+<a href="https://openjdk.java.net/">OpenJDK</a> and
|
||||
+<a href="https://jdk.java.net/">Oracle JDK</a>.
|
||||
+Although its source code is proprietary, its executable is available under the
|
||||
+<a href="https://www.oracle.com/a/tech/docs/tzupdater-lic.html">Java SE
|
||||
+Timezone Updater License Agreement</a>.</li>
|
||||
<li>The <a
|
||||
href="https://www.oracle.com/technetwork/articles/java/jf14-date-time-2125367.html">Java
|
||||
SE 8 Date and Time</a> <abbr>API</abbr> can be supplemented by <a
|
||||
@@ -451,11 +454,10 @@ and time <abbr>API</abbr></a> contains a class
|
||||
Java 8 <code>java.time</code>, which its users should migrate to once
|
||||
they can assume Java 8 or later. It is available under the <a
|
||||
href="https://www.apache.org/licenses/LICENSE-2.0">Apache License</a>.</li>
|
||||
-<li><a href="https://bell-sw.com/pages/iana-updater/">IANA Updater</a>,
|
||||
-<a href="https://github.com/akashche/tzdbgen">tzdbgen</a>, and <a
|
||||
+<li><a href="https://bell-sw.com/pages/iana-updater/">IANA Updater</a> and <a
|
||||
href="https://www.azul.com/products/open-source-tools/ziupdater-time-zone-tool/">ZIUpdater</a>
|
||||
-are other alternatives to TZUpdater. IANA Updater's license is unclear;
|
||||
-the others are licensed under the <abbr>GPL</abbr>.</li>
|
||||
+are alternatives to TZUpdater. IANA Updater's license is unclear;
|
||||
+ZIUpdater is licensed under the <abbr>GPL</abbr>.</li>
|
||||
<li><a href="https://github.com/MenoData/Time4A">Time4A: Advanced date and
|
||||
time library for Android</a> and
|
||||
<a href="https://github.com/MenoData/Time4J/">Time4J: Advanced date,
|
||||
@@ -515,7 +517,10 @@ It is freely available under a <abbr>BSD</abbr>-style license.</li>
|
||||
<li><a href="http://pytz.sourceforge.net">pytz – World Timezone
|
||||
Definitions for Python</a> compiles <code><abbr>tz</abbr></code> source into
|
||||
<a href="https://www.python.org">Python</a>.
|
||||
-It is freely available under a <abbr>BSD</abbr>-style license.</li>
|
||||
+It is freely available under a <abbr>BSD</abbr>-style license.
|
||||
+In code that can assume Python 3.9 or later it is superseded by
|
||||
+<a href="#python-zoneinfo"><code>zoneinfo.ZoneInfo</code></a>
|
||||
+and the <a href="#pypi-tzdata"><code>tzdata</code> Python package</a>.</li>
|
||||
<li><a href="https://tzinfo.github.io">TZInfo –
|
||||
Ruby Timezone Library</a>
|
||||
compiles <code><abbr>tz</abbr></code> source into
|
||||
@@ -579,14 +584,14 @@ DateTime::TimeZone::Tzfile</a>
|
||||
is a <abbr>TZif</abbr> file reader written in Perl.
|
||||
It is freely available under the same terms as Perl
|
||||
(dual <abbr>GPL</abbr> and Artistic license).</li>
|
||||
-<li>Python has a <a
|
||||
+<li>Python has a <a id="python-zoneinfo"
|
||||
href="https://docs.python.org/3.9/library/zoneinfo.html"><code>zoneinfo.ZoneInfo</code>
|
||||
class</a> that reads <abbr>TZif</abbr> data and creates objects
|
||||
that represent <code><abbr>tzdb</abbr></code> timezones.
|
||||
Python is freely available under the
|
||||
<a href="https://docs.python.org/3.9/license.html">Python Software Foundation
|
||||
License</a>.
|
||||
-A companion <a href="https://pypi.org/">PyPI</a> module
|
||||
+A companion <a id="pypi-tzdata"> href="https://pypi.org/">PyPI</a> module
|
||||
<a href="https://pypi.org/project/tzdata/"><code>tzdata</code></a>
|
||||
supplies TZif data if the underlying system data cannot be found;
|
||||
it is freely available under the Apache License.</li>
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
98
backport-Palestine-ends-DST-on-2020-10-24.patch
Normal file
98
backport-Palestine-ends-DST-on-2020-10-24.patch
Normal file
@ -0,0 +1,98 @@
|
||||
From efd0231aa7a68ec431ce99251d2496a0eed624ec Mon Sep 17 00:00:00 2001
|
||||
From: Tim Parenti <tim@timtimeonline.com>
|
||||
Date: Tue, 20 Oct 2020 10:53:09 -0400
|
||||
Subject: [PATCH 6/6] 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
|
||||
|
||||
35
backport-Port-make-rearguard_tarballs-to-macOS.patch
Normal file
35
backport-Port-make-rearguard_tarballs-to-macOS.patch
Normal file
@ -0,0 +1,35 @@
|
||||
From ce89cbaa436f336dca4b239fa528405abd7d84b7 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Fri, 16 Oct 2020 19:52:24 -0700
|
||||
Subject: [PATCH 3/6] =?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/' \
|
||||
<version >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
|
||||
|
||||
@ -1,62 +0,0 @@
|
||||
From 0c8cac40a6ee69e106f3b034624890b98cad5b01 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Mon, 12 Oct 2020 16:15:27 -0700
|
||||
Subject: [PATCH] Put dummy pacificnew into rearguard tarball
|
||||
|
||||
Problem reported by Mike Cullinan in:
|
||||
https://mm.icann.org/pipermail/tz/2020-October/029309.html
|
||||
* Makefile (tzdata$(VERSION)-rearguard.tar.gz):
|
||||
Put an empty pacificnew file into the rearguard tarball.
|
||||
* NEWS: Mention this.
|
||||
---
|
||||
Makefile | 6 +++++-
|
||||
NEWS | 7 +++++++
|
||||
2 files changed, 12 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/Makefile b/Makefile
|
||||
index 28972c6..95f0a06 100644
|
||||
--- a/Makefile
|
||||
+++ b/Makefile
|
||||
@@ -1022,10 +1022,14 @@ tzdata$(VERSION)-rearguard.tar.gz: rearguard.zi set-timestamps.out
|
||||
done
|
||||
sed '1s/$$/-rearguard/' \
|
||||
<version >tzdata$(VERSION)-rearguard.dir/version
|
||||
+ : The dummy pacificnew pacifies TZUpdater 2.3.1 and earlier.
|
||||
+ touch -md 2020-10-12T22:53:00Z \
|
||||
+ tzdata$(VERSION)-rearguard.dir/pacificnew
|
||||
touch -cmr version tzdata$(VERSION)-rearguard.dir/version
|
||||
LC_ALL=C && export LC_ALL && \
|
||||
(cd tzdata$(VERSION)-rearguard.dir && \
|
||||
- tar $(TARFLAGS) -cf - $(COMMON) $(DATA) $(MISC) | \
|
||||
+ tar $(TARFLAGS) -cf - \
|
||||
+ $(COMMON) $(DATA) $(MISC) pacificnew | \
|
||||
gzip $(GZIPFLAGS)) >$@.out
|
||||
mv $@.out $@
|
||||
|
||||
diff --git a/NEWS b/NEWS
|
||||
index 298ad4d..87d68d9 100644
|
||||
--- a/NEWS
|
||||
+++ b/NEWS
|
||||
@@ -6,12 +6,19 @@ Unreleased, experimental changes
|
||||
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.
|
||||
|
||||
+ Changes to build procedure
|
||||
+
|
||||
+ Rearguard tarballs now contain an empty file pacificnew.
|
||||
+ Some older downstream software expects this file to exist.
|
||||
+ (Problem reported by Mike Cullinan.)
|
||||
+
|
||||
|
||||
Release 2020b - 2020-10-06 18:35:04 -0700
|
||||
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
53
backport-Update-Danish-URLs.patch
Normal file
53
backport-Update-Danish-URLs.patch
Normal file
@ -0,0 +1,53 @@
|
||||
From 40e0dc322dda0d94807e422e337888f1da7a7f82 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Fri, 16 Oct 2020 19:11:31 -0700
|
||||
Subject: [PATCH 1/6] 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
|
||||
|
||||
@ -1,48 +0,0 @@
|
||||
From dc43ed5887d2b0a881790588097e2d3ca9a0c20a Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Mon, 12 Oct 2020 16:50:54 -0700
|
||||
Subject: [PATCH] =?UTF-8?q?*=20europe=20(Hungary):=20Add=20more=20URLs?=
|
||||
=?UTF-8?q?=20(thanks=20to=20G=C3=A9za=20Ny=C3=A1ry).?=
|
||||
MIME-Version: 1.0
|
||||
Content-Type: text/plain; charset=UTF-8
|
||||
Content-Transfer-Encoding: 8bit
|
||||
|
||||
---
|
||||
europe | 7 ++++---
|
||||
1 file changed, 4 insertions(+), 3 deletions(-)
|
||||
|
||||
diff --git a/europe b/europe
|
||||
index 9b3590f..af6c628 100644
|
||||
--- a/europe
|
||||
+++ b/europe
|
||||
@@ -1589,7 +1589,8 @@ Rule Hungary 1946 only - Oct 7 2:00 0 -
|
||||
# https://library.hungaricana.hu/hu/view/Zala_1948_09/?pg=64
|
||||
# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniNepujsag_1948/?pg=53
|
||||
# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniNepujsag_1948/?pg=160
|
||||
-# [URL missing for 1949 DST start]
|
||||
+# https://library.hungaricana.hu/hu/view/UjSzo_1949_01-04/?pg=102
|
||||
+# https://library.hungaricana.hu/hu/view/KeletMagyarorszag_1949_03/?pg=96
|
||||
# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1949_09/?pg=94
|
||||
Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
|
||||
Rule Hungary 1947 1949 - Oct Sun>=1 2:00s 0 -
|
||||
@@ -1605,7 +1606,7 @@ Rule Hungary 1955 only - Oct 2 3:00 0 -
|
||||
# https://library.hungaricana.hu/hu/view/PestMegyeiHirlap_1957_09/?pg=143
|
||||
Rule Hungary 1956 1957 - Jun Sun>=1 2:00 1:00 S
|
||||
Rule Hungary 1956 1957 - Sep lastSun 3:00 0 -
|
||||
-# [URLs missing for 1980 DST]
|
||||
+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg=189
|
||||
Rule Hungary 1980 only - Apr 6 0:00 1:00 S
|
||||
Rule Hungary 1980 only - Sep 28 1:00 0 -
|
||||
# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg=1227
|
||||
@@ -1619,7 +1620,7 @@ Rule Hungary 1981 1983 - Sep lastSun 1:00 0 -
|
||||
Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
|
||||
1:00 C-Eur CE%sT 1918
|
||||
# https://library.hungaricana.hu/hu/view/OGYK_RT_1941/?pg=1204
|
||||
-# [URL missing for 1942 DST end]
|
||||
+# https://library.hungaricana.hu/hu/view/OGYK_RT_1942/?pg=3955
|
||||
1:00 Hungary CE%sT 1941 Apr 7 23:00
|
||||
1:00 C-Eur CE%sT 1945
|
||||
1:00 Hungary CE%sT 1984
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,45 +0,0 @@
|
||||
From 6a244fd4161d04a9af661df4d51773fdc2c8ddd5 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Sun, 11 Oct 2020 10:05:08 -0700
|
||||
Subject: [PATCH] * europe: Hungary URL comments (thanks to Michael
|
||||
Deckers).
|
||||
|
||||
---
|
||||
europe | 5 ++++-
|
||||
1 file changed, 4 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/europe b/europe
|
||||
index 32e374a..9b3590f 100644
|
||||
--- a/europe
|
||||
+++ b/europe
|
||||
@@ -1589,6 +1589,7 @@ Rule Hungary 1946 only - Oct 7 2:00 0 -
|
||||
# https://library.hungaricana.hu/hu/view/Zala_1948_09/?pg=64
|
||||
# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniNepujsag_1948/?pg=53
|
||||
# https://library.hungaricana.hu/hu/view/SatoraljaujhelyiLeveltar_ZempleniNepujsag_1948/?pg=160
|
||||
+# [URL missing for 1949 DST start]
|
||||
# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1949_09/?pg=94
|
||||
Rule Hungary 1947 1949 - Apr Sun>=4 2:00s 1:00 S
|
||||
Rule Hungary 1947 1949 - Oct Sun>=1 2:00s 0 -
|
||||
@@ -1604,9 +1605,10 @@ Rule Hungary 1955 only - Oct 2 3:00 0 -
|
||||
# https://library.hungaricana.hu/hu/view/PestMegyeiHirlap_1957_09/?pg=143
|
||||
Rule Hungary 1956 1957 - Jun Sun>=1 2:00 1:00 S
|
||||
Rule Hungary 1956 1957 - Sep lastSun 3:00 0 -
|
||||
-# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg=1227
|
||||
+# [URLs missing for 1980 DST]
|
||||
Rule Hungary 1980 only - Apr 6 0:00 1:00 S
|
||||
Rule Hungary 1980 only - Sep 28 1:00 0 -
|
||||
+# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1980/?pg=1227
|
||||
# https://library.hungaricana.hu/hu/view/Delmagyarorszag_1981_01/?pg=79
|
||||
# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1982/?pg=115
|
||||
# https://library.hungaricana.hu/hu/view/DTT_KOZL_TanacsokKozlonye_1983/?pg=85
|
||||
@@ -1617,6 +1619,7 @@ Rule Hungary 1981 1983 - Sep lastSun 1:00 0 -
|
||||
Zone Europe/Budapest 1:16:20 - LMT 1890 Nov 1
|
||||
1:00 C-Eur CE%sT 1918
|
||||
# https://library.hungaricana.hu/hu/view/OGYK_RT_1941/?pg=1204
|
||||
+# [URL missing for 1942 DST end]
|
||||
1:00 Hungary CE%sT 1941 Apr 7 23:00
|
||||
1:00 C-Eur CE%sT 1945
|
||||
1:00 Hungary CE%sT 1984
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
@ -1,39 +0,0 @@
|
||||
From 27264eae807d894ba0f889e90756281194855540 Mon Sep 17 00:00:00 2001
|
||||
From: Paul Eggert <eggert@cs.ucla.edu>
|
||||
Date: Sun, 11 Oct 2020 11:02:35 -0700
|
||||
Subject: [PATCH] * ziguard.awk: Add limitations commentary.
|
||||
|
||||
---
|
||||
ziguard.awk | 9 ++++++++-
|
||||
1 file changed, 8 insertions(+), 1 deletion(-)
|
||||
|
||||
diff --git a/ziguard.awk b/ziguard.awk
|
||||
index e8ef49e..e27e799 100644
|
||||
--- a/ziguard.awk
|
||||
+++ b/ziguard.awk
|
||||
@@ -3,6 +3,13 @@
|
||||
# Contributed by Paul Eggert. This file is in the public domain.
|
||||
|
||||
# This is not a general-purpose converter; it is designed for current tzdata.
|
||||
+# It just converts from current source to main, vanguard, and rearguard forms.
|
||||
+# Although it might be nice for it to be idempotent, or to be useful
|
||||
+# for converting back and forth between vanguard and rearguard formats,
|
||||
+# it does not do these nonessential tasks now.
|
||||
+#
|
||||
+# Although main and vanguard forms are currently equivalent,
|
||||
+# this need not always be the case.
|
||||
#
|
||||
# When converting to vanguard form, the output can use negative SAVE
|
||||
# values.
|
||||
@@ -28,7 +35,7 @@ DATAFORM != "main" {
|
||||
in_comment = /^#/
|
||||
uncomment = comment_out = 0
|
||||
|
||||
- # If the line should differ due to Czechoslovakia using negative SAVE values,
|
||||
+ # If this line should differ due to Czechoslovakia using negative SAVE values,
|
||||
# uncomment the desired version and comment out the undesired one.
|
||||
if (zone == "Europe/Prague" && /1947 Feb 23/) {
|
||||
if (($(in_comment + 2) != "-") == vanguard) {
|
||||
--
|
||||
1.8.3.1
|
||||
|
||||
Binary file not shown.
BIN
tzcode2020c.tar.gz
Normal file
BIN
tzcode2020c.tar.gz
Normal file
Binary file not shown.
18
tzdata.spec
18
tzdata.spec
@ -1,6 +1,6 @@
|
||||
Name: tzdata
|
||||
Version: 2020b
|
||||
Release: 2
|
||||
Version: 2020c
|
||||
Release: 1
|
||||
Summary: Timezone data
|
||||
License: Public Domain
|
||||
URL: https://www.iana.org/time-zones
|
||||
@ -9,11 +9,12 @@ Source1: https://data.iana.org/time-zones/releases/tzcode%{version}.tar.gz
|
||||
Source2: javazic.tar.gz
|
||||
Source3: javazic-1.8-37392f2f5d59.tar.xz
|
||||
|
||||
Patch6000: backport-Fiji-observes-DST-from-2020-12-20-to-2021-01-17.patch
|
||||
Patch6001: backport-europe-Hungary-URL-comments-thanks-to-Michael-Decker.patch
|
||||
Patch6002: backport-ziguard.awk-Add-limitations-commentary.patch
|
||||
Patch6003: backport-Put-dummy-pacificnew-into-rearguard-tarball.patch
|
||||
Patch6004: backport-europe-Hungary-Add-more-URLs-thanks-to-G-za-Ny-ry.patch
|
||||
Patch6000: backport-Update-Danish-URLs.patch
|
||||
Patch6001: backport-Cite-Tom-Scott-on-Danish-time.patch
|
||||
Patch6002: backport-Port-make-rearguard_tarballs-to-macOS.patch
|
||||
Patch6003: backport-Improve-TZUpdater-and-Python-links.patch
|
||||
Patch6004: backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch
|
||||
Patch6005: backport-Palestine-ends-DST-on-2020-10-24.patch
|
||||
|
||||
Patch9000: bugfix-0001-add-Beijing-timezone.patch
|
||||
Patch9001: remove-country-selection-from-tzselect-steps.patch
|
||||
@ -109,6 +110,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
|
||||
%{_datadir}/javazi-1.8
|
||||
|
||||
%changelog
|
||||
* Wed Oct 21 2020 liuchao<liuchao173@huawei.com> - 2020c-1
|
||||
- Upgrade to 2020c and backport community patches
|
||||
|
||||
* Wed Oct 14 2020 liuchao<liuchao173@huawei.com> - 2020b-2
|
||||
- backport community patches
|
||||
|
||||
|
||||
Binary file not shown.
BIN
tzdata2020c.tar.gz
Normal file
BIN
tzdata2020c.tar.gz
Normal file
Binary file not shown.
Loading…
x
Reference in New Issue
Block a user