开源软件构建与测试

_service:tar_scm:tzdata.spec Changed

@@ -1,6 +1,6 @@
 Name:		tzdata
-Version:	2022g
-Release:	5
+Version:	2023d
+Release:	1
 Summary:	Timezone data
 License:	Public Domain
 URL:		https://www.iana.org/time-zones
@@ -9,12 +9,7 @@
 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
-Patch6003:	backport-This-year-Morocco-springs-forward-April-23-not-April.patch
-Patch6004:	backport-Palestine-no-longer-observes-DST-during-Ramadan.patch
-Patch6005:	backport-Greenland-changed-standard-time-already.patch
+Patch6000:	backport-Kazakhstan-unifies-on-UTC-5-beginning-2024-03-01.patch
 
 Patch9000:	bugfix-0001-add-Beijing-timezone.patch
 Patch9001:	remove-ROC-timezone.patch
@@ -114,6 +109,18 @@
 %{_datadir}/javazi-1.8
 
 %changelog
+* Tue Jan 23 2024 liuchao <liuchao173@huawei.com> - 2023d-1
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC: upgrade tzdata to 2023d
+
+* Wed Dec 13 2023 langfei<langfei@huawei.com> - 2022g-6
+- Type:bugfix
+- CVE:NA
+- SUG:NA
+- DESC: Fix Palestine predictions for 2072 through 2075; Ittoqqortoormiit (America/Scoresbysund) zone change.
+
 * Thu Apr 6 2023 qinyu<qinyu32@huawei.com> - 2022g-5
 - Type:bugfix
 - CVE:NA

_service:tar_scm:backport-Egypt-now-uses-DST-again.patch Deleted

@@ -1,47 +0,0 @@
-From dcd8cbed23201416cbd3bbf43f669737693282d7 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-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
-

_service:tar_scm:backport-Greenland-changed-standard-time-already.patch Deleted

@@ -1,47 +0,0 @@
-From b019d3a8b3c544d4bbbdb0541acbea5238fcf781 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-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
-

_service:tar_scm:backport-Kazakhstan-unifies-on-UTC-5-beginning-2024-03-01.patch Added

@@ -0,0 +1,67 @@
+From 95a16c87f21c4643055482429dad921357a630c9 Mon Sep 17 00:00:00 2001
+From: Tim Parenti <tim@timtimeonline.com>
+Date: Fri, 19 Jan 2024 14:13:23 -0500
+Subject: PATCH Kazakhstan unifies on UTC+5 beginning 2024-03-01.
+
+* NEWS: Mention this.
+* asia (Asia/Almaty, Asia/Qostanay): Switch from UTC+6 to UTC+5
+beginning 2024-03-01 00:00.
+
+Conflicts: remove the NEWS part
+---
+ asia | 18 ++++++++++++++----
+ 1 file changed, 14 insertions(+), 4 deletions(-)
+
+diff --git a/asia b/asia
+index 8028c06e..20ff92b4 100644
+--- a/asia
++++ b/asia
+@@ -2457,6 +2457,16 @@ Zone	Asia/Amman	2:23:44 -	LMT	1931
+ # effective December 21st, 2018....
+ # http://adilet.zan.kz/rus/docs/P1800000817 (russian language).
+ 
++# From Zhanbolat Raimbekov (2024-01-19):
++# Kazakhstan (all parts) switching to UTC+5 on March 1, 2024
++# https://www.gov.kz/memleket/entities/mti/press/news/details/688998?lang=ru
++# in Russian
++#
++# From Alexander Krivenyshev (2024-01-19):
++# According to a different news and the official web site for the Ministry of
++# Trade and Integration of the Republic of Kazakhstan:
++# https://en.inform.kz/news/kazakhstan-to-switch-to-single-hour-zone-mar-1-54ad0b/
++
+ # Zone	NAME		STDOFF	RULES	FORMAT	UNTIL
+ #
+ # Almaty (formerly Alma-Ata), representing most locations in Kazakhstan
+@@ -2467,7 +2477,8 @@ Zone	Asia/Almaty	5:07:48 -	LMT	1924 May  2 # or Alma-Ata
+ 			6:00 RussiaAsia +06/+07	1991 Mar 31  2:00s
+ 			5:00 RussiaAsia	+05/+06	1992 Jan 19  2:00s
+ 			6:00 RussiaAsia	+06/+07	2004 Oct 31  2:00s
+-			6:00	-	+06
++			6:00	-	+06	2024 Mar  1  0:00
++			5:00	-	+05
+ # Qyzylorda (aka Kyzylorda, Kizilorda, Kzyl-Orda, etc.) (KZ-KZY)
+ Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
+ 			4:00	-	+04	1930 Jun 21
+@@ -2481,7 +2492,6 @@ Zone	Asia/Qyzylorda	4:21:52 -	LMT	1924 May  2
+ 			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
+ 			6:00	-	+06	2018 Dec 21  0:00
+ 			5:00	-	+05
+-#
+ # Qostanay (aka Kostanay, Kustanay) (KZ-KUS)
+ # The 1991/2 rules are unclear partly because of the 1997 Turgai
+ # reorganization.
+@@ -2493,8 +2503,8 @@ Zone	Asia/Qostanay	4:14:28 -	LMT	1924 May  2
+ 			5:00 RussiaAsia	+05/+06	1991 Mar 31  2:00s
+ 			4:00 RussiaAsia	+04/+05	1992 Jan 19  2:00s
+ 			5:00 RussiaAsia	+05/+06	2004 Oct 31  2:00s
+-			6:00	-	+06
+-
++			6:00	-	+06	2024 Mar  1  0:00
++			5:00	-	+05
+ # Aqtöbe (aka Aktobe, formerly Aktyubinsk) (KZ-AKT)
+ Zone	Asia/Aqtobe	3:48:40	-	LMT	1924 May  2
+ 			4:00	-	+04	1930 Jun 21
+-- 
+2.23.0
+

