From c1c7aed6464460ab060ed09cd87ad8723cd5d296 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Sun, 26 Sep 2021 15:38:14 -0400 Subject: [PATCH] Resolves: #2007807 Rebase to tzdata-2021b - Jordan now starts DST on February's last Thursday. - Samoa no longer observes DST. - Merge more location-based Zones whose timestamps agree since 1970. - Move some backward-compatibility links to 'backward'. - Rename Pacific/Enderbury to Pacific/Kanton. - Correct many pre-1993 transitions in Malawi, Portugal, etc. - zic now creates each output file or link atomically. - zic -L no longer omits the POSIX TZ string in its output. - zic fixes for truncation and leap second table expiration. - zic now follows POSIX for TZ strings using all-year DST. - Fix some localtime crashes and bugs in obscure cases. - zdump -v now outputs more-useful boundary cases. - tzfile.5 better matches a draft successor to RFC 8536. --- .gitignore | 2 ++ 0001-Fix-Jan-Mayen-typo.patch | 29 +++++++++++++++++++++++++++++ sources | 4 ++-- tzdata.spec | 26 ++++++++++++++++++++++---- 4 files changed, 55 insertions(+), 6 deletions(-) create mode 100644 0001-Fix-Jan-Mayen-typo.patch diff --git a/.gitignore b/.gitignore index 6807054..09de820 100644 --- a/.gitignore +++ b/.gitignore @@ -184,3 +184,5 @@ noarch/ /tzdata2020f.tar.gz /tzcode2021a.tar.gz /tzdata2021a.tar.gz +/tzcode2021b.tar.gz +/tzdata2021b.tar.gz diff --git a/0001-Fix-Jan-Mayen-typo.patch b/0001-Fix-Jan-Mayen-typo.patch new file mode 100644 index 0000000..6e60061 --- /dev/null +++ b/0001-Fix-Jan-Mayen-typo.patch @@ -0,0 +1,29 @@ +From 2a7c7c5873ff0eb725e8eafad04f6af6ada66dc6 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sat, 25 Sep 2021 08:32:39 -0700 +Subject: [PROPOSED] Fix Jan Mayen typo + +Fix typo in 2021-09-24 revert of most of the 2021-05-19 +alike-since-1970 patch. Problem reported by Chris Walton in: +https://mm.icann.org/pipermail/tz/2021-September/030772.html +* backward (Atlantic/Jan_Mayen): Link from Europe/Oslo, +not Europe/Berlin. +--- + backward | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/backward b/backward +index 7c288e3..5412c46 100644 +--- a/backward ++++ b/backward +@@ -116,7 +116,7 @@ Link Asia/Makassar Asia/Ujung_Pandang + Link Asia/Ulaanbaatar Asia/Ulan_Bator + Link Asia/Bangkok Asia/Vientiane + Link Atlantic/Faroe Atlantic/Faeroe +-Link Europe/Berlin Atlantic/Jan_Mayen ++Link Europe/Oslo Atlantic/Jan_Mayen + Link Africa/Abidjan Atlantic/St_Helena + Link Australia/Sydney Australia/ACT + Link Australia/Sydney Australia/Canberra +-- +2.30.2 diff --git a/sources b/sources index c532355..06f46a1 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2021a.tar.gz) = bf1d53bcbfecd3b09d57a9e6d3cb49b5dc5f8e1b6674b67e7f974e1a268c2aaf13ca89a7ef12f49d0665aff782bd72685e00c22a41ca88a028da0429f972fd45 -SHA512 (tzdata2021a.tar.gz) = 7cdd762ec90ce12a30fa36b1d66d1ea82d9fa21e514e2b9c7fcbe2541514ee0fadf30843ff352c65512fb270857b51d1517b45e1232b89c6f954ba9ff1833bb3 +SHA512 (tzcode2021b.tar.gz) = 00fca7508cfbc42123065fe8087397c9dd2acbdda96f3bb0936187825348cf13538f1893f2d02bd8bfa3465427ca7a9a65451baffe39889bc58ba0a77a047806 +SHA512 (tzdata2021b.tar.gz) = ca61d64af5ae791f337533c09d2b4f7caa645ecab7b9d13e9bcafc47c7c68535abe7c103c56bbd41d6bd913a8607f9c5187c8ce8a91b4891a750a643f89c8b51 diff --git a/tzdata.spec b/tzdata.spec index 50011d6..cf3b1d4 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,14 +1,15 @@ Summary: Timezone data Name: tzdata -Version: 2021a -%define tzdata_version 2021a -%define tzcode_version 2021a -Release: 2%{?dist} +Version: 2021b +%define tzdata_version 2021b +%define tzcode_version 2021b +Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones Source0: ftp://ftp.iana.org/tz/releases/tzdata%{tzdata_version}.tar.gz Source1: ftp://ftp.iana.org/tz/releases/tzcode%{tzcode_version}.tar.gz +Patch001: 0001-Fix-Jan-Mayen-typo.patch Patch002: 0002-Fix-have-snprintf-error.patch %if 0%{?rhel} || 0%{?eln} Patch003: 0003-continue-to-ship-posixrules.patch @@ -41,6 +42,7 @@ This package contains timezone information for use by Java runtimes. %prep %setup -q -c -a 1 +%patch001 -p1 %patch002 -p1 %if 0%{?rhel} || 0%{?eln} %patch003 -p1 @@ -151,6 +153,22 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sat Sep 25 2021 Patsy Griffin - 2021b-1 +- Rebase to tzdata-2021b + - Jordan now starts DST on February's last Thursday. + - Samoa no longer observes DST. + - Merge more location-based Zones whose timestamps agree since 1970. + - Move some backward-compatibility links to 'backward'. + - Rename Pacific/Enderbury to Pacific/Kanton. + - Correct many pre-1993 transitions in Malawi, Portugal, etc. + - zic now creates each output file or link atomically. + - zic -L no longer omits the POSIX TZ string in its output. + - zic fixes for truncation and leap second table expiration. + - zic now follows POSIX for TZ strings using all-year DST. + - Fix some localtime crashes and bugs in obscure cases. + - zdump -v now outputs more-useful boundary cases. + - tzfile.5 better matches a draft successor to RFC 8536. + * Fri Jul 23 2021 Fedora Release Engineering - 2021a-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild