From b1a334cca6d2aa31282d45b5e5b4d7bff07fe619 Mon Sep 17 00:00:00 2001 From: qinyu Date: Thu, 6 Apr 2023 15:05:03 +0800 Subject: [PATCH 1/2] tzdata: Palestine no longer observes DST during Ramadan Palestine no longer observes DST during Ramadan Signed-off-by: qinyu --- ...o-longer-observes-DST-during-Ramadan.patch | 162 ++++++++++++++++++ tzdata.spec | 9 +- 2 files changed, 170 insertions(+), 1 deletion(-) create mode 100644 backport-Palestine-no-longer-observes-DST-during-Ramadan.patch diff --git a/backport-Palestine-no-longer-observes-DST-during-Ramadan.patch b/backport-Palestine-no-longer-observes-DST-during-Ramadan.patch new file mode 100644 index 0000000..267c9a7 --- /dev/null +++ b/backport-Palestine-no-longer-observes-DST-during-Ramadan.patch @@ -0,0 +1,162 @@ +From c759f632702b2db2645f733e3574469fc20ee9c3 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Fri, 17 Mar 2023 20:01:47 -0700 +Subject: [PATCH] Palestine no longer observes DST during Ramadan + +Reference: https://github.com/eggert/tz/commit/c759f632702b2db2645f733e3574469fc20ee9c3 +Conflict: remove NEWS; context + +The transition dates are not decided yet. (Thanks to Heba Hamad.) +For now, guess Ramadan transitions (as that is better than +guessing no transitions) and document the assumptions. +These predictions can be improved later as more info comes in. +* NEWS: Mention this. +* asia (Palestine): Implement it. +--- + asia | 123 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++--- + 1 file changed, 118 insertions(+), 5 deletions(-) + +diff --git a/asia b/asia +index 8a24509..f15d648 100644 +--- a/asia ++++ b/asia +@@ -3311,9 +3311,44 @@ Zone Asia/Karachi 4:28:12 - LMT 1907 + # 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-31): +-# For now, assume that this rule will also be used after 2026. ++ ++# From Heba Hamad (2023-03-13): ++# the Palestinian cabinet decided to extend the work in winter time ++# during the month of Ramadan and the Eid period. ++# I will later send to you the new date.... ++# ++# From Paul Eggert (2023-03-17): ++# Although we don't yet know the new date, it appears that our ++# previous guess of springing forward March 25 is incorrect. ++# For now, guess that spring and fall transitions will normally ++# continue to use 2022's rules, that during DST Palestine will switch ++# to standard time at 02:00 the last Saturday before Ramadan and back ++# to DST at 02:00 the first Saturday after Ramadan, and that ++# if the normal spring-forward or fall-back transition occurs during ++# Ramadan the former is delayed and the latter advanced. ++# To implement this, I predicted Ramadan-oriented transition dates for ++# 2023 through 2086 by running the following program under GNU Emacs 28.2, ++# with the results integrated by hand into the table below. ++# Predictions after 2086 are approximated without Ramadan. ++# ++# (let ((islamic-year 1444)) ++# (require 'cal-islam) ++# (while (< islamic-year 1510) ++# (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year))) ++# (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year)))) ++# (saturday 6)) ++# (while (/= saturday (mod (setq a (1- a)) 7))) ++# (while (/= saturday (mod b 7)) ++# (setq b (1+ b))) ++# (setq a (calendar-gregorian-from-absolute a)) ++# (setq b (calendar-gregorian-from-absolute b)) ++# (insert ++# (format ++# (concat "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t0\t-\n" ++# "Rule Palestine\t%d\tonly\t-\t%s\t%2d\t2:00\t1:00\tS\n") ++# (car (cdr (cdr a))) (calendar-month-name (car a) t) (car (cdr a)) ++# (car (cdr (cdr b))) (calendar-month-name (car b) t) (car (cdr b))))) ++# (setq islamic-year (+ 1 islamic-year)))) + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule EgyptAsia 1957 only - May 10 0:00 1:00 S +@@ -3353,8 +3388,86 @@ 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<=30 2:00 0 - +-Rule Palestine 2023 max - Mar Sat<=30 2:00 1:00 S ++Rule Palestine 2022 2035 - Oct Sat<=30 2:00 0 - ++Rule Palestine 2023 only - Apr 29 2:00 1:00 S ++Rule Palestine 2024 only - Apr 13 2:00 1:00 S ++Rule Palestine 2025 only - Apr 5 2:00 1:00 S ++Rule Palestine 2026 2054 - Mar Sat<=30 2:00 1:00 S ++Rule Palestine 2036 only - Oct 18 2:00 0 - ++Rule Palestine 2037 only - Oct 10 2:00 0 - ++Rule Palestine 2038 only - Sep 25 2:00 0 - ++Rule Palestine 2039 only - Sep 17 2:00 0 - ++Rule Palestine 2039 only - Oct 22 2:00 1:00 S ++Rule Palestine 2039 2067 - Oct Sat<=30 2:00 0 - ++Rule Palestine 2040 only - Sep 1 2:00 0 - ++Rule Palestine 2040 only - Oct 13 2:00 1:00 S ++Rule Palestine 2041 only - Aug 24 2:00 0 - ++Rule Palestine 2041 only - Sep 28 2:00 1:00 S ++Rule Palestine 2042 only - Aug 16 2:00 0 - ++Rule Palestine 2042 only - Sep 20 2:00 1:00 S ++Rule Palestine 2043 only - Aug 1 2:00 0 - ++Rule Palestine 2043 only - Sep 12 2:00 1:00 S ++Rule Palestine 2044 only - Jul 23 2:00 0 - ++Rule Palestine 2044 only - Aug 27 2:00 1:00 S ++Rule Palestine 2045 only - Jul 15 2:00 0 - ++Rule Palestine 2045 only - Aug 19 2:00 1:00 S ++Rule Palestine 2046 only - Jun 30 2:00 0 - ++Rule Palestine 2046 only - Aug 11 2:00 1:00 S ++Rule Palestine 2047 only - Jun 22 2:00 0 - ++Rule Palestine 2047 only - Jul 27 2:00 1:00 S ++Rule Palestine 2048 only - Jun 6 2:00 0 - ++Rule Palestine 2048 only - Jul 18 2:00 1:00 S ++Rule Palestine 2049 only - May 29 2:00 0 - ++Rule Palestine 2049 only - Jul 3 2:00 1:00 S ++Rule Palestine 2050 only - May 21 2:00 0 - ++Rule Palestine 2050 only - Jun 25 2:00 1:00 S ++Rule Palestine 2051 only - May 6 2:00 0 - ++Rule Palestine 2051 only - Jun 17 2:00 1:00 S ++Rule Palestine 2052 only - Apr 27 2:00 0 - ++Rule Palestine 2052 only - Jun 1 2:00 1:00 S ++Rule Palestine 2053 only - Apr 12 2:00 0 - ++Rule Palestine 2053 only - May 24 2:00 1:00 S ++Rule Palestine 2054 only - Apr 4 2:00 0 - ++Rule Palestine 2054 only - May 16 2:00 1:00 S ++Rule Palestine 2055 only - May 1 2:00 1:00 S ++Rule Palestine 2056 only - Apr 22 2:00 1:00 S ++Rule Palestine 2057 only - Apr 7 2:00 1:00 S ++Rule Palestine 2058 max - Mar Sat<=30 2:00 1:00 S ++Rule Palestine 2068 only - Oct 20 2:00 0 - ++Rule Palestine 2069 only - Oct 12 2:00 0 - ++Rule Palestine 2070 only - Oct 4 2:00 0 - ++Rule Palestine 2071 only - Sep 19 2:00 0 - ++Rule Palestine 2072 only - Sep 10 2:00 0 - ++Rule Palestine 2072 only - Oct 15 2:00 1:00 S ++Rule Palestine 2073 only - Sep 2 2:00 0 - ++Rule Palestine 2073 only - Oct 7 2:00 1:00 S ++Rule Palestine 2074 only - Aug 18 2:00 0 - ++Rule Palestine 2074 only - Sep 29 2:00 1:00 S ++Rule Palestine 2075 only - Aug 10 2:00 0 - ++Rule Palestine 2075 only - Sep 14 2:00 1:00 S ++Rule Palestine 2075 max - Oct Sat<=30 2:00 0 - ++Rule Palestine 2076 only - Jul 25 2:00 0 - ++Rule Palestine 2076 only - Sep 5 2:00 1:00 S ++Rule Palestine 2077 only - Jul 17 2:00 0 - ++Rule Palestine 2077 only - Aug 28 2:00 1:00 S ++Rule Palestine 2078 only - Jul 9 2:00 0 - ++Rule Palestine 2078 only - Aug 13 2:00 1:00 S ++Rule Palestine 2079 only - Jun 24 2:00 0 - ++Rule Palestine 2079 only - Aug 5 2:00 1:00 S ++Rule Palestine 2080 only - Jun 15 2:00 0 - ++Rule Palestine 2080 only - Jul 20 2:00 1:00 S ++Rule Palestine 2081 only - Jun 7 2:00 0 - ++Rule Palestine 2081 only - Jul 12 2:00 1:00 S ++Rule Palestine 2082 only - May 23 2:00 0 - ++Rule Palestine 2082 only - Jul 4 2:00 1:00 S ++Rule Palestine 2083 only - May 15 2:00 0 - ++Rule Palestine 2083 only - Jun 19 2:00 1:00 S ++Rule Palestine 2084 only - Apr 29 2:00 0 - ++Rule Palestine 2084 only - Jun 10 2:00 1:00 S ++Rule Palestine 2085 only - Apr 21 2:00 0 - ++Rule Palestine 2085 only - Jun 2 2:00 1:00 S ++Rule Palestine 2086 only - Apr 13 2:00 0 - ++Rule Palestine 2086 only - May 18 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/tzdata.spec b/tzdata.spec index f14759f..57cb749 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2022a -Release: 13 +Release: 14 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -23,6 +23,7 @@ Patch6012: backport-Much-of-Greenland-still-uses-DST-from-2024-on.patch Patch6013: backport-Egypt-now-uses-DST-again.patch Patch6014: backport-Max-max.patch Patch6015: backport-This-year-Morocco-springs-forward-April-23-not-April.patch +Patch6016: backport-Palestine-no-longer-observes-DST-during-Ramadan.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch @@ -125,6 +126,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Apr 6 2023 qinyu - 2022a-14 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Palestine no longer observes DST during Ramadan + * Fri Mar 17 2023 qinyu - 2022a-13 - Type:bugfix - CVE:NA From 5d0d6e086837df1f55f00d4c4273f6fa7cfb7042 Mon Sep 17 00:00:00 2001 From: qinyu Date: Thu, 6 Apr 2023 15:18:55 +0800 Subject: [PATCH 2/2] tzdata: Greenland changed standard time already Greenland changed standard time already Signed-off-by: qinyu --- ...enland-changed-standard-time-already.patch | 47 +++++++++++++++++++ tzdata.spec | 9 +++- 2 files changed, 55 insertions(+), 1 deletion(-) create mode 100644 backport-Greenland-changed-standard-time-already.patch diff --git a/backport-Greenland-changed-standard-time-already.patch b/backport-Greenland-changed-standard-time-already.patch new file mode 100644 index 0000000..15d130a --- /dev/null +++ b/backport-Greenland-changed-standard-time-already.patch @@ -0,0 +1,47 @@ +From b019d3a8b3c544d4bbbdb0541acbea5238fcf781 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 4 Apr 2023 19:58:47 -0700 +Subject: [PATCH] Greenland changed standard time already + +Reference: https://github.com/eggert/tz/commit/b019d3a8b3c544d4bbbdb0541acbea5238fcf781 +Conflict: remove NEWS + +This does not affect UTC offsets, only tm_isdst. +(Thanks to Thomas M. Steenholdt.) +* NEWS: Mention this. +* europe (America/Nuuk): Change standard time in March 2023, +not in October 2023. +--- + europe | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) + +diff --git a/europe b/europe +index 7f00931..f04d1fa 100644 +--- a/europe ++++ b/europe +@@ -1182,6 +1182,12 @@ Zone Atlantic/Faroe -0:27:04 - LMT 1908 Jan 11 # Tórshavn + # 2. The shift *from* DST in 2023 happens as normal, but coincides with the + # shift to UTC-02 normaltime (people will not change their clocks here). + # 3. After this, DST is still observed, but as -02/-01 instead of -03/-02. ++# ++# From Múte Bourup Egede via Jógvan Svabo Samuelsen (2023-03-15): ++# Greenland will not switch to Daylight Saving Time this year, 2023, ++# because the standard time for Greenland will change from UTC -3 to UTC -2. ++# However, Greenland will change to Daylight Saving Time again in 2024 ++# and onwards. + + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule Thule 1991 1992 - Mar lastSun 2:00 1:00 D +@@ -1205,7 +1211,8 @@ Zone America/Scoresbysund -1:27:52 - LMT 1916 Jul 28 # Ittoqqortoormiit + -1:00 EU -01/+00 + Zone America/Nuuk -3:26:56 - LMT 1916 Jul 28 # Godthåb + -3:00 - -03 1980 Apr 6 2:00 +- -3:00 EU -03/-02 2023 Oct 29 1:00u ++ -3:00 EU -03/-02 2023 Mar 26 1:00u ++ -2:00 - -02 2023 Oct 29 1:00u + -2:00 EU -02/-01 + Zone America/Thule -4:35:08 - LMT 1916 Jul 28 # Pituffik + -4:00 Thule A%sT +-- +2.33.0 + diff --git a/tzdata.spec b/tzdata.spec index 57cb749..33b7e70 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2022a -Release: 14 +Release: 15 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -24,6 +24,7 @@ Patch6013: backport-Egypt-now-uses-DST-again.patch Patch6014: backport-Max-max.patch Patch6015: backport-This-year-Morocco-springs-forward-April-23-not-April.patch Patch6016: backport-Palestine-no-longer-observes-DST-during-Ramadan.patch +Patch6017: backport-Greenland-changed-standard-time-already.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch @@ -126,6 +127,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Apr 6 2023 qinyu - 2022a-15 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Greenland changed standard time already + * Thu Apr 6 2023 qinyu - 2022a-14 - Type:bugfix - CVE:NA