diff --git a/8264805-Backport-Ahead-of-Time-Compiler.patch b/8264805-Backport-Ahead-of-Time-Compiler.patch index ffc80334ed800f0768d01b0bdffb314198a685e7..82af69170c69aca6e5d7250486c9a9903672ce8d 100644 --- a/8264805-Backport-Ahead-of-Time-Compiler.patch +++ b/8264805-Backport-Ahead-of-Time-Compiler.patch @@ -6951,13 +6951,6 @@ diff --git a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp b/sr index d66e9236d..5b779b4b4 100644 --- a/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp +++ b/src/hotspot/share/jfr/leakprofiler/checkpoint/rootResolver.cpp -@@ -1,5 +1,5 @@ - /* -- * Copyright (c) 2014, 2021, Oracle and/or its affiliates. All rights reserved. -+ * Copyright (c) 2014, 2023, Oracle and/or its affiliates. All rights reserved. - * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. - * - * This code is free software; you can redistribute it and/or modify it @@ -44,6 +44,9 @@ #include "services/management.hpp" #include "utilities/enumIterator.hpp" diff --git a/add-version-txt.patch b/add-version-txt.patch index 9ce549c410630f78515409d49aee386ce7bf6988..975b9afa310abe3e0aef48f175c745ff54fa531f 100644 --- a/add-version-txt.patch +++ b/add-version-txt.patch @@ -13,7 +13,7 @@ index 000000000..b717bafbe --- /dev/null +++ b/version.txt @@ -0,0 +1 @@ -+17.0.14.0.13 ++17.0.15.0.13 -- 2.19.0 diff --git a/jdk-updates-jdk17u-jdk-17.0.14+7.tar.gz b/jdk-updates-jdk17u-jdk-17.0.15+6.tar.gz similarity index 86% rename from jdk-updates-jdk17u-jdk-17.0.14+7.tar.gz rename to jdk-updates-jdk17u-jdk-17.0.15+6.tar.gz index fefd7d5811e9195d24fea1b6d0dd3c58c67bf7f3..355a9434999fe691a7ab0649b9dd1d4c429435be 100644 Binary files a/jdk-updates-jdk17u-jdk-17.0.14+7.tar.gz and b/jdk-updates-jdk17u-jdk-17.0.15+6.tar.gz differ diff --git a/openjdk-17.spec b/openjdk-17.spec index 51a59310f36aef4ea6f5f4dd2f5b4378f883359e..af9ba69328b58720e07b362bf98d76c9664e035a 100644 --- a/openjdk-17.spec +++ b/openjdk-17.spec @@ -168,7 +168,7 @@ # Used via new version scheme. JDK 17 was # GA'ed in March 2021 => 21.9 %global vendor_version_string 21.9 -%global securityver 14 +%global securityver 15 # 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 @@ -194,7 +194,7 @@ %global origin_nice OpenJDK %global top_level_dir_name %{origin} %global minorver 0 -%global buildver 7 +%global buildver 6 # priority must be 8 digits in total; up to openjdk 1.8, we were using 18..... so when we moved to 11, we had to add another digit %if %is_system_jdk %global priority %( printf '%02d%02d%02d%02d' %{majorver} %{minorver} %{securityver} %{buildver} ) @@ -920,7 +920,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -Release: 4 +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 @@ -1989,6 +1989,10 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Thu Apr 17 2025 DXwangg - 1:17.0.15.6-0 +- update to 17.0.15 +- modified 8264805-Backport-Ahead-of-Time-Compiler.patch + * Wed Mar 26 2025 Whitney33 - 1:17.0.14.7-4 - fix condigure arguments, disable global lto