Mercurial > hg > release > icedtea7-2.4

changeset 2733:3f3d537371cd

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Update to icedtea-2.4.8pre01. 2014-04-17 Andrew John Hughes <gnu_andrew@member.fsf.org> * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.4.8pre01 tag. (JAXP_CHANGESET): Likewise. (JAXWS_CHANGESET): Likewise. (JDK_CHANGESET): Likewise. (LANGTOOLS_CHANGESET): Likewise. (OPENJDK_CHANGESET): Likewise. (CORBA_SHA256SUM): Likewise. (JAXP_SHA256SUM): Likewise. (JAXWS_SHA256SUM): Likewise. (JDK_SHA256SUM): Likewise. (LANGTOOLS_SHA256SUM): Likewise. (OPENJDK_SHA256SUM): Likewise. (ICEDTEA_PATCHES): Temporarily disable systemtap_gc patch which breaks build. * NEWS: Add remaining changes from u55 and PR1188 regression fix. * hotspot.map: Update to icedtea-2.4.8pre01. * patches/boot/break-processbuilder-dependency.patch: Regenerated. * patches/boot/ecj-diamond.patch: Add new case in java.util.logging.LogManager.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Thu, 17 Apr 2014 17:21:03 +0100
parents 846234789ca0
children cfa8ae50fd2d
files ChangeLog Makefile.am NEWS hotspot.map patches/boot/break-processbuilder-dependency.patch patches/boot/ecj-diamond.patch
diffstat 6 files changed, 99 insertions(+), 33 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Apr 17 02:29:12 2014 +0100
+++ b/ChangeLog	Thu Apr 17 17:21:03 2014 +0100
@@ -1,3 +1,28 @@
+2014-04-17  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	* Makefile.am:
+	(CORBA_CHANGESET): Update to icedtea-2.4.8pre01 tag.
+	(JAXP_CHANGESET): Likewise.
+	(JAXWS_CHANGESET): Likewise.
+	(JDK_CHANGESET): Likewise.
+	(LANGTOOLS_CHANGESET): Likewise.
+	(OPENJDK_CHANGESET): Likewise.
+	(CORBA_SHA256SUM): Likewise.
+	(JAXP_SHA256SUM): Likewise.
+	(JAXWS_SHA256SUM): Likewise.
+	(JDK_SHA256SUM): Likewise.
+	(LANGTOOLS_SHA256SUM): Likewise.
+	(OPENJDK_SHA256SUM): Likewise.
+	(ICEDTEA_PATCHES): Temporarily disable systemtap_gc
+	patch which breaks build.
+	* NEWS: Add remaining changes from u55 and PR1188
+	regression fix.
+	* hotspot.map: Update to icedtea-2.4.8pre01.
+	* patches/boot/break-processbuilder-dependency.patch:
+	Regenerated.
+	* patches/boot/ecj-diamond.patch:
+	Add new case in java.util.logging.LogManager.
+
 2014-04-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	* configure.ac: Bump to 2.4.8pre00.
--- a/Makefile.am	Thu Apr 17 02:29:12 2014 +0100
+++ b/Makefile.am	Thu Apr 17 17:21:03 2014 +0100
@@ -4,19 +4,19 @@
 BUILD_VERSION = b14
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = e6ad5b912691
-JAXP_CHANGESET = 94b7e8e0d96f
-JAXWS_CHANGESET = bd9a50a78d04
-JDK_CHANGESET = 9448fff93286
-LANGTOOLS_CHANGESET = 8c26a3c39128
-OPENJDK_CHANGESET = 13970e76b784
+CORBA_CHANGESET = 179bc370340d
+JAXP_CHANGESET = 481d5d80aada
+JAXWS_CHANGESET = 2cc5b85692ba
+JDK_CHANGESET = 344829ae761e
+LANGTOOLS_CHANGESET = 200ea1a5797e
+OPENJDK_CHANGESET = f0fab6df83bb
 
