From 915614360218bae50e6724714abff0c489d47560 Mon Sep 17 00:00:00 2001 From: Benshuai5D Date: Thu, 17 Jul 2025 10:01:02 +0800 Subject: [PATCH] remove provides in kaeprovider module info --- ...-provides-in-kaeprovider-module-info.patch | 19 +++++++++++++++++++ openjdk-17.spec | 10 +++++++++- 2 files changed, 28 insertions(+), 1 deletion(-) create mode 100644 huawei-remove-provides-in-kaeprovider-module-info.patch 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 0000000..0ae8705 --- /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-17.spec b/openjdk-17.spec index 6555863..5b3ee7c 100644 --- a/openjdk-17.spec +++ b/openjdk-17.spec @@ -920,7 +920,7 @@ Provides: java-src%{?1} = %{epoch}:%{version}-%{release} Name: java-%{javaver}-%{origin} Version: %{newjavaver}.%{buildver} -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 @@ -1072,6 +1072,10 @@ Patch79: Huawei-fix-potential-build-fail-in-jbolt.patch Patch81: heapdump-bug-fix.patch Patch82: CompileCommand-support-dontprediction.patch Patch83: huawei-AArch64-Incorrect-matching-rule.patch + +#17.0.16 +Patch84: huawei-remove-provides-in-kaeprovider-module-info.patch + ############################################ # # LoongArch64 specific patches @@ -1372,6 +1376,7 @@ pushd %{top_level_dir_name} %patch 81 -p1 %patch 82 -p1 %patch 83 -p1 +%patch 84 -p1 popd # openjdk %endif @@ -1996,6 +2001,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Thu Jul 17 2025 benshuai5d 1:17.0.16.8-1 +- add huawei-remove-provides-in-kaeprovider-module-info.patch + * Wed Jul 16 2025 wulongyao - 1:17.0.16.8-0 - update to 17.0.16 - modified Apply-TBI-to-ZGC-of-JDK17.patch -- Gitee