/hg/icedtea6: Backport of S6883983: JarVerifier dependency on su...

[ptisnovs at icedtea.classpath.org]

changeset 44f51ec924fa in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=44f51ec924fa
author: ptisnovs
date: Mon Feb 27 11:50:34 2012 +0100

	Backport of S6883983: JarVerifier dependency on sun.security.pkcs
	should be removed


diffstat:

 ChangeLog                                                                      |   8 +++
 Makefile.am                                                                    |   3 +-
 NEWS                                                                           |   1 +
 patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch |  22 ++++++++++
 4 files changed, 33 insertions(+), 1 deletions(-)

diffs (66 lines):

diff -r 6b69d846d8cb -r 44f51ec924fa ChangeLog
--- a/ChangeLog	Fri Feb 24 13:52:49 2012 +0100
+++ b/ChangeLog	Mon Feb 27 11:50:34 2012 +0100
@@ -1,3 +1,11 @@
+2012-02-27  Pavel Tisnovsky  <ptisnovs at redhat.com>
+
+	* Makefile.am: Add new patch.
+	* NEWS: Mention backport.
+	* patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch:
+	Backport of S6883983: JarVerifier dependency on
+	sun.security.pkcs should be removed
+
 2012-02-24  Pavel Tisnovsky  <ptisnovs at redhat.com>
 
 	* patches/ScriptEngineManager-doc.patch:
diff -r 6b69d846d8cb -r 44f51ec924fa Makefile.am
--- a/Makefile.am	Fri Feb 24 13:52:49 2012 +0100
+++ b/Makefile.am	Mon Feb 27 11:50:34 2012 +0100
@@ -421,7 +421,8 @@
 	patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \
 	patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
 	patches/openjdk/remove-mimpure-option-to-gcc.patch \
-	patches/ScriptEngineManager-doc.patch
+	patches/ScriptEngineManager-doc.patch \
+	patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch
 
 if WITH_RHINO
 ICEDTEA_PATCHES += \
diff -r 6b69d846d8cb -r 44f51ec924fa NEWS
--- a/NEWS	Fri Feb 24 13:52:49 2012 +0100
+++ b/NEWS	Mon Feb 27 11:50:34 2012 +0100
@@ -18,6 +18,7 @@
   - S6706974: Add krb5 test infrastructure
   - S6764553: com.sun.org.apache.xml.internal.security.utils.IdResolver is not thread safe
   - S6761072: new krb5 tests fail on multiple platforms
+  - S6883983: JarVerifier dependency on sun.security.pkcs should be removed
 
 New in release 1.10.6 (2012-02-14):
 
diff -r 6b69d846d8cb -r 44f51ec924fa patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch	Mon Feb 27 11:50:34 2012 +0100
@@ -0,0 +1,23 @@
+# HG changeset patch
+# User alanb
+# Date 1255604044 -3600
+# Node ID f6833a276c1d74a51bcf6ac99f21aab317c7535b
+# Parent  16b33372af1c8555012d4b8dde6e12226f0d866a
+6883983: JarVerifier dependency on sun.security.pkcs should be removed
+Reviewed-by: sherman, wetmore
+
+diff -r 16b33372af1c -r f6833a276c1d src/share/classes/java/util/jar/JarVerifier.java
+--- openjdk.orig/jdk/src/share/classes/java/util/jar/JarVerifier.java	Wed Oct 14 20:16:02 2009 -0700
++++ openjdk/jdk/src/share/classes/java/util/jar/JarVerifier.java	Thu Oct 15 11:54:04 2009 +0100
+@@ -293,10 +293,8 @@
+                 }
+                 sfv.process(sigFileSigners);
+ 
+-            } catch (sun.security.pkcs.ParsingException pe) {
+-                if (debug != null) debug.println("processEntry caught: "+pe);
+-                // ignore and treat as unsigned
+             } catch (IOException ioe) {
++                // e.g. sun.security.pkcs.ParsingException
+                 if (debug != null) debug.println("processEntry caught: "+ioe);
+                 // ignore and treat as unsigned
+             } catch (SignatureException se) {