From eaa3da3b46597df0aec5d83e3cc452b47345ef2c Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Sun, 14 Aug 2022 22:47:16 -0400 Subject: [PATCH 1/9] Resolves: #2117429 Rebase to tzdata-2022b - Chile transitions to DST on 2022-09-11, not 2022-09-04 - 'make install' now defaults LOCALTIME to Factory rather than GMT - More zones that are the same since 1970 have been moved to backzone. - Include patch for awk workaround. --- .gitignore | 2 + 0001-Work-around-awk-bug-1.patch | 153 +++++++++++++++++++++++++++++++ sources | 4 +- tzdata.spec | 17 +++- 4 files changed, 170 insertions(+), 6 deletions(-) create mode 100644 0001-Work-around-awk-bug-1.patch diff --git a/.gitignore b/.gitignore index 3425c90..6a3c12c 100644 --- a/.gitignore +++ b/.gitignore @@ -192,3 +192,5 @@ noarch/ /tzcode2021e.tar.gz /tzdata2022a.tar.gz /tzcode2022a.tar.gz +/tzcode2022b.tar.gz +/tzdata2022b.tar.gz diff --git a/0001-Work-around-awk-bug-1.patch b/0001-Work-around-awk-bug-1.patch new file mode 100644 index 0000000..304accc --- /dev/null +++ b/0001-Work-around-awk-bug-1.patch @@ -0,0 +1,153 @@ +From e8171130f9b80ae3c75dfa5e96c47d5dbc0f4aae Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 10 Aug 2022 18:58:08 -0700 +Subject: [PROPOSED] Work around macOS awk bug + +* ziguard.awk: Replace every regular expression /ERE/ in ordinary +contexts with ($0 ~ /ERE/), to work around a bug in macOS 13.0 awk. +Problem reported by Deborah Goldsmith in: +https://mm.icann.org/pipermail/tz/2022-August/031783.html +--- + NEWS | 8 ++++++++ + ziguard.awk | 37 ++++++++++++++++++++----------------- + 2 files changed, 28 insertions(+), 17 deletions(-) + +diff --git a/NEWS b/NEWS +index 6a0d5c50..7291030a 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,13 @@ + News for the tz database + ++Unreleased, experimental changes ++ ++ Changes to code ++ ++ Work around a bug in macOS 'awk' that broke commands like 'make ++ traditional_tarballs'. (Problem reported by Deborah Goldsmith.) ++ ++ + Release 2022b - 2022-08-10 15:38:32 -0700 + + Briefly: +diff --git a/ziguard.awk b/ziguard.awk +index 0728baa5..0556cc4a 100644 +--- a/ziguard.awk ++++ b/ziguard.awk +@@ -91,12 +91,13 @@ $1 == "#PACKRATLIST" && $2 == PACKRATLIST { + /^Zone/ { zone = $2 } + + DATAFORM != "main" { +- in_comment = /^#/ ++ in_comment = $0 ~ /^#/ + uncomment = comment_out = 0 + + # 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" && /^#?[\t ]+[01]:00[\t ]/ && /1947 Feb 23/) { ++ if (zone == "Europe/Prague" && $0 ~ /^#?[\t ]+[01]:00[\t ]/ \ ++ && $0 ~ /1947 Feb 23/) { + if (($(in_comment + 2) != "-") == (DATAFORM != "rearguard")) { + uncomment = in_comment + } else { +@@ -106,9 +107,9 @@ DATAFORM != "main" { + + # If this line should differ due to Ireland using negative SAVE values, + # uncomment the desired version and comment out the undesired one. +- Rule_Eire = /^#?Rule[\t ]+Eire[\t ]/ ++ Rule_Eire = $0 ~ /^#?Rule[\t ]+Eire[\t ]/ + Zone_Dublin_post_1968 \ +- = (zone == "Europe/Dublin" && /^#?[\t ]+[01]:00[\t ]/ \ ++ = (zone == "Europe/Dublin" && $0 ~ /^#?[\t ]+[01]:00[\t ]/ \ + && (!$(in_comment + 4) || 1968 < $(in_comment + 4))) + if (Rule_Eire || Zone_Dublin_post_1968) { + if ((Rule_Eire \ +@@ -122,9 +123,9 @@ DATAFORM != "main" { + + # If this line should differ due to Namibia using negative SAVE values, + # uncomment the desired version and comment out the undesired one. +- Rule_Namibia = /^#?Rule[\t ]+Namibia[\t ]/ ++ Rule_Namibia = $0 ~ /^#?Rule[\t ]+Namibia[\t ]/ + Zone_using_Namibia_rule \ +- = (zone == "Africa/Windhoek" && /^#?[\t ]+[12]:00[\t ]/ \ ++ = (zone == "Africa/Windhoek" && $0 ~ /^#?[\t ]+[12]:00[\t ]/ \ + && ($(in_comment + 2) == "Namibia" \ + || ($(in_comment + 2) == "-" && $(in_comment + 3) == "CAT" \ + && ((1994 <= $(in_comment + 4) && $(in_comment + 4) <= 2017) \ +@@ -142,8 +143,8 @@ DATAFORM != "main" { + + # If this line should differ due to Portugal benefiting from %z if supported, + # uncomment the desired version and comment out the undesired one. +- if (/^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) { +- if (/%z/ == (DATAFORM == "vanguard")) { ++ if ($0 ~ /^#?[\t ]+-[12]:00[\t ]+Port[\t ]+[%+-]/) { ++ if (($0 ~ /%z/) == (DATAFORM == "vanguard")) { + uncomment = in_comment + } else { + comment_out = !in_comment +@@ -164,8 +165,8 @@ DATAFORM != "main" { + sub(/-00CHANGE-TO-%z/, "-00") + sub(/[-+][^\t ]+CHANGE-TO-/, "") + } else { +- if (/^[^#]*%z/) { +- stdoff_column = 2 * /^Zone/ + 1 ++ if ($0 ~ /^[^#]*%z/) { ++ stdoff_column = 2 * ($0 ~ /^Zone/) + 1 + rules_column = stdoff_column + 1 + stdoff = get_minutes($stdoff_column) + rules = $rules_column +@@ -184,9 +185,9 @@ DATAFORM != "main" { + dstoff = 20 + } else if (((rules == "Cook" || rules == "LH") && NF == 3) \ + || (rules == "Uruguay" \ +- && /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) { ++ && $0 ~ /[\t ](1942 Dec 14|1960|1970|1974 Dec 22)$/)) { + dstoff = 30 +- } else if (rules == "Uruguay" && /[\t ]1974 Mar 10$/) { ++ } else if (rules == "Uruguay" && $0 ~ /[\t ]1974 Mar 10$/) { + dstoff = 90 + } else { + dstoff = 60 +@@ -222,7 +223,7 @@ DATAFORM != "main" { + stdoff_subst[1] = rounded_stdoff + } + } else if (stdoff_subst[0]) { +- stdoff_column = 2 * /^Zone/ + 1 ++ stdoff_column = 2 * ($0 ~ /^Zone/) + 1 + stdoff_column_val = $stdoff_column + if (stdoff_column_val == stdoff_subst[0]) { + sub(stdoff_subst[0], stdoff_subst[1]) +@@ -233,7 +234,7 @@ DATAFORM != "main" { + + # In rearguard form, change the Japan rule line with "Sat>=8 25:00" + # to "Sun>=9 1:00", to cater to zic before 2007 and to older Java. +- if (/^Rule/ && $2 == "Japan") { ++ if ($0 ~ /^Rule/ && $2 == "Japan") { + if (DATAFORM == "rearguard") { + if ($7 == "Sat>=8" && $8 == "25:00") { + sub(/Sat>=8/, "Sun>=9") +@@ -250,7 +251,7 @@ DATAFORM != "main" { + # In rearguard form, change the Morocco lines with negative SAVE values + # to use positive SAVE values. + if ($2 == "Morocco") { +- if (/^Rule/) { ++ if ($0 ~ /^Rule/) { + if ($4 ~ /^201[78]$/ && $6 == "Oct") { + if (DATAFORM == "rearguard") { + sub(/\t2018\t/, "\t2017\t") +@@ -290,8 +291,10 @@ DATAFORM != "main" { + /^Zone/ { + packrat_ignored = FILENAME == PACKRATDATA && PACKRATLIST && !packratlist[$2]; + } +-packrat_ignored && !/^Rule/ { +- sub(/^/, "#") ++{ ++ if (packrat_ignored && $0 !~ /^Rule/) { ++ sub(/^/, "#") ++ } + } + + # If a Link line is followed by a Link or Zone line for the same data, comment +-- +2.34.1 + diff --git a/sources b/sources index 9c44d2d..6d8aeed 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzdata2022a.tar.gz) = 542e4559beac8fd8c4af7d08d816fd12cfe7ffcb6f20bba4ff1c20eba717749ef96e5cf599b2fe03b5b8469c0467f8cb1c893008160da281055a123dd9e810d9 -SHA512 (tzcode2022a.tar.gz) = 3f047a6f414ae3df4a3d6bb9b39a1790833d191ae48e6320ab9438cd326dc455475186a02c44e4cde96b48101ab000880919b1e0e8092aed7254443ed2c831ed +SHA512 (tzcode2022b.tar.gz) = 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79 +SHA512 (tzdata2022b.tar.gz) = a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1 diff --git a/tzdata.spec b/tzdata.spec index 69dc357..862b2a9 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,14 +1,15 @@ Summary: Timezone data Name: tzdata -Version: 2022a -%define tzdata_version 2022a -%define tzcode_version 2022a -Release: 4%{?dist} +Version: 2022b +%define tzdata_version 2022b +%define tzcode_version 2022b +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-Work-around-awk-bug-1.patch Patch002: 0002-Fix-have-snprintf-error.patch %if 0%{?rhel} || 0%{?eln} Patch003: 0003-continue-to-ship-posixrules.patch @@ -43,6 +44,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 @@ -153,6 +155,13 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sun Aug 14 2022 Patsy Griffin - 2022b-1 +- Rebase to tzdata-2022b + - Chile transitions to DST on 2022-09-11, not 2022-09-04 + - 'make install' now defaults LOCALTIME to Factory rather than GMT + - More zones that are the same since 1970 have been moved to backzone. + - Include patch for awk workaround. + * Sat Jul 23 2022 Fedora Release Engineering - 2022a-4 - Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild From 63dd520b47c21334aa3a365a6f8d22f31dac5bc5 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Mon, 22 Aug 2022 21:12:16 -0400 Subject: [PATCH 2/9] Resolves: #2118513 Rebase to tzdata-2022c - supersedes tzdata-2022b - Add a work-around for an awk bug in FreeBSD, macOS, etc. - Improve tzselect with respect to intercontinental Zones. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 13 ++++++++----- 3 files changed, 12 insertions(+), 7 deletions(-) diff --git a/.gitignore b/.gitignore index 6a3c12c..d843391 100644 --- a/.gitignore +++ b/.gitignore @@ -194,3 +194,5 @@ noarch/ /tzcode2022a.tar.gz /tzcode2022b.tar.gz /tzdata2022b.tar.gz +/tzcode2022c.tar.gz +/tzdata2022c.tar.gz diff --git a/sources b/sources index 6d8aeed..7e121c7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022b.tar.gz) = 851622eb8e6dc8f8201bf05e1f7e411ca32b2ed0f4dc9f6b875f4482c05c4a3302259b78c3e8e2dadda52ae19d4d34ffa3463fee10f70fa3a8b08b19f1417f79 -SHA512 (tzdata2022b.tar.gz) = a51418cda50386bc2e82a26201178c282ec225e04867e70a47ef90f42371a4014c70bffebb52ac09ccd893dfa17b0acc782f31527b3579ebdc4a302a9367ddb1 +SHA512 (tzcode2022c.tar.gz) = 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06 +SHA512 (tzdata2022c.tar.gz) = e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b diff --git a/tzdata.spec b/tzdata.spec index 862b2a9..b488d27 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,15 +1,14 @@ Summary: Timezone data Name: tzdata -Version: 2022b -%define tzdata_version 2022b -%define tzcode_version 2022b +Version: 2022c +%define tzdata_version 2022c +%define tzcode_version 2022c 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-Work-around-awk-bug-1.patch Patch002: 0002-Fix-have-snprintf-error.patch %if 0%{?rhel} || 0%{?eln} Patch003: 0003-continue-to-ship-posixrules.patch @@ -44,7 +43,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 @@ -155,6 +153,11 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon Aug 22 2022 Patsy Griffin - 2022c-1 +- Rebase to tzdata-2022c - supersedes tzdata-2022b + - Add a work-around for an awk bug in FreeBSD, macOS, etc. + - Improve tzselect with respect to intercontinental Zones. + * Sun Aug 14 2022 Patsy Griffin - 2022b-1 - Rebase to tzdata-2022b - Chile transitions to DST on 2022-09-11, not 2022-09-04 From ffbd2d31b182037ab7275fbb20efa6135c7867cb Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Sun, 25 Sep 2022 19:29:46 -0400 Subject: [PATCH 3/9] Resolves: #2129499 Rebase to tzdata-2022d - Palestine DST transition will be on October 29, 2022, not October 28, 2022. - Europe/Uzhgorod and Europe/Zaporozhye are moved to 'backzone'. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index d843391..da22f57 100644 --- a/.gitignore +++ b/.gitignore @@ -196,3 +196,5 @@ noarch/ /tzdata2022b.tar.gz /tzcode2022c.tar.gz /tzdata2022c.tar.gz +/tzcode2022d.tar.gz +/tzdata2022d.tar.gz diff --git a/sources b/sources index 7e121c7..c1e5897 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022c.tar.gz) = 3373fa16a12007415c3dc3a75c4a0d61d6ae54968eeecedcdf4bcfd7f554020a15c4687dde107b90462b75d848eebe1e200c33322ebe0d3f1ad11bc769cade06 -SHA512 (tzdata2022c.tar.gz) = e2ae92abac6d87ce4ab4ba9012e868e1791b842e083293489debc0c671b9cf135b5b70426dacb6dbebbf6eba24463205225ae45bb7df891a086b25475f85ee0b +SHA512 (tzcode2022d.tar.gz) = 54491ef8dbab7c41754eb3f2990b8ccb2a10960098c7d78d94375d7f1362540f0d71ba77a46bcaf95f419f8d01a23bdf940cdc9c7906c23ad6c40cd1c788b1c2 +SHA512 (tzdata2022d.tar.gz) = f0d9f1dc6b7613598a861a3860f249e5beff75d8c4bb12bae21018ee617044cf25065dff08f81b0e6ed2c43602f2166dd6407a989a369a004e068260f2eece30 diff --git a/tzdata.spec b/tzdata.spec index b488d27..3b7fb4f 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2022c -%define tzdata_version 2022c -%define tzcode_version 2022c +Version: 2022d +%define tzdata_version 2022d +%define tzcode_version 2022d Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Sun Sep 25 2022 Patsy Griffin - 2022d-1 +- Rebase to tzdata-2022d + - Palestine DST transition will be on October 29, 2022, + not October 28, 2022. + - Europe/Uzhgorod and Europe/Zaporozhye are moved to 'backzone'. + * Mon Aug 22 2022 Patsy Griffin - 2022c-1 - Rebase to tzdata-2022c - supersedes tzdata-2022b - Add a work-around for an awk bug in FreeBSD, macOS, etc. From c8956cc34a683b703b6a5bf5e8c669b78e5c8da3 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Fri, 14 Oct 2022 15:48:14 -0400 Subject: [PATCH 4/9] Resolves: #2134955 Rebase to tzdata-2022e - Jordan and Syria cancelled the DST transition planned for 2022-10-28, remaining at +03 permanently. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 11 ++++++++--- 3 files changed, 12 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index da22f57..8f7f52d 100644 --- a/.gitignore +++ b/.gitignore @@ -198,3 +198,5 @@ noarch/ /tzdata2022c.tar.gz /tzcode2022d.tar.gz /tzdata2022d.tar.gz +/tzcode2022e.tar.gz +/tzdata2022e.tar.gz diff --git a/sources b/sources index c1e5897..db1eaf4 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022d.tar.gz) = 54491ef8dbab7c41754eb3f2990b8ccb2a10960098c7d78d94375d7f1362540f0d71ba77a46bcaf95f419f8d01a23bdf940cdc9c7906c23ad6c40cd1c788b1c2 -SHA512 (tzdata2022d.tar.gz) = f0d9f1dc6b7613598a861a3860f249e5beff75d8c4bb12bae21018ee617044cf25065dff08f81b0e6ed2c43602f2166dd6407a989a369a004e068260f2eece30 +SHA512 (tzcode2022e.tar.gz) = 7b3771bfa024d0bf445256f4d837a046eaba910ca3f2a5b4fcaf72ddd5fe34a9318a68f94ee09c0de120f3bdea41e9a16b0e82763896df8a6254ced0b454c060 +SHA512 (tzdata2022e.tar.gz) = 3b63ba2662930ee13dec79290f57545d71d21d4ddb76f94498a7096edaee0b3150e501c221c4d596df6af7c1d770c211f88feb5add13c5e3bed979218b4544da diff --git a/tzdata.spec b/tzdata.spec index 3b7fb4f..911b3fe 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2022d -%define tzdata_version 2022d -%define tzcode_version 2022d +Version: 2022e +%define tzdata_version 2022e +%define tzcode_version 2022e Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,11 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Oct 14 2022 Patsy Griffin - 2022e-1 +- Rebase to tzdata-2022e + - Jordan and Syria cancelled the DST transition planned + for 2022-10-28, remaining at +03 permanently. + * Sun Sep 25 2022 Patsy Griffin - 2022d-1 - Rebase to tzdata-2022d - Palestine DST transition will be on October 29, 2022, From f32b8997aa3462cd5d382b9322bc9d36a558e796 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Mon, 31 Oct 2022 00:02:38 -0400 Subject: [PATCH 5/9] Resolves: #2138478 Rebase to tzdata-2022f - Mexico will stop observing DST except near the US border. - Chihuahua moved to -06 year round starting on 2022-10-30. - Fiji no longer observes DST. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 3 files changed, 13 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 8f7f52d..04e7e92 100644 --- a/.gitignore +++ b/.gitignore @@ -200,3 +200,5 @@ noarch/ /tzdata2022d.tar.gz /tzcode2022e.tar.gz /tzdata2022e.tar.gz +/tzcode2022f.tar.gz +/tzdata2022f.tar.gz diff --git a/sources b/sources index db1eaf4..48b67f7 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022e.tar.gz) = 7b3771bfa024d0bf445256f4d837a046eaba910ca3f2a5b4fcaf72ddd5fe34a9318a68f94ee09c0de120f3bdea41e9a16b0e82763896df8a6254ced0b454c060 -SHA512 (tzdata2022e.tar.gz) = 3b63ba2662930ee13dec79290f57545d71d21d4ddb76f94498a7096edaee0b3150e501c221c4d596df6af7c1d770c211f88feb5add13c5e3bed979218b4544da +SHA512 (tzcode2022f.tar.gz) = 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b +SHA512 (tzdata2022f.tar.gz) = 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6 diff --git a/tzdata.spec b/tzdata.spec index 911b3fe..357b6cb 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2022e -%define tzdata_version 2022e -%define tzcode_version 2022e +Version: 2022f +%define tzdata_version 2022f +%define tzcode_version 2022f Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Mon Oct 31 2022 Patsy Griffin - 2022f-1 +- Rebase to tzdata-2022f + - Mexico will stop observing DST except near the US border. + - Chihuahua moved to -06 year round starting on 2022-10-30. + - Fiji no longer observes DST. + * Fri Oct 14 2022 Patsy Griffin - 2022e-1 - Rebase to tzdata-2022e - Jordan and Syria cancelled the DST transition planned From 95284a308637f1babf367f08e5e184bd802492b2 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Fri, 2 Dec 2022 11:55:46 -0500 Subject: [PATCH 6/9] Resolves: #2149397 Rebase to tzdata-2022g - The northern edge of the Mexican state of Chihuahua will change time zone to agree with nearby US locations on 2022-11-30. - Added a new Zone America/Ciudad_Juarez that splits from America/Ojinaga. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 14 +++++++++++--- 3 files changed, 15 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index 04e7e92..46da8c6 100644 --- a/.gitignore +++ b/.gitignore @@ -202,3 +202,5 @@ noarch/ /tzdata2022e.tar.gz /tzcode2022f.tar.gz /tzdata2022f.tar.gz +/tzcode2022g.tar.gz +/tzdata2022g.tar.gz diff --git a/sources b/sources index 48b67f7..253accf 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022f.tar.gz) = 3e2ef91b972f1872e3e8da9eae9d1c4638bfdb32600f164484edd7147be45a116db80443cd5ae61b5c34f8b841e4362f4beefd957633f6cc9b7def543ed6752b -SHA512 (tzdata2022f.tar.gz) = 72d05d05be999075cdf57b896c0f4238b1b862d4d0ed92cc611736592a4ada14d47bd7f0fc8be39e7938a7f5940a903c8af41e87859482bcfab787d889d429f6 +SHA512 (tzcode2022g.tar.gz) = 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a +SHA512 (tzdata2022g.tar.gz) = 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65 diff --git a/tzdata.spec b/tzdata.spec index 357b6cb..e843956 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2022f -%define tzdata_version 2022f -%define tzcode_version 2022f +Version: 2022g +%define tzdata_version 2022g +%define tzcode_version 2022g Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,14 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Dec 02 2022 Patsy Griffin - 2022g-1 +- Rebase to tzdata-2022g + - The northern edge of the Mexican state of Chihuahua will + change time zone to agree with nearby US locations on + 2022-11-30. + - Added a new Zone America/Ciudad_Juarez that splits from + America/Ojinaga. + * Mon Oct 31 2022 Patsy Griffin - 2022f-1 - Rebase to tzdata-2022f - Mexico will stop observing DST except near the US border. From 09df56502c12d7f86eaf56afd1271a37e93a87de Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Thu, 23 Mar 2023 15:06:06 -0400 Subject: [PATCH 7/9] Resolves: #2181027 Rebase to tzdata-2023a - Egypt reintroduced DST, from April through October. - Morocco springs forward April 23, not April 30. - Palestine delayed the start of DST this year. --- .gitignore | 2 ++ 0003-continue-to-ship-posixrules.patch | 12 ++++++------ sources | 4 ++-- tzdata.spec | 12 +++++++++--- 4 files changed, 19 insertions(+), 11 deletions(-) diff --git a/.gitignore b/.gitignore index 46da8c6..bbfc0cd 100644 --- a/.gitignore +++ b/.gitignore @@ -204,3 +204,5 @@ noarch/ /tzdata2022f.tar.gz /tzcode2022g.tar.gz /tzdata2022g.tar.gz +/tzcode2023a.tar.gz +/tzdata2023a.tar.gz diff --git a/0003-continue-to-ship-posixrules.patch b/0003-continue-to-ship-posixrules.patch index 1755352..fa905d3 100644 --- a/0003-continue-to-ship-posixrules.patch +++ b/0003-continue-to-ship-posixrules.patch @@ -1,13 +1,13 @@ diff -Nrup a/Makefile b/Makefile ---- a/Makefile 2020-10-13 15:58:12.000000000 -0400 -+++ b/Makefile 2020-10-13 16:03:09.461302282 -0400 -@@ -60,7 +60,7 @@ LOCALTIME= GMT +--- a/Makefile 2023-03-22 17:41:49.069789592 -0400 ++++ b/Makefile 2023-03-22 17:44:07.528427093 -0400 +@@ -52,7 +52,7 @@ LOCALTIME= Factory # make zonenames # to get a list of the values you can use for POSIXRULES. -POSIXRULES= - -+POSIXRULES= America/New_York ++POSIXRULES= America/New_York # Also see TZDEFRULESTRING below, which takes effect only - # if the time zone files cannot be accessed. -Binary files a/tzdata2020b-rearguard.tar.gz and b/tzdata2020b-rearguard.tar.gz differ + # if POSIXRULES is '-' or if the template file cannot be accessed. +Binary files a/tzdata2023a-rearguard.tar.gz and b/tzdata2023a-rearguard.tar.gz differ diff --git a/sources b/sources index 253accf..58d053f 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2022g.tar.gz) = 5188edd8d05238a88da734cf78fadfb57640d4db3e7a0a9dddd70e3071e16b6eebc2e2ab17109b7dafafae68abfbc857df481cfdc3ffe63f7eb1569ea0b5997a -SHA512 (tzdata2022g.tar.gz) = 7f79394295e00e3a24ebdbf9af3bc454a65f432a93b517e7e96c7f9db9949f6f5fdae9892a9d3789ff44ae0eb1bfe4744d36976b4624659af951d26414f94e65 +SHA512 (tzcode2023a.tar.gz) = d45fc677a0a32ae807bf421faceff675565ee15e3ff42d3a4121df10e1f7855ac16b27fbc28bd365f93c57f40c5bdf19cde88546f7090cfab7676cac0a5516a4 +SHA512 (tzdata2023a.tar.gz) = 10aadd6eba50f63f427399281065ba34cb474f6a854f8dc7a6f4f1343b1474a05f22b69b1e113ea67bb5f3f479253610a16b89d9dfa157bf0fde4c69aa3d6493 diff --git a/tzdata.spec b/tzdata.spec index e843956..a91ba61 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2022g -%define tzdata_version 2022g -%define tzcode_version 2022g +Version: 2023a +%define tzdata_version 2023a +%define tzcode_version 2023a Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Mar 23 2023 Patsy Griffin - 2023a-1 +- Rebase to tzdata-2023a + - Egypt reintroduced DST, from April through October. + - Morocco springs forward April 23, not April 30. + - Palestine delayed the start of DST this year. + * Fri Dec 02 2022 Patsy Griffin - 2022g-1 - Rebase to tzdata-2022g - The northern edge of the Mexican state of Chihuahua will From d54411e34083e2a38c064f229380b421b784f136 Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Fri, 24 Mar 2023 10:10:33 -0400 Subject: [PATCH 8/9] Resolves: #2181427 Rebase to tzdata-2023b - Lebanon will transition to DST on April 20/21, not March 25/26. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index bbfc0cd..edecf92 100644 --- a/.gitignore +++ b/.gitignore @@ -206,3 +206,5 @@ noarch/ /tzdata2022g.tar.gz /tzcode2023a.tar.gz /tzdata2023a.tar.gz +/tzcode2023b.tar.gz +/tzdata2023b.tar.gz diff --git a/sources b/sources index 58d053f..b3fcd80 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2023a.tar.gz) = d45fc677a0a32ae807bf421faceff675565ee15e3ff42d3a4121df10e1f7855ac16b27fbc28bd365f93c57f40c5bdf19cde88546f7090cfab7676cac0a5516a4 -SHA512 (tzdata2023a.tar.gz) = 10aadd6eba50f63f427399281065ba34cb474f6a854f8dc7a6f4f1343b1474a05f22b69b1e113ea67bb5f3f479253610a16b89d9dfa157bf0fde4c69aa3d6493 +SHA512 (tzcode2023b.tar.gz) = 94058ceabfdaa62eeff9be804a030f0eb95b4099b62fbb7e55557e8b934c8d883f488a3a6996331e24aebd147d66c19a73fb925a3dd929c630a9e11b51003b7f +SHA512 (tzdata2023b.tar.gz) = 0f697b872ef02109d2098db12d0effc834b2ac5438921e0867f2c70987f305a47dc3eac720c344bb3757c902a7653109621e943564bdfbf00937077c311aa29b diff --git a/tzdata.spec b/tzdata.spec index a91ba61..47baa18 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2023a -%define tzdata_version 2023a -%define tzcode_version 2023a +Version: 2023b +%define tzdata_version 2023b +%define tzcode_version 2023b Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Mar 24 2023 Patsy Griffin - 2023b-1 +- Rebase to tzdata-2023b + - Lebanon will transition to DST on April 20/21, not March 25/26. + * Thu Mar 23 2023 Patsy Griffin - 2023a-1 - Rebase to tzdata-2023a - Egypt reintroduced DST, from April through October. From e2a86e1c1439cf0166272f13d4444eec3e14cf2c Mon Sep 17 00:00:00 2001 From: Patsy Griffin Date: Wed, 29 Mar 2023 10:38:32 -0400 Subject: [PATCH 9/9] Resolves: #2182501 Rebase to tzdata-2023c - Reinstate Lebanon DST change effective March 25. --- .gitignore | 2 ++ sources | 4 ++-- tzdata.spec | 10 +++++++--- 3 files changed, 11 insertions(+), 5 deletions(-) diff --git a/.gitignore b/.gitignore index edecf92..a323947 100644 --- a/.gitignore +++ b/.gitignore @@ -208,3 +208,5 @@ noarch/ /tzdata2023a.tar.gz /tzcode2023b.tar.gz /tzdata2023b.tar.gz +/tzcode2023c.tar.gz +/tzdata2023c.tar.gz diff --git a/sources b/sources index b3fcd80..35c485b 100644 --- a/sources +++ b/sources @@ -1,4 +1,4 @@ SHA512 (javazic.tar.gz) = c23a4a437a87d0792f23e98025520a11273fc3d12ef5dcf64af8332ed60ba9ce77eaadfd234cee92b3ca9dc08b9e4123e804745925d68ddbd0b2e1e9039e526b SHA512 (javazic-1.8-37392f2f5d59.tar.xz) = 2ba718dfeed53a3bd6b44e3dfe96338a609e482e4e6d942e2a7e622fc6c52606cb323ac3a59739c463e34f70fff217c0a61f5b3d3c4958eff2801b1504ee4204 -SHA512 (tzcode2023b.tar.gz) = 94058ceabfdaa62eeff9be804a030f0eb95b4099b62fbb7e55557e8b934c8d883f488a3a6996331e24aebd147d66c19a73fb925a3dd929c630a9e11b51003b7f -SHA512 (tzdata2023b.tar.gz) = 0f697b872ef02109d2098db12d0effc834b2ac5438921e0867f2c70987f305a47dc3eac720c344bb3757c902a7653109621e943564bdfbf00937077c311aa29b +SHA512 (tzcode2023c.tar.gz) = fa18bae9c0e7c061bc9d5f5f2eb9967f0e4ddb2baafdee9887fa30cd0c60f4aa6f21eacffb17df0d59d26ff54d08c5dcefa98159309eba497e86443624913a82 +SHA512 (tzdata2023c.tar.gz) = 608bd286ebcbd0004cfdc1da183273f08aff61f90c8867661154453d77a05d421e4c46ad6d066a1fe2e87d5c82ec0f1c0224667a3b35f3180a3eb7f6ff84cbf5 diff --git a/tzdata.spec b/tzdata.spec index 47baa18..ccd527e 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,8 +1,8 @@ Summary: Timezone data Name: tzdata -Version: 2023b -%define tzdata_version 2023b -%define tzcode_version 2023b +Version: 2023c +%define tzdata_version 2023c +%define tzcode_version 2023c Release: 1%{?dist} License: Public Domain URL: https://www.iana.org/time-zones @@ -153,6 +153,10 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Mar 29 2023 Patsy Griffin - 2023c-1 +- Rebase to tzdata-2023c + - Reinstate Lebanon DST change effective March 25. + * Fri Mar 24 2023 Patsy Griffin - 2023b-1 - Rebase to tzdata-2023b - Lebanon will transition to DST on April 20/21, not March 25/26.