diff --git a/backport-Egypt-now-uses-DST-again.patch b/backport-Egypt-now-uses-DST-again.patch new file mode 100644 index 0000000..4edbe9d --- /dev/null +++ b/backport-Egypt-now-uses-DST-again.patch @@ -0,0 +1,47 @@ +From dcd8cbed23201416cbd3bbf43f669737693282d7 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Wed, 1 Mar 2023 12:10:57 -0800 +Subject: [PATCH 1/2] Egypt now uses DST again + +Reference: https://github.com/eggert/tz/commit/dcd8cbed23201416cbd3bbf43f669737693282d7 +Conflict: remove NEWS; context + +From 2023 Egypt plans to observe DST from April's last Friday +through October's last Thursday (Thanks to Ahmad ElDardiry.) +Assume 00:00 and 24:00 transitions. +* NEWS: Mention this. +* africa (Egypt): Implement this. +--- + africa | 9 +++++++++ + 1 file changed, 9 insertions(+) + +diff --git a/africa b/africa +index 91b8342..6476336 100644 +--- a/africa ++++ b/africa +@@ -321,6 +321,13 @@ Rule Egypt 2007 only - Sep Thu>=1 24:00 0 - + # From Mina Samuel (2016-07-04): + # Egyptian government took the decision to cancel the DST, + ++# From Ahmad ElDardiry (2023-03-01): ++# Egypt officially announced today that daylight savings will be ++# applied from last Friday of April to last Thursday of October. ++# https://www.mena.org.eg/ar/news/dbcall/table/textnews/id/10044253 ++# From Paul Eggert (2023-03-01): ++# Assume transitions are at 00:00 and 24:00 respectively. ++ + Rule Egypt 2008 only - Aug lastThu 24:00 0 - + Rule Egypt 2009 only - Aug 20 24:00 0 - + Rule Egypt 2010 only - Aug 10 24:00 0 - +@@ -330,6 +337,8 @@ Rule Egypt 2014 only - May 15 24:00 1:00 S + Rule Egypt 2014 only - Jun 26 24:00 0 - + Rule Egypt 2014 only - Jul 31 24:00 1:00 S + Rule Egypt 2014 only - Sep lastThu 24:00 0 - ++Rule Egypt 2023 max - Apr lastFri 0:00 1:00 S ++Rule Egypt 2023 Max - Oct lastThu 24:00 0 - + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + #STDOFF 2:05:08.9 +-- +2.33.0 + diff --git a/backport-Max-max.patch b/backport-Max-max.patch new file mode 100644 index 0000000..39df0bb --- /dev/null +++ b/backport-Max-max.patch @@ -0,0 +1,33 @@ +From af242d11b62584808a66851b8707148bf1ee8d0a Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Thu, 2 Mar 2023 02:01:27 -0800 +Subject: [PATCH 2/2] =?UTF-8?q?Max=20=E2=86=92=20max?= +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +Reference: https://github.com/eggert/tz/commit/af242d11b62584808a66851b8707148bf1ee8d0a +Conflict: context + +* africa (Egypt): Use lower-case ‘max’ for consistency. +(Thanks to Peter Krefting.) +--- + africa | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/africa b/africa +index 6476336..cfee2a0 100644 +--- a/africa ++++ b/africa +@@ -338,7 +338,7 @@ Rule Egypt 2014 only - Jun 26 24:00 0 - + Rule Egypt 2014 only - Jul 31 24:00 1:00 S + Rule Egypt 2014 only - Sep lastThu 24:00 0 - + Rule Egypt 2023 max - Apr lastFri 0:00 1:00 S +-Rule Egypt 2023 Max - Oct lastThu 24:00 0 - ++Rule Egypt 2023 max - Oct lastThu 24:00 0 - + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + #STDOFF 2:05:08.9 +-- +2.33.0 + diff --git a/tzdata.spec b/tzdata.spec index 209bf6e..5c5f842 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2022g -Release: 1 +Release: 2 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -10,6 +10,8 @@ Source2: javazic.tar.gz Source3: javazic-1.8-37392f2f5d59.tar.xz Patch6000: backport-Much-of-Greenland-still-uses-DST-from-2024-on.patch +Patch6001: backport-Egypt-now-uses-DST-again.patch +Patch6002: backport-Max-max.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-ROC-timezone.patch @@ -109,6 +111,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Fri Mar 10 2023 qinyu - 2022g-2 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: Egypt now uses DST again + * Tue Jan 3 2023 qinyu - 2022g-1 - Type:bugfix - CVE:NA