view patches/icedtea-xjc.patch @ 2161:7524f507af5c

Apply latest security patches. 2011-10-17 Andrew John Hughes <ahughes@redhat.com> * Makefile.am: Add patches. * NEWS: List security updates. * patches/icedtea-rhino.patch: Change after 7046823 is applied. * patches/icedtea-xjc.patch: Update against 7046794. * patches/security/20111018/7000600.patch, * patches/security/20111018/7019773.patch, * patches/security/20111018/7023640.patch, * patches/security/20111018/7032417.patch, * patches/security/20111018/7046823.patch, * patches/security/20111018/7055902.patch, * patches/security/20111018/7057857.patch, * patches/security/20111018/7064341.patch, * patches/security/20111018/7083012.patch, * patches/security/20111018/7096936.patch, * patches/security/20111018/7046794.patch, * patches/security/20111018/7077466.patch: Add security patches.
author Andrew John Hughes <ahughes@redhat.com>
date Mon, 17 Oct 2011 15:40:23 +0100
parents e11a3915d1cf
children
line wrap: on
line source

diff -Nru openjdk.orig/jaxws/build.properties openjdk/jaxws/build.properties
--- openjdk.orig/jaxws/build.properties	2011-05-23 23:27:25.858844463 +0100
+++ openjdk/jaxws/build.properties	2011-05-23 23:28:12.143588051 +0100
@@ -78,7 +78,7 @@
 patches.dir=patches
 
 # Patches to apply
-jaxws_src.patch.list=7013971.patch 7046794.patch
+jaxws_src.patch.list=7013971.patch 7046794.patch xjc.patch
 
 # Sanity information
 sanity.info= Sanity Settings:${line.separator}\
diff -Nru openjdk.orig/jaxws/patches/jaxws_src/xjc.patch openjdk/jaxws/patches/jaxws_src/xjc.patch
--- openjdk.orig/jaxws/patches/jaxws_src/xjc.patch	1970-01-01 01:00:00.000000000 +0100
+++ openjdk/jaxws/patches/jaxws_src/xjc.patch	2011-05-23 23:28:02.719436649 +0100
@@ -0,0 +1,17 @@
+--- src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java.prev       2008-10-21 15:50:20.000000000 +0100
++++ src/com/sun/tools/internal/xjc/reader/xmlschema/parser/SchemaConstraintChecker.java    2008-10-21 15:57:37.000000000 +0100
+@@ -66,6 +66,14 @@
+ 
+         SchemaFactory sf = SchemaFactory.newInstance(W3C_XML_SCHEMA_NS_URI);
+         sf.setErrorHandler(errorFilter);
++        try {
++            // By default the SchemaFactory imposes a limit of 5000 on
++            // xsd:sequence maxOccurs if a SecurityManager is
++            // installed.  This breaks the specification of xjc,
++            // causing TCK failures.
++            sf.setProperty("http://apache.org/xml/properties/security-manager", null);
++        } catch (SAXException e) {
++        }
+         if( entityResolver != null ) {
+             sf.setResourceResolver(new LSResourceResolver() {
+                 public LSInput resolveResource(String type, String namespaceURI, String publicId, String systemId, String baseURI) {