MirrorHub/nixpkgs
0
0
Fork 0
mirror of https://github.com/NixOS/nixpkgs.git synced 2024-11-17 07:13:23 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

Merge pull request #41776 from pclewis/openjdk-jdk10-truststore-from-env

Browse source 
openjdk: fix truststore-from-env patch for jdk10
This commit is contained in:
Tim Steinbach 2018-06-11 09:35:12 -04:00 committed by GitHub
commit e0d1c6315a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
pkgs/development/compilers/openjdk/read-truststore-from-env-jdk10.patch
View file

@ -8,12 +8,22 @@
* jssecacerts
* cacerts
*/
@@ -144,6 +145,9 @@
@@ -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 = System.getenv("JAVAX_NET_SSL_TRUSTSTORE");
+ if (storePropName == null) {
+ storePropName = jsseDefaultStore;
+ }
if (!"NONE".equals(storePropName)) {
String[] fileNames =