!25 upgrade to tzdata-2020d

From: @SuperSix173
Reviewed-by: @wangbin224
Signed-off-by: @wangbin224

backport-Cite-Tom-Scott-on-Danish-time.patch

@@ -1,29 +0,0 @@
-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
-

backport-Fail-on-ZIC_BLOAT_DEFAULT-typo.patch

@@ -1,48 +0,0 @@
-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
-

backport-Improve-TZUpdater-and-Python-links.patch

@@ -1,98 +0,0 @@
-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 &ndash; 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 &ndash;
- 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
-

backport-Palestine-ends-DST-on-2020-10-24.patch

@@ -1,98 +0,0 @@
-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
-

backport-Port-make-rearguard_tarballs-to-macOS.patch

@@ -1,35 +0,0 @@
-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
-

backport-Update-Danish-URLs.patch

@@ -1,53 +0,0 @@
-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
-

tzdata.spec

@@ -1,5 +1,5 @@
 Name:		tzdata
-Version:	2020c
+Version:	2020d
 Release:	1
 Summary:	Timezone data
 License:	Public Domain
@@ -9,13 +9,6 @@ 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-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
 Patch9002:	remove-ROC-timezone.patch
@@ -110,6 +103,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/
 %{_datadir}/javazi-1.8
 
 %changelog
+* Thu Oct 22 2020 liuchao<liuchao173@huawei.com> - 2020d-1
+- Upgrade to 2020d
+
 * Wed Oct 21 2020 liuchao<liuchao173@huawei.com> - 2020c-1
 - Upgrade to 2020c and backport community patches