/hg/icedtea6: Make the old gcj jaxws patch still apply, given th...

[andrew at icedtea.classpath.org]

changeset 446bbf94ddcc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=446bbf94ddcc
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 29 23:15:25 2011 +0100

	Make the old gcj jaxws patch still apply, given the recent security
	updates.

	2011-06-29 Andrew John Hughes <ahughes at redhat.com>

	 * patches/ecj/jaxws-getdtdtype.patch: Fix patch to
	still apply after recent security updates.


diffstat:

 ChangeLog                          |  6 ++++++
 patches/ecj/jaxws-getdtdtype.patch |  7 +++----
 2 files changed, 9 insertions(+), 4 deletions(-)

diffs (40 lines):

diff -r e481486df309 -r 446bbf94ddcc ChangeLog
--- a/ChangeLog	Wed Jun 29 18:16:57 2011 +0100
+++ b/ChangeLog	Wed Jun 29 23:15:25 2011 +0100
@@ -1,3 +1,9 @@
+2011-06-29  Andrew John Hughes  <ahughes at redhat.com>
+
+	* patches/ecj/jaxws-getdtdtype.patch:
+	Fix patch to still apply after recent
+	security updates.
+
 2011-06-29  Andrew John Hughes  <ahughes at redhat.com>
 
 	* acinclude.m4:
diff -r e481486df309 -r 446bbf94ddcc patches/ecj/jaxws-getdtdtype.patch
--- a/patches/ecj/jaxws-getdtdtype.patch	Wed Jun 29 18:16:57 2011 +0100
+++ b/patches/ecj/jaxws-getdtdtype.patch	Wed Jun 29 23:15:25 2011 +0100
@@ -1,18 +1,18 @@
 diff -Nru openjdk-ecj.orig/jaxws/build.properties openjdk-ecj/jaxws/build.properties
---- openjdk-ecj.orig/jaxws/build.properties	2010-03-01 15:13:38.000000000 +0000
-+++ openjdk-ecj/jaxws/build.properties	2010-03-01 15:14:30.000000000 +0000
+--- openjdk-ecj.orig/jaxws/build.properties	2011-06-29 23:08:21.756066418 +0100
++++ openjdk-ecj/jaxws/build.properties	2011-06-29 23:09:51.701491292 +0100
 @@ -81,7 +81,7 @@
  patches.dir=patches
  
  # Patches to apply
--jaxws_src.patch.list=xjc.patch
-+jaxws_src.patch.list=xjc.patch getdtdtype.patch
+-jaxws_src.patch.list=7013971.patch xjc.patch
++jaxws_src.patch.list=7013971.patch xjc.patch getdtdtype.patch
  
  # Sanity information
  sanity.info= Sanity Settings:${line.separator}\
 diff -Nru openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch
 --- openjdk-ecj.orig/jaxws/patches/jaxws_src/getdtdtype.patch	1970-01-01 01:00:00.000000000 +0100
-+++ openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch	2010-03-01 15:15:10.000000000 +0000
++++ openjdk-ecj/jaxws/patches/jaxws_src/getdtdtype.patch	2011-06-29 23:09:34.609220483 +0100
 @@ -0,0 +1,27 @@
 +--- src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java	2009-11-17 16:37:06.000000000 +0000
 ++++ src/com/sun/xml/internal/bind/v2/runtime/unmarshaller/StAXEventConnector.java	2009-11-17 16:38:00.000000000 +0000