[PATCH REVIEW] [1.8, 1.9 & 1.10] Fix broken jaxws getdtdtype patch

[Deepak Bhole]

* Dr Andrew John Hughes <ahughes at redhat.com> [2011-07-11 17:56]:
> There is a bootstrap patch applied for certain old versions of gcj which was broken
> by the recent security updates.  The attached patches update 1.8, 1.9 & 1.10 so they
> still build if this patch is applied.
> 
> This fixes PR744.
> 
> Ok for 1.8, 1.9 & 1.10?
> 

Looks fine to me, okay for branches.

Cheers,
Deepak

> 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.
> -- 
> Andrew :)
> 
> Free Java Software Engineer
> Red Hat, Inc. (http://www.redhat.com)
> 
> Support Free Java!
> Contribute to GNU Classpath and IcedTea
> http://www.gnu.org/software/classpath
> http://icedtea.classpath.org
> PGP Key: F5862A37 (https://keys.indymedia.org/)
> Fingerprint = EA30 D855 D50F 90CD F54D  0698 0713 C3ED F586 2A37

> diff -r 208ad2bea295 NEWS
> --- a/NEWS	Wed Jun 08 17:59:56 2011 +0100
> +++ b/NEWS	Mon Jul 11 22:00:37 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 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	Mon Jul 11 22:00:37 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

> diff -r 1c554e7ce79e NEWS
> --- a/NEWS	Sat Jul 09 16:58:17 2011 +0200
> +++ b/NEWS	Mon Jul 11 22:44:28 2011 +0100
> @@ -10,6 +10,8 @@
>  
>  New in release 1.9.9 (20XX-XX-XX):
>  
> +* Bug Fixes
> +  - PR744: icedtea6-1.10.2 : patching error
>  * Shark
>    - PR632: patches/security/20110215/6878713.patch breaks shark zero build
>  
> diff -r 1c554e7ce79e patches/ecj/icedtea-jaxws-getdtdtype.patch
> --- a/patches/ecj/icedtea-jaxws-getdtdtype.patch	Sat Jul 09 16:58:17 2011 +0200
> +++ b/patches/ecj/icedtea-jaxws-getdtdtype.patch	Mon Jul 11 22:44:28 2011 +0100
> @@ -5,8 +5,8 @@
>   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 -r 6c21fc007867 NEWS
> --- a/NEWS	Wed Jun 29 18:16:57 2011 +0100
> +++ b/NEWS	Mon Jul 11 22:44:14 2011 +0100
> @@ -13,6 +13,7 @@
>  
>  * Bug fixes
>    - PR748: Icedtea6 fails to build with Linux 3.0.
> +  - PR744: icedtea6-1.10.2 : patching error
>  * Backports:
>    - S7037283, RH712211: Null Pointer Exception in SwingUtilities2.
>    - S6769607, PR677: Modal frame hangs for a while.
> diff -r 6c21fc007867 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	Mon Jul 11 22:44:14 2011 +0100
> @@ -5,8 +5,8 @@
>   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}\