/hg/icedtea6-hg: 4 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed Jun 13 13:11:26 PDT 2012
changeset f0964b6999c6 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f0964b6999c6
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 13 02:42:26 2012 +0100
Add 1.10.8 & 1.11.3 releases to NEWS.
2012-06-12 Andrew John Hughes <ahughes at redhat.com>
* NEWS: Add 1.10.8 & 1.11.3 releases.
changeset 9aff0fc60733 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=9aff0fc60733
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 13 15:54:52 2012 +0100
Add security updates from 2012/06/12.
2012-06-07 Andrew John Hughes <ahughes at redhat.com>
* Makefile.am,
* patches/ecj/override.patch:
Add additional cases from 7143872.
* patches/security/20120612/7079902.patch,
* patches/security/20120612/7110720.patch,
* patches/security/20120612/7143606.patch,
* patches/security/20120612/7143614.patch,
* patches/security/20120612/7143617.patch,
* patches/security/20120612/7143851.patch,
* patches/security/20120612/7143872.patch,
* patches/security/20120612/7145239.patch,
* patches/security/20120612/7152811.patch,
* patches/security/20120612/7157609.patch,
* patches/security/20120612/7160677.patch,
* patches/security/20120612/7160757.patch:
Security patches for 2012/06/12.
changeset 7a3b429bf4d5 in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=7a3b429bf4d5
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 13 17:33:16 2012 +0100
Merge
changeset f9a4a97fd49a in /hg/icedtea6-hg
details: http://icedtea.classpath.org/hg/icedtea6-hg?cmd=changeset;node=f9a4a97fd49a
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Jun 13 21:11:11 2012 +0100
Sync with upstream security patches and upstreaming of mimpure-text patch.
2012-06-13 Andrew John Hughes <ahughes at redhat.com>
* patches/openjdk/remove-mimpure-option-to-gcc.patch:
Dropped; upstreamed.
* patches/security/20120612/7079902.patch,
* patches/security/20120612/7110720.patch,
* patches/security/20120612/7143606.patch,
* patches/security/20120612/7143614.patch,
* patches/security/20120612/7143617.patch,
* patches/security/20120612/7143851.patch,
* patches/security/20120612/7143872.patch,
* patches/security/20120612/7145239.patch,
* patches/security/20120612/7152811.patch,
* patches/security/20120612/7157609.patch,
* patches/security/20120612/7160677.patch,
* patches/security/20120612/7160757.patch:
Dropped; provided by Oracle upstream.
* Makefile.am:
(JAXP_DROP_ZIP): Update to security fixed version.
(JAXP_DROP_SHA256SUM): Likewise.
(SECURITY_PATCHES): Drop; upstream.
(ICEDTEA_PATCHES): Drop mimpure-text patch; upstream.
* patches/ecj/override.patch: Regenerate
against Oracle version of security patches.
diffstat:
ChangeLog | 72 +++
Makefile.am | 11 +-
NEWS | 36 +
patches/ecj/override.patch | 95 ++-
patches/openjdk/6610244-modal-fatal-error-windows.patch | 125 -----
patches/openjdk/6633275-shaped_translucent_windows.patch | 201 ++++----
patches/openjdk/7103224-glibc_name_collision.patch | 236 ----------
patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch | 12 -
patches/openjdk/remove-mimpure-option-to-gcc.patch | 162 ------
patches/support_linux_3.patch | 19 -
10 files changed, 267 insertions(+), 702 deletions(-)
diffs (truncated from 1581 to 500 lines):
diff -r aaefc2cbbc10 -r f9a4a97fd49a ChangeLog
--- a/ChangeLog Wed May 16 12:59:46 2012 +0100
+++ b/ChangeLog Wed Jun 13 21:11:11 2012 +0100
@@ -1,3 +1,75 @@
+2012-06-13 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/remove-mimpure-option-to-gcc.patch:
+ Dropped; upstreamed.
+ * patches/security/20120612/7079902.patch,
+ * patches/security/20120612/7110720.patch,
+ * patches/security/20120612/7143606.patch,
+ * patches/security/20120612/7143614.patch,
+ * patches/security/20120612/7143617.patch,
+ * patches/security/20120612/7143851.patch,
+ * patches/security/20120612/7143872.patch,
+ * patches/security/20120612/7145239.patch,
+ * patches/security/20120612/7152811.patch,
+ * patches/security/20120612/7157609.patch,
+ * patches/security/20120612/7160677.patch,
+ * patches/security/20120612/7160757.patch:
+ Dropped; provided by Oracle upstream.
+ * Makefile.am:
+ (JAXP_DROP_ZIP): Update to security fixed version.
+ (JAXP_DROP_SHA256SUM): Likewise.
+ (SECURITY_PATCHES): Drop; upstream.
+ (ICEDTEA_PATCHES): Drop mimpure-text patch; upstream.
+ * patches/ecj/override.patch: Regenerate
+ against Oracle version of security patches.
+
+2012-06-07 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am,
+ * patches/ecj/override.patch:
+ Add additional cases from 7143872.
+ * patches/security/20120612/7079902.patch,
+ * patches/security/20120612/7110720.patch,
+ * patches/security/20120612/7143606.patch,
+ * patches/security/20120612/7143614.patch,
+ * patches/security/20120612/7143617.patch,
+ * patches/security/20120612/7143851.patch,
+ * patches/security/20120612/7143872.patch,
+ * patches/security/20120612/7145239.patch,
+ * patches/security/20120612/7152811.patch,
+ * patches/security/20120612/7157609.patch,
+ * patches/security/20120612/7160677.patch,
+ * patches/security/20120612/7160757.patch:
+ Security patches for 2012/06/12.
+
+2012-06-12 Andrew John Hughes <ahughes at redhat.com>
+
+ * NEWS: Add 1.10.8 & 1.11.3 releases.
+
+2012-06-11 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/7103224-glibc_name_collision.patch,
+ * patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch,
+ * patches/support_linux_3.patch:
+ Drop upstreamed patches.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Removed above patches.
+ * patches/openjdk/6633275-shaped_translucent_windows.patch:
+ Regenerated due to copyright header change by Oracle.
+
+2012-06-06 Andrew John Hughes <ahughes at redhat.com>
+
+ * patches/openjdk/6610244-modal-fatal-error-windows.patch:
+ Removed.
+ * Makefile.am,
+ Remove upstreamed patch.
+
+2012-05-16 Andrew John Hughes <ahughes at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Move to b26, ready
+ for next release.
+
2012-05-16 Andrew John Hughes <ahughes at redhat.com>
Move to released b25.
diff -r aaefc2cbbc10 -r f9a4a97fd49a Makefile.am
--- a/Makefile.am Wed May 16 12:59:46 2012 +0100
+++ b/Makefile.am Wed Jun 13 21:11:11 2012 +0100
@@ -2,7 +2,7 @@
OPENJDK_DATE = 01_may_2012
OPENJDK_SHA256SUM = 42db988b436593017e29d6543ac09168a901027817e41dc1be5c795b85d53b05
-OPENJDK_VERSION = b25
+OPENJDK_VERSION = b26
OPENJDK_URL = http://download.java.net/openjdk/jdk6/promoted/$(OPENJDK_VERSION)/
CACAO_VERSION = cff92704c4e0
@@ -24,8 +24,8 @@
JAF_DROP_ZIP = jdk6-jaf-b20.zip
JAF_DROP_SHA256SUM = 78c7b5c9d6271e88ee46abadd018a61f1e9645f8936cc8df1617e5f4f5074012
JAXP_DROP_URL = http://icedtea.classpath.org/download/drops
-JAXP_DROP_ZIP = jaxp144_03.zip
-JAXP_DROP_SHA256SUM = c1a5348e17b330a7e4b18431e61a40efd2ba99a7da71102cf2c604478ef96012
+JAXP_DROP_ZIP = jaxp144_04.zip
+JAXP_DROP_SHA256SUM = 490f696218c1fed9cb180680af883fe309b414fec232e9cec19645e12ad0b43c
OPENJDK_HG_URL = http://hg.openjdk.java.net/jdk6/jdk6
HOTSPOT_SRC_ZIP = hotspot.tar.gz
@@ -199,7 +199,6 @@
ICEDTEA_PATCHES = \
$(SECURITY_PATCHES) \
- patches/openjdk/6610244-modal-fatal-error-windows.patch \
patches/stdc-limit-macros.patch \
patches/openjdk/4993545-nativeinlightfixer.patch \
patches/openjdk/6637796-set_bounds.patch \
@@ -355,7 +354,6 @@
patches/openjdk/6699843-IllegalArgumentException_drawString.patch \
patches/openjdk/6918065-Crash_in_Java2D_blit_loop.patch \
patches/openjdk/6623219-Font_canDisplayUpTo_does_not_work.patch \
- patches/support_linux_3.patch \
patches/openjdk/6783910-java_awt_Color_brighter_darker_fix.patch \
patches/openjdk/6785424-SecurityException_locating_physical_fonts.patch \
patches/openjdk/7047069-Array_can_dynamically_change_size.patch \
@@ -390,15 +388,12 @@
patches/openjdk/6826104-npe_on_app_and_toolkit_modal_dialog_click.patch \
patches/openjdk/5082756-ImageIO_plugins_metadata_boolean_attributes.patch \
patches/openjdk/6296893-BMP_Writer_handles_TopDown_prop_incorrectly.patch \
- patches/openjdk/7103224-glibc_name_collision.patch \
patches/arm-debug.patch \
patches/arm-hsdis.patch \
patches/openjdk/7103610-_NET_WM_PID_and_WM_CLIENT_MACHINE_are_not_set.patch \
patches/openjdk/6706974-krb5_test_infrastructure.patch \
patches/openjdk/6764553-IdResolver_is_not_thread_safe.patch \
patches/openjdk/6761072-new_krb5_tests_fail_on_multiple_platforms.patch \
- patches/openjdk/7140882-dont-return-booleans-from-methods-returning-pointers.patch \
- patches/openjdk/remove-mimpure-option-to-gcc.patch \
patches/ScriptEngineManager-doc.patch \
patches/openjdk/6883983-JarVerifier_removed_dependency_sun_security_pkcs.patch \
patches/openjdk/4465490-Suspicious_double-check_locking_idiom.patch \
diff -r aaefc2cbbc10 -r f9a4a97fd49a NEWS
--- a/NEWS Wed May 16 12:59:46 2012 +0100
+++ b/NEWS Wed Jun 13 21:11:11 2012 +0100
@@ -19,6 +19,42 @@
- S6883983: JarVerifier dependency on sun.security.pkcs should be removed
- S4465490: Suspicious about double-check locking idiom being used in the code
+New in release 1.11.3 (2012-06-12):
+
+* Security fixes
+ - S7079902, CVE-2012-1711: Refine CORBA data models
+ - S7110720: Issue with vm config file loadingIssue with vm config file loading
+ - S7143606, CVE-2012-1717: File.createTempFile should be improved for temporary files created by the platform.
+ - S7143614, CVE-2012-1716: SynthLookAndFeel stability improvement
+ - S7143617, CVE-2012-1713: Improve fontmanager layout lookup operations
+ - S7143851, CVE-2012-1719: Improve IIOP stub and tie generation in RMIC
+ - S7143872, CVE-2012-1718: Improve certificate extension processing
+ - S7145239: Finetune package definition restriction
+ - S7152811, CVE-2012-1723: Issues in client compiler
+ - S7157609, CVE-2012-1724: Issues with loop
+ - S7160677: missing else in fix for 7152811
+ - S7160757, CVE-2012-1725: Problem with hotspot/runtime_classfile
+* Bug fixes
+ - PR1018: JVM fails due to SEGV during rendering some Unicode characters (part of 6886358)
+
+New in release 1.10.8 (2012-06-12):
+
+* Security fixes
+ - S7079902, CVE-2012-1711: Refine CORBA data models
+ - S7110720: Issue with vm config file loadingIssue with vm config file loading
+ - S7143606, CVE-2012-1717: File.createTempFile should be improved for temporary files created by the platform.
+ - S7143614, CVE-2012-1716: SynthLookAndFeel stability improvement
+ - S7143617, CVE-2012-1713: Improve fontmanager layout lookup operations
+ - S7143851, CVE-2012-1719: Improve IIOP stub and tie generation in RMIC
+ - S7143872, CVE-2012-1718: Improve certificate extension processing
+ - S7145239: Finetune package definition restriction
+ - S7152811, CVE-2012-1723: Issues in client compiler
+ - S7157609, CVE-2012-1724: Issues with loop
+ - S7160677: missing else in fix for 7152811
+ - S7160757, CVE-2012-1725: Problem with hotspot/runtime_classfile
+* Bug fixes
+ - PR1018: JVM fails due to SEGV during rendering some Unicode characters (part of 6886358)
+
New in release 1.11.2 (2012-05-11):
* Bug fixes
diff -r aaefc2cbbc10 -r f9a4a97fd49a patches/ecj/override.patch
--- a/patches/ecj/override.patch Wed May 16 12:59:46 2012 +0100
+++ b/patches/ecj/override.patch Wed Jun 13 21:11:11 2012 +0100
@@ -1,6 +1,6 @@
-diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
---- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2009-12-15 00:04:14.000000000 +0000
-+++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2009-12-15 00:09:04.000000000 +0000
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2011-01-07 21:32:58.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthComboBoxUI.java 2012-06-13 17:39:06.613931192 +0100
@@ -200,7 +200,6 @@
super.uninstallListeners();
}
@@ -121,10 +121,10 @@
public void popupMenuWillBecomeInvisible(PopupMenuEvent e) {}
}
-diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
---- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2009-12-09 16:38:59.000000000 +0000
-+++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2009-12-09 16:38:39.000000000 +0000
-@@ -832,7 +832,6 @@
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2012-06-13 17:24:23.771126209 +0100
++++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthLookAndFeel.java 2012-06-13 17:39:06.625931390 +0100
+@@ -839,7 +839,6 @@
tk.addPropertyChangeListener(key, this);
}
@@ -132,7 +132,7 @@
public void propertyChange(PropertyChangeEvent pce) {
UIDefaults defaults = UIManager.getLookAndFeelDefaults();
if (defaults.getBoolean("Synth.doNotSetTextAA")) {
-@@ -901,7 +900,6 @@
+@@ -908,7 +907,6 @@
if (!isUpdatePending()) {
setUpdatePending(true);
Runnable uiUpdater = new Runnable() {
@@ -140,7 +140,7 @@
public void run() {
updateAllUIs();
setUpdatePending(false);
-@@ -918,7 +916,6 @@
+@@ -925,7 +923,6 @@
}
private class Handler implements PropertyChangeListener {
@@ -148,9 +148,9 @@
public void propertyChange(PropertyChangeEvent evt) {
String propertyName = evt.getPropertyName();
Object newValue = evt.getNewValue();
-diff -Nru openjdk.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java openjdk/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
---- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2009-12-15 00:31:41.000000000 +0000
-+++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2009-12-15 00:32:03.000000000 +0000
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java
+--- openjdk-ecj.orig/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2011-01-07 21:32:58.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/javax/swing/plaf/synth/SynthTreeUI.java 2012-06-13 17:39:06.625931390 +0100
@@ -154,7 +154,6 @@
tree.addPropertyChangeListener(this);
}
@@ -159,20 +159,20 @@
public SynthContext getContext(JComponent c) {
return getContext(c, getComponentState(c));
}
-diff -Nru openjdk.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java openjdk/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
---- openjdk-ecj.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2009-12-15 00:44:58.000000000 +0000
-+++ openjdk-ecj/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2009-12-15 00:45:15.000000000 +0000
-@@ -701,7 +701,6 @@
- this.delegate = delegate;
- }
-
-- @Override
- public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
- Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
-
-diff -Nru openjdk.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java openjdk/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
---- openjdk-ecj.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2010-01-16 03:11:22.000000000 +0000
-+++ openjdk-ecj/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2010-01-16 03:11:57.000000000 +0000
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java openjdk-ecj/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java
+--- openjdk-ecj.orig/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java 2011-01-07 21:33:02.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java 2012-06-13 17:39:06.625931390 +0100
+@@ -624,7 +624,6 @@
+ * a given connection may change. When sessions change, so may
+ * peer identities and cipher suites.
+ */
+- @Override
+ public void handshakeCompleted(HandshakeCompletedEvent event)
+ {
+ session = event.getSession();
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java openjdk-ecj/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java
+--- openjdk-ecj.orig/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2011-01-07 21:33:03.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/sun/security/provider/certpath/OCSPResponse.java 2012-06-13 17:39:06.625931390 +0100
@@ -572,7 +572,7 @@
/*
* Return the certificate's revocation status code
@@ -196,14 +196,37 @@
return revocationReason;
}
-diff -r 697e3f8cac33 src/share/classes/sun/net/www/protocol/https/HttpsClient.java
---- openjdk-ecj.orig/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java Wed Mar 24 17:05:49 2010 +0000
-+++ openjdk-ecj/jdk/src/share/classes/sun/net/www/protocol/https/HttpsClient.java Sun Mar 28 12:55:34 2010 +0100
-@@ -624,7 +624,6 @@
- * a given connection may change. When sessions change, so may
- * peer identities and cipher suites.
- */
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
+--- openjdk-ecj.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2012-06-13 17:24:23.775126276 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java 2012-06-13 17:39:26.934270733 +0100
+@@ -463,7 +463,7 @@
+ return (CertificateIssuerExtension)
+ getExtension(PKIXExtensions.CertificateIssuer_Id);
+ }
- @Override
- public void handshakeCompleted(HandshakeCompletedEvent event)
- {
- session = event.getSession();
++
+ public int compareTo(X509CRLEntryImpl that) {
+ int compSerial = getSerialNumber().compareTo(that.getSerialNumber());
+ if (compSerial != 0) {
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java
+--- openjdk-ecj.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2012-06-13 17:24:23.779126343 +0100
++++ openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java 2012-06-13 17:39:06.625931390 +0100
+@@ -1277,7 +1277,6 @@
+ return hashcode;
+ }
+
+- @Override
+ public int compareTo(X509IssuerSerial another) {
+ int cissuer = issuer.toString()
+ .compareTo(another.issuer.toString());
+diff -Nru openjdk-ecj.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java openjdk-ecj/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java
+--- openjdk-ecj.orig/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2011-01-07 21:33:03.000000000 +0000
++++ openjdk-ecj/jdk/src/share/classes/sun/swing/plaf/synth/SynthFileChooserUIImpl.java 2012-06-13 17:39:06.625931390 +0100
+@@ -701,7 +701,6 @@
+ this.delegate = delegate;
+ }
+
+- @Override
+ public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) {
+ Component c = delegate.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+
diff -r aaefc2cbbc10 -r f9a4a97fd49a patches/openjdk/6610244-modal-fatal-error-windows.patch
--- a/patches/openjdk/6610244-modal-fatal-error-windows.patch Wed May 16 12:59:46 2012 +0100
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,125 +0,0 @@
-# HG changeset patch
-# User dav
-# Date 1206447363 -10800
-# Node ID 58c90502785df64cd26e9f2d400429dcfcaa3b91
-# Parent de9e902b1f24bef3ec7248890caa1722983e68f5
-6610244: modal dialog closes with fatal error if -Xcheck:jni is set
-Summary: obtain WWindowPeer class every time it is required
-Reviewed-by: art
-
-diff -r de9e902b1f24 -r 58c90502785d src/windows/native/sun/windows/awt_Dialog.cpp
---- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Dialog.cpp Mon Mar 24 18:24:15 2008 +0300
-+++ openjdk/jdk/src/windows/native/sun/windows/awt_Dialog.cpp Tue Mar 25 15:16:03 2008 +0300
-@@ -428,8 +428,12 @@
- {
- JNIEnv *env = (JNIEnv *)JNU_GetEnv(jvm, JNI_VERSION_1_2);
-
-- jlongArray windows = (jlongArray)(env->CallStaticObjectMethod(AwtWindow::wwindowPeerCls,
-- AwtWindow::getActiveWindowsMID));
-+ jclass wwindowPeerCls = env->FindClass("sun/awt/windows/WWindowPeer");
-+ jmethodID getActiveWindowsMID = env->GetStaticMethodID(wwindowPeerCls,
-+ "getActiveWindowHandles", "()[J");
-+ DASSERT(getActiveWindowsMID != NULL);
-+ jlongArray windows = (jlongArray)(env->CallStaticObjectMethod(wwindowPeerCls,
-+ getActiveWindowsMID));
- if (windows == NULL) {
- return;
- }
-diff -r de9e902b1f24 -r 58c90502785d src/windows/native/sun/windows/awt_Window.cpp
---- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.cpp Mon Mar 24 18:24:15 2008 +0300
-+++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.cpp Tue Mar 25 15:16:03 2008 +0300
-@@ -122,9 +122,6 @@
- jfieldID AwtWindow::locationByPlatformID;
- jfieldID AwtWindow::autoRequestFocusID;
-
--jclass AwtWindow::wwindowPeerCls;
--jmethodID AwtWindow::getActiveWindowsMID;
--
- jfieldID AwtWindow::sysXID;
- jfieldID AwtWindow::sysYID;
- jfieldID AwtWindow::sysWID;
-diff -r de9e902b1f24 -r 58c90502785d src/windows/native/sun/windows/awt_Window.h
---- openjdk.orig/jdk/src/windows/native/sun/windows/awt_Window.h Mon Mar 24 18:24:15 2008 +0300
-+++ openjdk/jdk/src/windows/native/sun/windows/awt_Window.h Tue Mar 25 15:16:03 2008 +0300
-@@ -57,11 +57,6 @@
- static jfieldID screenID; /* screen number passed over from WindowPeer */
- static jfieldID autoRequestFocusID;
-
-- /* WWindowPeer class */
-- static jclass wwindowPeerCls;
-- /* long[] getActiveWindowHandles() method in WWindowPeer */
-- static jmethodID getActiveWindowsMID;
--
- // The coordinates at the peer.
- static jfieldID sysXID;
- static jfieldID sysYID;
-diff -r de9e902b1f24 -r 58c90502785d test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ openjdk/jdk/test/java/awt/Dialog/CrashXCheckJni/CrashXCheckJni.java Tue Mar 25 15:16:03 2008 +0300
-@@ -0,0 +1,64 @@
-+/*
-+ * Copyright 2008 Sun Microsystems, Inc. All Rights Reserved.
-+ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER.
-+ *
-+ * This code is free software; you can redistribute it and/or modify it
-+ * under the terms of the GNU General Public License version 2 only, as
-+ * published by the Free Software Foundation.
-+ *
-+ * This code is distributed in the hope that it will be useful, but WITHOUT
-+ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
-+ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License
-+ * version 2 for more details (a copy is included in the LICENSE file that
-+ * accompanied this code).
-+ *
-+ * You should have received a copy of the GNU General Public License version
-+ * 2 along with this work; if not, write to the Free Software Foundation,
-+ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA.
-+ *
-+ * Please contact Sun Microsystems, Inc., 4150 Network Circle, Santa Clara,
-+ * CA 95054 USA or visit www.sun.com if you need additional information or
-+ * have any questions.
-+ */
-+
-+/*
-+ @test
-+ @bug 6610244
-+ @library ../../regtesthelpers
-+ @build Util Sysout AbstractTest
-+ @summary modal dialog closes with fatal error if -Xcheck:jni is set
-+ @author Andrei Dmitriev : area=awt.dialog
-+ @run main/othervm -Xcheck:jni CrashXCheckJni
-+*/
-+
-+import java.awt.*;
-+import java.awt.event.*;
-+import java.util.Timer;
-+import java.util.TimerTask;
-+import test.java.awt.regtesthelpers.Util;
-+import test.java.awt.regtesthelpers.AbstractTest;
-+import test.java.awt.regtesthelpers.Sysout;
-+
-+public class CrashXCheckJni {
-+
-+ public static void main(String []s)
-+ {
-+ final Dialog fd = new Dialog(new Frame(), true);
-+ Timer t = new Timer();
-+ t.schedule(new TimerTask() {
-+
-+ public void run() {
-+ System.out.println("RUNNING TASK");
-+ fd.setVisible(false);
-+ fd.dispose();
-+ System.out.println("FINISHING TASK");
-+ }
-+ }, 3000L);
-+
-+ fd.setVisible(true);
-+ t.cancel();
-+ Util.waitForIdle(null);
-+
-+ AbstractTest.pass();
-+ }
-+}
-exporting patch:
-<fdopen>
diff -r aaefc2cbbc10 -r f9a4a97fd49a patches/openjdk/6633275-shaped_translucent_windows.patch
--- a/patches/openjdk/6633275-shaped_translucent_windows.patch Wed May 16 12:59:46 2012 +0100
+++ b/patches/openjdk/6633275-shaped_translucent_windows.patch Wed Jun 13 21:11:11 2012 +0100
@@ -1,6 +1,6 @@
diff -Nru openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk openjdk/jdk/make/sun/awt/FILES_c_windows.gmk
---- openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/FILES_c_windows.gmk 2011-05-18 16:12:18.052791528 +0100
+--- openjdk.orig/jdk/make/sun/awt/FILES_c_windows.gmk 2012-06-11 16:31:11.645927727 +0100
++++ openjdk/jdk/make/sun/awt/FILES_c_windows.gmk 2012-06-11 16:47:59.677058564 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1997, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -19,8 +19,8 @@
FILES_cpp = \
CmdIDList.cpp \
diff -Nru openjdk.orig/jdk/make/sun/awt/make.depend openjdk/jdk/make/sun/awt/make.depend
---- openjdk.orig/jdk/make/sun/awt/make.depend 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/make.depend 2011-05-18 16:12:18.068791794 +0100
+--- openjdk.orig/jdk/make/sun/awt/make.depend 2012-06-11 16:31:11.653927846 +0100
++++ openjdk/jdk/make/sun/awt/make.depend 2012-06-11 16:47:59.685058684 +0100
@@ -16,7 +16,7 @@
$(OBJDIR)/awt_AWTEvent.obj:: $(CLASSHDRDIR)/java_awt_AWTEvent.h $(CLASSHDRDIR)/java_awt_Component.h $(CLASSHDRDIR)/java_awt_Dimension.h $(CLASSHDRDIR)/java_awt_Event.h $(CLASSHDRDIR)/java_awt_event_FocusEvent.h $(CLASSHDRDIR)/java_awt_event_KeyEvent.h $(CLASSHDRDIR)/java_awt_event_MouseEvent.h $(CLASSHDRDIR)/java_awt_event_WindowEvent.h $(CLASSHDRDIR)/java_awt_Font.h $(CLASSHDRDIR)/sun_awt_FontDescriptor.h $(CLASSHDRDIR)/sun_awt_PlatformFont.h $(CLASSHDRDIR)/sun_awt_windows_WComponentPeer.h $(CLASSHDRDIR)/sun_awt_windows_WFontMetrics.h $(CLASSHDRDIR)/sun_awt_windows_WObjectPeer.h $(CLASSHDRDIR)/sun_awt_windows_WToolkit.h ../../../src/share/javavm/export/jni.h ../../../src/share/javavm/export/jvm.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/share/native/sun/awt/debug/debug_assert.h ../../../src/share/native/sun/awt/debug/debug_mem.h ../../../src/share/native/sun/awt/debug/debug_trace.h ../../../src/share/native/sun/awt/debug/debug_util.h ../../../src/share/native/sun/awt/image/cvutils/img_globals.h ../../../src/share/native/sun/java2d/SurfaceData.h ../../../src/share/native/sun/java2d/Trace.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/javavm/export/jvm_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/java2d/windows/GDIWindowSurfaceData.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/awt.h ../../../src/windows/native/sun/windows/awtmsg.h ../../../src/windows/native/sun/windows/awt_AWTEvent.h ../../../src/windows/native/sun/windows/awt_Brush.h ../../../src/windows/native/sun/windows/awt_Component.h ../../../src/windows/native/sun/windows/awt_Debug.h ../../../src/windows/native/sun/windows/awt_Font.h ../../../src/windows/native/sun/windows/awt_GDIObject.h ../../../src/windows/native/sun/windows/awt_MMStub.h ../../../src/windows/native/sun/windows/awt_Multimon.h ../../../src/windows/native/sun/windows/awt_Object.h ../../../src/windows/native/sun/windows/awt_Palette.h ../../../src/windows/native/sun/windows/awt_Pen.h ../../../src/windows/native/sun/windows/awt_Toolkit.h ../../../src/windows/native/sun/windows/awt_Unicode.h ../../../src/windows/native/sun/windows/awt_Win32GraphicsDevice.h ../../../src/windows/native/sun/windows/colordata.h ../../../src/windows/native/sun/windows/Devices.h ../../../src/windows/native/sun/windows/GDIHashtable.h ../../../src/windows/native/sun/windows/Hashtable.h ../../../src/windows/native/sun/windows/ObjectList.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
@@ -107,8 +107,8 @@
$(OBJDIR)/UnicowsLoader.obj:: ../../../src/share/javavm/export/jni.h ../../../src/share/native/common/jlong.h ../../../src/share/native/common/jni_util.h ../../../src/windows/javavm/export/jni_md.h ../../../src/windows/native/common/jlong_md.h ../../../src/windows/native/sun/windows/alloc.h ../../../src/windows/native/sun/windows/stdhdrs.h ../../../src/windows/native/sun/windows/UnicowsLoader.h
diff -Nru openjdk.orig/jdk/make/sun/awt/Makefile openjdk/jdk/make/sun/awt/Makefile
---- openjdk.orig/jdk/make/sun/awt/Makefile 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/Makefile 2011-05-18 16:12:18.076791927 +0100
+--- openjdk.orig/jdk/make/sun/awt/Makefile 2012-06-11 16:31:11.645927727 +0100
++++ openjdk/jdk/make/sun/awt/Makefile 2012-06-11 16:47:59.685058684 +0100
@@ -1,5 +1,5 @@
#
-# Copyright (c) 1995, 2008, Oracle and/or its affiliates. All rights reserved.
@@ -125,8 +125,8 @@
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/loops
vpath %.c $(SHARE_SRC)/native/$(PKGDIR)/../java2d/pipe
diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers openjdk/jdk/make/sun/awt/mapfile-mawt-vers
---- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2011-05-18 15:58:49.000000000 +0100
-+++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2011-05-18 16:12:18.088792126 +0100
+--- openjdk.orig/jdk/make/sun/awt/mapfile-mawt-vers 2012-06-11 16:31:11.657927905 +0100
++++ openjdk/jdk/make/sun/awt/mapfile-mawt-vers 2012-06-11 16:47:59.685058684 +0100
@@ -291,6 +291,7 @@
Java_sun_awt_X11GraphicsConfig_createBackBuffer;
Java_sun_awt_X11GraphicsConfig_destroyBackBuffer;
@@ -136,8 +136,8 @@
Java_sun_awt_X11GraphicsDevice_getDisplay;
Java_sun_awt_X11GraphicsDevice_getDoubleBufferVisuals;
diff -Nru openjdk.orig/jdk/make/sun/awt/mapfile-vers-linux openjdk/jdk/make/sun/awt/mapfile-vers-linux
More information about the distro-pkg-dev
mailing list