From d702f2ff67ed1099c01d5485a2063e67ba76b577 Mon Sep 17 00:00:00 2001 From: langfei Date: Wed, 30 Oct 2024 23:14:40 -0400 Subject: [PATCH] The time zone rule of Paraguay is changed. Signed-off-by: langfei (cherry picked from commit cbdd68de11a8982e61893d85f5b7d02348609f49) --- ...ts-permanent-03-starting-spring-2024.patch | 68 +++++++++++++++++++ ...raguay-tm_isdst-flag-goes-to-0-today.patch | 67 ++++++++++++++++++ tzdata.spec | 10 ++- 3 files changed, 144 insertions(+), 1 deletion(-) create mode 100644 backport-Paraguay-adopts-permanent-03-starting-spring-2024.patch create mode 100644 backport-Paraguay-tm_isdst-flag-goes-to-0-today.patch diff --git a/backport-Paraguay-adopts-permanent-03-starting-spring-2024.patch b/backport-Paraguay-adopts-permanent-03-starting-spring-2024.patch new file mode 100644 index 0000000..6204ac8 --- /dev/null +++ b/backport-Paraguay-adopts-permanent-03-starting-spring-2024.patch @@ -0,0 +1,68 @@ +From 636e6f983bca35e6f945e092ffdc315ae3e5dd9e Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Sat, 5 Oct 2024 09:57:40 -0700 +Subject: [PATCH] Paraguay adopts permanent -03 starting spring 2024 +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +(Thanks to Heitor David Pinto and Even Scharning.) +* NEWS: Mention this. +* southamerica (Para): Stop DST transitions in fall 2024. +(America/Asuncion): Switch to -03 without DST in spring 2024. +* zonenow.tab (America/Asuncion): Remove, since it’s equivalent to +America/Sao_Paulo starting tomorrow and we won’t have a new TZDB +release before tomorrow. Until then, you can check with +‘make CHECK_NOW_TIMESTAMP=1728187201 check’. + +Reference: https://github.com/eggert/tz/commit/636e6f983bca35e6f945e092ffdc315ae3e5dd9e +Conflict: 1.remove NEWS. +2.remove zonenow.tab modified due to bb7c04a1de47 not merged. +3.Modify context due to 94e6b3b0eb773e66a9ac49b905c69c0fa6a31dc3 not merged. +--- + southamerica | 16 +++++++++++++--- + 1 files changed, 13 insertions(+), 3 deletions(-) + +diff --git a/southamerica b/southamerica +index c8d9097a..24f92e24 100644 +--- a/southamerica ++++ b/southamerica +@@ -1656,7 +1656,7 @@ Rule Para 2005 2009 - Mar Sun>=8 0:00 0 - + # and that on the first Sunday of the month of October, it is to be set + # forward 60 minutes, in all the territory of the Paraguayan Republic. + # ... +-Rule Para 2010 max - Oct Sun>=1 0:00 1:00 - ++Rule Para 2010 2023 - Oct Sun>=1 0:00 1:00 - + Rule Para 2010 2012 - Apr Sun>=8 0:00 0 - + # + # From Steffen Thorsen (2013-03-07): +@@ -1669,14 +1669,24 @@ Rule Para 2010 2012 - Apr Sun>=8 0:00 0 - + # From Carlos Raúl Perasso (2014-02-28): + # Decree 1264 can be found at: + # http://www.presidencia.gov.py/archivos/documentos/DECRETO1264_ey9r8zai.pdf +-Rule Para 2013 max - Mar Sun>=22 0:00 0 - ++Rule Para 2013 2024 - Mar Sun>=22 0:00 0 - ++# ++# From Heitor David Pinto (2024-09-24): ++# Today the Congress of Paraguay passed a bill to observe UTC-3 permanently.... ++# The text of the bill says that it would enter into force on the first ++# Sunday in October 2024, the same date currently scheduled to start DST.... ++# https://silpy.congreso.gov.py/web/expediente/132531 ++# From Even Scharning (2024-10-04): ++# President Santiago Peña confirmed today that he will sign the bill. Source: ++# https://www.ip.gov.py/ip/2024/10/04/ejecutivo-confirma-que-promulgara-ley-de-horario-unico-en-el-territorio-paraguayo/ + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone America/Asuncion -3:50:40 - LMT 1890 + -3:50:40 - AMT 1931 Oct 10 # Asunción Mean Time + -4:00 - -04 1972 Oct + -3:00 - -03 1974 Apr +- -4:00 Para -04/-03 ++ -4:00 Para -04/-03 2024 Oct 6 0:00 ++ -3:00 - -03 + + # Peru + # +-- +2.28.0.windows.1 + diff --git a/backport-Paraguay-tm_isdst-flag-goes-to-0-today.patch b/backport-Paraguay-tm_isdst-flag-goes-to-0-today.patch new file mode 100644 index 0000000..e7bfeff --- /dev/null +++ b/backport-Paraguay-tm_isdst-flag-goes-to-0-today.patch @@ -0,0 +1,67 @@ +From 486e1e890e68d52f9236b2b354484463f57ec692 Mon Sep 17 00:00:00 2001 +From: Paul Eggert +Date: Tue, 15 Oct 2024 08:13:38 -0700 +Subject: [PATCH] Paraguay tm_isdst flag goes to 0 today +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +* southamerica (America/Asuncion): Legal change was today. +(Thanks to Heitor David Pinto.) This doesn’t affect UT offset or +abbreviation, only the obsolescent tm_isdst flag. + +Reference: https://github.com/eggert/tz/commit/486e1e890e68d52f9236b2b354484463f57ec692 +Conflict: 1.remove NEWS. +2.Modify context due to 94e6b3b0eb773e66a9ac49b905c69c0fa6a31dc3 not merged. +--- + southamerica | 21 ++++++++++++++++----- + 1 files changed, 16 insertions(+), 5 deletions(-) + +diff --git a/southamerica b/southamerica +index 24f92e24..1fcf6514 100644 +--- a/southamerica ++++ b/southamerica +@@ -1656,7 +1656,7 @@ Rule Para 2005 2009 - Mar Sun>=8 0:00 0 - + # and that on the first Sunday of the month of October, it is to be set + # forward 60 minutes, in all the territory of the Paraguayan Republic. + # ... +-Rule Para 2010 2023 - Oct Sun>=1 0:00 1:00 - ++Rule Para 2010 2024 - Oct Sun>=1 0:00 1:00 - + Rule Para 2010 2012 - Apr Sun>=8 0:00 0 - + # + # From Steffen Thorsen (2013-03-07): +@@ -1676,16 +1676,27 @@ Rule Para 2013 2024 - Mar Sun>=22 0:00 0 - + # The text of the bill says that it would enter into force on the first + # Sunday in October 2024, the same date currently scheduled to start DST.... + # https://silpy.congreso.gov.py/web/expediente/132531 +-# From Even Scharning (2024-10-04): +-# President Santiago Peña confirmed today that he will sign the bill. Source: +-# https://www.ip.gov.py/ip/2024/10/04/ejecutivo-confirma-que-promulgara-ley-de-horario-unico-en-el-territorio-paraguayo/ ++# (2024-10-14): ++# The president approved the law on 11 October 2024, ++# and it was officially published on 14 October 2024. ++# https://www.gacetaoficial.gov.py/index/detalle_publicacion/89723 ++# The text of the law says that it enters into force on the first ++# Sunday in October 2024 (6 October 2024). But the constitution ++# prohibits retroactive effect, and the civil code says that laws ++# enter into force on the day after their publication or on the day ++# that they specify, and it also says that they don't have retroactive ++# effect. So I think that the time change on 6 October 2024 should ++# still be considered as DST according to the previous law, and ++# permanently UTC-3 from 15 October 2024 according to the new law.... ++# https://www.constituteproject.org/constitution/Paraguay_2011 ++# https://www.oas.org/dil/esp/codigo_civil_paraguay.pdf + + # Zone NAME STDOFF RULES FORMAT [UNTIL] + Zone America/Asuncion -3:50:40 - LMT 1890 + -3:50:40 - AMT 1931 Oct 10 # Asunción Mean Time + -4:00 - -04 1972 Oct + -3:00 - -03 1974 Apr +- -4:00 Para -04/-03 2024 Oct 6 0:00 ++ -4:00 Para -04/-03 2024 Oct 15 + -3:00 - -03 + + # Peru +-- +2.28.0.windows.1 + diff --git a/tzdata.spec b/tzdata.spec index 58e5fea..6ec4ffd 100644 --- a/tzdata.spec +++ b/tzdata.spec @@ -1,6 +1,6 @@ Name: tzdata Version: 2022a -Release: 18 +Release: 19 Summary: Timezone data License: Public Domain URL: https://www.iana.org/time-zones @@ -33,6 +33,8 @@ Patch6020: backport-Vostok-was-at-07-and-just-switched-to-05.patch Patch6021: backport-Sync-Casey-data-from-timeanddate.com.patch Patch6022: backport-Kazakhstan-unifies-on-UTC-5-beginning-2024-03-01.patch Patch6023: backport-Palestine-springs-forward-a-week-later-after-Ramadan.patch +Patch6024: backport-Paraguay-adopts-permanent-03-starting-spring-2024.patch +Patch6025: backport-Paraguay-tm_isdst-flag-goes-to-0-today.patch Patch9000: bugfix-0001-add-Beijing-timezone.patch Patch9001: remove-country-selection-from-tzselect-steps.patch @@ -133,6 +135,12 @@ install -p -m 644 tzdb.dat $RPM_BUILD_ROOT%{_datadir}/javazi-1.8/ %{_datadir}/javazi-1.8 %changelog +* Thu Oct 31 2024 langfei - 2022a-19 +- Type:bugfix +- CVE:NA +- SUG:NA +- DESC: The time zone rule of Paraguay is changed. + * Sun Feb 4 2024 liuchao - 2022a-18 - Type:bugfix - CVE:NA