diff --git a/8352716-tz-Update-Timezone-Data-to-2025b.patch b/8352716-tz-Update-Timezone-Data-to-2025b.patch deleted file mode 100644 index 47bf15604a800d668de5cbd08421702ace69831a..0000000000000000000000000000000000000000 --- a/8352716-tz-Update-Timezone-Data-to-2025b.patch +++ /dev/null @@ -1,268 +0,0 @@ -From a2efc9eab5da50a9ede65ae56159d73a107104e2 Mon Sep 17 00:00:00 2001 -Date: Tue, 29 Apr 2025 11:28:39 +0800 -Subject: [PATCH] 8352716: (tz) Update Timezone Data to 2025b - ---- - make/data/tzdata/VERSION | 2 +- - make/data/tzdata/asia | 12 +- - make/data/tzdata/northamerica | 9 ++ - make/data/tzdata/southamerica | 109 +++++++++++------- - make/data/tzdata/zone.tab | 3 +- - .../java/util/TimeZone/TimeZoneData/VERSION | 2 +- - 6 files changed, 94 insertions(+), 43 deletions(-) - -diff --git a/make/data/tzdata/VERSION b/make/data/tzdata/VERSION -index 9c056fac3..4bd54efbc 100644 ---- a/make/data/tzdata/VERSION -+++ b/make/data/tzdata/VERSION -@@ -21,4 +21,4 @@ - # or visit www.oracle.com if you need additional information or have any - # questions. - # --tzdata2025a -+tzdata2025b -diff --git a/make/data/tzdata/asia b/make/data/tzdata/asia -index b0a6fa01d..55b13134f 100644 ---- a/make/data/tzdata/asia -+++ b/make/data/tzdata/asia -@@ -1523,6 +1523,16 @@ Zone Asia/Jayapura 9:22:48 - LMT 1932 Nov - # (UIT No. 143 17.XI.1977) and not 23 September (UIT No. 141 13.IX.1977). - # UIT is the Operational Bulletin of International Telecommunication Union. - -+# From Roozbeh Pournader (2025-03-18): -+# ... the exact time of Iran's transition from +0400 to +0330 ... was Friday -+# 1357/8/19 AP=1978-11-10. Here's a newspaper clip from the Ettela'at -+# newspaper, dated 1357/8/14 AP=1978-11-05, translated from Persian -+# (at https://w.wiki/DUEY): -+# Following the government's decision about returning the official time -+# to the previous status, the spokesperson for the Ministry of Energy -+# announced today: At the hour 24 of Friday 19th of Aban (=1978-11-10), -+# the country's time will be pulled back half an hour. -+# - # From Roozbeh Pournader (2003-03-15): - # This is an English translation of what I just found (originally in Persian). - # The Gregorian dates in brackets are mine: -@@ -1650,7 +1660,7 @@ Rule Iran 2021 2022 - Sep 21 24:00 0 - - Zone Asia/Tehran 3:25:44 - LMT 1916 - 3:25:44 - TMT 1935 Jun 13 # Tehran Mean Time - 3:30 Iran %z 1977 Oct 20 24:00 -- 4:00 Iran %z 1979 -+ 4:00 Iran %z 1978 Nov 10 24:00 - 3:30 Iran %z - - -diff --git a/make/data/tzdata/northamerica b/make/data/tzdata/northamerica -index 0a54e63be..21f178ee8 100644 ---- a/make/data/tzdata/northamerica -+++ b/make/data/tzdata/northamerica -@@ -1634,6 +1634,15 @@ Zone America/Moncton -4:19:08 - LMT 1883 Dec 9 - # For more on Orillia, see: Daubs K. Bold attempt at daylight saving - # time became a comic failure in Orillia. Toronto Star 2017-07-08. - # https://www.thestar.com/news/insight/2017/07/08/bold-attempt-at-daylight-saving-time-became-a-comic-failure-in-orillia.html -+# From Paul Eggert (2025-03-20): -+# Also see the 1912-06-17 front page of The Evening Sunbeam, -+# reproduced in: Richardson M. "Daylight saving was a confusing -+# time in Orillia" in the 2025-03-15 Orillia Matters. Richardson writes, -+# "The first Sunday after the switch was made, [DST proponent and -+# Orillia mayor William Sword] Frost walked into church an hour late. -+# This became a symbol of the downfall of daylight saving in Orillia." -+# The mayor became known as "Daylight Bill". -+# https://www.orilliamatters.com/local-news/column-daylight-saving-was-a-confusing-time-in-orillia-10377529 - - # From Mark Brader (2010-03-06): - # -diff --git a/make/data/tzdata/southamerica b/make/data/tzdata/southamerica -index 0a5859600..06fee598b 100644 ---- a/make/data/tzdata/southamerica -+++ b/make/data/tzdata/southamerica -@@ -1,26 +1,3 @@ --# --# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. --# --# This code is free software; you can redistribute it and/or modify it --# under the terms of the GNU General Public License version 2 only, as --# published by the Free Software Foundation. Oracle designates this --# particular file as subject to the "Classpath" exception as provided --# by Oracle in the LICENSE file that accompanied this code. --# --# This code is distributed in the hope that it will be useful, but WITHOUT --# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or --# FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License --# version 2 for more details (a copy is included in the LICENSE file that --# accompanied this code). --# --# You should have received a copy of the GNU General Public License version --# 2 along with this work; if not, write to the Free Software Foundation, --# Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. --# --# Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA --# or visit www.oracle.com if you need additional information or have any --# questions. --# - # tzdb data for South America and environs - - # This file is in the public domain, so clarified as of -@@ -1269,35 +1246,45 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 - # dates to 2014. - # DST End: last Saturday of April 2014 (Sun 27 Apr 2014 03:00 UTC) - # DST Start: first Saturday of September 2014 (Sun 07 Sep 2014 04:00 UTC) --# http://www.diariooficial.interior.gob.cl//media/2014/02/19/do-20140219.pdf -+# From Tim Parenti (2025-03-22): -+# Decreto 307 of 2014 of the Ministry of the Interior and Public Security, -+# promulgated 2014-01-30 and published 2014-02-19: -+# https://www.diariooficial.interior.gob.cl/media/2014/02/19/do-20140219.pdf#page=1 -+# https://www.bcn.cl/leychile/navegar?idNorma=1059557 - - # From Eduardo Romero Urra (2015-03-03): - # Today has been published officially that Chile will use the DST time - # permanently until March 25 of 2017 --# http://www.diariooficial.interior.gob.cl/media/2015/03/03/1-large.jpg --# --# From Paul Eggert (2015-03-03): --# For now, assume that the extension will persist indefinitely. -+# From Tim Parenti (2025-03-22): -+# Decreto 106 of 2015 of the Ministry of the Interior and Public Security, -+# promulgated 2015-01-27 and published 2015-03-03: -+# https://www.diariooficial.interior.gob.cl/media/2015/03/03/do-20150303.pdf#page=1 -+# https://www.bcn.cl/leychile/navegar?idNorma=1075157 - - # From Juan Correa (2016-03-18): --# The decree regarding DST has been published in today's Official Gazette: --# http://www.diariooficial.interior.gob.cl/versiones-anteriores/do/20160318/ --# http://www.leychile.cl/Navegar?idNorma=1088502 -+# The decree regarding DST has been published in today's Official Gazette... - # It does consider the second Saturday of May and August as the dates - # for the transition; and it lists DST dates until 2019, but I think - # this scheme will stick. --# - # From Paul Eggert (2016-03-18): --# For now, assume the pattern holds for the indefinite future. - # The decree says transitions occur at 24:00; in practice this appears - # to mean 24:00 mainland time, not 24:00 local time, so that Easter - # Island is always two hours behind the mainland. -+# From Tim Parenti (2025-03-22): -+# Decreto 253 of 2016 of the Ministry of the Interior and Public Security, -+# promulgated 2016-03-16 and published 2016-03-18. -+# https://www.diariooficial.interior.gob.cl/media/2016/03/18/do-20160318.pdf#page=1 -+# https://www.bcn.cl/leychile/navegar?idNorma=1088502 - - # From Juan Correa (2016-12-04): - # Magallanes region ... will keep DST (UTC -3) all year round.... - # http://www.soychile.cl/Santiago/Sociedad/2016/12/04/433428/Bachelet-firmo-el-decreto-para-establecer-un-horario-unico-para-la-Region-de-Magallanes.aspx --# From Deborah Goldsmith (2017-01-19): --# http://www.diariooficial.interior.gob.cl/publicaciones/2017/01/17/41660/01/1169626.pdf -+# From Tim Parenti (2025-03-22), via Deborah Goldsmith (2017-01-19): -+# Decreto 1820 of 2016 of the Ministry of the Interior and Public Security, -+# promulgated 2016-12-02 and published 2017-01-17: -+# https://www.diariooficial.interior.gob.cl/publicaciones/2017/01/17/41660/01/1169626.pdf -+# https://www.bcn.cl/leychile/Navegar?idNorma=1099217 -+# Model this as a change to standard offset effective 2016-12-04. - - # From Juan Correa (2018-08-13): - # As of moments ago, the Ministry of Energy in Chile has announced the new -@@ -1316,13 +1303,20 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 - # https://twitter.com/MinEnergia/status/1029009354001973248 - # "We will keep the new time policy unchanged for at least the next 4 years." - # So we extend the new rules on Saturdays at 24:00 mainland time indefinitely. --# From Juan Correa (2019-02-04): --# http://www.diariooficial.interior.gob.cl/publicaciones/2018/11/23/42212/01/1498738.pdf -+# From Tim Parenti (2025-03-22), via Juan Correa (2019-02-04): -+# Decreto 1286 of 2018 of the Ministry of the Interior and Public Security, -+# promulgated 2018-09-21 and published 2018-11-23: -+# https://www.diariooficial.interior.gob.cl/publicaciones/2018/11/23/42212/01/1498738.pdf -+# https://www.bcn.cl/leychile/Navegar?idNorma=1125760 - - # From Juan Correa (2022-04-02): - # I found there was a decree published last Thursday that will keep --# Magallanes region to UTC -3 "indefinitely". The decree is available at -+# Magallanes region to UTC -3 "indefinitely". -+# From Tim Parenti (2025-03-22): -+# Decreto 143 of 2022 of the Ministry of the Interior and Public Security, -+# promulgated 2022-03-29 and published 2022-03-31: - # https://www.diariooficial.interior.gob.cl/publicaciones/2022/03/31/43217-B/01/2108910.pdf -+# https://www.bcn.cl/leychile/Navegar?idNorma=1174342 - - # From Juan Correa (2022-08-09): - # the Internal Affairs Ministry (Ministerio del Interior) informed DST -@@ -1331,13 +1325,36 @@ Zone America/Rio_Branco -4:31:12 - LMT 1914 - # will keep UTC -3 "indefinitely"... This is because on September 4th - # we will have a voting whether to approve a new Constitution. - # --# From Eduardo Romero Urra (2022-08-17): -+# From Tim Parenti (2025-03-22), via Eduardo Romero Urra (2022-08-17): -+# Decreto 224 of 2022 of the Ministry of the Interior and Public Security, -+# promulgated 2022-07-14 and published 2022-08-13: - # https://www.diariooficial.interior.gob.cl/publicaciones/2022/08/13/43327/01/2172567.pdf -+# https://www.bcn.cl/leychile/navegar?idNorma=1179983 - # - # From Paul Eggert (2022-08-17): - # Although the presidential decree stops at fall 2026, assume that - # similar DST rules will continue thereafter. - -+# From Paul Eggert (2025-01-15): -+# Diario Regional Aysén's Sebastián Martel reports that 94% of Aysén -+# citizens polled in November favored changing the rules from -+# -04/-03-with-DST to -03 all year... -+# https://www.diarioregionalaysen.cl/noticia/actualidad/2024/12/presentan-decision-que-gano-la-votacion-sobre-el-cambio-del-huso-horario-en-aysen -+# -+# From Yonathan Dossow (2025-03-20): -+# [T]oday we have more confirmation of the change. [Aysén] region will keep -+# UTC-3 all year... -+# https://www.cnnchile.com/pais/region-de-aysen-mantendra-horario-de-verano-todo-el-ano_20250320/ -+# https://www.latercera.com/nacional/noticia/tras-consulta-ciudadana-region-de-aysen-mantendra-el-horario-de-verano-durante-todo-el-ano/ -+# https://x.com/min_interior/status/1902692504270672098 -+# -+# From Tim Parenti (2025-03-22), via Eduardo Romero Urra (2025-03-20): -+# Decreto 93 of 2025 of the Ministry of the Interior and Public Security, -+# promulgated 2025-03-11 and published 2025-03-20: -+# https://www.diariooficial.interior.gob.cl/publicaciones/2025/03/20/44104/01/2624263.pdf -+# https://www.bcn.cl/leychile/Navegar?idNorma=1211955 -+# Model this as a change to standard offset effective 2025-03-20. -+ - # Rule NAME FROM TO - IN ON AT SAVE LETTER/S - Rule Chile 1927 1931 - Sep 1 0:00 1:00 - - Rule Chile 1928 1932 - Apr 1 0:00 0 - -@@ -1394,6 +1411,20 @@ Zone America/Santiago -4:42:45 - LMT 1890 - -5:00 1:00 %z 1947 Mar 31 24:00 - -5:00 - %z 1947 May 21 23:00 - -4:00 Chile %z -+Zone America/Coyhaique -4:48:16 - LMT 1890 -+ -4:42:45 - SMT 1910 Jan 10 -+ -5:00 - %z 1916 Jul 1 -+ -4:42:45 - SMT 1918 Sep 10 -+ -4:00 - %z 1919 Jul 1 -+ -4:42:45 - SMT 1927 Sep 1 -+ -5:00 Chile %z 1932 Sep 1 -+ -4:00 - %z 1942 Jun 1 -+ -5:00 - %z 1942 Aug 1 -+ -4:00 - %z 1946 Aug 28 24:00 -+ -5:00 1:00 %z 1947 Mar 31 24:00 -+ -5:00 - %z 1947 May 21 23:00 -+ -4:00 Chile %z 2025 Mar 20 -+ -3:00 - %z - Zone America/Punta_Arenas -4:43:40 - LMT 1890 - -4:42:45 - SMT 1910 Jan 10 - -5:00 - %z 1916 Jul 1 -diff --git a/make/data/tzdata/zone.tab b/make/data/tzdata/zone.tab -index e7a4868c3..c8fc60104 100644 ---- a/make/data/tzdata/zone.tab -+++ b/make/data/tzdata/zone.tab -@@ -162,7 +162,8 @@ CH +4723+00832 Europe/Zurich - CI +0519-00402 Africa/Abidjan - CK -2114-15946 Pacific/Rarotonga - CL -3327-07040 America/Santiago most of Chile --CL -5309-07055 America/Punta_Arenas Region of Magallanes -+CL -4534-07204 America/Coyhaique Aysen Region -+CL -5309-07055 America/Punta_Arenas Magallanes Region - CL -2709-10926 Pacific/Easter Easter Island - CM +0403+00942 Africa/Douala - CN +3114+12128 Asia/Shanghai Beijing Time -diff --git a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -index 5159b3786..750d9fae2 100644 ---- a/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -+++ b/test/jdk/java/util/TimeZone/TimeZoneData/VERSION -@@ -1 +1 @@ --tzdata2025a -+tzdata2025b --- - diff --git a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch index 12408a808d467951911de08b75b4691227f4aa1f..0ef64b6a8c66caf0a7f220bde7b86c0945092d61 100755 --- a/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch +++ b/G1-iterate-region-by-bitmap-rather-than-obj-size-in.patch @@ -367,4 +367,4 @@ index 000000000..85b49171c --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ -+11.0.27.0.13 ++11.0.28.0.13 diff --git a/delete_expired_certificates.patch b/delete_expired_certificates.patch index 19a0e1562473a34aaec8579fb4f75bd14d52c163..14a230a492fa41246cb5f5ad7d412c9c9a64c9a2 100644 --- a/delete_expired_certificates.patch +++ b/delete_expired_certificates.patch @@ -120,13 +120,13 @@ index 122a01901..c131bd493 100644 + File.separator + "security" + File.separator + "cacerts"; // The numbers of certs now. -- private static final int COUNT = 112; +- private static final int COUNT = 113; + private static final int COUNT = 109; // SHA-256 of cacerts, can be generated with // shasum -a 256 cacerts | sed -e 's/../&:/g' | tr '[:lower:]' '[:upper:]' | cut -c1-95 private static final String CHECKSUM -- = "8F:E0:6F:7F:21:59:33:A6:43:F3:48:FD:A3:4A:8E:28:35:AA:DD:6E:A5:43:56:F1:28:34:48:DF:5C:D2:7C:72"; +- = "1E:63:88:DF:34:AD:7E:61:3F:06:BD:C4:DC:FE:05:52:9B:0D:86:6E:64:DA:E8:25:7C:C0:15:8F:31:C0:2C:78"; + = "20:83:CF:5E:F7:A9:E6:C6:06:ED:2C:28:3E:CE:AF:B9:BF:9D:26:CB:29:0C:E2:CF:B8:4F:DF:E9:59:5F:A6:3C"; // map of cert alias to SHA-256 fingerprint diff --git a/jdk-updates-jdk11u-jdk-11.0.27-ga.tar.xz b/jdk-updates-jdk11u-jdk-11.0.28-ga.tar.xz similarity index 86% rename from jdk-updates-jdk11u-jdk-11.0.27-ga.tar.xz rename to jdk-updates-jdk11u-jdk-11.0.28-ga.tar.xz index 79279c7beddc9d5d04bbb6c59bc7ff4da22d4a60..122aef5304edb46323bb7390158c5271b6553fb9 100644 Binary files a/jdk-updates-jdk11u-jdk-11.0.27-ga.tar.xz and b/jdk-updates-jdk11u-jdk-11.0.28-ga.tar.xz differ diff --git a/openjdk-11.spec b/openjdk-11.spec index 4fa0a56f92a6e34730f379afb7e9551d74d63738..cde80bc88add89d19c9adaeebb84e0ea13afdd7f 100644 --- a/openjdk-11.spec +++ b/openjdk-11.spec @@ -131,7 +131,7 @@ # New Version-String scheme-style defines %global majorver 11 -%global securityver 27 +%global securityver 28 # buildjdkver is usually same as %%{majorver}, # but in time of bootstrap of next jdk, it is majorver-1, # and this it is better to change it here, on single place @@ -152,12 +152,12 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 6 +%global buildver 5 %global patchver 0 %global project jdk-updates %global repo jdk11u -%global revision jdk-11.0.27-ga +%global revision jdk-11.0.28-ga %global full_revision %{project}-%{repo}-%{revision} # priority must be 7 digits in total # setting to 1, so debug ones can have 0 @@ -773,7 +773,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 1 +Release: 0 # java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons # and this change was brought into RHEL-4. java-1.5.0-ibm packages # also included the epoch in their virtual provides. This created a @@ -911,7 +911,6 @@ Patch94: change-ActivePrcoessorCount-only-for-HBase.patch # 11.0.26 Patch96: add-jbolt-feature.patch Patch97: fix-potential-build-fail-in-jbolt.patch -Patch98: 8352716-tz-Update-Timezone-Data-to-2025b.patch ############################################ # @@ -1215,7 +1214,6 @@ pushd %{top_level_dir_name} %patch94 -p1 %patch96 -p1 %patch97 -p1 -%patch98 -p1 %endif %endif %ifarch loongarch64 @@ -1753,6 +1751,10 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Mon Jul 7 2025 yangyingqing - 1:11.0.28.5-0 +- update to 11.0.28+5(GA) +- delete 8352716-tz-Update-Timezone-Data-to-2025b.patch + * Thu Apr 29 2025 wulongyao - 1:11.0.27.6-1 - add 8352716-tz-Update-Timezone-Data-to-2025b.patch