pyrox.dev / nixpkgs
lol
0
fork

Configure Feed

Select the types of activity you want to include in your feed.

nixpkgs / pkgs / development / compilers / openjdk / read-truststore-from-env.patch
at 15.09-beta 21 lines 1.0 kB view raw
Rickard Nilsson openjdk: Introduce JAVAX_NET_SSL_TRUSTSTORE env
95fdc8cf
1diff -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 2--- openjdk-7u65-b32/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-07-17 12:12:14.000000000 +0200 3+++ openjdk-7u65-b32.new/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2014-12-09 13:31:27.821960372 +0100 4@@ -158,6 +158,7 @@ 5 /* 6 * Try: 7 * javax.net.ssl.trustStore (if this variable exists, stop) 8+ * system environment variable JAVAX_NET_SSL_TRUSTSTORE 9 * jssecacerts 10 * cacerts 11 * 12@@ -165,6 +166,9 @@ 13 */ 14 15 storeFileName = props.get("trustStore"); 16+ if (storeFileName == null) { 17+ storeFileName = System.getenv("JAVAX_NET_SSL_TRUSTSTORE"); 18+ } 19 if (!"NONE".equals(storeFileName)) { 20 if (storeFileName != null) { 21 storeFile = new File(storeFileName);