diff options
| author | jperkin <jperkin> | 2017-03-30 12:57:10 +0000 |
|---|---|---|
| committer | jperkin <jperkin> | 2017-03-30 12:57:10 +0000 |
| commit | 6dd4b2a82f28f61aff90007a82c3bf27e761318b (patch) | |
| tree | d1eba277ed238ca8f6a8b05bb4a83de0e9142482 /lang/openjdk8/patches | |
| parent | ae770d574a998c85564cfff700c7616db68d09f9 (diff) | |
| download | pkgsrc-6dd4b2a82f28f61aff90007a82c3bf27e761318b.tar.gz | |
Pull in OI fix for https://www.illumos.org/issues/7227.
Ride previous PKGREVISION bump.
Diffstat (limited to 'lang/openjdk8/patches')
| -rw-r--r-- | lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java | 28 |
1 files changed, 28 insertions, 0 deletions
diff --git a/lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java b/lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java new file mode 100644 index 00000000000..3bfa6e09b9c --- /dev/null +++ b/lang/openjdk8/patches/patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java @@ -0,0 +1,28 @@ +$NetBSD: patch-jdk_src_share_classes_sun_security_jca_ProviderConfig.java,v 1.1 2017/03/30 12:57:11 jperkin Exp $ + +Fix https://www.illumos.org/issues/7227 + +--- jdk/src/share/classes/sun/security/jca/ProviderConfig.java.orig 2017-01-31 13:43:12.000000000 +0000 ++++ jdk/src/share/classes/sun/security/jca/ProviderConfig.java +@@ -102,15 +102,14 @@ final class ProviderConfig { + Boolean o = AccessController.doPrivileged( + new PrivilegedAction<Boolean>() { + public Boolean run() { +- File file = new File("/usr/lib/libpkcs11.so"); +- if (file.exists() == false) { +- return Boolean.FALSE; +- } +- if ("false".equalsIgnoreCase(System.getProperty ++ if ("true".equalsIgnoreCase(System.getProperty + ("sun.security.pkcs11.enable-solaris"))) { +- return Boolean.FALSE; ++ File file = new File("/usr/lib/libpkcs11.so"); ++ if (file.exists()) { ++ return Boolean.TRUE; ++ } + } +- return Boolean.TRUE; ++ return Boolean.FALSE; + } + }); + if (o == Boolean.FALSE) { |