From 3d1cd4a959d3ec5f397064a099514e26876de7e2 Mon Sep 17 00:00:00 2001 From: qinyu Date: Fri, 2 Sep 2022 10:47:56 +0800 Subject: [PATCH] tzdata: Palestine DST transitions time change Palestine DST transitions time change Signed-off-by: qinyu --- ...ansitions-are-now-Saturdays-at-02-00.patch | 75 +++++++++++++++++++ ...k-expression-of-Palestine-transition.patch | 75 +++++++++++++++++++ tzdata.spec | 10 ++- 3 files changed, 159 insertions(+), 1 deletion(-) create mode 100644 backport-Palestine-transitions-are-now-Saturdays-at-02-00.patch create mode 100644 backport-Tweak-expression-of-Palestine-transition.patch diff --git a/backport-Palestine-transitions-are-now-Saturdays-at-02-00.patch b/backport-Palestine-transitions-are-now-Saturdays-at-02-00.patch new file mode 100644 index 0000000..f4f1337 --- /dev/null +++ b/backport-Palestine-transitions-are-now-Saturdays-at-02-00.patch @@ -0,0 +1,75 @@ +From dd5a45a91d9da0c178de9541334ab6cf05deb2c0 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 30 Aug 2022 12:45:52 -0500 +Subject: [PATCH] Palestine transitions are now Saturdays at 02:00 + +Reference: https://github.com/eggert/tz/commit/c42d108da5a95cd0432bfeeff35498d695d09da8 +Conflict: News context + +(Thanks to Heba Hamad.) +* NEWS: Mention this. +* asia (Palestine): Mar and Oct Sat>=24 2:00 going forward. +--- + NEWS | 11 +++++++++++ + asia | 17 +++++++++++++++-- + 2 files changed, 26 insertions(+), 2 deletions(-) + +diff --git a/NEWS b/NEWS +index af39e69..df6b384 100644 +--- a/NEWS ++++ b/NEWS +@@ -1,5 +1,16 @@ + News for the tz database + ++ Briefly: ++ Palestine transitions are now Saturdays at 02:00. ++ Simplify three Ukraine zones into one. ++ ++ Changes to future timestamps ++ ++ Palestine now springs forward and falls back at 02:00 on the first ++ Saturday on or after March 24 and October 24, respectively. This ++ this means 2022 falls back 10-29 at 02:00, not 10-28 at 01:00. ++ (Thanks to Heba Hamad.) ++ + Release 2022a - 2022-03-15 23:02:01 -0700 + + Briefly: +diff --git a/asia b/asia +index 9698cf9..28e130e 100644 +--- a/asia ++++ b/asia +@@ -3292,6 +3292,17 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 + # From Heba Hamad (2022-03-10): + # summer time will begin in Palestine from Sunday 03-27-2022, 00:00 AM. + ++# From Heba Hamad (2022-08-30): ++# winter time will begin in Palestine from Saturday 10-29, 02:00 AM by ++# 60 minutes backwards. Also the state of Palestine adopted the summer ++# and winter time for the years: 2023,2024,2025,2026 ... ++# https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf ++# ++# From Paul Eggert (2022-08-30): ++# Guess they spring forward on the first Saturday on or after March 24, ++# and fall back on the first Saturday on or after October 24, as this is ++# consistent with the given transitions and with previous date practice. ++ + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule EgyptAsia 1957 only - May 10 0:00 1:00 S + Rule EgyptAsia 1957 1958 - Oct 1 0:00 0 - +@@ -3328,8 +3339,10 @@ Rule Palestine 2019 only - Mar 29 0:00 1:00 S + Rule Palestine 2019 only - Oct Sat>=24 0:00 0 - + Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S + Rule Palestine 2020 only - Oct 24 1:00 0 - +-Rule Palestine 2021 max - Oct Fri>=23 1:00 0 - +-Rule Palestine 2022 max - Mar Sun>=25 0:00 1:00 S ++Rule Palestine 2021 only - Oct 29 1:00 0 - ++Rule Palestine 2022 only - Mar 27 0:00 1:00 S ++Rule Palestine 2022 max - Oct Sat>=24 2:00 0 - ++Rule Palestine 2023 max - Mar Sat>=24 2:00 1:00 S + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Asia/Gaza 2:17:52 - LMT 1900 Oct +-- +2.33.0 + diff --git a/backport-Tweak-expression-of-Palestine-transition.patch b/backport-Tweak-expression-of-Palestine-transition.patch new file mode 100644 index 0000000..0e856a2 --- /dev/null +++ b/backport-Tweak-expression-of-Palestine-transition.patch @@ -0,0 +1,75 @@ +From 1a0e30a84b2f76663123a4555c2785b450ce06f1 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 31 Aug 2022 16:58:10 -0500 +Subject: [PATCH] Tweak expression of Palestine transition +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reference:https://github.com/eggert/tz/commit/1a0e30a84b2f76663123a4555c2785b450ce06f1 +Conflict: NA + +* asia (Palestine): Say "Sat<=30" instead of "Sat>=24". +These have equivalent effect, so this does not change the +generated data. “Sat<=30” is a bit closer to the intended +“Saturday before the last Sunday” given by Heba Hamad. +--- + asia | 24 ++++++++++-------------- + 1 file changed, 10 insertions(+), 14 deletions(-) + +diff --git a/asia b/asia +index 1a3d8c1..9fbeb71 100644 +--- a/asia ++++ b/asia +@@ -3375,10 +3375,6 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 + # The winter time in 2015 started on October 23 at 01:00. + # https://wafa.ps/ar_page.aspx?id=CgpCdYa670694628582aCgpCdY + # http://www.palestinecabinet.gov.ps/portal/meeting/details/27583 +-# +-# From Paul Eggert (2019-04-10): +-# For now, guess spring-ahead transitions are at 00:00 on the Saturday +-# preceding March's last Sunday (i.e., Sat>=24). + + # From P Chan (2021-10-18): + # http://wafa.ps/Pages/Details/34701 +@@ -3400,11 +3396,11 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 + # 60 minutes backwards. Also the state of Palestine adopted the summer + # and winter time for the years: 2023,2024,2025,2026 ... + # https://mm.icann.org/pipermail/tz/attachments/20220830/9f024566/Time-0001.pdf ++# (2022-08-31): ... the Saturday before the last Sunday in March and October ++# at 2:00 AM ,for the years from 2023 to 2026. + # +-# From Paul Eggert (2022-08-30): +-# Guess they spring forward on the first Saturday on or after March 24, +-# and fall back on the first Saturday on or after October 24, as this is +-# consistent with the given transitions and with previous date practice. ++# From Paul Eggert (2022-08-31): ++# For now, assume that this rule will also be used after 2026. + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule EgyptAsia 1957 only - May 10 0:00 1:00 S +@@ -3436,16 +3432,16 @@ Rule Palestine 2013 only - Sep 27 0:00 0 - + Rule Palestine 2014 only - Oct 24 0:00 0 - + Rule Palestine 2015 only - Mar 28 0:00 1:00 S + Rule Palestine 2015 only - Oct 23 1:00 0 - +-Rule Palestine 2016 2018 - Mar Sat>=24 1:00 1:00 S +-Rule Palestine 2016 2018 - Oct Sat>=24 1:00 0 - ++Rule Palestine 2016 2018 - Mar Sat<=30 1:00 1:00 S ++Rule Palestine 2016 2018 - Oct Sat<=30 1:00 0 - + Rule Palestine 2019 only - Mar 29 0:00 1:00 S +-Rule Palestine 2019 only - Oct Sat>=24 0:00 0 - +-Rule Palestine 2020 2021 - Mar Sat>=24 0:00 1:00 S ++Rule Palestine 2019 only - Oct Sat<=30 0:00 0 - ++Rule Palestine 2020 2021 - Mar Sat<=30 0:00 1:00 S + Rule Palestine 2020 only - Oct 24 1:00 0 - + Rule Palestine 2021 only - Oct 29 1:00 0 - + Rule Palestine 2022 only - Mar 27 0:00 1:00 S +-Rule Palestine 2022 max - Oct Sat>=24 2:00 0 - +-Rule Palestine 2023 max - Mar Sat>=24 2:00 1:00 S ++Rule Palestine 2022 max - Oct Sat<=30 2:00 0 - ++Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Asia/Gaza 2:17:52 - LMT 1900 Oct +-- +2.23.0 diff --git a/tzdata.spec b/tzdata.spec index d06f254..d0d268d 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2022a -Release: 4 +Release: 5 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -11,6 +11,8 @@ Source3: javazic-1.8-37392f2f5d59.tar.xz Patch6000: backport-Iran-will-stop-DST-in-2023.patch Patch6001: backport-Chile-s-DST-is-delayed-by-a-week-in-September-2022.patch +Patch6002: backport-Palestine-transitions-are-now-Saturdays-at-02-00.patch +Patch6003: backport-Tweak-expression-of-Palestine-transition.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch @@ -111,6 +113,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Sep 2 2022 qinyu - 2022a-5 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Palestine DST transitions time change + * Fri Aug 19 2022 qinyu - 2022a-4 - Type:bugfix - CVE:NA