diff --git a/huawei-remove-provides-in-kaeprovider-module-info.patch b/huawei-remove-provides-in-kaeprovider-module-info.patch new file mode 100644 index 0000000000000000000000000000000000000000..0ae87053b32dd924fcc6442cf3c133b734facced --- /dev/null +++ b/huawei-remove-provides-in-kaeprovider-module-info.patch @@ -0,0 +1,19 @@ +Subject: [PATCH] remove provides in kaeprovider module info + +--- + src/jdk.crypto.kaeprovider/linux/classes/module-info.java | 1 - + 1 file changed, 1 deletion(-) + +diff --git a/src/jdk.crypto.kaeprovider/linux/classes/module-info.java b/src/jdk.crypto.kaeprovider/linux/classes/module-info.java +index 802ac8960..0b3f7fe64 100644 +--- a/src/jdk.crypto.kaeprovider/linux/classes/module-info.java ++++ b/src/jdk.crypto.kaeprovider/linux/classes/module-info.java +@@ -35,5 +35,4 @@ module jdk.crypto.kaeprovider { + requires jdk.crypto.ec; + + exports org.openeuler.security.openssl to java.base; +- provides java.security.Provider with org.openeuler.security.openssl.KAEProvider; + } +-- +2.34.1 + diff --git a/openjdk-21.spec b/openjdk-21.spec index 572e53921bf1deef238a43d25dd65e5a042bd37e..28cec8d6b90a16fc114209ee3c3ff795436a16c5 100644 --- a/openjdk-21.spec +++ b/openjdk-21.spec @@ -905,7 +905,7 @@ Name: java-21-%{origin} Version: %{newjavaver}.%{buildver} # This package needs `.rolling` as part of Release so as to not conflict on install with # java-X-openjdk. I.e. when latest rolling release is also an LTS release packaged as -Release: 0 +Release: 1 # 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 @@ -1036,6 +1036,10 @@ Patch90: Backport-JDK-7036144-GZIPInputStream-readTrailer-use.patch Patch92: Backport-JDK-8340532-C2-assert-is_OuterStripMinedLoo.patch Patch93: huawei-fix-arm32-build-fail-undefined-reference-_Copy_conjo.patch Patch94: huawei-AArch64-Incorrect-matching-rule.patch + +#21.0.8 +Patch95: huawei-remove-provides-in-kaeprovider-module-info.patch + ############################################ # # LoongArch64 specific patches @@ -1338,6 +1342,7 @@ pushd %{top_level_dir_name} %patch92 -p1 %patch93 -p1 %patch94 -p1 +%patch95 -p1 popd # openjdk %endif @@ -1913,6 +1918,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Thu Jul 17 2025 Benshuai5D - 1:21.0.8.9-1 +- huawei-remove-provides-in-kaeprovider-module-info.patch + * Tue Jul 15 2025 Benshuai5D - 1:21.0.8.9-0 - update to jdk21.0.8-ga - delete 8334780-Crash-assert-h_array_list.not_null-failed-in.patch