_service:tar_scm:backport-Max-max.patch Deleted

@@ -1,33 +0,0 @@
-From af242d11b62584808a66851b8707148bf1ee8d0a Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-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
-

_service:tar_scm:backport-Much-of-Greenland-still-uses-DST-from-2024-on.patch Deleted

@@ -1,67 +0,0 @@
-From 6438e996dc99cd5988b1ddd6dc3f95dfd1919caf Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Fri, 2 Dec 2022 13:26:46 -0800
-Subject: PATCH Much of Greenland still uses DST from 2024 on
-
-Reference: https://github.com/eggert/tz/commit/bb7bfd2dd475402b79a87263ee89aa78c4af7c60
-Conflict: remove NEWS;
-
-(Thanks to Thomas M. Steenholdt.)
-* NEWS: Mention this.
-* europe (America/Nuuk): Instead of switching from -03/-02 to
-permanent -02 in March 2023, switch from -03/-02 to -02/-01
-in October 2023.
----
- europe | 29 ++++++++++++++---------------
- 1 file changed, 14 insertions(+), 15 deletions(-)
-
-diff --git a/europe b/europe
-index 122a0b5..7f00931 100644
---- a/europe
-+++ b/europe
-@@ -1170,19 +1170,18 @@ Zone Atlantic/Faroe	-0:27:04 -	LMT	1908 Jan 11 # Tórshavn
- #
- # From Jürgen Appel (2022-11-25):
- # https://ina.gl/samlinger/oversigt-over-samlinger/samling/dagsordener/dagsorden.aspx?lang=da&day=24-11-2022
--# If I understand this correctly, from the next planned switch to
--# summer time, Greenland will permanently stay at that time, i.e. no
--# switch back to winter time in 2023 will occur.
--#
--# From Paul Eggert (2022-11-28):
--# The official document in Danish
--# https://naalakkersuisut.gl/-/media/naalakkersuisut/filer/kundgoerelser/2022/11/2511/31_da_inatsisartutlov-om-tidens-bestemmelse.pdf?la=da&hash=A33597D8A38CC7038465241119EF34F3
--# says standard time for Greenland is -02, that Naalakkersuisut can lay down
--# rules for DST and can require some areas to use a different time zone,
--# and that this all takes effect 2023-03-25 22:00.  The abovementioned
--# "bekymringer" URL says the intent is no transition March 25, that
--# Greenland will not go back to winter time in fall 2023, and that
--# only America/Nuuk is affected (though further changes may occur).
-+#
-+# From Thomas M. Steenholdt (2022-12-02):
-+# - The bill to move America/Nuuk from UTC-03 to UTC-02 passed.
-+# - The bill to stop observing DST did not (Greenland will stop observing DST
-+#   when EU does).
-+# Details on the implementation are here (section 6):
-+# https://ina.gl/dvd/EM%202022/pdf/media/2553529/pkt17_em2022_tidens_bestemmelse_bem_da.pdf
-+# This is how the change will be implemented:
-+# 1. The shift *to* DST in 2023 happens as normal.
-+# 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.
- 
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule	Thule	1991	1992	-	Mar	lastSun	2:00	1:00	D
-@@ -1206,8 +1205,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 Mar 25 22:00
--			-2:00	-	-02
-+			-3:00	EU	-03/-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
-

