From caafbf6809d605677e959b6b0dc460d0fef6dbb0 Mon Sep 17 00:00:00 2001 From: SuperSix173 Date: Wed, 14 Oct 2020 09:56:17 +0800 Subject: [PATCH] backport community patches --- ...my-pacificnew-into-rearguard-tarball.patch | 62 +++++++++++++++++++ ...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 ++++++++++++ tzdata.spec | 9 ++- 5 files changed, 202 insertions(+), 1 deletion(-) create mode 100644 backport-Put-dummy-pacificnew-into-rearguard-tarball.patch create mode 100644 backport-europe-Hungary-Add-more-URLs-thanks-to-G-za-Ny-ry.patch create mode 100644 backport-europe-Hungary-URL-comments-thanks-to-Michael-Decker.patch create mode 100644 backport-ziguard.awk-Add-limitations-commentary.patch diff --git a/backport-Put-dummy-pacificnew-into-rearguard-tarball.patch b/backport-Put-dummy-pacificnew-into-rearguard-tarball.patch new file mode 100644 index 0000000..6538054 --- /dev/null +++ b/backport-Put-dummy-pacificnew-into-rearguard-tarball.patch @@ -0,0 +1,62 @@ +From 0c8cac40a6ee69e106f3b034624890b98cad5b01 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +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/' \ + 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 + diff --git a/backport-europe-Hungary-Add-more-URLs-thanks-to-G-za-Ny-ry.patch b/backport-europe-Hungary-Add-more-URLs-thanks-to-G-za-Ny-ry.patch new file mode 100644 index 0000000..b5e62b9 --- /dev/null +++ b/backport-europe-Hungary-Add-more-URLs-thanks-to-G-za-Ny-ry.patch @@ -0,0 +1,48 @@ +From dc43ed5887d2b0a881790588097e2d3ca9a0c20a Mon Sep 17 00:00:00 2001 +From: Paul Eggert +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 + diff --git a/backport-europe-Hungary-URL-comments-thanks-to-Michael-Decker.patch b/backport-europe-Hungary-URL-comments-thanks-to-Michael-Decker.patch new file mode 100644 index 0000000..2267c66 --- /dev/null +++ b/backport-europe-Hungary-URL-comments-thanks-to-Michael-Decker.patch @@ -0,0 +1,45 @@ +From 6a244fd4161d04a9af661df4d51773fdc2c8ddd5 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +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 + diff --git a/backport-ziguard.awk-Add-limitations-commentary.patch b/backport-ziguard.awk-Add-limitations-commentary.patch new file mode 100644 index 0000000..f7ea021 --- /dev/null +++ b/backport-ziguard.awk-Add-limitations-commentary.patch @@ -0,0 +1,39 @@ +From 27264eae807d894ba0f889e90756281194855540 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +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 + diff --git a/tzdata.spec b/tzdata.spec index bbbff7a..e5cfe01 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2020b -Release: 1 +Release: 2 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -10,6 +10,10 @@ 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 Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch @@ -105,6 +109,9 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Oct 14 2020 liuchao - 2020b-2 +- backport community patches + * Sat Oct 10 2020 liuchao - 2020b-1 - Upgrade to 2020b