diff options
Diffstat (limited to 'pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch')
| -rw-r--r-- | pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch | 30 |
1 files changed, 0 insertions, 30 deletions
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch deleted file mode 100644 index 6203064f5c06..000000000000 --- a/pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch +++ /dev/null @@ -1,30 +0,0 @@ ---- a/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-06-26 21:48:25.000000000 -0400 -+++ b/src/java.base/share/classes/sun/security/ssl/TrustStoreManager.java 2017-07-05 20:45:57.491295030 -0400 -@@ -71,6 +71,7 @@ - * - * The preference of the default trusted KeyStore is: - * javax.net.ssl.trustStore -+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE - * jssecacerts - * cacerts - */ -@@ -132,7 +133,8 @@ - public TrustStoreDescriptor run() { - // Get the system properties for trust store. - String storePropName = System.getProperty( -- "javax.net.ssl.trustStore", jsseDefaultStore); -+ "javax.net.ssl.trustStore", -+ System.getenv("JAVAX_NET_SSL_TRUSTSTORE")); - String storePropType = System.getProperty( - "javax.net.ssl.trustStoreType", - KeyStore.getDefaultType()); -@@ -144,6 +146,9 @@ - String temporaryName = ""; - File temporaryFile = null; - long temporaryTime = 0L; -+ if (storePropName == null) { -+ storePropName = jsseDefaultStore; -+ } - if (!"NONE".equals(storePropName)) { - String[] fileNames = - new String[] {storePropName, defaultStore}; |