/hg/release/icedtea6-1.13: 3 new changesets
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Wed May 4 19:05:03 UTC 2016
changeset 06179516eff2 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=06179516eff2
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed May 04 04:24:30 2016 +0100
Update to build against the b39 tarball & April 2016 security fixes.
Upstream changes:
- S4459600: java -jar fails to run Main-Class if classname followed by whitespace.
- S4963723: Implement SHA-224
- S6378099: RFE: Use libfontconfig to create/synthesise a fontconfig.properties
- S6414899: P11Digest should support cloning
- S6452854: Provide a flag to print the java configuration
- S6578658: Request for raw RSA (NONEwithRSA) Signature support in SunMSCAPI
- S6604496: Support for CKM_AES_CTR (counter mode)
- S6742159: (launcher) improve the java launching mechanism
- S6752622: java.awt.Font.getPeer throws "java.lang.InternalError: Not implemented" on Linux
- S6753664: Support SHA256 (and higher) in SunMSCAPI
- S6758881: (launcher) needs to throw NoClassDefFoundError instead of JavaRuntimeException
- S6812738: SSL stress test with GF leads to 32 bit max process size in less than 5 minutes with PCKS11 provider
- S6856415: Enabling java security manager will make program thrown wrong exception ( main method not found )
- S6892493: potential memory leaks in 2D font code indentified by parfait.
- S6924489: sun.security.pkcs11.wrapper.PKCS11Exception: CKR_OPERATION_NOT_INITIALIZED
- S6925851: Localize JRE into pt_BR
- S6956398: make ephemeral DH key match the length of the certificate key
- S6968053: (launcher) hide exceptions under certain launcher failures
- S6977738: Deadlock between java.lang.ClassLoader and java.util.Properties
- S6981001: (launcher) EnsureJREInstallation is not being called in order
- S7017734: jdk7 message drop 1 translation integration
- S7026184: (launcher) Regression: class with unicode name can't be launched by java.
- S7033170: Cipher.getMaxAllowedKeyLength(String) throws NoSuchAlgorithmException
- S7044060: Need to support NSA Suite B Cryptography algorithms
- S7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu
- S7106773: 512 bits RSA key cannot work with SHA384 and SHA512
- S7125442: jar application located in two bytes character named folder cannot be run with JRE 7 u1/u2
- S7127906: (launcher) convert the launcher regression tests to java
- S7141141: Add 3 new test scenarios for testing Main-Class attribute in jar manifest file
- S7158988: jvm crashes while debugging on x86_32 and x86_64
- S7189944: (launcher) test/tools/launcher/Arrrrghs.java needs a couple of minor fixes
- S7193318: C2: remove number of inputs requirement from Node's new operator
- S8002116: This JdbReadTwiceTest.sh gets an exit 1
- S8004007: test/sun/tools/jinfo/Basic.sh fails on when runSA is set to true
- S8006935: Need to take care of long secret keys in HMAC/PRF compuation
- S8023990: Regression: postscript size increase from 6u18
- S8027705: com/sun/jdi/JdbMethodExitTest.sh fails when a background thread is generating events.
- S8028537: PPC64: Updated the JDK regression tests to run on AIX
- S8036132: Tab characters in test/com/sun/jdi files
- S8038963: com/sun/jdi tests fail because cygwin's ps sometimes misses processes
- S8039921: SHA1WithDSA with key > 1024 bits not working
- S8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when run under root
- S8059661: Test SoftReference and OOM behavior
- S8067364: Printing to Postscript doesn't support dieresis
- S8072753: Nondeterministic wrong answer on arithmetic
- S8073735: [TEST_BUG] compiler/loopopts/CountedLoopProblem.java got OOME
- S8074146: [TEST_BUG] jdb has succeded to read an unreadable file
- S8075584: test for 8067364 depends on hardwired text advance
- S8087120: [GCC5] java.lang.StackOverflowError on Zero JVM initialization on non x86 platforms.
- S8129952: Ensure thread consistency
- S8132051: Better byte behavior
- S8134297: NPE in GSSNameElement nameType check
- S8134650: Xsl transformation gives different results in 8u66
- S8138593: Make DSA more fair
- S8141229: [Parfait] Null pointer dereference in cmsstrcasecmp of cmserr.c
- S8143002: [Parfait] JNI exception pending in fontpath.c:1300
- S8143167: Better buffering of XML strings
- S8144430: Improve JMX connections
- S8146477: [TEST_BUG] ClientJSSEServerJSSE.java failing again
- S8146494: Better ligature substitution
- S8146498: Better device table adjustments
- S8146967: [TEST_BUG] javax/security/auth/SubjectDomainCombiner/Optimize.java should use 4-args ProtectionDomain constructor
- S8147567: InterpreterRuntime::post_field_access not updated for boolean in JDK-8132051
- S8148446: (tz) Support tzdata2016a
- S8148475: Missing SA Bytecode updates.
- S8149170: Better byte behavior for native arguments
- S8149367: PolicyQualifierInfo/index_Ctor JCk test fails with IOE: Invalid encoding for PolicyQualifierInfo
- S8150012: Better byte behavior for reflection
- S8150790: 8u75 L10n resource file translation update
- S8154210: Zero: Better byte behaviour
- S8155261: Zero broken since HS23 update
- S8155699: Resolve issues created by backports in OpenJDK 6 b39
- S8155699: Resolve issues created by backports in OpenJDK 6 b39, part 2
- S8155746: Sync Windows export list in make/java/jli/Makefile with make/java/jli/mapfile-vers
ChangeLog:
2016-05-03 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_DATE): Bump to b39 creation date;
3rd of May, 2016.
(OPENJDK_SHA256SUM): Update for b39 tarball.
2016-05-03 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/openjdk/8039921-sha1_1024plus.patch:
Remove further b39 patch missed in earlier batch.
2016-05-03 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/openjdk/4963723-implement_sha-224.patch,
* patches/openjdk/6578658-sunmscapi_nonewithrsa.patch,
* patches/openjdk/6753664-sunmscapi_sha-256.patch,
* patches/openjdk/6956398-ephemeraldhkeysize.patch,
* patches/openjdk/7033170-getmaxallowedkeylength_throws_exception.patch,
* patches/openjdk/7044060-support_nsa_suite_b.patch,
* patches/openjdk/7106773-512_bits_rsa.patch,
* patches/openjdk/8006935-long_keys_in_hmac_prf.patch,
* patches/openjdk/8087120-zero_gcc5.patch,
* patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch,
* patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch,
* patches/openjdk/p11cipher-6812738-native_cleanup.patch,
* patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch,
* patches/pr2486-768_dh.patch,
* patches/pr2488-1024_dh.patch:
Remove patches upstreamed in b39.
* Makefile.am:
(ICEDTEA_PATCHES): Remove above patches.
* NEWS: Updated.
* patches/openjdk/7170638-systemtap.patch:
Regenerated due to copyright header change in jni.cpp.
2016-05-03 Andrew John Hughes <gnu.andrew at redhat.com>
* patches/hotspot/hs23/zero_fixes.patch:
Remove fragments upstreamed in 8155261.
* patches/hotspot/hs23/zero_hs22.patch:
Likewise.
2016-01-29 Andrew John Hughes <gnu.andrew at redhat.com>
* Makefile.am:
(OPENJDK_VERSION): Bump to next release, b39.
changeset ca47e59e06a7 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=ca47e59e06a7
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed May 04 04:27:34 2016 +0100
Prepare for 1.13.11 release.
2016-05-03 Andrew John Hughes <gnu.andrew at redhat.com>
* NEWS: Set provisional release date of the 5th.
* configure.ac: Bump to 1.13.11.
changeset 63bd3c27db39 in /hg/release/icedtea6-1.13
details: http://icedtea.classpath.org/hg/release/icedtea6-1.13?cmd=changeset;node=63bd3c27db39
author: Andrew John Hughes <gnu.andrew at redhat.com>
date: Wed May 04 04:36:43 2016 +0100
PR2953: make dist fails after PR2887 made jstaptest.pl auto-generated
2016-05-03 Andrew John Hughes <gnu.andrew at redhat.com>
PR2953: make dist fails after PR2887 made
jstaptest.pl auto-generated
* Makefile.am:
(TAPSET_TEST_SRCS): Remove jstaptest.pl which
is now auto-generated and handled by autotools.
* NEWS: Updated.
diffstat:
ChangeLog | 62 +
Makefile.am | 23 +-
NEWS | 67 +-
configure.ac | 2 +-
patches/hotspot/hs23/zero_fixes.patch | 308 +-
patches/hotspot/hs23/zero_hs22.patch | 149 +-
patches/openjdk/4963723-implement_sha-224.patch | 2301 ----
patches/openjdk/6578658-sunmscapi_nonewithrsa.patch | 602 -
patches/openjdk/6753664-sunmscapi_sha-256.patch | 640 -
patches/openjdk/6956398-ephemeraldhkeysize.patch | 761 -
patches/openjdk/7033170-getmaxallowedkeylength_throws_exception.patch | 117 -
patches/openjdk/7044060-support_nsa_suite_b.patch | 3214 ------
patches/openjdk/7106773-512_bits_rsa.patch | 1336 --
patches/openjdk/7170638-systemtap.patch | 34 +-
patches/openjdk/8006935-long_keys_in_hmac_prf.patch | 41 -
patches/openjdk/8039921-sha1_1024plus.patch | 87 -
patches/openjdk/8087120-zero_gcc5.patch | 24 -
patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch | 1511 ---
patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch | 608 -
patches/openjdk/p11cipher-6812738-native_cleanup.patch | 4832 ----------
patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch | 102 -
patches/pr2486-768_dh.patch | 52 -
patches/pr2488-1024_dh.patch | 53 -
23 files changed, 161 insertions(+), 16765 deletions(-)
diffs (truncated from 17194 to 500 lines):
diff -r 49231b25f344 -r 63bd3c27db39 ChangeLog
--- a/ChangeLog Wed May 04 02:55:09 2016 +0100
+++ b/ChangeLog Wed May 04 04:36:43 2016 +0100
@@ -1,3 +1,65 @@
+2016-05-03 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ PR2953: make dist fails after PR2887 made
+ jstaptest.pl auto-generated
+ * Makefile.am:
+ (TAPSET_TEST_SRCS): Remove jstaptest.pl which
+ is now auto-generated and handled by autotools.
+ * NEWS: Updated.
+
+2016-05-03 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * NEWS: Set provisional release date of the 5th.
+ * configure.ac: Bump to 1.13.11.
+
+2016-05-03 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_DATE): Bump to b39 creation date;
+ 3rd of May, 2016.
+ (OPENJDK_SHA256SUM): Update for b39 tarball.
+
+2016-05-03 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/openjdk/8039921-sha1_1024plus.patch:
+ Remove further b39 patch missed in earlier batch.
+
+2016-05-03 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/openjdk/4963723-implement_sha-224.patch,
+ * patches/openjdk/6578658-sunmscapi_nonewithrsa.patch,
+ * patches/openjdk/6753664-sunmscapi_sha-256.patch,
+ * patches/openjdk/6956398-ephemeraldhkeysize.patch,
+ * patches/openjdk/7033170-getmaxallowedkeylength_throws_exception.patch,
+ * patches/openjdk/7044060-support_nsa_suite_b.patch,
+ * patches/openjdk/7106773-512_bits_rsa.patch,
+ * patches/openjdk/8006935-long_keys_in_hmac_prf.patch,
+ * patches/openjdk/8087120-zero_gcc5.patch,
+ * patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch,
+ * patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch,
+ * patches/openjdk/p11cipher-6812738-native_cleanup.patch,
+ * patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch,
+ * patches/pr2486-768_dh.patch,
+ * patches/pr2488-1024_dh.patch:
+ Remove patches upstreamed in b39.
+ * Makefile.am:
+ (ICEDTEA_PATCHES): Remove above patches.
+ * NEWS: Updated.
+ * patches/openjdk/7170638-systemtap.patch:
+ Regenerated due to copyright header change in jni.cpp.
+
+2016-05-03 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * patches/hotspot/hs23/zero_fixes.patch:
+ Remove fragments upstreamed in 8155261.
+ * patches/hotspot/hs23/zero_hs22.patch:
+ Likewise.
+
+2016-01-29 Andrew John Hughes <gnu.andrew at redhat.com>
+
+ * Makefile.am:
+ (OPENJDK_VERSION): Bump to next release, b39.
+
2016-05-03 Andrew John Hughes <gnu.andrew at member.fsf.org>
PR2887: Location of 'stap' executable is hard-coded
diff -r 49231b25f344 -r 63bd3c27db39 Makefile.am
--- a/Makefile.am Wed May 04 02:55:09 2016 +0100
+++ b/Makefile.am Wed May 04 04:36:43 2016 +0100
@@ -1,8 +1,8 @@
# Dependencies
-OPENJDK_DATE = 20_jan_2016
-OPENJDK_SHA256SUM = ff88dbcbda6c3c7d80b7cbd28065a455cdb009de9874fcf9ff9ca8205d38a257
-OPENJDK_VERSION = b38
+OPENJDK_DATE = 03_may_2016
+OPENJDK_SHA256SUM = d11dc2ababe88e7891f1abbd7fa4fe033a65dea22c071331a641374b3247717f
+OPENJDK_VERSION = b39
OPENJDK_URL = https://java.net/downloads/openjdk6/
CACAO_VERSION = 68fe50ac34ec
@@ -270,7 +270,6 @@
$(top_srcdir)/test/tapset/JNITestClass.c \
$(top_srcdir)/test/tapset/JNITestClass.h \
$(top_srcdir)/test/tapset/JNITestClass.java \
- $(top_srcdir)/test/tapset/jstaptest.pl \
$(top_srcdir)/test/tapset/RunWrapper.java \
$(top_srcdir)/test/tapset/StapJNIClassLoader.java \
$(top_srcdir)/test/tapset/StapURLClassLoader.java \
@@ -465,11 +464,7 @@
patches/remove_multicatch_in_testrsa.patch \
patches/openjdk/p11cipher-6682411-fix_indexoutofboundsexception.patch \
patches/openjdk/p11cipher-6682417-fix_decrypted_data_not_multiple_of_blocks.patch \
- patches/openjdk/p11cipher-6812738-native_cleanup.patch \
patches/openjdk/p11cipher-6687725-throw_illegalblocksizeexception.patch \
- patches/openjdk/p11cipher-6924489-ckr_operation_not_initialized.patch \
- patches/openjdk/p11cipher-6604496-support_ckm_aes_ctr.patch \
- patches/openjdk/p11cipher-6414899-p11digest_should_support_cloning.patch \
patches/traceable.patch \
patches/pr1319-support_giflib_5.patch \
patches/openjdk/6718364-inference_failure.patch \
@@ -581,15 +576,8 @@
patches/shark_fixes_from_8003868.patch \
patches/8003992_support_6.patch \
patches/shark-drop_compile_method_arg_following_7083786.patch \
- patches/openjdk/4963723-implement_sha-224.patch \
patches/openjdk/7180907-jarsigner_sha-256.patch \
patches/openjdk/8049480-jarsigner_openjdk_9.patch \
- patches/openjdk/6753664-sunmscapi_sha-256.patch \
- patches/openjdk/6578658-sunmscapi_nonewithrsa.patch \
- patches/openjdk/7033170-getmaxallowedkeylength_throws_exception.patch \
- patches/openjdk/7044060-support_nsa_suite_b.patch \
- patches/openjdk/8006935-long_keys_in_hmac_prf.patch \
- patches/openjdk/7106773-512_bits_rsa.patch \
patches/pr1904-icedtea_and_distro_versioning.patch \
patches/openjdk/8017173-xml_cipher_rsa_oaep_cant_be_instantiated.patch \
patches/openjdk/8000897-pr2173-vm_crash_in_compilebroker.patch \
@@ -605,7 +593,6 @@
patches/pr2226-support_future_giflib_6_and_up.patch \
patches/openjdk/4890063-hprof_truncation.patch \
patches/openjdk/6562615-compiler_warnings.patch \
- patches/openjdk/6956398-ephemeraldhkeysize.patch \
patches/openjdk/6989466-compiler_warnings.patch \
patches/openjdk/6991580-ipv6_nameservers.patch \
patches/openjdk/7007905-javazic_line_numbers.patch \
@@ -615,7 +602,6 @@
patches/openjdk/7133138-timezone_io_improvement.patch \
patches/openjdk/8011709-canonshaping_memory_leak.patch \
patches/openjdk/8023052-jvm_crash_in_native_layout.patch \
- patches/openjdk/8039921-sha1_1024plus.patch \
patches/openjdk/8041451-ldap_read_timeout_abandon.patch \
patches/openjdk/8042855-indiclayoutengine_null_dereference.patch \
patches/openjdk/7094377-ldaps_timeout.patch \
@@ -627,12 +613,9 @@
patches/openjdk/8074761-ldap_empty_optional_params.patch \
patches/openjdk/8078654-closettfontfilefunc.patch \
patches/openjdk/8081315-giflib_interlacing.patch \
- patches/openjdk/8087120-zero_gcc5.patch \
patches/pr2319-policy_jar_checksum.patch \
patches/pr2460-policy_jar_timestamp.patch \
patches/pr2481_sysconfig_clock_spaces.patch \
- patches/pr2486-768_dh.patch \
- patches/pr2488-1024_dh.patch \
patches/openjdk/6440786-pr363-zero_entry_zips.patch \
patches/openjdk/6763122-no_zipfile_ctor_exception.patch \
patches/openjdk/6599383-pr363-large_zip_files.patch \
diff -r 49231b25f344 -r 63bd3c27db39 NEWS
--- a/NEWS Wed May 04 02:55:09 2016 +0100
+++ b/NEWS Wed May 04 04:36:43 2016 +0100
@@ -12,8 +12,70 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 1.13.11 (2016-04-XX):
-
+New in release 1.13.11 (2016-05-05):
+
+* Security fixes
+ - S8129952, CVE-2016-0686: Ensure thread consistency
+ - S8132051, CVE-2016-0687: Better byte behavior
+ - S8138593, CVE-2016-0695: Make DSA more fair
+ - S8139008: Better state table management
+ - S8143167, CVE-2016-3425: Better buffering of XML strings
+ - S8144430, CVE-2016-3427: Improve JMX connections
+ - S8146494: Better ligature substitution
+ - S8146498: Better device table adjustments
+* Import of OpenJDK6 b38
+ - S4459600: java -jar fails to run Main-Class if classname followed by whitespace.
+ - S6378099: RFE: Use libfontconfig to create/synthesise a fontconfig.properties
+ - S6452854: Provide a flag to print the java configuration
+ - S6742159: (launcher) improve the java launching mechanism
+ - S6752622: java.awt.Font.getPeer throws "java.lang.InternalError: Not implemented" on Linux
+ - S6758881: (launcher) needs to throw NoClassDefFoundError instead of JavaRuntimeException
+ - S6856415: Enabling java security manager will make program thrown wrong exception ( main method not found )
+ - S6892493: potential memory leaks in 2D font code indentified by parfait.
+ - S6925851: Localize JRE into pt_BR (corba)
+ - S6968053: (launcher) hide exceptions under certain launcher failures
+ - S6977738: Deadlock between java.lang.ClassLoader and java.util.Properties
+ - S6981001: (launcher) EnsureJREInstallation is not being called in order
+ - S7017734: jdk7 message drop 1 translation integration
+ - S7026184: (launcher) Regression: class with unicode name can't be launched by java.
+ - S7104161: test/sun/tools/jinfo/Basic.sh fails on Ubuntu
+ - S7125442: jar application located in two bytes character named folder cannot be run with JRE 7 u1/u2
+ - S7127906: (launcher) convert the launcher regression tests to java
+ - S7141141: Add 3 new test scenarios for testing Main-Class attribute in jar manifest file
+ - S7158988: jvm crashes while debugging on x86_32 and x86_64
+ - S7189944: (launcher) test/tools/launcher/Arrrrghs.java needs a couple of minor fixes
+ - S7193318: C2: remove number of inputs requirement from Node's new operator
+ - S8002116: This JdbReadTwiceTest.sh gets an exit 1
+ - S8004007: test/sun/tools/jinfo/Basic.sh fails on when runSA is set to true
+ - S8023990: Regression: postscript size increase from 6u18
+ - S8027705: com/sun/jdi/JdbMethodExitTest.sh fails when a background thread is generating events.
+ - S8028537: PPC64: Updated the JDK regression tests to run on AIX
+ - S8036132: Tab characters in test/com/sun/jdi files
+ - S8038963: com/sun/jdi tests fail because cygwin's ps sometimes misses processes
+ - S8044419: TEST_BUG: com/sun/jdi/JdbReadTwiceTest.sh fails when run under root
+ - S8059661: Test SoftReference and OOM behavior
+ - S8067364: Printing to Postscript doesn't support dieresis
+ - S8072753: Nondeterministic wrong answer on arithmetic
+ - S8073735: [TEST_BUG] compiler/loopopts/CountedLoopProblem.java got OOME
+ - S8074146: [TEST_BUG] jdb has succeded to read an unreadable file
+ - S8075584: test for 8067364 depends on hardwired text advance
+ - S8134297: NPE in GSSNameElement nameType check
+ - S8134650: Xsl transformation gives different results in 8u66
+ - S8141229: [Parfait] Null pointer dereference in cmsstrcasecmp of cmserr.c
+ - S8143002: [Parfait] JNI exception pending in fontpath.c:1300
+ - S8146477: [TEST_BUG] ClientJSSEServerJSSE.java failing again
+ - S8146967: [TEST_BUG] javax/security/auth/SubjectDomainCombiner/Optimize.java should use 4-args ProtectionDomain constructor
+ - S8147567: InterpreterRuntime::post_field_access not updated for boolean in JDK-8132051
+ - S8148446: (tz) Support tzdata2016a
+ - S8148475: Missing SA Bytecode updates.
+ - S8149170: Better byte behavior for native arguments
+ - S8149367: PolicyQualifierInfo/index_Ctor JCk test fails with IOE: Invalid encoding for PolicyQualifierInfo
+ - S8150012: Better byte behavior for reflection
+ - S8150790: 8u75 L10n resource file translation update
+ - S8154210: Zero: Better byte behaviour
+ - S8155261: Zero broken since HS23 update
+ - S8155699: Resolve issues created by backports in OpenJDK 6 b39
+ - S8155746: Sync Windows export list in make/java/jli/Makefile with make/java/jli/mapfile-vers
* Backports
- S6863746, PR2951: javap should not scan ct.sym by default
- S8071705, PR2820, RH1182694: Java application menu misbehaves when running multiple screen stacked vertically
@@ -22,6 +84,7 @@
- PR2887: Location of 'stap' executable is hard-coded
- PR2890: OpenJDK should check for system cacerts database (e.g. /etc/pki/java/cacerts)
- PR2952: test/tapset/jstaptest.pl requires Perl
+ - PR2953: make dist fails after PR2887 made jstaptest.pl auto-generated
New in release 1.13.10 (2016-01-22):
diff -r 49231b25f344 -r 63bd3c27db39 configure.ac
--- a/configure.ac Wed May 04 02:55:09 2016 +0100
+++ b/configure.ac Wed May 04 04:36:43 2016 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea6],[1.13.11pre],[distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea6],[1.13.11],[distro-pkg-dev at openjdk.java.net])
AC_CANONICAL_HOST
AC_CANONICAL_TARGET
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
diff -r 49231b25f344 -r 63bd3c27db39 patches/hotspot/hs23/zero_fixes.patch
--- a/patches/hotspot/hs23/zero_fixes.patch Wed May 04 02:55:09 2016 +0100
+++ b/patches/hotspot/hs23/zero_fixes.patch Wed May 04 04:36:43 2016 +0100
@@ -1,60 +1,6 @@
-# HG changeset patch
-# User andrew
-# Date 1346354667 -3600
-# Thu Aug 30 20:24:27 2012 +0100
-# Node ID 2a413d946cb1acdcbe1110098f79b7a1f267bf75
-# Parent 3e0087ab5e924827bc198557c8e4e5b1c4ff1fa3
-Fix Zero FTBFS issues
-
-diff --git a/src/cpu/zero/vm/assembler_zero.cpp b/src/cpu/zero/vm/assembler_zero.cpp
---- openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/assembler_zero.cpp
-@@ -91,3 +91,11 @@
- address ShouldNotCallThisEntry() {
- return (address) should_not_call;
- }
-+
-+static void zero_null_fn() {
-+ return;
-+}
-+
-+address ZeroNullStubEntry(address fn) {
-+ return (address) fn;
-+}
-diff --git a/src/cpu/zero/vm/assembler_zero.hpp b/src/cpu/zero/vm/assembler_zero.hpp
---- openjdk/hotspot/src/cpu/zero/vm/assembler_zero.hpp
-+++ openjdk/hotspot/src/cpu/zero/vm/assembler_zero.hpp
-@@ -65,5 +65,6 @@
-
- address ShouldNotCallThisStub();
- address ShouldNotCallThisEntry();
-+address ZeroNullStubEntry(address fn);
-
- #endif // CPU_ZERO_VM_ASSEMBLER_ZERO_HPP
-diff --git a/src/cpu/zero/vm/copy_zero.hpp b/src/cpu/zero/vm/copy_zero.hpp
---- openjdk/hotspot/src/cpu/zero/vm/copy_zero.hpp
-+++ openjdk/hotspot/src/cpu/zero/vm/copy_zero.hpp
-@@ -169,7 +169,7 @@
- }
-
- static void pd_fill_to_bytes(void* to, size_t count, jubyte value) {
-- memset(to, value, count);
-+ if ( count > 0 ) memset(to, value, count);
- }
-
- static void pd_zero_to_words(HeapWord* tohw, size_t count) {
-@@ -177,7 +177,7 @@
- }
-
- static void pd_zero_to_bytes(void* to, size_t count) {
-- memset(to, 0, count);
-+ if ( count > 0 ) memset(to, 0, count);
- }
-
- #endif // CPU_ZERO_VM_COPY_ZERO_HPP
-diff --git a/src/cpu/zero/vm/cppInterpreter_zero.cpp b/src/cpu/zero/vm/cppInterpreter_zero.cpp
---- openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2016-05-03 20:18:13.388935986 +0100
++++ openjdk/hotspot/src/cpu/zero/vm/cppInterpreter_zero.cpp 2016-05-03 20:19:21.099818351 +0100
@@ -36,6 +36,7 @@
#include "oops/oop.inline.hpp"
#include "prims/jvmtiExport.hpp"
@@ -77,81 +23,7 @@
int CppInterpreter::normal_entry(methodOop method, intptr_t UNUSED, TRAPS) {
JavaThread *thread = (JavaThread *) THREAD;
-@@ -699,6 +707,9 @@
- method_handle = adapter;
- }
-
-+ CPPINT_DEBUG( tty->print_cr( "Process method_handle sp: 0x%x unwind_sp: 0x%x result_slots: %d.", \
-+ stack->sp(), unwind_sp, result_slots ); )
-+
- // Start processing
- process_method_handle(method_handle, THREAD);
- if (HAS_PENDING_EXCEPTION)
-@@ -718,6 +729,8 @@
- }
-
- // Check
-+ CPPINT_DEBUG( tty->print_cr( "Exiting method_handle_entry, sp: 0x%x unwind_sp: 0x%x result_slots: %d.", \
-+ stack->sp(), unwind_sp, result_slots ); )
- assert(stack->sp() == unwind_sp - result_slots, "should be");
-
- // No deoptimized frames on the stack
-@@ -725,6 +738,7 @@
- }
-
- void CppInterpreter::process_method_handle(oop method_handle, TRAPS) {
-+
- JavaThread *thread = (JavaThread *) THREAD;
- ZeroStack *stack = thread->zero_stack();
- intptr_t *vmslots = stack->sp();
-@@ -739,6 +753,7 @@
- (MethodHandles::EntryKind) (((intptr_t) entry) & 0xffffffff);
-
- methodOop method = NULL;
-+ CPPINT_DEBUG( tty->print_cr( "\nEntering %s 0x%x.",MethodHandles::entry_name(entry_kind), (char *)vmslots ); )
- switch (entry_kind) {
- case MethodHandles::_invokestatic_mh:
- direct_to_method = true;
-@@ -811,11 +826,15 @@
- case MethodHandles::_bound_int_mh:
- case MethodHandles::_bound_long_mh:
- {
-- BasicType arg_type = T_ILLEGAL;
-- int arg_mask = -1;
-- int arg_slots = -1;
-- MethodHandles::get_ek_bound_mh_info(
-- entry_kind, arg_type, arg_mask, arg_slots);
-+ // BasicType arg_type = T_ILLEGAL;
-+ // int arg_mask = -1;
-+ // int arg_slots = -1;
-+ // MethodHandles::get_ek_bound_mh_info(
-+ // entry_kind, arg_type, arg_mask, arg_slots);
-+ BasicType arg_type = MethodHandles::ek_bound_mh_arg_type(entry_kind);
-+ int arg_mask = 0;
-+ int arg_slots = type2size[arg_type];;
-+
- int arg_slot =
- java_lang_invoke_BoundMethodHandle::vmargslot(method_handle);
-
-@@ -961,10 +980,13 @@
- java_lang_invoke_AdapterMethodHandle::conversion(method_handle);
- int arg2 = MethodHandles::adapter_conversion_vminfo(conv);
-
-- int swap_bytes = 0, rotate = 0;
-- MethodHandles::get_ek_adapter_opt_swap_rot_info(
-- entry_kind, swap_bytes, rotate);
-- int swap_slots = swap_bytes >> LogBytesPerWord;
-+ // int swap_bytes = 0, rotate = 0;
-+ // MethodHandles::get_ek_adapter_opt_swap_rot_info(
-+ // entry_kind, swap_bytes, rotate);
-+ int swap_slots = MethodHandles::ek_adapter_opt_swap_slots(entry_kind);
-+ int rotate = MethodHandles::ek_adapter_opt_swap_mode(entry_kind);
-+ int swap_bytes = swap_slots * Interpreter::stackElementSize;
-+ swap_slots = swap_bytes >> LogBytesPerWord;
-
- intptr_t tmp;
- switch (rotate) {
-@@ -1080,12 +1102,309 @@
+@@ -1079,12 +1094,309 @@
}
break;
@@ -464,17 +336,9 @@
// Continue along the chain
if (direct_to_method) {
if (method == NULL) {
-@@ -1138,6 +1457,7 @@
- tty->print_cr("dst_rtype = %s", type2name(dst_rtype));
- ShouldNotReachHere();
- }
-+ CPPINT_DEBUG( tty->print_cr( "LEAVING %s\n",MethodHandles::entry_name(entry_kind) ); )
- }
-
- // The new slots will be inserted before slot insert_before.
-diff --git a/src/cpu/zero/vm/frame_zero.inline.hpp b/src/cpu/zero/vm/frame_zero.inline.hpp
---- openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
-+++ openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
+diff -Nru openjdk.orig/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp
+--- openjdk.orig/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2013-09-13 00:30:29.930952968 +0100
++++ openjdk/hotspot/src/cpu/zero/vm/frame_zero.inline.hpp 2016-05-03 20:19:21.099818351 +0100
@@ -36,6 +36,8 @@
_deopt_state = unknown;
}
@@ -484,161 +348,3 @@
inline frame::frame(ZeroFrame* zf, intptr_t* sp) {
_zeroframe = zf;
_sp = sp;
-diff --git a/src/cpu/zero/vm/methodHandles_zero.cpp b/src/cpu/zero/vm/methodHandles_zero.cpp
---- openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp
-+++ openjdk/hotspot/src/cpu/zero/vm/methodHandles_zero.cpp
-@@ -28,6 +28,8 @@
- #include "memory/allocation.inline.hpp"
- #include "prims/methodHandles.hpp"
-
-+#define __ _masm->
-+
- int MethodHandles::adapter_conversion_ops_supported_mask() {
- return ((1<<java_lang_invoke_AdapterMethodHandle::OP_RETYPE_ONLY)
- |(1<<java_lang_invoke_AdapterMethodHandle::OP_RETYPE_RAW)
-@@ -38,12 +40,73 @@
- |(1<<java_lang_invoke_AdapterMethodHandle::OP_ROT_ARGS)
- |(1<<java_lang_invoke_AdapterMethodHandle::OP_DUP_ARGS)
- |(1<<java_lang_invoke_AdapterMethodHandle::OP_DROP_ARGS)
-- //|(1<<java_lang_invoke_AdapterMethodHandle::OP_SPREAD_ARGS) //BUG!
-+ |(1<<java_lang_invoke_AdapterMethodHandle::OP_SPREAD_ARGS)
- );
-- // FIXME: MethodHandlesTest gets a crash if we enable OP_SPREAD_ARGS.
- }
-
- void MethodHandles::generate_method_handle_stub(MacroAssembler* masm,
- MethodHandles::EntryKind ek) {
- init_entry(ek, (MethodHandleEntry *) ek);
- }
-+void MethodHandles::RicochetFrame::generate_ricochet_blob(MacroAssembler* _masm,
-+ // output params:
-+ int* bounce_offset,
-+ int* exception_offset,
-+ int* frame_size_in_words) {
-+ (*frame_size_in_words) = 0;
-+ address start = __ pc();
-+ (*bounce_offset) = __ pc() - start;
-+ (*exception_offset) = __ pc() - start;
-+}
-+
-+frame MethodHandles::ricochet_frame_sender(const frame& fr, RegisterMap *map) {
-+ //RicochetFrame* f = RicochetFrame::from_frame(fr);
-+ // Cf. is_interpreted_frame path of frame::sender
-+ // intptr_t* younger_sp = fr.sp();
-+ // intptr_t* sp = fr.sender_sp();
-+ // return frame(sp, younger_sp, this_frame_adjusted_stack);
-+ ShouldNotCallThis();
-+}
-+
-+void MethodHandles::ricochet_frame_oops_do(const frame& fr, OopClosure* blk, const RegisterMap* reg_map) {
-+ // ResourceMark rm;
-+ // RicochetFrame* f = RicochetFrame::from_frame(fr);
-+
-+ // pick up the argument type descriptor:
-+ // Thread* thread = Thread::current();
-+ // process fixed part
-+ // blk->do_oop((oop*)f->saved_target_addr());
-+ // blk->do_oop((oop*)f->saved_args_layout_addr());
-+
-+ // process variable arguments:
-+ // if (cookie.is_null()) return; // no arguments to describe
-+
-+ // the cookie is actually the invokeExact method for my target
-+ // his argument signature is what I'm interested in
-+ // assert(cookie->is_method(), "");
-+ // methodHandle invoker(thread, methodOop(cookie()));
-+ // assert(invoker->name() == vmSymbols::invokeExact_name(), "must be this kind of method");
-+ // assert(!invoker->is_static(), "must have MH argument");
-+ // int slot_count = invoker->size_of_parameters();
-+ // assert(slot_count >= 1, "must include 'this'");
-+ // intptr_t* base = f->saved_args_base();
-+ // intptr_t* retval = NULL;
-+ // if (f->has_return_value_slot())
-+ // retval = f->return_value_slot_addr();
-+ // int slot_num = slot_count - 1;
-+ // intptr_t* loc = &base[slot_num];
-+ //blk->do_oop((oop*) loc); // original target, which is irrelevant
-+ // int arg_num = 0;
-+ // for (SignatureStream ss(invoker->signature()); !ss.is_done(); ss.next()) {
-+ // if (ss.at_return_type()) continue;
-+ // BasicType ptype = ss.type();
-+ // if (ptype == T_ARRAY) ptype = T_OBJECT; // fold all refs to T_OBJECT
-+ // assert(ptype >= T_BOOLEAN && ptype <= T_OBJECT, "not array or void");
-+ // slot_num -= type2size[ptype];
-+ // loc = &base[slot_num];
-+ // bool is_oop = (ptype == T_OBJECT && loc != retval);
More information about the distro-pkg-dev
mailing list