-CORBA_SHA256SUM = cc37272df260d08207c84763d4c39d7807728ba2d5908276b9bc63e925e70674
-JAXP_SHA256SUM = 3515cd105c29563bf78432576e658005386f45d7c3b2b7eac7af86cf196aaaea
-JAXWS_SHA256SUM = 3e107628080d84a80a78ef0ef9dc3664989291dd17c8bacf031d59fba7bd7f4d
-JDK_SHA256SUM = 9222e5317264f20d4a0b8170b4c4d02459cda98333c18e3a75064e7856ff58be
-LANGTOOLS_SHA256SUM = 5af29e32344e2f2fc0beb31f91b8312f2a0d6d02c53b4cb700ee2e27bcf1043b
-OPENJDK_SHA256SUM = bcd45546509defc439f42f230c0ca64e8aa6ec00542c3634aab3a4c10be3fe6b
+CORBA_SHA256SUM = a33c40fcf5476c72ec4538d3d940eef4e7cfc64683bf25a64a7d331e2d894519
+JAXP_SHA256SUM = ff826a59c8cc53e373b2e6efe41a1949daf1395db5ed3a30e1e115a2d0585b2c
+JAXWS_SHA256SUM = 44d90a5a7e4457119b216a07642da39c03d8b2e2828114a8cdfd8929d7eb24bc
+JDK_SHA256SUM = 4b8e215495fd57385598ea7b03af6290e19d5a3ed42b03a29b53b666f31bd9bb
+LANGTOOLS_SHA256SUM = 9baba9050787585556eed19f24852b69a1ef6dbe211fcb7952b104e0835e789d
+OPENJDK_SHA256SUM = 555276d65d155e4182e4e35bd3ec173d198205143dcc5a0640e4fb74d0137f99
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
@@ -289,8 +289,8 @@
 endif
 
 if ENABLE_SYSTEMTAP
-ICEDTEA_PATCHES += \
-	patches/hotspot/$(HSBUILD)/systemtap_gc.patch
+#ICEDTEA_PATCHES += \
+#	patches/hotspot/$(HSBUILD)/systemtap_gc.patch
 endif
 
 if ENABLE_NSS
--- a/NEWS	Thu Apr 17 02:29:12 2014 +0100
+++ b/NEWS	Thu Apr 17 17:21:03 2014 +0100
@@ -14,6 +14,35 @@
 
 New in release 2.4.8 (2014-07-XX):
 
+* Backports
+  - S5049299: (process) Use posix_spawn, not fork, on S10 to avoid swap exhaustion
+  - S6571600: JNI use results in UnsatisfiedLinkError looking for libmawt.so
+  - S7131153: GetDC called way too many times - causes bad performance.
+  - S7190349: [macosx] Text (Label) is incorrectly drawn with a rotated g2d
+  - S8008118: (process) Possible null pointer dereference in jdk/src/solaris/native/java/lang/UNIXProcess_md.c
+  - S8014460: Need to check for non-empty EXT_LIBS_PATH before using it
+  - S8019853: Break logging and AWT circular dependency
+  - S8020191: System.getProperty("os.name") returns "Windows NT (unknown)" on Windows 8.1
+  - S8022452: Hotspot needs to know about Windows 8.1 and Windows Server 2012 R2
+  - S8024830: SEGV in org.apache.lucene.codecs.compressing.CompressingTermVectorsReader.get
+  - S8025588: [macosx] Frozen AppKit thread in 7u40
+  - S8026404: Logging in Applet can trigger ACE: access denied ("java.lang.RuntimePermission" "modifyThreadGroup")
+  - S8026705: [TEST_BUG] java/beans/Introspector/TestTypeResolver.java failed
+  - S8027196: Increment minor version of HSx for 7u55 and initialize the build number
+  - S8030655: Regression: 14_01 Security fix 8024306 causes test failures
+  - S8030813: Signed applet fails to load when CRLs are stored in an LDAP directory
+  - S8030822: (tz) Support tzdata2013i
+  - S8031050: (thread) Change Thread initialization so that thread name is set before invoking SecurityManager
+  - S8031462: Fonts with morx tables are broken with latest ICU fixes
+  - S8032740: Need to create SE Embedded Source Bundles in 7 Release
+  - S8034772: JDK-8028795 brought a specification change to 7u55 release and caused JCK7 signature test failure
+  - S8035283: Second phase of branch shortening doesn't account for loop alignment
+  - S8035618: Four api/org_omg/CORBA TCK tests fail under plugin only
+  - S8036147: Increment hsx 24.55 build to b02 for 7u55-b11
+  - S8036837: Increment hsx 24.55 build to b03 for 7u55-b12
+* Bug fixes
+  - Fix accidental reversion of PR1188 for armel
+
 New in release 2.4.7 (2014-04-15):
 
 * Security fixes
--- a/hotspot.map	Thu Apr 17 02:29:12 2014 +0100
+++ b/hotspot.map	Thu Apr 17 17:21:03 2014 +0100
@@ -1,3 +1,3 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot 69b542696e5b e3bbed298ed7c77169fdfddc47cdb85c62ef2e5e7ea04ca28aa8779861efca65
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot ee5d9f6749da d5bd060c0bbe69c0207f822bc9dcded1e58e0661a772a678b88bdb742ae0ee76
 aarch64 http://hg.openjdk.java.net/aarch64-port/jdk7u/hotspot f50993b6c38d 64c2d0bfa71d6eecf18ab28fd64d5bd79af096f77548d80de7953c306fd9c22c
