From a8aae1c7f328d54a69a6bc38d4cb3a5130c8948c Mon Sep 17 00:00:00 2001 From: Benshuai5D Date: Wed, 7 Aug 2024 11:47:26 +0800 Subject: [PATCH] delete rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch --- openjdk-21.spec | 9 +++------ ...ented_out_nss_cfg_provider_to_java_security.patch | 12 ------------ 2 files changed, 3 insertions(+), 18 deletions(-) delete mode 100644 rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch diff --git a/openjdk-21.spec b/openjdk-21.spec index 76a05fe..f02737b 100644 --- a/openjdk-21.spec +++ b/openjdk-21.spec @@ -956,10 +956,6 @@ Source14: TestECDSA.java # ############################################ -# NSS via SunPKCS11 Provider (disabled comment -# due to memory leak). -Patch1000: rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch - # Ignore AWTError when assistive technologies are loaded Patch1: rh1648242-accessible_toolkit_crash_do_not_break_jvm.patch # Restrict access to java-atk-wrapper classes @@ -1222,8 +1218,6 @@ pushd %{top_level_dir_name} popd %endif -%patch1000 - # Extract systemtap tapsets %if %{with_systemtap} tar --strip-components=1 -x -I xz -f %{SOURCE8} @@ -1775,6 +1769,9 @@ cjc.mainProgram(args) -- the returns from copy_jdk_configs.lua should not affect %changelog +* Wen Aug 7 2024 Autistic_boyya - 1:21.0.4.7-3 +- delete rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch + * Mon Jul 29 2024 zhaosaisai - 1:21.0.4.7-2 - change boot jdk to itself diff --git a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch deleted file mode 100644 index ef4c828..0000000 --- a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch +++ /dev/null @@ -1,12 +0,0 @@ -diff -r e3f940bd3c8f src/java.base/share/conf/security/java.security ---- openjdk/src/java.base/share/conf/security/java.security Thu Jun 11 21:54:51 2020 +0530 -+++ openjdk/src/java.base/share/conf/security/java.security Mon Aug 24 10:14:31 2020 +0200 -@@ -77,7 +77,7 @@ - #ifdef macosx - security.provider.tbd=Apple - #endif --security.provider.tbd=SunPKCS11 -+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg - - # - # A list of preferred providers for specific algorithms. These providers will -- Gitee