"enabled" system nss
This commit is contained in:
parent
b52576e0c5
commit
d30ae1b648
11
enableCommentedOutSystemNss.patch
Normal file
11
enableCommentedOutSystemNss.patch
Normal file
@ -0,0 +1,11 @@
|
|||||||
|
diff -r 5b86f66575b7 src/share/lib/security/java.security-linux
|
||||||
|
--- openjdk/jdk/src/java.base/share/conf/security/java.security Tue May 16 13:29:05 2017 -0700
|
||||||
|
+++ openjdk/jdk/src/java.base/share/conf/security/java.security Tue Jun 06 14:05:12 2017 +0200
|
||||||
|
@@ -83,6 +83,7 @@
|
||||||
|
#ifndef solaris
|
||||||
|
security.provider.tbd=SunPKCS11
|
||||||
|
#endif
|
||||||
|
+#security.provider.tbd=SunPKCS11 ${java.home}/lib/security/nss.cfg
|
||||||
|
|
||||||
|
#
|
||||||
|
# A list of preferred providers for specific algorithms. These providers will
|
@ -848,7 +848,7 @@ Provides: java-%{javaver}-%{origin}-accessiblity = %{epoch}:%{version}-%{release
|
|||||||
|
|
||||||
Name: java-%{majorver}-%{origin}
|
Name: java-%{majorver}-%{origin}
|
||||||
Version: %{newjavaver}.%{buildver}
|
Version: %{newjavaver}.%{buildver}
|
||||||
Release: 2%{?dist}
|
Release: 3%{?dist}
|
||||||
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
|
# java-1.5.0-ibm from jpackage.org set Epoch to 1 for unknown reasons,
|
||||||
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
# and this change was brought into RHEL-4. java-1.5.0-ibm packages
|
||||||
# also included the epoch in their virtual provides. This created a
|
# also included the epoch in their virtual provides. This created a
|
||||||
@ -883,7 +883,7 @@ Source9: jconsole.desktop.in
|
|||||||
Source10: policytool.desktop.in
|
Source10: policytool.desktop.in
|
||||||
|
|
||||||
# nss configuration file
|
# nss configuration file
|
||||||
Source11: nss.cfg
|
Source11: nss.cfg.in
|
||||||
|
|
||||||
# Removed libraries that we link instead
|
# Removed libraries that we link instead
|
||||||
Source12: remove-intree-libraries.sh
|
Source12: remove-intree-libraries.sh
|
||||||
@ -925,6 +925,9 @@ Patch104: bootcycle_jobs.patch
|
|||||||
Patch400: ppc_stack_overflow_fix.patch
|
Patch400: ppc_stack_overflow_fix.patch
|
||||||
Patch401: aarch64BuildFailure.patch
|
Patch401: aarch64BuildFailure.patch
|
||||||
|
|
||||||
|
# Non-OpenJDK fixes
|
||||||
|
Patch1000: enableCommentedOutSystemNss.patch
|
||||||
|
|
||||||
BuildRequires: autoconf
|
BuildRequires: autoconf
|
||||||
BuildRequires: automake
|
BuildRequires: automake
|
||||||
BuildRequires: alsa-lib-devel
|
BuildRequires: alsa-lib-devel
|
||||||
@ -1231,6 +1234,7 @@ sh %{SOURCE12}
|
|||||||
%patch401 -p1
|
%patch401 -p1
|
||||||
popd
|
popd
|
||||||
|
|
||||||
|
%patch1000
|
||||||
|
|
||||||
# Extract systemtap tapsets
|
# Extract systemtap tapsets
|
||||||
%if %{with_systemtap}
|
%if %{with_systemtap}
|
||||||
@ -1272,6 +1276,8 @@ for file in %{SOURCE9} %{SOURCE10} ; do
|
|||||||
done
|
done
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Setup nss.cfg
|
||||||
|
sed -e s:@NSS_LIBDIR@:%{NSS_LIBDIR}:g %{SOURCE11} > nss.cfg
|
||||||
|
|
||||||
%build
|
%build
|
||||||
# How many cpu's do we have?
|
# How many cpu's do we have?
|
||||||
@ -1372,7 +1378,7 @@ popd >& /dev/null
|
|||||||
export JAVA_HOME=$(pwd)/%{buildoutputdir $suffix}/images/%{jdkimage}
|
export JAVA_HOME=$(pwd)/%{buildoutputdir $suffix}/images/%{jdkimage}
|
||||||
|
|
||||||
# Install nss.cfg right away as we will be using the JRE above
|
# Install nss.cfg right away as we will be using the JRE above
|
||||||
install -m 644 %{SOURCE11} $JAVA_HOME/conf/security/
|
install -m 644 nss.cfg $JAVA_HOME/conf/security/
|
||||||
|
|
||||||
# Use system-wide tzdata
|
# Use system-wide tzdata
|
||||||
rm $JAVA_HOME/lib/tzdb.dat
|
rm $JAVA_HOME/lib/tzdb.dat
|
||||||
|
Loading…
x
Reference in New Issue
Block a user