rpms/java-21-openjdk
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Fix patch rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch

Browse Source 
It makes the SunPKCS provider show up again
Resolves: rhbz#1971120
This commit is contained in:
Petra Mikova 2021-06-17 10:22:07 +02:00
parent 2849b03224
commit e22fd4035f
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
java-latest-openjdk.spec
View File

@ -300,7 +300,7 @@
%global top_level_dir_name %{origin} %global top_level_dir_name %{origin}
%global top_level_dir_name_backup %{top_level_dir_name}-backup %global top_level_dir_name_backup %{top_level_dir_name}-backup
%global buildver 26 %global buildver 26
%global rpmrelease 2 %global rpmrelease 3
# 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 # 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 %if %is_system_jdk
# Using 10 digits may overflow the int used for priority, so we combine the patch and build versions # Using 10 digits may overflow the int used for priority, so we combine the patch and build versions
@ -2231,6 +2231,10 @@ cjc.mainProgram(args)
%endif %endif
%changelog %changelog
* Mon Jun 28 2021 Petra Alice Mikova <pmikova@redhat.com> - 1:17.0.0.0.26-0.3.ea.rolling
- fix patch rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch which made the SunPKCS provider show up again
- Resolves: rhbz#1971120
* Thu Jun 24 2021 Severin Gehwolf <sgehwolf@redhat.com> - 1:17.0.0.0.26-0.2.ea.rolling * Thu Jun 24 2021 Severin Gehwolf <sgehwolf@redhat.com> - 1:17.0.0.0.26-0.2.ea.rolling
- Re-enable TestSecurityProperties after inclusion of PR3695 - Re-enable TestSecurityProperties after inclusion of PR3695

12
rh1648249-add_commented_out_nss_cfg_provider_to_java_security.patch
View File

@ -1,11 +1,11 @@
diff -r e3f940bd3c8f src/java.base/share/conf/security/java.security diff --git openjdk/src/java.base/share/conf/security/java.security openjdk/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 index 534bdae5a16..2df2b59cbf6 100644
+++ openjdk/src/java.base/share/conf/security/java.security Mon Aug 24 10:14:31 2020 +0200 --- openjdk/src/java.base/share/conf/security/java.security
@@ -77,7 +77,7 @@ +++ openjdk/src/java.base/share/conf/security/java.security
#ifdef macosx @@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI
security.provider.tbd=Apple security.provider.tbd=Apple
#endif #endif
-security.provider.tbd=SunPKCS11 security.provider.tbd=SunPKCS11
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg +#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
# #