/hg/release/icedtea6-1.11: 2 new changesets

andrew at icedtea.classpath.org andrew at icedtea.classpath.org
Sun Feb 10 12:38:26 PST 2013


changeset 76246747ca9d in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=76246747ca9d
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Feb 08 13:36:48 2013 +0000

	S8004341: Two JCK tests fails with 7u11 b06

	2013-02-08  Andrew John Hughes  <gnu.andrew at 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.


changeset f9cce486b359 in /hg/release/icedtea6-1.11
details: http://icedtea.classpath.org/hg/release/icedtea6-1.11?cmd=changeset;node=f9cce486b359
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Fri Feb 08 13:00:04 2013 +0000

	PR1297: cacao and jamvm parallel unpack failures

	2013-02-08  Andrew John Hughes  <gnu.andrew at redhat.com>

		PR1297: cacao and jamvm parallel unpack failures
		* Makefile.am:
		Add aliases for extract-cacao and extract-jamvm.
		(extract-cacao): Depend on download-cacao.
		(extract-jamvm): Depend on download-jamvm.
		* NEWS: Updated.


diffstat:

 ChangeLog                                        |  19 +++++++++++++++++++
 Makefile.am                                      |  11 ++++++++---
 NEWS                                             |   8 ++++++++
 configure.ac                                     |   2 +-
 patches/openjdk/8004341-jck_dialog_failure.patch |  19 +++++++++++++++++++
 5 files changed, 55 insertions(+), 4 deletions(-)

diffs (120 lines):

diff -r 93f37b050b57 -r f9cce486b359 ChangeLog
--- a/ChangeLog	Thu Feb 07 15:40:42 2013 +0000
+++ b/ChangeLog	Fri Feb 08 13:00:04 2013 +0000
@@ -1,3 +1,22 @@
+2013-02-08  Andrew John Hughes  <gnu.andrew at redhat.com>
+
+	PR1297: cacao and jamvm parallel unpack failures
+	* Makefile.am:
+	Add aliases for extract-cacao and extract-jamvm.
+	(extract-cacao): Depend on download-cacao.
+	(extract-jamvm): Depend on download-jamvm.
+	* NEWS: Updated.
+
+2013-02-08  Andrew John Hughes  <gnu.andrew at 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 at redhat.com>
 
 	* Makefile.am:
diff -r 93f37b050b57 -r f9cce486b359 Makefile.am
--- a/Makefile.am	Thu Feb 07 15:40:42 2013 +0000
+++ b/Makefile.am	Fri Feb 08 13:00:04 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 += \
@@ -1064,7 +1065,7 @@
 	rm -f stamps/patch-fsg.stamp
 	rm -f stamps/patch.stamp
 
-stamps/extract-cacao.stamp:
+stamps/extract-cacao.stamp: stamps/download-cacao.stamp
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
 if USE_ALT_CACAO_SRC_DIR
@@ -1089,7 +1090,7 @@
 	mkdir -p stamps
 	touch stamps/extract-cacao.stamp
 
-stamps/extract-jamvm.stamp:
+stamps/extract-jamvm.stamp: stamps/download-jamvm.stamp
 if BUILD_JAMVM
 	set -e ; \
 	if ! test -d jamvm ; \
@@ -2400,8 +2401,12 @@
 
 extract: stamps/extract.stamp
 
+extract-cacao: stamps/extract-cacao.stamp
+
 extract-ecj: stamps/extract-ecj.stamp
 
+extract-jamvm: stamps/extract-jamvm.stamp
+
 hotspot-ports: stamps/ports.stamp
 
 icedtea: stamps/icedtea.stamp
diff -r 93f37b050b57 -r f9cce486b359 NEWS
--- a/NEWS	Thu Feb 07 15:40:42 2013 +0000
+++ b/NEWS	Fri Feb 08 13:00:04 2013 +0000
@@ -10,6 +10,14 @@
 
 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)
+* Bug fixes
+  - PR1297: cacao and jamvm parallel unpack failures
+
 New in release 1.11.6 (2012-02-03):
 
 * Security fixes
diff -r 93f37b050b57 -r f9cce486b359 configure.ac
--- a/configure.ac	Thu Feb 07 15:40:42 2013 +0000
+++ b/configure.ac	Fri Feb 08 13:00:04 2013 +0000
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.11.6],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.11.7pre],[distro-pkg-dev at openjdk.java.net])
 AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
 AC_CONFIG_FILES([Makefile])
 
diff -r 93f37b050b57 -r f9cce486b359 patches/openjdk/8004341-jck_dialog_failure.patch
--- /dev/null	Thu Jan 01 00:00:00 1970 +0000
+++ b/patches/openjdk/8004341-jck_dialog_failure.patch	Fri Feb 08 13:00:04 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);



More information about the distro-pkg-dev mailing list