Mercurial > hg > release > icedtea7-2.4

changeset 2683:194e13fbc0d7

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Bring in u45 changes. 2013-10-21 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am: (JDK_UPDATE_VERSION): Bump to 45. (BUILD_VERSION): Bump to b31. (CORBA_CHANGESET): Update to IcedTea 2.4 branch HEAD. (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. * NEWS: Add changes brought in by bump. * hotspot.map: Update to IcedTea 2.4 branch HotSpot HEAD. * patches/boot/ecj-stringswitch.patch: Regenerated.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Mon, 21 Oct 2013 04:52:08 +0100
parents 54b900700f8f
children 3dd8c1e3a5b3
files ChangeLog Makefile.am NEWS hotspot.map patches/boot/ecj-stringswitch.patch
diffstat 5 files changed, 153 insertions(+), 32 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Tue Sep 24 00:40:30 2013 +0100
+++ b/ChangeLog	Mon Oct 21 04:52:08 2013 +0100
@@ -1,3 +1,26 @@
+2013-10-21  Andrew John Hughes  <gnu.andrew@redhat.com>
+
+	* Makefile.am:
+	(JDK_UPDATE_VERSION): Bump to 45.
+	(BUILD_VERSION): Bump to b31.
+	(CORBA_CHANGESET): Update to IcedTea 2.4 branch HEAD.
+	(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.
+	* NEWS: Add changes brought in by bump.
+	* hotspot.map: Update to IcedTea 2.4 branch
+	HotSpot HEAD.
+	* patches/boot/ecj-stringswitch.patch:
+	Regenerated.
+
 2013-09-23  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* NEWS: Add 2.4.3 section.
--- a/Makefile.am	Tue Sep 24 00:40:30 2013 +0100
+++ b/Makefile.am	Mon Oct 21 04:52:08 2013 +0100
@@ -1,22 +1,22 @@
 # Dependencies
 
-JDK_UPDATE_VERSION = 40
-BUILD_VERSION = b60
+JDK_UPDATE_VERSION = 45
+BUILD_VERSION = b31
 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
 
-CORBA_CHANGESET = 5ea58899ae9f
-JAXP_CHANGESET = 135f46e0e653
-JAXWS_CHANGESET = a2ff16e5361f
-JDK_CHANGESET = 4bf5ac86e0e4
-LANGTOOLS_CHANGESET = 06ea051f7ffe
-OPENJDK_CHANGESET = 6125b83238df
+CORBA_CHANGESET = 8ed5df839fbc
+JAXP_CHANGESET = 8f220f7b51c7
+JAXWS_CHANGESET = 652eb396f959
+JDK_CHANGESET = 7958751eb9ef
+LANGTOOLS_CHANGESET = 3c8eb52a32ea
+OPENJDK_CHANGESET = e2f5917da3c1
 
-CORBA_SHA256SUM = 41fc9041d7804bbd519290325c0a21b48405ed96ccf557037189b007391d33a8
-JAXP_SHA256SUM = 3e043ea822cf18232fb0897431a2c900c8d29dce59e33bd8e3236ed1ac6c8fde
-JAXWS_SHA256SUM = ac21931af93267188fb6dac8ed5eb44121e25e55fe432c19184c20c17cc9ceda
-JDK_SHA256SUM = 8cc46ef5d73a3a6445b411637fee5cc5f086e400d42b36f1f42eba4caee2a11a
-LANGTOOLS_SHA256SUM = d2de1d2e98ebea56d2367f0003e5f4b5031d55ed529a7c524df8eba9da08c735
-OPENJDK_SHA256SUM = bc5703a7c31a6f1de53259768f613fa1f451d721d3301c58a59513dc3953d95b
+CORBA_SHA256SUM = 7fab9af64ffcdf635a6fed5abf78cffd1f64be1f3827a1aaf3a0e5e1fdbc599c
+JAXP_SHA256SUM = cec41aebd42f4c8caba9c24c306ba78e8cf5da3d23da1604b98753340a2719ca
+JAXWS_SHA256SUM = fb9c22e92c2a056917b7b5dce6905a01ab2e904cbc3c1c6badcc470d22136518
+JDK_SHA256SUM = 4df06346d197180bbb9d182e3ebc9ab6386562199d9898d057d0df75566349fe
+LANGTOOLS_SHA256SUM = 462ad61fd34708c90362f9e3d3c432b9246833ea8ff0d8a14955ae386bce4a91
+OPENJDK_SHA256SUM = 75a18abd117e3295c6de4d3450f0094a9abc08f2168e2911bce25d1e153107b9
 
 CACAO_VERSION = e215e36be9fc
 CACAO_SHA256SUM = 4966514c72ee7ed108b882d9b6e65c3adf8a8f9c2dccb029f971b3c8cb4870ab
--- a/NEWS	Tue Sep 24 00:40:30 2013 +0100
+++ b/NEWS	Mon Oct 21 04:52:08 2013 +0100
@@ -14,6 +14,101 @@
 
 New in release 2.4.3 (2013-10-XX):
 
+* Security fixes
+  - S8006900, CVE-2013-3829: Add new date/time capability
+  - S8008589: Better MBean permission validation
+  - S8011071, CVE-2013-5780: Better crypto provider handling
+  - S8011081, CVE-2013-5772: Improve jhat
+  - S8011157, CVE-2013-5814: Improve CORBA portablility
+  - S8012071, CVE-2013-5790: Better Building of Beans
+  - S8012147: Improve tool support
+  - S8012277: CVE-2013-5849: Improve AWT DataFlavor
+  - S8012425, CVE-2013-5802: Transform TransformerFactory
+  - S8013503, CVE-2013-5851: Improve stream factories
+  - S8013506: Better Pack200 data handling
+  - S8013510, CVE-2013-5809: Augment image writing code
+  - S8013514: Improve stability of cmap class
+  - S8013739, CVE-2013-5817: Better LDAP resource management
+  - S8013744, CVE-2013-5783: Better tabling for AWT
+  - S8014085: Better serialization support in JMX classes
+  - S8014093, CVE-2013-5782: Improve parsing of images
+  - S8014098: Better profile validation
+  - S8014102, CVE-2013-5778: Improve image conversion
+  - S8014341, CVE-2013-5803: Better service from Kerberos servers
+  - S8014349, CVE-2013-5840: (cl) Class.getDeclaredClass problematic in some class loader configurations
+  - S8014530, CVE-2013-5825: Better digital signature processing
+  - S8014534: Better profiling support
+  - S8014987, CVE-2013-5842: Augment serialization handling
+  - S8015614: Update build settings
+  - S8015731: Subject java.security.auth.subject to improvements
+  - S8015743, CVE-2013-5774: Address internet addresses
+  - S8016256: Make finalization final
+  - S8016653, CVE-2013-5804: javadoc should ignore ignoreable characters in names
+  - S8016675, CVE-2013-5797: Make Javadoc pages more robust
+  - S8017196, CVE-2013-5850: Ensure Proxies are handled appropriately
+  - S8017287, CVE-2013-5829: Better resource disposal
+  - S8017291, CVE-2013-5830: Cast Proxies Aside
+  - S8017298, CVE-2013-4002: Better XML support
+  - S8017300, CVE-2013-5784: Improve Interface Implementation
+  - S8017505, CVE-2013-5820: Better Client Service
+  - S8019292: Better Attribute Value Exceptions
+  - S8019617: Better view of objects
+  - S8020293: JVM crash
+  - S8021275, CVE-2013-5805: Better screening for ScreenMenu
+  - S8021282, CVE-2013-5806: Better recycling of object instances
+  - S8021286: Improve MacOS resourcing
+  - S8021290, CVE-2013-5823: Better signature validation
+  - S8022931, CVE-2013-5800: Enhance Kerberos exceptions
+  - S8022940: Enhance CORBA translations
+  - S8023683: Enhance class file parsing
+* Backports
+  - S6614237: missing codepage Cp290 at java runtime
+  - S8005932: Java 7 on mac os x only provides text clipboard formats
+  - S8014046: (process) Runtime.exec(String) fails if command contains spaces [win]
+  - S8015144: Performance regression in ICU OpenType Layout library
+  - S8015965: (process) Typo in name of property to allow ambiguous commands
+  - S8015978: Incorrect transformation of XPath expression "string(-0)"
+  - S8016357: Update hotspot diagnostic class
+  - S8019584: javax/management/remote/mandatory/loading/MissingClassTest.java failed in nightly against jdk7u45: java.io.InvalidObjectException: Invalid notification: null
+  - S8019969: nioNetworkChannelInet6/SetOptionGetOptionTestInet6 test case crashes
+  - S8020032: 7u fastdebug doesn't generate fastdebuginfo file
+  - S8020085: Linux ARM build failure for 7u45
+  - S8020088: Increment minor version of HSx for 7u45 and initialize the build number
+  - S8020551: increment hsx build to b03 for 7u45-b03
+  - S8020943: Memory leak when GCNotifier uses create_from_platform_dependent_str()
+  - S8021287: Improve MacOS resourcing
+  - S8021355: REGRESSION: Five closed/java/awt/SplashScreen tests fail since 7u45 b01 on Linux, Solaris
+  - S8021360: object not exported" on start of JMXConnectorServer for RMI-IIOP protocol with security manager
+  - S8021366: java_util/Properties/PropertiesWithOtherEncodings fails during 7u45 nightly testing
+  - S8021577: JCK test api/javax_management/jmx_serial/modelmbean/ModelMBeanNotificationInfo/serial/index.html#Input has failed since jdk 7u45 b01
+  - S8021899: Re-adjust fix of # 8020498 in 7u45 after mergeing 7u40
+  - S8021901: Increment hsx build to b05 for 7u45-b05
+  - S8021933: Add extra check for fix # JDK-8014530
+  - S8021969: The index_AccessAllowed jnlp can not load successfully with exception thrown in the log.
+  - S8022066: Evaluation of method reference to signature polymorphic method crashes VM
+  - S8022086: Fixing licence of newly added files
+  - S8022254: Remove incorrect jdk7u45-b05 tag from jdk7u-cpu forest
+  - S8022661: InetAddress.writeObject() performs flush() on object output stream
+  - S8022682: Supporting XOM
+  - S8022808: Kitchensink hangs on macos
+  - S8022856: 7u45 l10n resource file translation update
+  - S8023323: Increment hsx build to b06 for 7u45-b08
+  - S8023457: Event based tracing framework needs a mutex for thread groups
+  - S8023478: Test fails with HS crash in GCNotifier.
+  - S8023741: Increment hsx 24.45 build to b07 for 7u45-b09
+  - S8023771: when USER_RELEASE_SUFFIX is set in order to add a string to java -version, build number in the bundles names should not be changed to b00
+  - S8023888: Increment hsx 24.45 build to b08 for 7u45-b10
+  - S8023964: java/io/IOException/LastErrorString.java should be @ignore-d
+  - S8024369: Increment build # of hs24.0 to b57 for 7u40-b61 psu
+  - S8024668: api/java_nio/charset/Charset/index.html#Methods JCK-runtime test fails with 7u45 b11
+  - S8024697: Fix for 8020983 causes Xcheck:jni warnings
+  - S8024863: X11: Support GNOME Shell as mutter
+  - S8024883: (se) SelectableChannel.register throws NPE if fd >= 64k (lnx)
+  - S8025128: File.createTempFile fails if prefix is absolute path
+  - S8025170: jdk7u51 7u-1-prebuild is failing since 9/19
+* Bug fixes
+  - PR1400: Menu of maximized AWT window not working in Mate
+
 New in release 2.4.2 (2013-09-20):
 
 * System LCMS 2 support again enabled by default, requiring 2.5 or above.
--- a/hotspot.map	Tue Sep 24 00:40:30 2013 +0100
+++ b/hotspot.map	Mon Oct 21 04:52:08 2013 +0100
@@ -1,2 +1,2 @@
 # version url changeset sha256sum
-default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot b732355257e3 4a4a04fa2c49d0a688400f6c9f129f47ba5cd931874c33254a047a1f36e6ac36
+default http://icedtea.classpath.org/hg/release/icedtea7-forest-2.4/hotspot b59e02d9e72b b7d7e01d7ab9e49b68aa29b55355a019d71f9ae5cabb4ea7378b55855a07df57
--- a/patches/boot/ecj-stringswitch.patch	Tue Sep 24 00:40:30 2013 +0100
+++ b/patches/boot/ecj-stringswitch.patch	Mon Oct 21 04:52:08 2013 +0100
@@ -1,6 +1,6 @@
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-07-02 03:38:10.090272900 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/ClassReader.java	2013-10-18 06:03:03.743761153 +0100
 @@ -350,19 +350,16 @@
              if (attrCommands != null) {
                  Object lkey = Attribute.keyForLookup(ctype, name);
@@ -32,8 +32,8 @@
              // Find canonical instance of the requested attribute.
              Attribute a = Attribute.lookup(Package.attrDefs, ctype, name);
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Driver.java	2013-10-18 06:03:03.743761153 +0100
 @@ -73,16 +73,14 @@
          {
              // Non-standard, undocumented "--unpack" switch enables unpack mode.
@@ -91,8 +91,8 @@
  
          if (logFile != null && !logFile.equals("")) {
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/java/util/jar/pack/Package.java	2013-10-18 06:03:03.743761153 +0100
 @@ -1116,30 +1116,25 @@
          // what is one of { Debug, Compile, Constant, Exceptions, InnerClasses }
          if (verbose > 0)
@@ -144,8 +144,8 @@
      }
  
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java
---- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/security/ntlm/NTLM.java	2013-10-18 06:03:03.743761153 +0100
 @@ -64,17 +64,23 @@
  
      protected NTLM(String version) throws NTLMException {
@@ -182,8 +182,8 @@
              fac = SecretKeyFactory.getInstance ("DES");
              cipher = Cipher.getInstance ("DES/ECB/NoPadding");
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-07-02 03:42:53.718781065 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java	2013-10-18 14:55:10.324629268 +0100
 @@ -328,12 +328,11 @@
                                       Object[] appendixResult) {
          try {
@@ -202,7 +202,7 @@
              }
          } catch (Throwable ex) {
              if (ex instanceof LinkageError)
-@@ -403,122 +402,118 @@
+@@ -403,124 +402,119 @@
      // this method is also called by test/sun/reflect/CallerSensitiveFinder
      // to validate the hand-maintained list
      private static boolean isCallerSensitiveMethod(Class<?> defc, String method) {
@@ -261,6 +261,7 @@
 -        case "getDeclaredField":
 -        case "getDeclaredMethod":
 -        case "getDeclaredConstructor":
+-        case "getDeclaringClass":
 -        case "getEnclosingClass":
 -        case "getEnclosingMethod":
 -        case "getEnclosingConstructor":
@@ -296,6 +297,7 @@
 -            return defc == java.lang.ClassLoader.class;
 -        case "registerAsParallelCapable":
 -            return defc == java.lang.ClassLoader.class;
+-        case "getInvocationHandler":
 -        case "getProxyClass":
 -        case "newProxyInstance":
 -            return defc == java.lang.reflect.Proxy.class;
@@ -396,6 +398,7 @@
 +        } else if ("registerAsParallelCapable".equals(method)) {
 +             return defc == java.lang.ClassLoader.class;
 +        } else if ("getProxyClass".equals(method) ||
++		   "getInvocationHandler".equals(method) ||
 +		   "newProxyInstance".equals(method)) {
 +             return defc == java.lang.reflect.Proxy.class;
 +        } else if ("asInterfaceInstance".equals(method)) {
@@ -430,8 +433,8 @@
          }
          return false;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleProxies.java	2013-10-18 06:03:03.743761153 +0100
 @@ -269,14 +269,16 @@
  
      private static
@@ -473,8 +476,8 @@
          }
          return null;
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/launcher/LauncherHelper.java	2013-10-18 06:03:03.743761153 +0100
 @@ -119,24 +119,20 @@
          String optStr = (opts.length > 1 && opts[1] != null)
                  ? opts[1].trim()
@@ -512,8 +515,8 @@
  
      /*
 diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-07-01 15:22:10.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-07-02 03:38:10.106273156 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-10-16 15:17:14.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/security/util/DisabledAlgorithmConstraints.java	2013-10-18 06:03:03.743761153 +0100
 @@ -378,19 +378,23 @@
              GE;         // ">="