From 0fd8f1db3f94ce0fbbfe027abf2922e417d115e0 Mon Sep 17 00:00:00 2001 From: Andrew John Hughes Date: Thu, 2 Dec 2021 02:39:26 +0000 Subject: [PATCH] Use 'sql:' prefix in nss.fips.cfg Fedora 35 and better no longer ship the legacy secmod.db file as part of the nss package. Explicitly tell OpenJDK to use sqlite-based sec mode. Resolves: rhbz#2023535 --- java-11-openjdk.spec | 8 ++++++-- nss.fips.cfg.in | 2 +- 2 files changed, 7 insertions(+), 3 deletions(-) diff --git a/java-11-openjdk.spec b/java-11-openjdk.spec index 7150de9..c3e6d71 100644 --- a/java-11-openjdk.spec +++ b/java-11-openjdk.spec @@ -345,7 +345,7 @@ %global top_level_dir_name %{origin} %global top_level_dir_name_backup %{top_level_dir_name}-backup %global buildver 8 -%global rpmrelease 3 +%global rpmrelease 4 #%%global tagsuffix %%{nil} # 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 @@ -1728,7 +1728,6 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg # Setup nss.fips.cfg sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE17} > nss.fips.cfg -sed -i -e "s:@NSS_SECMOD@:/etc/pki/nssdb:g" nss.fips.cfg %build # How many CPU's do we have? @@ -2431,6 +2430,11 @@ require "copy_jdk_configs.lua" %endif %changelog +* Thu Dec 02 2021 Severin Gehwolf - 1:11.0.13.0.8-4 +- Use 'sql:' prefix in nss.fips.cfg as F35+ no longer ship the legacy + secmod.db file as part of NSS +- Resolves: rhbz#2023535 + * Wed Dec 01 2021 Jiri Vanek - 1:11.0.13.0.8-3 - Replaced hardcoded 11 by featurever where appropriate - Fixed comment of `for slowdebug` to correct `any debug` diff --git a/nss.fips.cfg.in b/nss.fips.cfg.in index ead27be..1aff153 100644 --- a/nss.fips.cfg.in +++ b/nss.fips.cfg.in @@ -1,6 +1,6 @@ name = NSS-FIPS nssLibraryDirectory = @NSS_LIBDIR@ -nssSecmodDirectory = @NSS_SECMOD@ +nssSecmodDirectory = sql:/etc/pki/nssdb nssDbMode = readOnly nssModule = fips