_service:tar_scm:backport-Palestine-no-longer-observes-DST-during-Ramadan.patch Deleted

@@ -1,162 +0,0 @@
-From c759f632702b2db2645f733e3574469fc20ee9c3 Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-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 c656cd4..4c8d22c 100644
---- a/asia
-+++ b/asia
-@@ -3388,9 +3388,44 @@ Zone	Asia/Karachi	4:28:12 -	LMT	1907
- # (2022-08-31): ... the Saturday before the last Sunday in March and October
- # at 2:00 AM ,for the years from 2023 to 2026.
- # (2022-09-05): https://mtit.pna.ps/Site/New/1453
--#
--# 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
-@@ -3430,8 +3465,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
-

_service:tar_scm:backport-This-year-Morocco-springs-forward-April-23-not-April.patch Deleted

@@ -1,155 +0,0 @@
-From 251c97bb872fe6074824a1144eea5f84c419bb9d Mon Sep 17 00:00:00 2001
-From: Paul Eggert <eggert@cs.ucla.edu>
-Date: Tue, 14 Mar 2023 15:17:59 -0700
-Subject: PATCH This year Morocco springs forward April 23, not April 30
-
-Reference:https://github.com/eggert/tz/commit/251c97bb872fe6074824a1144eea5f84c419bb9d
-Conflict: remove NEWS
-
-* NEWS: Mention this.
-* africa (Morocco): In 2023 Morocco's spring-forward transition after
-Ramadan will occur April 23, not April 30.  (Thanks to Milamber.)
-Adjust predictions for future years accordingly.
----
- africa | 41 +++++++++++++++++++++++------------------
- 1 file changed, 23 insertions(+), 18 deletions(-)
-
-diff --git a/africa b/africa
-index 6ea984b..30ff3ca 100644
---- a/africa
-+++ b/africa
-@@ -901,19 +901,28 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
- # Friday or Saturday (and so the 2 days off are on a weekend), the next time
- # shift will be the next weekend.
- #
--# From Paul Eggert (2020-05-31):
-+# From Milamber (2021-03-31, 2022-03-10):
-+# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076
-+# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/
-+#
-+# From Milamber (2023-03-14):
-+# https://fr.le360.ma/societe/ramadan-2023-retour-a-lheure-gmt-a-partir-de-ce-dimanche-19-mars_6ARLYJJ4ZNHCFGOYEJ3LVIVZPQ/
-+# The return to legal GMT time will take place this Sunday, March 19 at 3 a.m.
-+# ... the return to GMT+1 will be made on Sunday April 23, 2023 at 2 a.m.
-+#
-+# From Paul Eggert (2023-03-14):
- # For now, guess that in the future Morocco will fall back at 03:00
- # the last Sunday before Ramadan, and spring forward at 02:00 the
--# first Sunday after two days after Ramadan.  To implement this,
-+# first Sunday after one day after Ramadan.  To implement this,
- # transition dates and times for 2019 through 2087 were determined by
--# running the following program under GNU Emacs 26.3.  (This algorithm
-+# running the following program under GNU Emacs 28.2.  (This algorithm
- # also produces the correct transition dates for 2016 through 2018,
- # though the times differ due to Morocco's time zone change in 2018.)
- # (let ((islamic-year 1440))
- #   (require 'cal-islam)
- #   (while (< islamic-year 1511)
- #     (let ((a (calendar-islamic-to-absolute (list 9 1 islamic-year)))
--#           (b (+ 2 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
-+#           (b (+ 1 (calendar-islamic-to-absolute (list 10 1 islamic-year))))
- #           (sunday 0))
- #       (while (/= sunday (mod (setq a (1- a)) 7)))
- #       (while (/= sunday (mod b 7))
-@@ -927,10 +936,6 @@ Zone Indian/Mauritius	3:50:00 -	LMT	1907 # Port Louis
- #         (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))))
--#
--# From Milamber (2021-03-31, 2022-03-10), confirming these predictions:
--# https://www.mmsp.gov.ma/fr/actualites.aspx?id=2076
--# https://www.ecoactu.ma/horaires-administration-ramadan-gmtheure-gmt-a-partir-de-dimanche-27-mars/
- 
- # Rule	NAME	FROM	TO	-	IN	ON	AT	SAVE	LETTER/S
- Rule	Morocco	1939	only	-	Sep	12	 0:00	1:00	-
-@@ -983,7 +988,7 @@ Rule	Morocco	2021	only	-	May	16	 2:00	0	-
- Rule	Morocco	2022	only	-	Mar	27	 3:00	-1:00	-
- Rule	Morocco	2022	only	-	May	 8	 2:00	0	-
- Rule	Morocco	2023	only	-	Mar	19	 3:00	-1:00	-
--Rule	Morocco	2023	only	-	Apr	30	 2:00	0	-
-+Rule	Morocco	2023	only	-	Apr	23	 2:00	0	-
- Rule	Morocco	2024	only	-	Mar	10	 3:00	-1:00	-
- Rule	Morocco	2024	only	-	Apr	14	 2:00	0	-
- Rule	Morocco	2025	only	-	Feb	23	 3:00	-1:00	-
-@@ -999,7 +1004,7 @@ Rule	Morocco	2029	only	-	Feb	18	 2:00	0	-
- Rule	Morocco	2029	only	-	Dec	30	 3:00	-1:00	-
- Rule	Morocco	2030	only	-	Feb	10	 2:00	0	-
- Rule	Morocco	2030	only	-	Dec	22	 3:00	-1:00	-
--Rule	Morocco	2031	only	-	Feb	 2	 2:00	0	-
-+Rule	Morocco	2031	only	-	Jan	26	 2:00	0	-
- Rule	Morocco	2031	only	-	Dec	14	 3:00	-1:00	-
- Rule	Morocco	2032	only	-	Jan	18	 2:00	0	-
- Rule	Morocco	2032	only	-	Nov	28	 3:00	-1:00	-
-@@ -1015,7 +1020,7 @@ Rule	Morocco	2036	only	-	Nov	23	 2:00	0	-
- Rule	Morocco	2037	only	-	Oct	 4	 3:00	-1:00	-
- Rule	Morocco	2037	only	-	Nov	15	 2:00	0	-
- Rule	Morocco	2038	only	-	Sep	26	 3:00	-1:00	-
--Rule	Morocco	2038	only	-	Nov	 7	 2:00	0	-
-+Rule	Morocco	2038	only	-	Oct	31	 2:00	0	-
- Rule	Morocco	2039	only	-	Sep	18	 3:00	-1:00	-
- Rule	Morocco	2039	only	-	Oct	23	 2:00	0	-
- Rule	Morocco	2040	only	-	Sep	 2	 3:00	-1:00	-
-@@ -1031,7 +1036,7 @@ Rule	Morocco	2044	only	-	Aug	28	 2:00	0	-
- Rule	Morocco	2045	only	-	Jul	 9	 3:00	-1:00	-
- Rule	Morocco	2045	only	-	Aug	20	 2:00	0	-
- Rule	Morocco	2046	only	-	Jul	 1	 3:00	-1:00	-
--Rule	Morocco	2046	only	-	Aug	12	 2:00	0	-
-+Rule	Morocco	2046	only	-	Aug	 5	 2:00	0	-
- Rule	Morocco	2047	only	-	Jun	23	 3:00	-1:00	-
- Rule	Morocco	2047	only	-	Jul	28	 2:00	0	-
- Rule	Morocco	2048	only	-	Jun	 7	 3:00	-1:00	-
-@@ -1047,7 +1052,7 @@ Rule	Morocco	2052	only	-	Jun	 2	 2:00	0	-
- Rule	Morocco	2053	only	-	Apr	13	 3:00	-1:00	-
- Rule	Morocco	2053	only	-	May	25	 2:00	0	-
- Rule	Morocco	2054	only	-	Apr	 5	 3:00	-1:00	-
--Rule	Morocco	2054	only	-	May	17	 2:00	0	-
-+Rule	Morocco	2054	only	-	May	10	 2:00	0	-
- Rule	Morocco	2055	only	-	Mar	28	 3:00	-1:00	-
- Rule	Morocco	2055	only	-	May	 2	 2:00	0	-
- Rule	Morocco	2056	only	-	Mar	12	 3:00	-1:00	-
-@@ -1063,7 +1068,7 @@ Rule	Morocco	2060	only	-	Mar	 7	 2:00	0	-
- Rule	Morocco	2061	only	-	Jan	16	 3:00	-1:00	-
- Rule	Morocco	2061	only	-	Feb	27	 2:00	0	-
- Rule	Morocco	2062	only	-	Jan	 8	 3:00	-1:00	-
--Rule	Morocco	2062	only	-	Feb	19	 2:00	0	-
-+Rule	Morocco	2062	only	-	Feb	12	 2:00	0	-
- Rule	Morocco	2062	only	-	Dec	31	 3:00	-1:00	-
- Rule	Morocco	2063	only	-	Feb	 4	 2:00	0	-
- Rule	Morocco	2063	only	-	Dec	16	 3:00	-1:00	-
-@@ -1079,7 +1084,7 @@ Rule	Morocco	2067	only	-	Dec	11	 2:00	0	-
- Rule	Morocco	2068	only	-	Oct	21	 3:00	-1:00	-
- Rule	Morocco	2068	only	-	Dec	 2	 2:00	0	-
- Rule	Morocco	2069	only	-	Oct	13	 3:00	-1:00	-
--Rule	Morocco	2069	only	-	Nov	24	 2:00	0	-
-+Rule	Morocco	2069	only	-	Nov	17	 2:00	0	-
- Rule	Morocco	2070	only	-	Oct	 5	 3:00	-1:00	-
- Rule	Morocco	2070	only	-	Nov	 9	 2:00	0	-
- Rule	Morocco	2071	only	-	Sep	20	 3:00	-1:00	-
-@@ -1095,7 +1100,7 @@ Rule	Morocco	2075	only	-	Sep	15	 2:00	0	-
- Rule	Morocco	2076	only	-	Jul	26	 3:00	-1:00	-
- Rule	Morocco	2076	only	-	Sep	 6	 2:00	0	-
- Rule	Morocco	2077	only	-	Jul	18	 3:00	-1:00	-
--Rule	Morocco	2077	only	-	Aug	29	 2:00	0	-
-+Rule	Morocco	2077	only	-	Aug	22	 2:00	0	-
- Rule	Morocco	2078	only	-	Jul	10	 3:00	-1:00	-
- Rule	Morocco	2078	only	-	Aug	14	 2:00	0	-
- Rule	Morocco	2079	only	-	Jun	25	 3:00	-1:00	-
-@@ -1105,13 +1110,13 @@ Rule	Morocco	2080	only	-	Jul	21	 2:00	0	-
- Rule	Morocco	2081	only	-	Jun	 1	 3:00	-1:00	-
- Rule	Morocco	2081	only	-	Jul	13	 2:00	0	-
- Rule	Morocco	2082	only	-	May	24	 3:00	-1:00	-
--Rule	Morocco	2082	only	-	Jul	 5	 2:00	0	-
-+Rule	Morocco	2082	only	-	Jun	28	 2:00	0	-
- Rule	Morocco	2083	only	-	May	16	 3:00	-1:00	-
- Rule	Morocco	2083	only	-	Jun	20	 2:00	0	-
- Rule	Morocco	2084	only	-	Apr	30	 3:00	-1:00	-
- Rule	Morocco	2084	only	-	Jun	11	 2:00	0	-
- Rule	Morocco	2085	only	-	Apr	22	 3:00	-1:00	-
--Rule	Morocco	2085	only	-	Jun	 3	 2:00	0	-
-+Rule	Morocco	2085	only	-	May	27	 2:00	0	-
- Rule	Morocco	2086	only	-	Apr	14	 3:00	-1:00	-
- Rule	Morocco	2086	only	-	May	19	 2:00	0	-
- Rule	Morocco	2087	only	-	Mar	30	 3:00	-1:00	-
--- 
-2.33.0
-

_service:tar_scm:bugfix-0001-add-Beijing-timezone.patch Changed

_service:tar_scm:rename-Macau-to-Macao.patch Changed

_service:tar_scm:skip-check_web-testcase.patch Changed

_service Changed

_service:tar_scm:tzcode2022g.tar.gz Deleted

_service:tar_scm:tzcode2023d.tar.gz Added

_service:tar_scm:tzdata2022g.tar.gz Deleted

_service:tar_scm:tzdata2023d.tar.gz Added

Changes of Revision 3