Mercurial > hg > release > icedtea6-1.2
changeset 856:d86e9eb1fa7d
2008-05-08 Lillian Angel <langel@redhat.com>
Fixes Bug #150
* patches/icedtea-certbundle.patch: Moved system properties defined in
hotspot to TrustManagerFactoryImpl.
* icedtea-use-system-tzdata.patch: Updated to patch cleanly.
author | Lillian Angel <langel@redhat.com> |
---|---|
date | Thu, 08 May 2008 11:04:53 -0400 |
parents | 07c44f5d2c52 |
children | 3c358d6fd84e |
files | ChangeLog patches/icedtea-certbundle.patch patches/icedtea-use-system-tzdata.patch |
diffstat | 3 files changed, 47 insertions(+), 38 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed May 07 13:31:36 2008 -0400 +++ b/ChangeLog Thu May 08 11:04:53 2008 -0400 @@ -1,3 +1,10 @@ +2008-05-08 Lillian Angel <langel@redhat.com> + + Fixes Bug #150 + * patches/icedtea-certbundle.patch: Moved system properties defined in + hotspot to TrustManagerFactoryImpl. + * icedtea-use-system-tzdata.patch: Updated to patch cleanly. + 2008-05-07 Joshua Sumali <jsumali@redhat.com> * rt/net/sourceforge/jnlp/Launcher.java: Check main jar for main class in
--- a/patches/icedtea-certbundle.patch Wed May 07 13:31:36 2008 -0400 +++ b/patches/icedtea-certbundle.patch Thu May 08 11:04:53 2008 -0400 @@ -1,27 +1,3 @@ -diff -urN openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2007-10-12 03:46:00.000000000 -0400 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2007-10-12 18:24:12.000000000 -0400 -@@ -376,6 +382,20 @@ - } - } - -+ SystemProperty* sp = Arguments::system_properties(); -+ Arguments::PropertyList_add (&sp, -+ "javax.net.ssl.trustStore", -+ "/etc/pki/tls/certs/ca-bundle.crt"); -+ Arguments::PropertyList_add (&sp, -+ "javax.net.ssl.trustStoreType", -+ "CertBundle"); -+ Arguments::PropertyList_add (&sp, -+ "javax.net.ssl.trustStoreProvider", -+ ""); -+ Arguments::PropertyList_add (&sp, -+ "javax.net.ssl.trustStorePassword", -+ ""); -+ - #undef malloc - #undef getenv - #undef EXTENSIONS_DIR diff -urN openjdk.orig/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java openjdk/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java --- openjdk.orig/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java 1969-12-31 19:00:00.000000000 -0500 +++ openjdk/jdk/src/share/classes/sun/security/provider/CertBundleKeyStoreImpl.java 2007-10-12 18:24:05.000000000 -0400 @@ -235,3 +211,30 @@ /* * Policy +--- openjdkold/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2008-03-26 04:59:04.000000000 -0400 ++++ openjdk/jdk/src/share/classes/sun/security/ssl/TrustManagerFactoryImpl.java 2008-05-08 10:49:22.000000000 -0400 +@@ -140,18 +140,18 @@ + + AccessController.doPrivileged(new PrivilegedExceptionAction<Void>() { + public Void run() throws Exception { +- props.put("trustStore", System.getProperty( +- "javax.net.ssl.trustStore")); + props.put("javaHome", System.getProperty( + "java.home")); +- props.put("trustStoreType", System.getProperty( +- "javax.net.ssl.trustStoreType", +- KeyStore.getDefaultType())); + props.put("trustStoreProvider", System.getProperty( + "javax.net.ssl.trustStoreProvider", "")); + props.put("trustStorePasswd", System.getProperty( + "javax.net.ssl.trustStorePassword", "")); +- return null; ++ props.put("/etc/pki/tls/certs/ca-bundle.crt", System.getProperty( ++ "javax.net.ssl.trustStore") ++ props.put("CertBundle", System.getProperty( ++ "javax.net.ssl.trustStoreType", ++ KeyStore.getDefaultType())); ++ return null; + } + }); +
--- a/patches/icedtea-use-system-tzdata.patch Wed May 07 13:31:36 2008 -0400 +++ b/patches/icedtea-use-system-tzdata.patch Thu May 08 11:04:53 2008 -0400 @@ -1,17 +1,3 @@ -diff -urN openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp openjdk/hotspot/src/os/linux/vm/os_linux.cpp ---- openjdk.orig/hotspot/src/os/linux/vm/os_linux.cpp 2007-10-12 18:25:55.000000000 -0400 -+++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2007-10-12 18:26:02.000000000 -0400 -@@ -390,6 +390,10 @@ - "javax.net.ssl.trustStorePassword", - ""); - -+ // Use the system zoneinfo files, if present -+ Arguments::PropertyList_add (&sp, -+ "user.zoneinfo.dir", "/usr/share/javazi"); -+ - #undef malloc - #undef getenv - #undef EXTENSIONS_DIR --- ../openjdkb23/openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2007-10-30 04:38:28.000000000 -0400 +++ openjdk/jdk/src/share/classes/sun/util/calendar/ZoneInfoFile.java 2007-11-13 13:16:52.000000000 -0500 @@ -28,6 +28,7 @@ @@ -57,3 +43,16 @@ public Object run() throws IOException { File file = new File(fname); if (!file.canRead()) { +--- oldopenjdk6/hotspot/src/os/linux/vm/os_linux.cpp 2008-03-26 05:07:22.000000000 -0400 ++++ openjdk/hotspot/src/os/linux/vm/os_linux.cpp 2008-05-08 11:03:17.000000000 -0400 +@@ -376,6 +376,10 @@ + } + } + ++// Use the system zoneinfo files, if present ++Arguments::PropertyList_add (&sp, ++ "user.zoneinfo.dir", "/usr/share/javazi"); ++ + #undef malloc + #undef getenv + #undef EXTENSIONS_DIR