From 83b93c22c74dc02b870c1cfd28d6372ad75a93bb Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Sun, 26 Sep 2021 16:00:43 -0400 Subject: [PATCH 1/4] 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 | 24 +++++++++++++++++++++--- 4 files changed, 54 insertions(+), 5 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 895ef98..7e62971 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 +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. + * Mon Jan 25 2021 Patsy Griffin - 2021a-1 - Rebase to tzdata-2021a - South Sudan will change from +03 to +02 on 2021-02-01. From 560a75779d035f2d4cd901de11ff9a385d0d2834 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Thu, 7 Oct 2021 13:02:17 -0400 Subject: [PATCH 2/4] Resolves: #2009906 Rebase to tzdata-2021c - Revert most 2021b changes to the 'backward' file. - Fix 'zic -b fat' bug in pre-1970 32-bit data reported in tzdata-2021b. - Fix two Link line typos from tzdata-2021b. - Distribute the new SECURITY file. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 15 ++++++++++----- 3 files changed, 14 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 09de820..eb4923b 100644 --- a/.gitignore +++ b/.gitignore @@ -186,3 +186,5 @@ noarch/ /tzdata2021a.tar.gz /tzcode2021b.tar.gz /tzdata2021b.tar.gz +/tzcode2021c.tar.gz +/tzdata2021c.tar.gz diff --git a/sources b/sources index 06f46a1..cadbc5d 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2021b.tar.gz) = 00fca7508cfbc42123065fe8087397c9dd2acbdda96f3bb0936187825348cf13538f1893f2d02bd8bfa3465427ca7a9a65451baffe39889bc58ba0a77a047806 -SHA512 (tzdata2021b.tar.gz) = ca61d64af5ae791f337533c09d2b4f7caa645ecab7b9d13e9bcafc47c7c68535abe7c103c56bbd41d6bd913a8607f9c5187c8ce8a91b4891a750a643f89c8b51 +SHA512 (tzcode2021c.tar.gz) = 9ed7677744058c58656b47d77d464bad6ef503f2892b53c6abe694e68e73fa123dfc5c11bbcbbb7798f0a6bf1da72b81f8f1c63670839b967e15e58d6d36adad +SHA512 (tzdata2021c.tar.gz) = e8de3a17c38f530b2ec39605699742dd32da5ee92ecf64accaaa5b012a1dac51d1f594adc52660602c3425016520346ab6ad614fa475eb310e17ccdcae93e6ca diff --git a/tzdata.spec b/tzdata.spec index 7e62971..498da6e 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,15 +1,14 @@ Summary: Timezone data Name: tzdata -Version: 2021b -%define tzdata_version 2021b -%define tzcode_version 2021b +Version: 2021c +%define tzdata_version 2021c +%define tzcode_version 2021c 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 @@ -42,7 +41,6 @@ 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 @@ -153,6 +151,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Oct 07 2021 Patsy Griffin - 2021c-1 +- Rebase to tzdata-2021c + - Revert most 2021b changes to the 'backward' file. + - Fix 'zic -b fat' bug in pre-1970 32-bit data reported in tzdata-2021b. + - Fix two Link line typos from tzdata-2021b. + - Distribute the new SECURITY file. + * Sat Sep 25 2021 Patsy Griffin - 2021b-1 - Rebase to tzdata-2021b - Jordan now starts DST on February's last Thursday. From 8351f4b7887723585f1116abf62ec009869f5016 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Thu, 28 Oct 2021 18:12:12 -0400 Subject: [PATCH 3/4] Resolves: #2014708 Rebase to tzdata-2021e - supersedes tzdata-2021d - Pacific/Fiji suspended DST for the 2021/2022 season. - 'zic -r' now marks unspecified timestamps with "-00". - Palestine will fall back 2021-10-29 at 01:00, rather than the predicted 2021-10-30. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 13 ++++++++++--- 3 files changed, 14 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index eb4923b..d91b1e0 100644 --- a/.gitignore +++ b/.gitignore @@ -188,3 +188,5 @@ noarch/ /tzdata2021b.tar.gz /tzcode2021c.tar.gz /tzdata2021c.tar.gz +/tzcode2021e.tar.gz +/tzdata2021e.tar.gz diff --git a/sources b/sources index cadbc5d..8e572e8 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2021c.tar.gz) = 9ed7677744058c58656b47d77d464bad6ef503f2892b53c6abe694e68e73fa123dfc5c11bbcbbb7798f0a6bf1da72b81f8f1c63670839b967e15e58d6d36adad -SHA512 (tzdata2021c.tar.gz) = e8de3a17c38f530b2ec39605699742dd32da5ee92ecf64accaaa5b012a1dac51d1f594adc52660602c3425016520346ab6ad614fa475eb310e17ccdcae93e6ca +SHA512 (tzcode2021e.tar.gz) = 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a +SHA512 (tzdata2021e.tar.gz) = c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 diff --git a/tzdata.spec b/tzdata.spec index 498da6e..bed4e0f 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2021c -%define tzdata_version 2021c -%define tzcode_version 2021c +Version: 2021e +%define tzdata_version 2021e +%define tzcode_version 2021e Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -151,6 +151,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Tue Oct 26 2021 Patsy Griffin - 2021e-1 +- Rebase to tzdata-2021e - supersedes tzdata-2021d + - Pacific/Fiji suspended DST for the 2021/2022 season. + - 'zic -r' now marks unspecified timestamps with "-00". + - Palestine will fall back 2021-10-29 at 01:00, rather + than the predicted 2021-10-30. + * Thu Oct 07 2021 Patsy Griffin - 2021c-1 - Rebase to tzdata-2021c - Revert most 2021b changes to the 'backward' file. From 37232906c13e32cd8568152c9842fc05721ade28 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 23 Mar 2022 20:02:21 -0400 Subject: [PATCH 4/4] Resolves: #2064770 Rebase to tzdata-2022a - Palestine springs forward on 2022-03-27, not 2022-03-26. - zdump -v now outputs better failure information. - bug fixes for code that reads corrupted TZif data. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d91b1e0..1aa5527 100644 --- a/.gitignore +++ b/.gitignore @@ -190,3 +190,5 @@ noarch/ /tzdata2021c.tar.gz /tzcode2021e.tar.gz /tzdata2021e.tar.gz +/tzcode2022a.tar.gz +/tzdata2022a.tar.gz diff --git a/sources b/sources index 8e572e8..de0de07 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2021e.tar.gz) = 87b0335129ea41c5f42f687f548712e5da892baa8494cecf5d34851beceecf6ae52f22104696ed187713cf9e502570eb2041e277dfd3c043c11d0253bfde685a -SHA512 (tzdata2021e.tar.gz) = c1e8d04e049157ed5d4af0868855bbd75517e3d7e1db9c41d5283ff260109de46b6fac6be94828201d093e163d868044ac2a9db2bf0aeab800e264d0c73a9119 +SHA512 (tzcode2022a.tar.gz) = 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed +SHA512 (tzdata2022a.tar.gz) = 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9 diff --git a/tzdata.spec b/tzdata.spec index bed4e0f..8fe2f6f 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2021e -%define tzdata_version 2021e -%define tzcode_version 2021e +Version: 2022a +%define tzdata_version 2022a +%define tzcode_version 2022a Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -151,6 +151,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Mar 23 2022 Patsy Griffin - 2022a-1 +- Rebase to tzdata-2022a + - Palestine springs forward on 2022-03-27, not 2022-03-26. + - zdump -v now outputs better failure information. + - bug fixes for code that reads corrupted TZif data. + * Tue Oct 26 2021 Patsy Griffin - 2021e-1 - Rebase to tzdata-2021e - supersedes tzdata-2021d - Pacific/Fiji suspended DST for the 2021/2022 season.