# HG changeset patch # User Andrew John Hughes # Date 1428099914 -3600 # Node ID dd18b2f67c8d00099bb843d17f25f079a8a27a38 # Parent caed9a29935beec29b22eb4de06c09f54baf04fd Bump to icedtea-2.5.5pre02. Upstream changes: - PR2196, RH1164762: jhat man page has broken URL - PR2200: Support giflib 5.1.0 - PR2210: DGifCloseFile call should check the return value, not the error code, for failure - PR2225: giflib 5.1 conditional excludes 6.0, 7.0, etc. - PR2250: JSSE server is still limited to 768-bit DHE - S6584008, PR2193, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null - S6956398, PR2250: make ephemeral DH key match the length of the certificate key - S8074312, PR2254: Enable hotspot builds on 4.x Linux kernels 2015-04-03 Andrew John Hughes * Makefile.am: (CORBA_CHANGESET): Update to icedtea-2.5.5pre02. (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_BOOT_PATCHES): Turn on new underscored literals patch when the compiler doesn't support them. * NEWS: Updated. * acinclude.m4: (IT_UNDERSCORE_CHECK): Check that the compiler supports underscored literals. * configure.ac: Bump to 2.5.5pre02 and run IT_UNDERSCORE_CHECK. * hotspot.map.in: Update to icedtea-2.5.5pre01. * patches/boot/ecj-underscored_literals.patch: New patch to remove underscored literals in sun.security.ssl.ServerHandshaker diff -r caed9a29935b -r dd18b2f67c8d ChangeLog --- a/ChangeLog Fri Apr 03 21:41:31 2015 +0100 +++ b/ChangeLog Fri Apr 03 23:25:14 2015 +0100 @@ -1,3 +1,31 @@ +2015-04-03 Andrew John Hughes + + * Makefile.am: + (CORBA_CHANGESET): Update to icedtea-2.5.5pre02. + (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_BOOT_PATCHES): Turn on new underscored literals + patch when the compiler doesn't support them. + * NEWS: Updated. + * acinclude.m4: + (IT_UNDERSCORE_CHECK): Check that the compiler supports + underscored literals. + * configure.ac: + Bump to 2.5.5pre02 and run IT_UNDERSCORE_CHECK. + * hotspot.map.in: Update to icedtea-2.5.5pre01. + * patches/boot/ecj-underscored_literals.patch: + New patch to remove underscored literals in + sun.security.ssl.ServerHandshaker + 2015-01-27 Andrew John Hughes * Makefile.am, diff -r caed9a29935b -r dd18b2f67c8d Makefile.am --- a/Makefile.am Fri Apr 03 21:41:31 2015 +0100 +++ b/Makefile.am Fri Apr 03 23:25:14 2015 +0100 @@ -4,19 +4,19 @@ BUILD_VERSION = b31 COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION) -CORBA_CHANGESET = e8e7ada7819c -JAXP_CHANGESET = 91f042201bb6 -JAXWS_CHANGESET = be14a67897fc -JDK_CHANGESET = e1bfd77b6e1a -LANGTOOLS_CHANGESET = 62af99c4ba80 -OPENJDK_CHANGESET = cf5639f1ca27 +CORBA_CHANGESET = e6764ce23dab +JAXP_CHANGESET = d1d14eb7d6e5 +JAXWS_CHANGESET = a4d2c21355d5 +JDK_CHANGESET = fbace7bbfb81 +LANGTOOLS_CHANGESET = b4aed9cdd65b +OPENJDK_CHANGESET = 76ca358c79a2 -CORBA_SHA256SUM = a0ad9c9bec9f9381ff32aa7e0fa4a6cacd30bbf77bb7c4a7a416990e6bf3e254 -JAXP_SHA256SUM = a31439d977298cb49c4c6c7b2fe5a54f5d434d9744c7e9d19da1fd223dfbf6ce -JAXWS_SHA256SUM = c04aa71beccb31dba2b65a5cb31f1de8b614985722b00d8afa55f0c7809de1a1 -JDK_SHA256SUM = a6b60a3d1236cca2649e8071cdcbf56b3697384332daa161b35c6e5c59878f0c -LANGTOOLS_SHA256SUM = fb200d190bd3544dcece20eb3c43619134c6a8be2c8d96ab2c5484b477648621 -OPENJDK_SHA256SUM = 3268954c04d6d9b11f5c56b0ea4ecfc099ee37fc3a9ff9a67bdde42b1d1bdf2f +CORBA_SHA256SUM = ef8aa2d8cc01e9902ff2249f1a0d780528aa531fec24a7751d54820c0ea5222f +JAXP_SHA256SUM = 8d8730b5eca2f9a2765a1c5bfc31545659e017a3e55592fd213cc6937363c17b +JAXWS_SHA256SUM = dcdc1be3421b932edb1bbb45dfdaf0b2762bb1e45a63d22904ae6981b458f06d +JDK_SHA256SUM = ff7b00b6fdd26ca7f4e1b8ae1be6fd86d8cc90eae4f7a9cba7a5d4014934e015 +LANGTOOLS_SHA256SUM = 7491f6ec5dddad5892bbbe8dcc4dd9702da0d8b7712c69b4ba614fdb73e32cd7 +OPENJDK_SHA256SUM = 0d364defd2fb313e411042630217fa58b6be7215ecd4d02e448f75b540485d02 DROP_URL = http://icedtea.classpath.org/download/drops @@ -388,6 +388,10 @@ endif endif +if JAVAC_LACKS_UNDERSCORED_LITERALS +ICEDTEA_BOOT_PATCHES += patches/boot/ecj-underscored_literals.patch +endif + if DTDTYPE_QNAME ICEDTEA_BOOT_PATCHES += patches/boot/jaxws-getdtdtype.patch endif diff -r caed9a29935b -r dd18b2f67c8d NEWS --- a/NEWS Fri Apr 03 21:41:31 2015 +0100 +++ b/NEWS Fri Apr 03 23:25:14 2015 +0100 @@ -15,6 +15,8 @@ New in release 2.5.5 (2015-04-XX): * Backports + - S6584008, PR2193, RH1173326: jvmtiStringPrimitiveCallback should not be invoked when string value is null + - S6956398, PR2250: make ephemeral DH key match the length of the certificate key - S7142035: assert in j.l.instrument agents during shutdown when daemon thread is running - S7160837: DigestOutputStream does not turn off digest calculation when "close()" is called - S7195480: javax.smartcardio does not detect cards on Mac OS X @@ -67,6 +69,13 @@ - S8055714: Increment hsx 24.72 build to b04 for 7u72-b11 - S8056211: api/java_awt/Event/InputMethodEvent/serial/index.html#Input[serial2002] failure - S8068405: GenerateCurrencyData throws RuntimeException for old data + - S8074312, PR2254: Enable hotspot builds on 4.x Linux kernels +* Bug fixes + - PR2196, RH1164762: jhat man page has broken URL + - PR2200: Support giflib 5.1.0 + - PR2210: DGifCloseFile call should check the return value, not the error code, for failure + - PR2225: giflib 5.1 conditional excludes 6.0, 7.0, etc. + - PR2250: JSSE server is still limited to 768-bit DHE New in release 2.5.4 (2015-01-21): diff -r caed9a29935b -r dd18b2f67c8d acinclude.m4 --- a/acinclude.m4 Fri Apr 03 21:41:31 2015 +0100 +++ b/acinclude.m4 Fri Apr 03 23:25:14 2015 +0100 @@ -2918,3 +2918,42 @@ AM_CONDITIONAL([CP64174], test x"${it_cv_cp64174}" = "xyes") AC_PROVIDE([$0])dnl ]) + +AC_DEFUN([IT_UNDERSCORE_CHECK],[ + AC_REQUIRE([IT_CHECK_JAVA_AND_JAVAC_WORK]) + AC_CACHE_CHECK([if javac lacks support for underscored literals], it_cv_underscore, [ + CLASS=Test.java + BYTECODE=$(echo $CLASS|sed 's#\.java##') + mkdir tmp.$$ + cd tmp.$$ + cat << \EOF > $CLASS +[/* [#]line __oline__ "configure" */ + +public class Test +{ + public static void main(String[] args) + { + if (args.length == 0) + System.exit(-1); + long value = Long.parseLong(args[0]); + if ((value & 0xffff_ffff_0000_0000L) == 0) + System.out.println(args[0] + " is below Integer.MAX_VALUE"); + } +}] +EOF + if $JAVAC -cp . $JAVACFLAGS -source 7 -target 7 $CLASS >&AS_MESSAGE_LOG_FD 2>&1; then + if $JAVA -classpath . $BYTECODE $$ >&AS_MESSAGE_LOG_FD 2>&1 ; then + it_cv_underscore=no; + else + it_cv_underscore=yes; + fi + else + it_cv_underscore=yes; + fi + rm -f $CLASS *.class + cd .. + rmdir tmp.$$ + ]) +AM_CONDITIONAL([JAVAC_LACKS_UNDERSCORED_LITERALS], test x"${it_cv_underscore}" = "xyes") +AC_PROVIDE([$0])dnl +]) diff -r caed9a29935b -r dd18b2f67c8d configure.ac --- a/configure.ac Fri Apr 03 21:41:31 2015 +0100 +++ b/configure.ac Fri Apr 03 23:25:14 2015 +0100 @@ -1,4 +1,4 @@ -AC_INIT([icedtea], [2.5.5pre01], [distro-pkg-dev@openjdk.java.net]) +AC_INIT([icedtea], [2.5.5pre02], [distro-pkg-dev@openjdk.java.net]) AM_INIT_AUTOMAKE([1.9 tar-pax foreign]) AM_MAINTAINER_MODE([enable]) AC_CONFIG_FILES([Makefile]) @@ -153,6 +153,7 @@ IT_CHECK_ENABLE_WARNINGS IT_DIAMOND_CHECK +IT_UNDERSCORE_CHECK IT_BYTECODE7_CHECK IT_USE_BOOTSTRAP_TOOLS IT_CHECK_FOR_XBOOTCLASSPATH diff -r caed9a29935b -r dd18b2f67c8d hotspot.map.in --- a/hotspot.map.in Fri Apr 03 21:41:31 2015 +0100 +++ b/hotspot.map.in Fri Apr 03 23:25:14 2015 +0100 @@ -1,3 +1,3 @@ # version type(drop/hg) url changeset sha256sum -default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ bbda609c9d24 006cee4f215f228f1131a8c5cfcd3e1d9d33f8fe980a1172bf208606a0100b68 +default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4cb6ece5f073 43b37b7276a3c5d3314762a019f73345a7a67bd3cb336b9d631c11725b58e62e aarch64 drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 4d25046abb67 60da8d427f7e3659f701e54c763ea8366d8af3280c7e10670004938b2f07efef diff -r caed9a29935b -r dd18b2f67c8d patches/boot/ecj-underscored_literals.patch --- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/patches/boot/ecj-underscored_literals.patch Fri Apr 03 23:25:14 2015 +0100 @@ -0,0 +1,11 @@ +--- openjdk-boot.orig/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java.old 2015-04-03 20:33:29.164024020 +0100 ++++ openjdk-boot/jdk/src/share/classes/sun/security/ssl/ServerHandshaker.java 2015-04-03 20:33:38.840136632 +0100 +@@ -1850,7 +1850,7 @@ + return Integer.parseInt(s, radix); + } else { + long ell = Long.parseLong(s, radix); +- if ((ell & 0xffff_ffff_0000_0000L) == 0) { ++ if ((ell & 0xffffffff00000000L) == 0) { + return (int) ell; + } else { + throw new