Mercurial > hg > release > icedtea6-1.11
changeset 2860:76246747ca9d
S8004341: Two JCK tests fails with 7u11 b06
2013-02-08 Andrew John Hughes <gnu.andrew@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add additional patch to
fix regression introduced by security fix
7201064.
* patches/openjdk/8004341-jck_dialog_failure.patch:
Fix issue with Dialog serialization.
* NEWS: Updated.
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Fri, 08 Feb 2013 13:36:48 +0000 |
| parents | 93f37b050b57 |
| children | f9cce486b359 |
| files | ChangeLog Makefile.am NEWS configure.ac patches/openjdk/8004341-jck_dialog_failure.patch |
| diffstat | 5 files changed, 38 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Feb 07 15:40:42 2013 +0000 +++ b/ChangeLog Fri Feb 08 13:36:48 2013 +0000 @@ -1,3 +1,13 @@ +2013-02-08 Andrew John Hughes <gnu.andrew@redhat.com> + + * Makefile.am: + (ICEDTEA_PATCHES): Add additional patch to + fix regression introduced by security fix + 7201064. + * patches/openjdk/8004341-jck_dialog_failure.patch: + Fix issue with Dialog serialization. + * NEWS: Updated. + 2013-02-07 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/Makefile.am Thu Feb 07 15:40:42 2013 +0000 +++ b/Makefile.am Fri Feb 08 13:36:48 2013 +0000 @@ -490,7 +490,8 @@ patches/openjdk/7177216-native2ascii_changes_file_permissions.patch \ patches/openjdk/7199153-try_with_resources_pushed_to_6.patch \ patches/openjdk/7010849-modernise_sa.patch \ - patches/openjdk/8005615-failure_to_load_logger_implementation.patch + patches/openjdk/8005615-failure_to_load_logger_implementation.patch \ + patches/openjdk/8004341-jck_dialog_failure.patch if WITH_RHINO ICEDTEA_PATCHES += \
--- a/NEWS Thu Feb 07 15:40:42 2013 +0000 +++ b/NEWS Fri Feb 08 13:36:48 2013 +0000 @@ -10,6 +10,12 @@ CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY +New in release 1.11.7 (2013-02-XX): + +* Backports + - S8004341: Two JCK tests fails with 7u11 b06 + - S8005615: Java Logger fails to load tomcat logger implementation (JULI) + New in release 1.11.6 (2012-02-03): * Security fixes
--- a/configure.ac Thu Feb 07 15:40:42 2013 +0000 +++ b/configure.ac Fri Feb 08 13:36:48 2013 +0000 @@ -1,4 +1,4 @@ -AC_INIT([icedtea6],[1.11.6],[distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea6],[1.11.7pre],[distro-pkg-dev@openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AC_CONFIG_FILES([Makefile])
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/openjdk/8004341-jck_dialog_failure.patch Fri Feb 08 13:36:48 2013 +0000 @@ -0,0 +1,19 @@ +# HG changeset patch +# User andrew +# Date 1360323180 0 +# Node ID ca6ee539c5f4f4dd9d5fb9b0604d94c5806c3e28 +# Parent 635d562a25becae602dc5988dae8bce84b199eb4 +8004341: Two JCK tests fails with 7u11 b06 + +diff --git a/src/share/classes/java/awt/Dialog.java b/src/share/classes/java/awt/Dialog.java +--- openjdk/jdk/src/share/classes/java/awt/Dialog.java ++++ openjdk/jdk/src/share/classes/java/awt/Dialog.java +@@ -1636,6 +1636,8 @@ + if (localModalityType == null) { + this.modal = fields.get("modal", false); + setModal(modal); ++ } else { ++ this.modalityType = localModalityType; + } + + this.resizable = fields.get("resizable", true);