From a9c385cc9a43f7f060cf4a9e3ef2658fe2f4f1e2 Mon Sep 17 00:00:00 2001 From: Andrew Hughes Date: Wed, 14 Jul 2021 05:44:00 +0100 Subject: [PATCH] Fix patch rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch It makes the SunPKCS provider show up again Resolves: rhbz#1870625 --- java-17-openjdk.spec | 10 +++++++++- ...ented_out_nss_cfg_provider_to_java_security.patch | 12 ++++++------ 2 files changed, 15 insertions(+), 7 deletions(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 723883e..10811c2 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -300,7 +300,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 26 -%global rpmrelease 3 +%global rpmrelease 4 # 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 # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions @@ -2231,6 +2231,14 @@ cjc.mainProgram(args) %endif %changelog +* Wed Jul 14 2021 Petra Alice Mikova - 1:17.0.0.0.26-0.4.ea +- Fix patch rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch which made the SunPKCS provider show up again +- Resolves: rhbz#1870625 + +* Tue Jul 13 2021 Jiri Vanek - 1:17.0.0.0.26-0.3.ea +- Add gating support +- Resolves: rhbz#1870625 + * Fri Jun 25 2021 Severin Gehwolf - 1:17.0.0.0.26-0.2.ea - Re-enable TestSecurityProperties after inclusion of PR3695 - Resolves: rhbz#1870625 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 index ef4c828..7be1fae 100644 --- a/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch +++ b/rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch @@ -1,11 +1,11 @@ -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 +diff --git openjdk/src/java.base/share/conf/security/java.security openjdk/src/java.base/share/conf/security/java.security +index 534bdae5a16..2df2b59cbf6 100644 +--- openjdk/src/java.base/share/conf/security/java.security ++++ openjdk/src/java.base/share/conf/security/java.security +@@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI security.provider.tbd=Apple #endif --security.provider.tbd=SunPKCS11 + security.provider.tbd=SunPKCS11 +#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg #