Mercurial > hg > release > icedtea7-2.1

changeset 2521:710992b0e922

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bring in security fixes. 2012-06-12 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: (JDK_UPDATE_VERSION): Bump to 05. (CORBA_CHANGESET): Update to 2.1.1 release tag. (HOTSPOT_CHANGESET): Likewise. (JAXP_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. * NEWS: List security fixes. * patches/boot/ecj-diamond.patch: Add additional cases due to 7143872.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Wed, 13 Jun 2012 02:24:02 +0100
parents 049a0940c8c3
children 5ce34ab26820
files ChangeLog Makefile.am NEWS patches/boot/ecj-diamond.patch
diffstat 4 files changed, 150 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 13 00:55:23 2012 +0100
+++ b/ChangeLog	Wed Jun 13 02:24:02 2012 +0100
@@ -1,3 +1,20 @@
+2012-06-12  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Bump to 05.
+	(CORBA_CHANGESET): Update to 2.1.1 release tag.
+	(HOTSPOT_CHANGESET): Likewise.
+	(JAXP_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(HOTSPOT_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	* NEWS:
+	List security fixes.
+	* patches/boot/ecj-diamond.patch:
+	Add additional cases due to 7143872.
+
 2012-05-07  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* Makefile.am:
--- a/Makefile.am	Wed Jun 13 00:55:23 2012 +0100
+++ b/Makefile.am	Wed Jun 13 02:24:02 2012 +0100
@@ -4,19 +4,19 @@
 JDK_UPDATE_VERSION = 03
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-CORBA_CHANGESET = 5617f6c5cc94
-HOTSPOT_CHANGESET = 883fc064689b
-JAXP_CHANGESET = 1cf75c0e2c96
+CORBA_CHANGESET = 338c21646c76
+HOTSPOT_CHANGESET = 8b7c4c5f6ba9
+JAXP_CHANGESET = 7a8825b15df6
 JAXWS_CHANGESET = 7edfbfe974f2
-JDK_CHANGESET = 7ceda3124828
+JDK_CHANGESET = d5ddeffc4651
 LANGTOOLS_CHANGESET = b534c4c6cd9b
 OPENJDK_CHANGESET = 22cc03983e20
 
-CORBA_SHA256SUM = 963915483530f311ff313635f79ed11ea7ce5a1c0dbee5d1acb1994132857fa3
-HOTSPOT_SHA256SUM = d9fabfdc138c38c05f194d13dd9109851d54786957312a68365ffcbfc532e403
-JAXP_SHA256SUM = 8ce48c704f38285207ee6dc56c45b2d214083b4d4d36be02901401b594ce701e
+CORBA_SHA256SUM = 10425cbbb439551293a7a96a128f25ce408c38826bef8562f4c2d65d3134a1d3
+HOTSPOT_SHA256SUM = 22866990d143e76ced94b76defa3051e5e5d9a51fd272d63daa0df272d6406a2
+JAXP_SHA256SUM = 297c8dbeed5afa5395b6be06b17282d53f8a888c2909074dfc1605afc0daf1c2
 JAXWS_SHA256SUM = 823ca6b8fd780bf1b1565a90cfc8ec6f0ee422a5d25ffb20b1ce0272dc4955aa
-JDK_SHA256SUM = b95f5b01e3a692c240b80507b793f75cc831d114ded8e93eb056abf37db9eaeb
+JDK_SHA256SUM = e83e6234842376147a4c32451f23d629ba107e908ebdb0f367657f9cc6c1be98
 LANGTOOLS_SHA256SUM = c77dd42d83f06d18fa8aa65c93d137608a2e02cf24b68fc10d7b1c0bcc12a93c
 OPENJDK_SHA256SUM = ada790b4754f521ebfad0dd909ea29b92b2b3c1b84b2e99d32673343727d95d7
 
--- a/NEWS	Wed Jun 13 00:55:23 2012 +0100
+++ b/NEWS	Wed Jun 13 02:24:02 2012 +0100
@@ -12,6 +12,20 @@
 
 New in release 2.1.1 (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
+  - S7165628, CVE-2012-1726: Issues with java.lang.invoke.MethodHandles.Lookup
 * Bug fixes
   - PR885: IcedTea7 does not build scripting support
   - Fix bug whereby JPEG_LIBS were not set by jdk_generic_profile.sh
--- a/patches/boot/ecj-diamond.patch	Wed Jun 13 00:55:23 2012 +0100
+++ b/patches/boot/ecj-diamond.patch	Wed Jun 13 02:24:02 2012 +0100
@@ -5711,3 +5711,114 @@
  
  
           Thread appThread = new Thread(appsThreadGroup, launcher, "AppThread-0");
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CertImpl.java	2012-06-13 00:23:50.888084888 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CertImpl.java	2012-06-13 00:24:25.328561965 +0100
+@@ -1214,7 +1214,7 @@
+             if (exts == null) {
+                 return null;
+             }
+-            Set<String> extSet = new TreeSet<>();
++            Set<String> extSet = new TreeSet<String>();
+             for (Extension ex : exts.getAllExtensions()) {
+                 if (ex.isCritical()) {
+                     extSet.add(ex.getExtensionId().toString());
+@@ -1244,7 +1244,7 @@
+             if (exts == null) {
+                 return null;
+             }
+-            Set<String> extSet = new TreeSet<>();
++            Set<String> extSet = new TreeSet<String>();
+             for (Extension ex : exts.getAllExtensions()) {
+                 if (!ex.isCritical()) {
+                     extSet.add(ex.getExtensionId().toString());
+@@ -1484,10 +1484,10 @@
+         if (names.isEmpty()) {
+             return Collections.<List<?>>emptySet();
+         }
+-        List<List<?>> newNames = new ArrayList<>();
++        List<List<?>> newNames = new ArrayList<List<?>>();
+         for (GeneralName gname : names.names()) {
+             GeneralNameInterface name = gname.getName();
+-            List<Object> nameEntry = new ArrayList<>(2);
++            List<Object> nameEntry = new ArrayList<Object>(2);
+             nameEntry.add(Integer.valueOf(name.getType()));
+             switch (name.getType()) {
+             case GeneralNameInterface.NAME_RFC822:
+@@ -1545,12 +1545,12 @@
+             }
+         }
+         if (mustClone) {
+-            List<List<?>> namesCopy = new ArrayList<>();
++            List<List<?>> namesCopy = new ArrayList<List<?>>();
+             for (List<?> nameEntry : altNames) {
+                 Object nameObject = nameEntry.get(1);
+                 if (nameObject instanceof byte[]) {
+                     List<Object> nameEntryCopy =
+-                                        new ArrayList<>(nameEntry);
++                                        new ArrayList<Object>(nameEntry);
+                     nameEntryCopy.set(1, ((byte[])nameObject).clone());
+                     namesCopy.add(Collections.unmodifiableList(nameEntryCopy));
+                 } else {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	2012-06-13 00:23:34.591859370 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLEntryImpl.java	2012-06-13 00:25:17.953292153 +0100
+@@ -352,7 +352,7 @@
+         if (extensions == null) {
+             return null;
+         }
+-        Set<String> extSet = new TreeSet<>();
++        Set<String> extSet = new TreeSet<String>();
+         for (Extension ex : extensions.getAllExtensions()) {
+             if (ex.isCritical()) {
+                 extSet.add(ex.getExtensionId().toString());
+@@ -373,7 +373,7 @@
+         if (extensions == null) {
+             return null;
+         }
+-        Set<String> extSet = new TreeSet<>();
++        Set<String> extSet = new TreeSet<String>();
+         for (Extension ex : extensions.getAllExtensions()) {
+             if (!ex.isCritical()) {
+                 extSet.add(ex.getExtensionId().toString());
+@@ -510,7 +510,7 @@
+             return Collections.emptyMap();
+         }
+         Collection<Extension> exts = extensions.getAllExtensions();
+-        Map<String, java.security.cert.Extension> map = new TreeMap<>();
++        Map<String, java.security.cert.Extension> map = new TreeMap<String, java.security.cert.Extension>();
+         for (Extension ext : exts) {
+             map.put(ext.getId(), ext);
+         }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java openjdk-boot/jdk/src/share/classes/sun/secrity/x509/X509CRLImpl.java
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java	2012-06-13 00:23:41.063948918 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/x509/X509CRLImpl.java	2012-06-13 00:24:53.264949412 +0100
+@@ -104,8 +104,8 @@
+     private X500Principal    issuerPrincipal = null;
+     private Date             thisUpdate = null;
+     private Date             nextUpdate = null;
+-    private Map<X509IssuerSerial,X509CRLEntry> revokedMap = new TreeMap<>();
+-    private List<X509CRLEntry> revokedList = new LinkedList<>();
++    private Map<X509IssuerSerial,X509CRLEntry> revokedMap = new TreeMap<X509IssuerSerial,X509CRLEntry>();
++    private List<X509CRLEntry> revokedList = new LinkedList<X509CRLEntry>();
+     private CRLExtensions    extensions = null;
+     private final static boolean isExplicit = true;
+     private static final long YR_2050 = 2524636800000L;
+@@ -907,7 +907,7 @@
+         if (extensions == null) {
+             return null;
+         }
+-        Set<String> extSet = new TreeSet<>();
++        Set<String> extSet = new TreeSet<String>();
+         for (Extension ex : extensions.getAllExtensions()) {
+             if (ex.isCritical()) {
+                 extSet.add(ex.getExtensionId().toString());
+@@ -928,7 +928,7 @@
+         if (extensions == null) {
+             return null;
+         }
+-        Set<String> extSet = new TreeSet<>();
++        Set<String> extSet = new TreeSet<String>();
+         for (Extension ex : extensions.getAllExtensions()) {
+             if (!ex.isCritical()) {
+                 extSet.add(ex.getExtensionId().toString());