summary refs log tree commit diff
path: root/pkgs/development/compilers/openjdk/read-truststore-from-env.patch
diff options
context:
space:
mode:
Diffstat (limited to 'pkgs/development/compilers/openjdk/read-truststore-from-env.patch')
-rw-r--r--pkgs/development/compilers/openjdk/read-truststore-from-env.patch21
1 files changed, 0 insertions, 21 deletions
diff --git a/pkgs/development/compilers/openjdk/read-truststore-from-env.patch b/pkgs/development/compilers/openjdk/read-truststore-from-env.patch
deleted file mode 100644
index 8fb0f409d0a..00000000000
--- a/pkgs/development/compilers/openjdk/read-truststore-from-env.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-diff -ur openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
---- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2014-07-17 12:12:14.000000000 +0200
-+++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	2014-12-09 13:31:27.821960372 +0100
-@@ -158,6 +158,7 @@
-         /*
-          * Try:
-          *      javax.net.ssl.trustStore  (if this variable exists, stop)
-+         *      system environment variable JAVAX_NET_SSL_TRUSTSTORE
-          *      jssecacerts
-          *      cacerts
-          *
-@@ -165,6 +166,9 @@
-          */
- 
-         storeFileName = props.get("trustStore");
-+        if (storeFileName == null) {
-+            storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
-+        }
-         if (!"NONE".equals(storeFileName)) {
-             if (storeFileName != null) {
-                 storeFile = new File(storeFileName);