/hg/release/icedtea7-forest-2.6/jdk: 2 new changesets

[andrew at icedtea.classpath.org]

changeset 7ee0fc11e1d5 in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=7ee0fc11e1d5
author: andrew
date: Fri Apr 15 05:02:05 2016 +0100

	PR2889: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)


changeset a4a37396e04b in /hg/release/icedtea7-forest-2.6/jdk
details: http://icedtea.classpath.org/hg/release/icedtea7-forest-2.6/jdk?cmd=changeset;node=a4a37396e04b
author: andrew
date: Mon Apr 18 03:30:01 2016 +0100

	Bump to icedtea-2.6.6pre01


diffstat:

 make/jdk_generic_profile.sh                                     |   2 +-
 src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java |  19 ++++++---
 2 files changed, 13 insertions(+), 8 deletions(-)

diffs (43 lines):

diff -r 7db52ae27b66 -r a4a37396e04b make/jdk_generic_profile.sh
--- a/make/jdk_generic_profile.sh	Thu Mar 24 21:35:22 2016 +0000
+++ b/make/jdk_generic_profile.sh	Mon Apr 18 03:30:01 2016 +0100
@@ -671,7 +671,7 @@
 
 # IcedTea versioning
 export ICEDTEA_NAME="IcedTea"
-export PACKAGE_VERSION="2.6.5"
+export PACKAGE_VERSION="2.6.6pre01"
 export DERIVATIVE_ID="${ICEDTEA_NAME} ${PACKAGE_VERSION}"
 echo "Building ${DERIVATIVE_ID}"
 
diff -r 7db52ae27b66 -r a4a37396e04b src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java
--- a/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	Thu Mar 24 21:35:22 2016 +0000
+++ b/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java	Mon Apr 18 03:30:01 2016 +0100
@@ -170,15 +170,20 @@
                 storeFile = new File(storeFileName);
                 fis = getFileInputStream(storeFile);
             } else {
-                String javaHome = props.get("javaHome");
-                storeFile = new File(javaHome + sep + "lib" + sep
-                                                + "security" + sep +
-                                                "jssecacerts");
+                /* Check system cacerts DB first; /etc/pki/java/cacerts */
+                storeFile = new File(sep + "etc" + sep + "pki" + sep
+                                     + "java" + sep + "cacerts");
                 if ((fis = getFileInputStream(storeFile)) == null) {
+                    String javaHome = props.get("javaHome");
                     storeFile = new File(javaHome + sep + "lib" + sep
-                                                + "security" + sep +
-                                                "cacerts");
-                    fis = getFileInputStream(storeFile);
+                                         + "security" + sep +
+                                         "jssecacerts");
+                    if ((fis = getFileInputStream(storeFile)) == null) {
+                        storeFile = new File(javaHome + sep + "lib" + sep
+                                             + "security" + sep +
+                                             "cacerts");
+                        fis = getFileInputStream(storeFile);
+                    }
                 }
             }