--- a/patches/boot/break-processbuilder-dependency.patch	Thu Apr 17 02:29:12 2014 +0100
+++ b/patches/boot/break-processbuilder-dependency.patch	Thu Apr 17 17:21:03 2014 +0100
@@ -1,7 +1,7 @@
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux
---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2010-09-01 22:21:08.815402468 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2010-09-01 22:23:19.572081778 +0100
-@@ -62,6 +62,32 @@
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2014-04-16 19:41:14.000000000 +0100
++++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.linux	2014-04-17 15:36:16.563068772 +0100
+@@ -63,6 +63,32 @@
      private /* final */ InputStream  stdout;
      private /* final */ InputStream  stderr;
  
@@ -31,10 +31,10 @@
 +        }
 +    }
 +
-     /* this is for the reaping thread */
-     private native int waitForProcessExit(int pid);
- 
-@@ -155,15 +181,15 @@
+     private static enum LaunchMechanism {
+         FORK(1),
+         VFORK(3);
+@@ -211,15 +237,15 @@
  
      void initStreams(int[] fds) throws IOException {
          stdin = (fds[0] == -1) ?
@@ -53,7 +53,7 @@
              new ProcessPipeInputStream(fds[2]);
  
          processReaperExecutor.execute(new Runnable() {
-@@ -275,7 +301,7 @@
+@@ -332,7 +358,7 @@
                      byte[] stragglers = drainInputStream(in);
                      in.close();
                      this.in = (stragglers == null) ?
@@ -62,7 +62,7 @@
                          new ByteArrayInputStream(stragglers);
                      if (buf == null) // asynchronous close()?
                          this.in = null;
-@@ -306,7 +332,7 @@
+@@ -363,7 +389,7 @@
                      // We know of no reason to get an IOException, but if
                      // we do, there's nothing else to do but carry on.
                  }
@@ -72,9 +72,9 @@
          }
      }
 diff -Nru openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris
---- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2010-09-01 22:21:08.815402468 +0100
-+++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2010-09-01 22:22:33.204096111 +0100
-@@ -45,6 +45,32 @@
+--- openjdk-boot.orig/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2014-04-16 19:41:14.000000000 +0100
++++ openjdk-boot/jdk/src/solaris/classes/java/lang/UNIXProcess.java.solaris	2014-04-17 15:36:49.211552223 +0100
+@@ -47,6 +47,32 @@
      private DeferredCloseInputStream stdout_inner_stream;
      private InputStream stderr_stream;
  
@@ -104,10 +104,10 @@
 +        }
 +    }
 +
-     /* this is for the reaping thread */
-     private native int waitForProcessExit(int pid);
- 
-@@ -86,7 +112,7 @@
+     private static enum LaunchMechanism {
+         FORK(1),
+         POSIX_SPAWN(2);
+@@ -145,7 +171,7 @@
          java.security.AccessController.doPrivileged(
          new java.security.PrivilegedAction<Void>() { public Void run() {
              if (std_fds[0] == -1)
@@ -116,7 +116,7 @@
              else {
                  FileDescriptor stdin_fd = new FileDescriptor();
                  fdAccess.set(stdin_fd, std_fds[0]);
-@@ -95,7 +121,7 @@
+@@ -154,7 +180,7 @@
              }
  
              if (std_fds[1] == -1)
@@ -125,7 +125,7 @@
              else {
                  FileDescriptor stdout_fd = new FileDescriptor();
                  fdAccess.set(stdout_fd, std_fds[1]);
-@@ -104,7 +130,7 @@
+@@ -163,7 +189,7 @@
              }
  
              if (std_fds[2] == -1)
--- a/patches/boot/ecj-diamond.patch	Thu Apr 17 02:29:12 2014 +0100
+++ b/patches/boot/ecj-diamond.patch	Thu Apr 17 17:21:03 2014 +0100
@@ -7131,3 +7131,15 @@
          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/java/util/logging/LogManager.java openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/logging/LogManager.java	2014-04-17 15:39:21.173802195 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/logging/LogManager.java	2014-04-17 15:39:34.838004489 +0100
+@@ -381,7 +381,7 @@
+                 final Object ecx = javaAwtAccess.getAppletContext();
+                 if (ecx != null) {
+                     if (contextsMap == null) {
+-                        contextsMap = new WeakHashMap<>();
++                        contextsMap = new WeakHashMap<Object, LoggerContext>();
+                     }
+                     context = contextsMap.get(ecx);
+                     if (context == null) {