From 00ca0ab3b6516f26fb4c7118327b418eb15288fb Mon Sep 17 00:00:00 2001 From: slava86 Date: Mon, 9 Jan 2023 15:30:16 +0300 Subject: [PATCH] rediff path --- java-17-openjdk.spec | 2 +- ...-add_commented_out_nss_cfg_provider_to_java_security.patch | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/java-17-openjdk.spec b/java-17-openjdk.spec index 55ef04c..5fb026b 100644 --- a/java-17-openjdk.spec +++ b/java-17-openjdk.spec @@ -1843,7 +1843,7 @@ sed -e "s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g" %{SOURCE11} > nss.cfg # How many CPU's do we have? NUM_PROC="$(getconf _NPROCESSORS_ONLN)" -[ -n "$NUM_PROC" ] && %(expr $NUM_PROC / 2 ) +[ -z "$NUM_PROC" ] && NUM_PROC=8 %ifarch s390x sparc64 alpha %{power64} %{aarch64} export ARCH_DATA_MODEL=64 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 6d2342a..f0be74b 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,5 +1,5 @@ diff --git a/src/java.base/share/conf/security/java.security b/src/java.base/share/conf/security/java.security -index adfaf57d29e..abf89bbf327 100644 +index fbbe754..0822502 100644 --- a/src/java.base/share/conf/security/java.security +++ b/src/java.base/share/conf/security/java.security @@ -78,6 +78,7 @@ security.provider.tbd=SunMSCAPI @@ -9,4 +9,4 @@ index adfaf57d29e..abf89bbf327 100644 +#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg # - # Security providers used when FIPS mode support is active + # A list of preferred providers for specific algorithms. These providers will