|
 |
235ad9 |
diff --git openjdk.orig/common/autoconf/configure.ac openjdk/common/autoconf/configure.ac
|
|
|
235ad9 |
--- openjdk.orig/common/autoconf/configure.ac
|
|
|
235ad9 |
+++ openjdk/common/autoconf/configure.ac
|
|
|
235ad9 |
@@ -212,6 +212,7 @@
|
|
|
235ad9 |
LIB_SETUP_ALSA
|
|
|
235ad9 |
LIB_SETUP_FONTCONFIG
|
|
|
235ad9 |
LIB_SETUP_MISC_LIBS
|
|
|
235ad9 |
+LIB_SETUP_SYSCONF_LIBS
|
|
|
235ad9 |
LIB_SETUP_STATIC_LINK_LIBSTDCPP
|
|
|
235ad9 |
LIB_SETUP_ON_WINDOWS
|
|
|
235ad9 |
|
|
|
235ad9 |
diff --git openjdk.orig/common/autoconf/libraries.m4 openjdk/common/autoconf/libraries.m4
|
|
|
235ad9 |
--- openjdk.orig/common/autoconf/libraries.m4
|
|
|
235ad9 |
+++ openjdk/common/autoconf/libraries.m4
|
|
|
235ad9 |
@@ -1067,3 +1067,63 @@
|
|
|
235ad9 |
BASIC_DEPRECATED_ARG_WITH([dxsdk-include])
|
|
|
235ad9 |
fi
|
|
|
235ad9 |
])
|
|
|
235ad9 |
+
|
|
|
235ad9 |
+################################################################################
|
|
|
235ad9 |
+# Setup system configuration libraries
|
|
|
235ad9 |
+################################################################################
|
|
|
235ad9 |
+AC_DEFUN_ONCE([LIB_SETUP_SYSCONF_LIBS],
|
|
|
235ad9 |
+[
|
|
|
235ad9 |
+ ###############################################################################
|
|
|
235ad9 |
+ #
|
|
|
235ad9 |
+ # Check for the NSS library
|
|
|
235ad9 |
+ #
|
|
|
235ad9 |
+
|
|
|
235ad9 |
+ AC_MSG_CHECKING([whether to use the system NSS library with the System Configurator (libsysconf)])
|
|
|
235ad9 |
+
|
|
|
235ad9 |
+ # default is not available
|
|
|
235ad9 |
+ DEFAULT_SYSCONF_NSS=no
|
|
|
235ad9 |
+
|
|
|
235ad9 |
+ AC_ARG_ENABLE([sysconf-nss], [AS_HELP_STRING([--enable-sysconf-nss],
|
|
|
235ad9 |
+ [build the System Configurator (libsysconf) using the system NSS library if available @<:@disabled@:>@])],
|
|
|
235ad9 |
+ [
|
|
|
235ad9 |
+ case "${enableval}" in
|
|
|
235ad9 |
+ yes)
|
|
|
235ad9 |
+ sysconf_nss=yes
|
|
|
235ad9 |
+ ;;
|
|
|
235ad9 |
+ *)
|
|
|
235ad9 |
+ sysconf_nss=no
|
|
|
235ad9 |
+ ;;
|
|
|
235ad9 |
+ esac
|
|
|
235ad9 |
+ ],
|
|
|
235ad9 |
+ [
|
|
|
235ad9 |
+ sysconf_nss=${DEFAULT_SYSCONF_NSS}
|
|
|
235ad9 |
+ ])
|
|
|
235ad9 |
+ AC_MSG_RESULT([$sysconf_nss])
|
|
|
235ad9 |
+
|
|
|
235ad9 |
+ USE_SYSCONF_NSS=false
|
|
|
235ad9 |
+ if test "x${sysconf_nss}" = "xyes"; then
|
|
|
235ad9 |
+ PKG_CHECK_MODULES(NSS, nss >= 3.53, [NSS_FOUND=yes], [NSS_FOUND=no])
|
|
|
235ad9 |
+ if test "x${NSS_FOUND}" = "xyes"; then
|
|
|
235ad9 |
+ AC_MSG_CHECKING([for system FIPS support in NSS])
|
|
|
235ad9 |
+ saved_libs="${LIBS}"
|
|
|
235ad9 |
+ saved_cflags="${CFLAGS}"
|
|
|
235ad9 |
+ CFLAGS="${CFLAGS} ${NSS_CFLAGS}"
|
|
|
235ad9 |
+ LIBS="${LIBS} ${NSS_LIBS}"
|
|
|
235ad9 |
+ AC_LANG_PUSH([C])
|
|
|
235ad9 |
+ AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include <nss3/pk11pub.h>]],
|
|
|
235ad9 |
+ [[SECMOD_GetSystemFIPSEnabled()]])],
|
|
|
235ad9 |
+ [AC_MSG_RESULT([yes])],
|
|
|
235ad9 |
+ [AC_MSG_RESULT([no])
|
|
|
235ad9 |
+ AC_MSG_ERROR([System NSS FIPS detection unavailable])])
|
|
|
235ad9 |
+ AC_LANG_POP([C])
|
|
|
235ad9 |
+ CFLAGS="${saved_cflags}"
|
|
|
235ad9 |
+ LIBS="${saved_libs}"
|
|
|
235ad9 |
+ USE_SYSCONF_NSS=true
|
|
|
235ad9 |
+ else
|
|
|
235ad9 |
+ dnl NSS 3.53 is the one that introduces the SECMOD_GetSystemFIPSEnabled API
|
|
|
235ad9 |
+ dnl in nss3/pk11pub.h.
|
|
|
235ad9 |
+ AC_MSG_ERROR([--enable-sysconf-nss specified, but NSS 3.53 or above not found.])
|
|
|
235ad9 |
+ fi
|
|
|
235ad9 |
+ fi
|
|
|
235ad9 |
+ AC_SUBST(USE_SYSCONF_NSS)
|
|
|
235ad9 |
+])
|
|
|
235ad9 |
diff --git openjdk.orig/common/autoconf/spec.gmk.in openjdk/common/autoconf/spec.gmk.in
|
|
|
235ad9 |
--- openjdk.orig/common/autoconf/spec.gmk.in
|
|
|
235ad9 |
+++ openjdk/common/autoconf/spec.gmk.in
|
|
|
235ad9 |
@@ -312,6 +312,10 @@
|
|
|
235ad9 |
ALSA_LIBS:=@ALSA_LIBS@
|
|
|
235ad9 |
ALSA_CFLAGS:=@ALSA_CFLAGS@
|
|
|
235ad9 |
|
|
|
235ad9 |
+USE_SYSCONF_NSS:=@USE_SYSCONF_NSS@
|
|
|
235ad9 |
+NSS_LIBS:=@NSS_LIBS@
|
|
|
235ad9 |
+NSS_CFLAGS:=@NSS_CFLAGS@
|
|
|
235ad9 |
+
|
|
|
235ad9 |
PACKAGE_PATH=@PACKAGE_PATH@
|
|
|
235ad9 |
|
|
|
235ad9 |
# Source file for cacerts
|
|
|
235ad9 |
diff --git openjdk.orig/common/bin/compare_exceptions.sh.incl openjdk/common/bin/compare_exceptions.sh.incl
|
|
|
235ad9 |
--- openjdk.orig/common/bin/compare_exceptions.sh.incl
|
|
|
235ad9 |
+++ openjdk/common/bin/compare_exceptions.sh.incl
|
|
|
235ad9 |
@@ -280,6 +280,7 @@
|
|
|
235ad9 |
./jre/lib/i386/libsplashscreen.so
|
|
|
235ad9 |
./jre/lib/i386/libsunec.so
|
|
|
235ad9 |
./jre/lib/i386/libsunwjdga.so
|
|
|
235ad9 |
+./jre/lib/i386/libsystemconf.so
|
|
|
235ad9 |
./jre/lib/i386/libt2k.so
|
|
|
235ad9 |
./jre/lib/i386/libunpack.so
|
|
|
235ad9 |
./jre/lib/i386/libverify.so
|
|
|
235ad9 |
@@ -433,6 +434,7 @@
|
|
|
235ad9 |
./jre/lib/amd64/libsplashscreen.so
|
|
|
235ad9 |
./jre/lib/amd64/libsunec.so
|
|
|
235ad9 |
./jre/lib/amd64/libsunwjdga.so
|
|
|
235ad9 |
+//jre/lib/amd64/libsystemconf.so
|
|
|
235ad9 |
./jre/lib/amd64/libt2k.so
|
|
|
235ad9 |
./jre/lib/amd64/libunpack.so
|
|
|
235ad9 |
./jre/lib/amd64/libverify.so
|
|
|
235ad9 |
@@ -587,6 +589,7 @@
|
|
|
235ad9 |
./jre/lib/sparc/libsplashscreen.so
|
|
|
235ad9 |
./jre/lib/sparc/libsunec.so
|
|
|
235ad9 |
./jre/lib/sparc/libsunwjdga.so
|
|
|
235ad9 |
+./jre/lib/sparc/libsystemconf.so
|
|
|
235ad9 |
./jre/lib/sparc/libt2k.so
|
|
|
235ad9 |
./jre/lib/sparc/libunpack.so
|
|
|
235ad9 |
./jre/lib/sparc/libverify.so
|
|
|
235ad9 |
@@ -741,6 +744,7 @@
|
|
|
235ad9 |
./jre/lib/sparcv9/libsplashscreen.so
|
|
|
235ad9 |
./jre/lib/sparcv9/libsunec.so
|
|
|
235ad9 |
./jre/lib/sparcv9/libsunwjdga.so
|
|
|
235ad9 |
+./jre/lib/sparcv9/libsystemconf.so
|
|
|
235ad9 |
./jre/lib/sparcv9/libt2k.so
|
|
|
235ad9 |
./jre/lib/sparcv9/libunpack.so
|
|
|
235ad9 |
./jre/lib/sparcv9/libverify.so
|
|
|
235ad9 |
diff --git openjdk.orig/common/nb_native/nbproject/configurations.xml openjdk/common/nb_native/nbproject/configurations.xml
|
|
|
235ad9 |
--- openjdk.orig/common/nb_native/nbproject/configurations.xml
|
|
|
235ad9 |
+++ openjdk/common/nb_native/nbproject/configurations.xml
|
|
|
235ad9 |
@@ -53,6 +53,9 @@
|
|
|
235ad9 |
<in>jvmtiEnterTrace.cpp</in>
|
|
|
235ad9 |
</df>
|
|
|
235ad9 |
</df>
|
|
|
235ad9 |
+ <df name="libsystemconf">
|
|
|
235ad9 |
+ <in>systemconf.c</in>
|
|
|
235ad9 |
+ </df>
|
|
|
235ad9 |
</df>
|
|
|
235ad9 |
</df>
|
|
|
235ad9 |
<df name="jdk">
|
|
|
235ad9 |
@@ -12772,6 +12775,11 @@
|
|
|
235ad9 |
tool="0"
|
|
|
235ad9 |
flavor2="0">
|
|
|
235ad9 |
</item>
|
|
|
235ad9 |
+
|
|
|
235ad9 |
+ ex="false"
|
|
|
235ad9 |
+ tool="0"
|
|
|
235ad9 |
+ flavor2="0">
|
|
|
235ad9 |
+ </item>
|
|
|
235ad9 |
|
|
|
235ad9 |
ex="false"
|
|
|
235ad9 |
tool="0"
|