changeset 2328:9822da18c162 icedtea6-1.9.7

Fix latent JAXP bug caused by missing import. 2011-02-14 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Add patch. * NEWS: Updated. * patches/latent_jaxp_bug.patch: Add missing import.
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 14 Feb 2011 16:52:57 +0000
parents e524c624d58a
children 64b56daa6bc0
files ChangeLog Makefile.am NEWS patches/latent_jaxp_bug.patch
diffstat 4 files changed, 40 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Mon Feb 14 12:54:26 2011 +0000
+++ b/ChangeLog	Mon Feb 14 16:52:57 2011 +0000
@@ -1,3 +1,15 @@
+2011-02-14  Andrew John Hughes  <ahughes@redhat.com>
+
+	* Makefile.am: Add patch.
+	* NEWS: Updated.
+	* patches/latent_jaxp_bug.patch:
+	Add missing import.
+
+2011-02-14  Andrew John Hughes  <ahughes@redhat.com>
+
+	* NEWS: Add CVE and bug ID for NetX
+	security fix.
+
 2011-02-13  Andrew John Hughes  <ahughes@redhat.com>
 
 	G344659: Fix issue when building on SPARC
@@ -10,11 +22,6 @@
 
 	* configure.ac: Bump to 1.9.7.
 
-2011-02-14  Andrew John Hughes  <ahughes@redhat.com>
-
-	* NEWS: Add CVE and bug ID for NetX
-	security fix.
-
 2011-02-13  Andrew John Hughes  <ahughes@redhat.com>
 
 	* NEWS: Updated.
--- a/Makefile.am	Mon Feb 14 12:54:26 2011 +0000
+++ b/Makefile.am	Mon Feb 14 16:52:57 2011 +0000
@@ -336,7 +336,8 @@
 	patches/openjdk/6541476-png-iTXt-chunk.patch \
 	patches/openjdk/6782079-png_metadata_oom.patch \
 	patches/rh676659-gcc-export-dynamic.patch \
-	patches/g344659-sparc_fix.patch
+	patches/g344659-sparc_fix.patch \
+	patches/latent_jaxp_bug.patch
 
 if WITH_ALT_HSBUILD
 ICEDTEA_PATCHES += \
--- a/NEWS	Mon Feb 14 12:54:26 2011 +0000
+++ b/NEWS	Mon Feb 14 16:52:57 2011 +0000
@@ -22,6 +22,7 @@
 * Bug fixes
   - RH676659: Pass -export-dynamic flag to linker using -Wl, as option in gcc 4.6+ is broken
   - G344659: Fix issue when building on SPARC
+  - Fix latent JAXP bug caused by missing import
 
 New in release 1.9.6 (2011-02-09):
 
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/latent_jaxp_bug.patch	Mon Feb 14 16:52:57 2011 +0000
@@ -0,0 +1,25 @@
+--- openjdk.orig/jaxp/build.properties	2011-02-14 12:55:39.000000000 +0000
++++ openjdk/jaxp/build.properties	2011-02-14 12:55:25.000000000 +0000
+@@ -78,7 +78,7 @@
+ patches.dir=patches
+ 
+ # Patches to apply
+-jaxp_src.patch.list=6927050.patch
++jaxp_src.patch.list=6927050.patch,import_fix.patch
+ 
+ # Sanity information
+ sanity.info= Sanity Settings:${line.separator}\
+diff -Nru jaxp.orig/patches/jaxp_src/import_fix.patch jaxp/patches/jaxp_src/import_fix.patch
+--- openjdk.orig/jaxp/patches/jaxp_src/import_fix.patch	1970-01-01 01:00:00.000000000 +0100
++++ openjdk/jaxp/patches/jaxp_src/import_fix.patch	2011-02-14 13:46:22.000000000 +0000
+@@ -0,0 +1,10 @@
++--- src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java	2009-10-14 18:13:41.000000000 +0100
+++++ src/com/sun/org/apache/xerces/internal/jaxp/validation/ValidatorHandlerImpl.java	2011-02-14 10:56:42.000000000 +0000
++@@ -47,6 +47,7 @@
++ import com.sun.org.apache.xerces.internal.util.SAXLocatorWrapper;
++ import com.sun.org.apache.xerces.internal.util.SAXMessageFormatter;
++ import com.sun.org.apache.xerces.internal.util.SymbolTable;
+++import com.sun.org.apache.xerces.internal.util.SecurityManager;
++ import com.sun.org.apache.xerces.internal.util.URI;
++ import com.sun.org.apache.xerces.internal.util.XMLAttributesImpl;
++ import com.sun.org.apache.xerces.internal.util.XMLSymbols;