From 328ed6f8ce18d8d412ffcc8d6e2ca401f39ade60 Mon Sep 17 00:00:00 2001 From: qinyu Date: Wed, 12 Oct 2022 15:08:04 +0800 Subject: [PATCH] tzdata: Syria and Jordan switch from 02/03 with DST to plain 03 Syria and Jordan switch from 02/03 with DST to plain 03 Signed-off-by: qinyu --- ...itch-from-02-03-with-DST-to-plain-03.patch | 91 +++++++++++++++++++ ...itch-from-02-03-with-DST-to-plain-03.patch | 80 ++++++++++++++++ tzdata.spec | 10 +- 3 files changed, 180 insertions(+), 1 deletion(-) create mode 100644 backport-Jordan-to-switch-from-02-03-with-DST-to-plain-03.patch create mode 100644 backport-Syria-to-switch-from-02-03-with-DST-to-plain-03.patch diff --git a/backport-Jordan-to-switch-from-02-03-with-DST-to-plain-03.patch b/backport-Jordan-to-switch-from-02-03-with-DST-to-plain-03.patch new file mode 100644 index 0000000..074a07a --- /dev/null +++ b/backport-Jordan-to-switch-from-02-03-with-DST-to-plain-03.patch @@ -0,0 +1,91 @@ +From 0b7bd0c706347be1856fd7b1f1455d91cc6fae03 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 5 Oct 2022 17:55:04 -0700 +Subject: [PATCH] Jordan to switch from +02/+03 with DST to plain +03 + +Reference:https://github.com/eggert/tz/commit/3aa74b7f79a3df2f92b563a515a7e24fa175a2eb +Conflict:NEWS context + +* NEWS: Mention this. +* asia (Jordan, Asia/Amman): Go to year-round +03, +effective when the fallback would have occurred. +(Thanks to Issam Al-Zuwairi.) +--- + NEWS | 8 ++++---- + asia | 18 ++++++++++++++---- + 2 files changed, 18 insertions(+), 8 deletions(-) + +diff --git a/NEWS b/NEWS +index cb0f534..50a1302 100644 +--- a/NEWS ++++ b/NEWS +@@ -3,7 +3,7 @@ News for the tz database + Briefly: + Palestine transitions are now Saturdays at 02:00. + Simplify three Ukraine zones into one. +- Syria is switching from +02/+03 with DST to year-round +03. ++ Jordan and Syria switch from +02/+03 with DST to year-round +03. + + Changes to future timestamps + +@@ -12,9 +12,9 @@ News for the tz database + this means 2022 falls back 10-29 at 02:00, not 10-28 at 01:00. + (Thanks to Heba Hamad.) + +- Syria is abandoning the DST regime and is changing to permanent +- +03, so it will not fall back from +03 to +02 on 2022-10-28. +- (Thanks to Steffen Thorsen.) ++ Jordan and Syria are abandoning the DST regime and are changing to ++ permanent +03, so they will not fall back from +03 to +02 on ++ 2022-10-28. (Thanks to Steffen Thorsen and Issam Al-Zuwairi.) + + Release 2022a - 2022-03-15 23:02:01 -0700 + +diff --git a/asia b/asia +index 7c29e49..950bd3f 100644 +--- a/asia ++++ b/asia +@@ -2118,6 +2118,15 @@ Zone Asia/Tokyo 9:18:59 - LMT 1887 Dec 31 15:00u + # From the Arabic version, it seems to say it would be at midnight + # (assume 24:00) on the last Thursday in February, starting from 2022. + ++# From Issam Al-Zuwairi (2022-10-05): ++# The Council of Ministers in Jordan decided Wednesday 5th October 2022, ++# that daylight saving time (DST) will be throughout the year.... ++# https://en.royanews.tv/news/37769/2022-10-05 ++# ++# From Paul Eggert (2022-10-05): ++# Like Syria, model this as a transition from EEST +03 (DST) to plain +03 ++# (non-DST) at the point where DST would otherwise have ended. ++ + # Rule NAME FROM TO - IN ON AT SAVE LETTER/S + Rule Jordan 1973 only - Jun 6 0:00 1:00 S + Rule Jordan 1973 1975 - Oct 1 0:00 0 - +@@ -2149,11 +2158,12 @@ Rule Jordan 2005 only - Sep lastFri 0:00s 0 - + Rule Jordan 2006 2011 - Oct lastFri 0:00s 0 - + Rule Jordan 2013 only - Dec 20 0:00 0 - + Rule Jordan 2014 2021 - Mar lastThu 24:00 1:00 S +-Rule Jordan 2014 max - Oct lastFri 0:00s 0 - +-Rule Jordan 2022 max - Feb lastThu 24:00 1:00 S ++Rule Jordan 2014 2022 - Oct lastFri 0:00s 0 - ++Rule Jordan 2022 only - Feb lastThu 24:00 1:00 S + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Asia/Amman 2:23:44 - LMT 1931 +- 2:00 Jordan EE%sT ++ 2:00 Jordan EE%sT 2022 Oct 28 0:00s ++ 3:00 - +03 + + + # Kazakhstan +@@ -3717,7 +3727,7 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 - + # Tuesday 4 October ..." + # + # From Paul Eggert (2022-10-05): +-# Model this as a transition from EEST +03 (DST) to plain +03 ++# Like Jordan, model this as a transition from EEST +03 (DST) to plain +03 + # (non-DST) at the point where DST would otherwise have ended. + + Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S +-- +2.33.0 + diff --git a/backport-Syria-to-switch-from-02-03-with-DST-to-plain-03.patch b/backport-Syria-to-switch-from-02-03-with-DST-to-plain-03.patch new file mode 100644 index 0000000..f4d3b37 --- /dev/null +++ b/backport-Syria-to-switch-from-02-03-with-DST-to-plain-03.patch @@ -0,0 +1,80 @@ +From dbdd9e57123bce9ee770e7f4e90e12ab60ecb8f9 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 5 Oct 2022 17:17:05 -0700 +Subject: [PATCH] Syria to switch from +02/+03 with DST to plain +03 + +Reference:https://github.com/eggert/tz/commit/59aa97e8e9e3744a06cb004946a104824a5234c2 +Conflict:NEWS context + +* NEWS: Mention this. +* asia (Syria, Asia/Damascus): Go to year-round +03, +effective when the fallback would have occurred. +(Thanks to Steffen Thorsen.) +--- + NEWS | 5 +++++ + asia | 18 +++++++++++++----- + 2 files changed, 18 insertions(+), 5 deletions(-) + +diff --git a/NEWS b/NEWS +index df6b384..cb0f534 100644 +--- a/NEWS ++++ b/NEWS +@@ -3,6 +3,7 @@ News for the tz database + Briefly: + Palestine transitions are now Saturdays at 02:00. + Simplify three Ukraine zones into one. ++ Syria is switching from +02/+03 with DST to year-round +03. + + Changes to future timestamps + +@@ -11,6 +12,10 @@ News for the tz database + this means 2022 falls back 10-29 at 02:00, not 10-28 at 01:00. + (Thanks to Heba Hamad.) + ++ Syria is abandoning the DST regime and is changing to permanent ++ +03, so it will not fall back from +03 to +02 on 2022-10-28. ++ (Thanks to Steffen Thorsen.) ++ + Release 2022a - 2022-03-15 23:02:01 -0700 + + Briefly: +diff --git a/asia b/asia +index b57e8a6..7c29e49 100644 +--- a/asia ++++ b/asia +@@ -3710,19 +3710,27 @@ Rule Syria 2007 only - Nov Fri>=1 0:00 0 - + # Our brief summary: + # https://www.timeanddate.com/news/time/syria-dst-2012.html + +-# From Arthur David Olson (2012-03-27): +-# Assume last Friday in March going forward XXX. ++# From Steffen Thorsen (2022-10-05): ++# Syria is adopting year-round DST, starting this autumn.... ++# From https://www.enabbaladi.net/archives/607812 ++# "This [the decision] came after the weekly government meeting today, ++# Tuesday 4 October ..." ++# ++# From Paul Eggert (2022-10-05): ++# Model this as a transition from EEST +03 (DST) to plain +03 ++# (non-DST) at the point where DST would otherwise have ended. + + Rule Syria 2008 only - Apr Fri>=1 0:00 1:00 S + Rule Syria 2008 only - Nov 1 0:00 0 - + Rule Syria 2009 only - Mar lastFri 0:00 1:00 S + Rule Syria 2010 2011 - Apr Fri>=1 0:00 1:00 S +-Rule Syria 2012 max - Mar lastFri 0:00 1:00 S +-Rule Syria 2009 max - Oct lastFri 0:00 0 - ++Rule Syria 2012 2022 - Mar lastFri 0:00 1:00 S ++Rule Syria 2009 2022 - Oct lastFri 0:00 0 - + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone Asia/Damascus 2:25:12 - LMT 1920 # Dimashq +- 2:00 Syria EE%sT ++ 2:00 Syria EE%sT 2022 Oct 28 0:00 ++ 3:00 - +03 + + # Tajikistan + # From Shanks & Pottenger. +-- +2.33.0 + diff --git a/tzdata.spec b/tzdata.spec index d0d268d..104eeee 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2022a -Release: 5 +Release: 6 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -13,6 +13,8 @@ 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 +Patch6004: backport-Syria-to-switch-from-02-03-with-DST-to-plain-03.patch +Patch6005: backport-Jordan-to-switch-from-02-03-with-DST-to-plain-03.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch @@ -113,6 +115,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Wed Oct 12 2022 qinyu - 2022a-6 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Syria and Jordan switch from 02/03 with DST to plain 03 + * Fri Sep 2 2022 qinyu - 2022a-5 - Type:bugfix - CVE:NA -- Gitee