Mercurial > hg > release > icedtea6-1.8
changeset 2154:ed75c53af605
PR744: Fix jaxws patch broken by latest security update.
2011-07-11 Andrew John Hughes <ahughes@redhat.com>
PR744: Patching error
* NEWS: Updated.
* patches/ecj/icedtea-jaxws-getdtdtype.patch:
Update patch to apply after security patch.
| author | Andrew John Hughes <ahughes@redhat.com> |
|---|---|
| date | Tue, 19 Jul 2011 22:00:36 +0100 |
| parents | 208ad2bea295 |
| children | c5121c10ed2f |
| files | ChangeLog NEWS patches/ecj/icedtea-jaxws-getdtdtype.patch |
| diffstat | 3 files changed, 16 insertions(+), 6 deletions(-) [+] |
line wrap: on
line diff
--- 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@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@redhat.com> * NEWS: Add 1.8.9 section.
--- 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
--- 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