Mercurial > hg > release > icedtea6-1.10
view patches/ecj/override.patch @ 2578:96394d394527
Add security patches for 2012/06/12.
2012-06-07 Andrew John Hughes <ahughes@redhat.com>
* Makefile.am:
(ICEDTEA_PATCHES): Add security patches. Make more
patches HotSpot-build specific.
* patches/ecj/override.patch:
Add additional cases from 7143872.
* patches/arm.patch: Moved to HotSpot-specific versions.
* patches/arch.patch,
* patches/freetypeversion.patch,
* patches/gcc-suffix.patch:
Fix to work with no fuzz.
* patches/hotspot/hs20/arm.patch,
* patches/hotspot/hs20/gcc-stack-markings.patch,
* patches/hotspot/hs20/numa_on_early_glibc.patch,
* patches/hotspot/hs20/sparc-trapsfix.patch,
* patches/hotspot/hs20/version-hotspot.patch:
Split to work with hs20 with no fuzz.
* patches/hotspot/original/arm.patch,
* patches/hotspot/original/gcc-stack-markings.patch,
* patches/hotspot/original/numa_on_early_glibc.patch,
* patches/hotspot/original/sparc-trapsfix.patch,
* patches/hotspot/original/version-hotspot.patch:
Likewise for hs19 (original).
* patches/jaxp-serial-version-uid.patch,
* patches/libraries.patch,
* patches/nio2.patch,
* patches/no-static-linking.patch,
* patches/openjdk/6693253-security_warning.patch,
* patches/openjdk/6766342-AA-simple-shape-performance.patch,
* patches/openjdk/6797139-jbutton_truncation.patch,
* patches/openjdk/6851973-kerberos.patch,
* patches/openjdk/7102369-7094468-rmiregistry.patch:
Fixed to work with no fuzz.
* patches/openjdk/hs20/7034464-hugepage.patch,
* patches/openjdk/hs20/7103224-glibc_name_collision.patch,
Fixed to work with hs20 and no fuzz.
* patches/openjdk/mutter.patch:
Fixed to work with no fuzz.
* patches/openjdk/original/7034464-hugepage.patch,
* patches/openjdk/original/7103224-glibc_name_collision.patch,
Fixed to work with hs19 (original) and no fuzz.
* patches/openjdk/remove-mimpure-option-to-gcc.patch:
Fixed to work with no fuzz.
* patches/security/20120612/7079902.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/7157609.patch,
* patches/security/20120612/7160677.patch,
* patches/security/20120612/7160757.patch,
* patches/security/20120612/hs20/7110720.patch,
* patches/security/20120612/hs20/7152811.patch,
* patches/security/20120612/original/7110720.patch,
* patches/security/20120612/original/7152811.patch,
Security patches for 2012/06/12.
* NEWS: Updated.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Fri, 08 Jun 2012 14:23:28 +0100 |
parents | c467335ab509 |
children | 6df81d93af9c |
line wrap: on
line source
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 @@ -200,7 +200,6 @@ super.uninstallListeners(); } - @Override public SynthContext getContext(JComponent c) { return getContext(c, getComponentState(c)); } @@ -273,7 +272,6 @@ // end UI Initialization //====================== - @Override public void propertyChange(PropertyChangeEvent e) { if (SynthLookAndFeel.shouldUpdateStyle(e)) { updateStyle(comboBox); @@ -318,7 +316,6 @@ } } - @Override public void paintBorder(SynthContext context, Graphics g, int x, int y, int w, int h) { context.getPainter().paintComboBoxBorder(context, g, x, y, w, h); @@ -424,7 +421,6 @@ setText(" "); } - @Override public Component getListCellRendererComponent(JList list, Object value, int index, boolean isSelected, boolean cellHasFocus) { setName("ComboBox.listRenderer"); @@ -491,7 +487,6 @@ editor.setName("ComboBox.textField"); } - @Override public Component getEditorComponent() { return editor; } @@ -501,7 +496,6 @@ * * @param anObject the displayed value of the editor */ - @Override public void setItem(Object anObject) { String text; @@ -517,7 +511,6 @@ } } - @Override public Object getItem() { Object newValue = editor.getText(); @@ -540,18 +533,15 @@ return newValue; } - @Override public void selectAll() { editor.selectAll(); editor.requestFocus(); } - @Override public void addActionListener(ActionListener l) { editor.addActionListener(l); } - @Override public void removeActionListener(ActionListener l) { editor.removeActionListener(l); } @@ -685,27 +675,22 @@ // MouseListener/MouseMotionListener Methods //------------------------------------------------------------------ - @Override public void mouseEntered(MouseEvent mouseEvent) { updateOver(true); } - @Override public void mouseExited(MouseEvent mouseEvent) { updateOver(false); } - @Override public void mousePressed(MouseEvent mouseEvent) { updatePressed(true); } - @Override public void mouseReleased(MouseEvent mouseEvent) { updatePressed(false); } - @Override public void mouseClicked(MouseEvent e) {} //------------------------------------------------------------------ @@ -722,16 +707,13 @@ * This bug was only noticed when acting as a button, but may be generally * present. If so, remove the if() block */ - @Override public void popupMenuCanceled(PopupMenuEvent e) { if (shouldActLikeButton() || pressedWhenPopupVisible) { comboBox.repaint(); } } - @Override public void popupMenuWillBecomeVisible(PopupMenuEvent e) {} - @Override 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 @@ tk.addPropertyChangeListener(key, this); } - @Override public void propertyChange(PropertyChangeEvent pce) { UIDefaults defaults = UIManager.getLookAndFeelDefaults(); if (defaults.getBoolean("Synth.doNotSetTextAA")) { @@ -901,7 +900,6 @@ if (!isUpdatePending()) { setUpdatePending(true); Runnable uiUpdater = new Runnable() { - @Override public void run() { updateAllUIs(); setUpdatePending(false); @@ -918,7 +916,6 @@ } private class Handler implements PropertyChangeListener { - @Override 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 @@ -154,7 +154,6 @@ tree.addPropertyChangeListener(this); } - @Override 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 @@ -572,7 +572,7 @@ /* * Return the certificate's revocation status code */ - @Override public CertStatus getCertStatus() { + public CertStatus getCertStatus() { return certStatus; } @@ -580,11 +580,11 @@ return certId; } - @Override public Date getRevocationTime() { + public Date getRevocationTime() { return (Date) revocationTime.clone(); } - @Override public Reason getRevocationReason() { + public Reason getRevocationReason() { 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. */ - @Override public void handshakeCompleted(HandshakeCompletedEvent event) { session = event.getSession(); diff --git a/src/share/classes/sun/security/x509/X509CRLEntryImpl.java b/src/share/classes/sun/security/x509/X509CRLEntryImpl.java --- openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java +++ openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java @@ -464,7 +464,6 @@ getExtension(PKIXExtensions.CertificateIssuer_Id); } - @Override public int compareTo(X509CRLEntryImpl that) { int compSerial = getSerialNumber().compareTo(that.getSerialNumber()); if (compSerial != 0) { diff --git a/src/share/classes/sun/security/x509/X509CRLImpl.java b/src/share/classes/sun/security/x509/X509CRLImpl.java --- openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java +++ openjdk-ecj/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java @@ -1276,7 +1276,6 @@ return hashcode; } - @Override public int compareTo(X509IssuerSerial another) { int cissuer = issuer.toString() .compareTo(another.issuer.toString());