Mercurial > hg > release > icedtea7-2.3

changeset 2560:b174e5813594

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bring in security updates. 2012-06-13 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: (CORBA_CHANGESET): Update to forest head and bring in security updates. (HOTSPOT_CHANGESET): Likewise. (JAXP_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (HOTSPOT_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. * 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 17:17:37 +0100
parents df0999b55509
children bb9ab7e1d3b2
files ChangeLog Makefile.am patches/boot/ecj-diamond.patch
diffstat 3 files changed, 134 insertions(+), 8 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Jun 13 12:49:37 2012 +0100
+++ b/ChangeLog	Wed Jun 13 17:17:37 2012 +0100
@@ -1,3 +1,18 @@
+2012-06-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to forest head and
+	bring in security updates.
+	(HOTSPOT_CHANGESET): Likewise.
+	(JAXP_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(HOTSPOT_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	* patches/boot/ecj-diamond.patch:
+	Add additional cases due to 7143872.
+
 2012-06-13  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* Makefile.am:
--- a/Makefile.am	Wed Jun 13 12:49:37 2012 +0100
+++ b/Makefile.am	Wed Jun 13 17:17:37 2012 +0100
@@ -4,19 +4,19 @@
 JDK_UPDATE_VERSION = 06
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(OPENJDK_VERSION)
 
-CORBA_CHANGESET = fdff99b68633
-HOTSPOT_CHANGESET = 25544370b08a
-JAXP_CHANGESET = d058831728ea
+CORBA_CHANGESET = 7563af238aaf
+HOTSPOT_CHANGESET = 8d01d54c01ce
+JAXP_CHANGESET = 590d8b5ba966
 JAXWS_CHANGESET = 9527a5961398
-JDK_CHANGESET = dcfc6cbe78fc
+JDK_CHANGESET = 9022ed117d90
 LANGTOOLS_CHANGESET = ce88d36be582
 OPENJDK_CHANGESET = 4ad80e78b55b
 
-CORBA_SHA256SUM = 80afdada85c2a2c1d3754120764a37e68ff002c1a3dd3e43a8b09972e046bba1
-HOTSPOT_SHA256SUM = 656f27e952e31780cc3621e2dfee92892098a313d84738c4a150855b36586159
-JAXP_SHA256SUM = b48fba30c4ce97beb31c1cae2edee0f0e6b68a00da1da0405c1cedb2a6277dd5
+CORBA_SHA256SUM = 06d7cfca4dc14a65329fc3e5314599aa2b6a2609fd83745321870ba19faae857
+HOTSPOT_SHA256SUM = 62d71622b9f052b769e521449f95e080801a982fcfd8383e8529485cbbc30d4d
+JAXP_SHA256SUM = 0fad006fded04011fb71a1bd4405d60e0c4731d8662576f5dde825342a383701
 JAXWS_SHA256SUM = d1ceb2f1182766d199a9118603669a35d1b1f62cb42f92af4cf14c554840b006
-JDK_SHA256SUM = b3e69c1ba90ab23c2a4b8d2fc5723a15bb40e9515e21e4296f4a86017305c7a1
+JDK_SHA256SUM = 94e455e2409a0717bc1dbd86488bce9fcf4e4fff84143bd136c2b28e77be80e5
 LANGTOOLS_SHA256SUM = ba6f16e69d18686935f25aefaee36f0a39bda4f6f8f7260513f5c53e777340a6
 OPENJDK_SHA256SUM = 65e54962cf9b77b6967a814515a58d7660624be0464af599229e6ad55647eb7e
 
--- a/patches/boot/ecj-diamond.patch	Wed Jun 13 12:49:37 2012 +0100
+++ b/patches/boot/ecj-diamond.patch	Wed Jun 13 17:17:37 2012 +0100
@@ -6021,3 +6021,114 @@
          List<Thread> threads = new ArrayList<Thread>();
          for (int i = 0; i < threadCount; i++) {
              RandomCollector r = new RandomCollector();
+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/security/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());