/hg/release/icedtea6-1.8: PR744: Fix jaxws patch broken by lates...

[andrew at icedtea.classpath.org]

changeset ed75c53af605 in /hg/release/icedtea6-1.8
details: http://icedtea.classpath.org/hg/release/icedtea6-1.8?cmd=changeset;node=ed75c53af605
author: Andrew John Hughes <ahughes at redhat.com>
date: Tue Jul 19 22:00:36 2011 +0100

	PR744: Fix jaxws patch broken by latest security update.

	2011-07-11 Andrew John Hughes <ahughes at redhat.com>

	 PR744: Patching error
		* NEWS: Updated.
		* patches/ecj/icedtea-jaxws-getdtdtype.patch: Update patch to
	apply after security patch.


diffstat:

 ChangeLog                                  |  7 +++++++
 NEWS                                       |  3 +++
 patches/ecj/icedtea-jaxws-getdtdtype.patch |  9 ++++-----
 3 files changed, 14 insertions(+), 5 deletions(-)

diffs (55 lines):

diff -r 208ad2bea295 -r ed75c53af605 ChangeLog
--- a/ChangeLog	Wed Jun 08 17:59:56 2011 +0100
+++ b/ChangeLog	Tue Jul 19 22:00:36 2011 +0100
@@ -1,3 +1,10 @@
+2011-07-11  Andrew John Hughes  <ahughes at redhat.com>
+
+	PR744: Patching error
+	* NEWS: Updated.
+	* patches/ecj/icedtea-jaxws-getdtdtype.patch:
+	Update patch to apply after security patch.
+
 2011-06-08  Andrew John Hughes  <ahughes at redhat.com>
 
 	* NEWS: Add 1.8.9 section.
diff -r 208ad2bea295 -r ed75c53af605 NEWS
--- a/NEWS	Wed Jun 08 17:59:56 2011 +0100
+++ b/NEWS	Tue Jul 19 22:00:36 2011 +0100
@@ -10,6 +10,9 @@
 
 New in release 1.8.9 (20XX-XX-XX):
 
+* Bug fixes
+  - PR744: icedtea6-1.10.2 : patching error
+
 New in release 1.8.8 (2011-06-07):
 
 * Security fixes
diff -r 208ad2bea295 -r ed75c53af605 patches/ecj/icedtea-jaxws-getdtdtype.patch
--- a/patches/ecj/icedtea-jaxws-getdtdtype.patch	Wed Jun 08 17:59:56 2011 +0100
+++ b/patches/ecj/icedtea-jaxws-getdtdtype.patch	Tue Jul 19 22:00:36 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
-@@ -81,7 +81,7 @@
+--- openjdk-ecj.orig/jaxws/build.properties	2011-07-11 21:56:16.000000000 +0100
++++ openjdk-ecj/jaxws/build.properties	2011-07-11 21:58:15.168357598 +0100
+@@ -78,7 +78,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-07-11 21:57:55.656033418 +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