/hg/release/icedtea7-2.5: Bump to icedtea-2.5.3.
andrew at icedtea.classpath.org
andrew at icedtea.classpath.org
Tue Oct 14 21:12:03 UTC 2014
changeset 121ad7411fd1 in /hg/release/icedtea7-2.5
details: http://icedtea.classpath.org/hg/release/icedtea7-2.5?cmd=changeset;node=121ad7411fd1
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Tue Oct 14 22:11:50 2014 +0100
Bump to icedtea-2.5.3.
2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
* patches/hotspot/aarch64/20140715-8030763-validate_global_memory_allocation.patch,
* patches/hotspot/aarch64/20140715-8032536-jvm_resolves_wrong_method.patch,
* patches/hotspot/aarch64/20140715-8035119-fix_exceptions_to_bytecode_verification.patch,
* patches/hotspot/aarch64/20140715-8036800-attribute_oom_to_right_code.patch,
* patches/hotspot/aarch64/20140715-8037076-check_constant_pool_constants.patch,
* patches/hotspot/aarch64/20140715-8037157-verify_init_call.patch,
* patches/hotspot/aarch64/20140715-8037167-better_method_signature_resolution.patch,
* patches/hotspot/aarch64/20140715-8043454-8037157_test_case_fix.patch:
Remove patches included in latest AArch64 drop.
* Makefile.am:
(CORBA_CHANGESET): Update to icedtea-2.5.3 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): Remove old AArch64 security patches and
add new ones from the 2014/10/14 update.
* NEWS: List changes from u71 and AArch64 port. Set release
date to today.
* configure.ac: Bump to 2.5.3.
* hotspot.map.in: Update to icedtea-2.5.3 tag for default.
Update AArch64 to jdk7u60_b04_aarch64_834 tag.
* patches/boot/ecj-multicatch.patch:
Remove defunct RSAClientKeyExchange patch. Add new cases
in CipherInputStream and CipherOutputStream.
* patches/boot/ecj-stringswitch.patch: Add new case in
AnnotationInvocationHandler.
* patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch,
* patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch,
* patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch,
* patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch,
* patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch,
* patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch,
* patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch,
* patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch,
* patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch,
* patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch:
OpenJDK 8 version of 2014/10/14 HotSpot security patches for AArch64.
diffstat:
ChangeLog | 48 +
Makefile.am | 42 +-
NEWS | 62 +-
configure.ac | 2 +-
hotspot.map.in | 4 +-
patches/boot/ecj-multicatch.patch | 387 +++++----
patches/boot/ecj-stringswitch.patch | 21 +
patches/hotspot/aarch64/20140715-8030763-validate_global_memory_allocation.patch | 233 ------
patches/hotspot/aarch64/20140715-8032536-jvm_resolves_wrong_method.patch | 77 -
patches/hotspot/aarch64/20140715-8035119-fix_exceptions_to_bytecode_verification.patch | 119 ---
patches/hotspot/aarch64/20140715-8036800-attribute_oom_to_right_code.patch | 40 -
patches/hotspot/aarch64/20140715-8037076-check_constant_pool_constants.patch | 37 -
patches/hotspot/aarch64/20140715-8037157-verify_init_call.patch | 25 -
patches/hotspot/aarch64/20140715-8037167-better_method_signature_resolution.patch | 67 -
patches/hotspot/aarch64/20140715-8043454-8037157_test_case_fix.patch | 48 -
patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch | 209 +++++
patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch | 291 +++++++
patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch | 221 +++++
patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch | 21 +
patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch | 30 +
patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch | 33 +
patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch | 22 +
patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch | 250 ++++++
patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch | 24 +
patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch | 259 ++++++
25 files changed, 1720 insertions(+), 852 deletions(-)
diffs (truncated from 2852 to 500 lines):
diff -r 2b5024a64ce9 -r 121ad7411fd1 ChangeLog
--- a/ChangeLog Thu Oct 02 01:04:25 2014 +0100
+++ b/ChangeLog Tue Oct 14 22:11:50 2014 +0100
@@ -1,3 +1,51 @@
+2014-10-14 Andrew John Hughes <gnu.andrew at member.fsf.org>
+
+ * patches/hotspot/aarch64/20140715-8030763-validate_global_memory_allocation.patch,
+ * patches/hotspot/aarch64/20140715-8032536-jvm_resolves_wrong_method.patch,
+ * patches/hotspot/aarch64/20140715-8035119-fix_exceptions_to_bytecode_verification.patch,
+ * patches/hotspot/aarch64/20140715-8036800-attribute_oom_to_right_code.patch,
+ * patches/hotspot/aarch64/20140715-8037076-check_constant_pool_constants.patch,
+ * patches/hotspot/aarch64/20140715-8037157-verify_init_call.patch,
+ * patches/hotspot/aarch64/20140715-8037167-better_method_signature_resolution.patch,
+ * patches/hotspot/aarch64/20140715-8043454-8037157_test_case_fix.patch:
+ Remove patches included in latest AArch64 drop.
+ * Makefile.am:
+ (CORBA_CHANGESET): Update to icedtea-2.5.3 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): Remove old AArch64 security patches and
+ add new ones from the 2014/10/14 update.
+ * NEWS: List changes from u71 and AArch64 port. Set release
+ date to today.
+ * configure.ac: Bump to 2.5.3.
+ * hotspot.map.in: Update to icedtea-2.5.3 tag for default.
+ Update AArch64 to jdk7u60_b04_aarch64_834 tag.
+ * patches/boot/ecj-multicatch.patch:
+ Remove defunct RSAClientKeyExchange patch. Add new cases
+ in CipherInputStream and CipherOutputStream.
+ * patches/boot/ecj-stringswitch.patch: Add new case in
+ AnnotationInvocationHandler.
+ * patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch,
+ * patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch,
+ * patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch,
+ * patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch,
+ * patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch,
+ * patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch,
+ * patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch,
+ * patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch,
+ * patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch,
+ * patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch:
+ OpenJDK 8 version of 2014/10/14 HotSpot security patches for AArch64.
+
2014-10-01 Andrew John Hughes <gnu.andrew at member.fsf.org>
* Makefile.am:
diff -r 2b5024a64ce9 -r 121ad7411fd1 Makefile.am
--- a/Makefile.am Thu Oct 02 01:04:25 2014 +0100
+++ b/Makefile.am Tue Oct 14 22:11:50 2014 +0100
@@ -4,19 +4,19 @@
BUILD_VERSION = b32
COMBINED_VERSION = $(JDK_UPDATE_VERSION)-$(BUILD_VERSION)
-CORBA_CHANGESET = 090fc686cf0b
-JAXP_CHANGESET = a4e4e763970f
-JAXWS_CHANGESET = dcb5afbd4d7d
-JDK_CHANGESET = 16dfadea81a1
-LANGTOOLS_CHANGESET = 0e3fd42f2696
-OPENJDK_CHANGESET = 6f40002d1813
+CORBA_CHANGESET = 4aed5efcd8df
+JAXP_CHANGESET = c903902aadd7
+JAXWS_CHANGESET = d3bef5fd93db
+JDK_CHANGESET = 6b81c7cc733e
+LANGTOOLS_CHANGESET = a64b8bf851a9
+OPENJDK_CHANGESET = 49dc79ef05ab
-CORBA_SHA256SUM = 65b0cb4638f08fe44d7d6d79af042e75747098bf4118003e141e87135ae6dcaa
-JAXP_SHA256SUM = 722493ec24c4fb4023f1d65b9334dee3526f0e347c249e074a45421ea870ecc5
-JAXWS_SHA256SUM = f3c2915ae2bdf3c2aab82a0e700c05512850063baf06fb2c2fb5896cabce110e
-JDK_SHA256SUM = dc00f5c39eb0fe8ccbf26aafe62e0eccf9785651f3ef8e090db1c62a970802d8
-LANGTOOLS_SHA256SUM = f560c641a6808726ed6cafdf6b1f29e98fc85faea56b1e751696892a2f5a1046
-OPENJDK_SHA256SUM = f2d69cdffd2bb14b744f4e25cb5ef2d0590926d1cb7da5868c2025479b2c74e1
+CORBA_SHA256SUM = 8ceb2cd60782b7fc14b88e3d366f273873fa5436cf0e36b86406c0905b7dc43c
+JAXP_SHA256SUM = 2d13a82078f3f2b8831d1e670e5e75719336a56490df64f16ab7647674a272ef
+JAXWS_SHA256SUM = 5a63d85307203f1aed1e31459ad5e32687909e0640d424ff6f540d9b1cceeb1e
+JDK_SHA256SUM = 40c4dda969be0ecd213e79269184e19cfc32100b83777dc529b3cf4b6aa3e12f
+LANGTOOLS_SHA256SUM = 516f6c21719f4b5a2092847c147cde7890c5a30d4aed9425ff667c0164ef1dd0
+OPENJDK_SHA256SUM = 3ba1a30762f5d5890e8ee6af11f52213ab9c574c01f07c75a081c42034f5d5c9
DROP_URL = http://icedtea.classpath.org/download/drops
@@ -279,14 +279,16 @@
if WITH_ALT_HSBUILD
ICEDTEA_PATCHES += patches/hotspot/aarch64/werror.patch \
- patches/hotspot/aarch64/20140715-8030763-validate_global_memory_allocation.patch \
- patches/hotspot/aarch64/20140715-8032536-jvm_resolves_wrong_method.patch \
- patches/hotspot/aarch64/20140715-8036800-attribute_oom_to_right_code.patch \
- patches/hotspot/aarch64/20140715-8035119-fix_exceptions_to_bytecode_verification.patch \
- patches/hotspot/aarch64/20140715-8037076-check_constant_pool_constants.patch \
- patches/hotspot/aarch64/20140715-8037157-verify_init_call.patch \
- patches/hotspot/aarch64/20140715-8043454-8037157_test_case_fix.patch \
- patches/hotspot/aarch64/20140715-8037167-better_method_signature_resolution.patch
+ patches/hotspot/aarch64/20141014-8015256-better_class_accessibility.patch \
+ patches/hotspot/aarch64/20141014-8036533-method_for_correct_defaults.patch \
+ patches/hotspot/aarch64/20141014-8036805-correct_linker_method_lookup.patch \
+ patches/hotspot/aarch64/20141014-8038898-safer_safepoints.patch \
+ patches/hotspot/aarch64/20141014-8038903-more_native_monitor_monitoring.patch \
+ patches/hotspot/aarch64/20141014-8041717-issue_with_class_file_parser.patch \
+ patches/hotspot/aarch64/20141014-8042603-safepointpolloffset.patch \
+ patches/hotspot/aarch64/20141014-8044269-analysis_of_archive_files.patch \
+ patches/hotspot/aarch64/20141014-8046213-testemptybootstrapmethodsattr_failure.patch \
+ patches/hotspot/aarch64/20141014-8050485-super_causes_verifyerror.patch
if ENABLE_SYSTEMTAP
ICEDTEA_PATCHES += \
patches/hotspot/aarch64/systemtap_gc.patch
diff -r 2b5024a64ce9 -r 121ad7411fd1 NEWS
--- a/NEWS Thu Oct 02 01:04:25 2014 +0100
+++ b/NEWS Tue Oct 14 22:11:50 2014 +0100
@@ -12,13 +12,48 @@
CVE-XXXX-YYYY: http://www.cve.mitre.org/cgi-bin/cvename.cgi?name=XXXX-YYYY
-New in release 2.5.3 (2014-10-XX):
+New in release 2.5.3 (2014-10-14):
+* Security fixes
+ - S8015256: Better class accessibility
+ - S8022783, CVE-2014-6504: Optimize C2 optimizations
+ - S8035162: Service printing service
+ - S8035781: Improve equality for annotations
+ - S8036805: Correct linker method lookup.
+ - S8036810: Correct linker field lookup
+ - S8036936: Use local locales
+ - S8037066, CVE-2014-6457: Secure transport layer
+ - S8037846, CVE-2014-6558: Ensure streaming of input cipher streams
+ - S8038364: Use certificate exceptions correctly
+ - S8038899: Safer safepoints
+ - S8038903: More native monitor monitoring
+ - S8038908: Make Signature more robust
+ - S8038913: Bolster XML support
+ - S8039509, CVE-2014-6512: Wrap sockets more thoroughly
+ - S8039533, CVE-2014-6517: Higher resolution resolvers
+ - S8041540, CVE-2014-6511: Better use of pages in font processing
+ - S8041529: Better parameterization of parameter lists
+ - S8041545: Better validation of generated rasters
+ - S8041564, CVE-2014-6506: Improved management of logger resources
+ - S8041717, CVE-2014-6519: Issue with class file parser
+ - S8042609, CVE-2014-6513: Limit splashiness of splash images
+ - S8042797, CVE-2014-6502: Avoid strawberries in LogRecord
+ - S8044274, CVE-2014-6531: Proper property processing
* Backports
- S4963723: Implement SHA-224
- S7044060: Need to support NSA Suite B Cryptography algorithms
- S7122142: (ann) Race condition between isAnnotationPresent and getAnnotations
+ - S7160837: DigestOutputStream does not turn off digest calculation when "close()" is called
- S8006935: Need to take care of long secret keys in HMAC/PRF compuation
+ - S8012637: Adjust CipherInputStream class to work in AEAD/GCM mode
+ - S8028192: Use of PKCS11-NSS provider in FIPS mode broken
+ - S8038000: java.awt.image.RasterFormatException: Incorrect scanline stride
+ - S8039396: NPE when writing a class descriptor object to a custom ObjectOutputStream
+ - S8042603: 'SafepointPollOffset' was not declared in static member function 'static bool Arguments::check_vm_args_consistency()'
+ - S8042850: Extra unused entries in ICU ScriptCodes enum
+ - S8052162: REGRESSION: sun/java2d/cmm/ColorConvertOp tests fail since 7u71 b01
+ - S8053963: (dc) Use DatagramChannel.receive() instead of read() in connect()
+ - S8055176: 7u71 l10n resource file translation update
* Bug fixes
- PR1988: C++ Interpreter should no longer be used on ppc64
- PR1989: Make jdk_generic_profile.sh handle missing programs better and be more verbose
@@ -29,6 +64,31 @@
- PR2009: Checksum of policy JAR files changes on every build
- PR2025: LCMS_CFLAGS & LCMS_LIBS should not be used unless SYSTEM_LCMS is enabled
- RH1015432: java-1.7.0-openjdk: Fails on PPC with StackOverflowError (revised comprehensive fix)
+* AArch64 port
+ - AArch64 C2 instruct for smull
+ - Add frame anchor fences.
+ - Add MacroAssembler::maybe_isb()
+ - Add missing instruction synchronization barriers and cache flushes.
+ - Add support for a few simple intrinsics
+ - Add support for builtin crc32 instructions
+ - Add support for Neon implementation of CRC32
+ - All address constants are 48 bits in size.
+ - array load must only read 32 bits
+ - Define uabs(). Use it everywhere an absolute value is wanted.
+ - Fast string comparison
+ - Fast String.equals()
+ - Fix register usage in generate_verify_oop().
+ - Fix thinko in Atomic::xchg_ptr.
+ - Fix typo in fsqrts
+ - Improve C1 performance improvements in ic_cache checks
+ - Performance improvement and ease of use changes pulled from upstream
+ - Remove obsolete C1 patching code.
+ - Replace hotspot jtreg test suite with tests from jdk7u
+ - S8024648: 7141246 breaks Zero port
+ - Save intermediate state before removing C1 patching code.
+ - Unwind native AArch64 frames.
+ - Use 2- and 3-instruction immediate form of movoop and mov_metadata in C2-generated code.
+ - Various concurrency fixes.
New in release 2.5.2 (2014-08-29):
diff -r 2b5024a64ce9 -r 121ad7411fd1 configure.ac
--- a/configure.ac Thu Oct 02 01:04:25 2014 +0100
+++ b/configure.ac Tue Oct 14 22:11:50 2014 +0100
@@ -1,4 +1,4 @@
-AC_INIT([icedtea], [2.5.3pre02], [distro-pkg-dev at openjdk.java.net])
+AC_INIT([icedtea], [2.5.3], [distro-pkg-dev at openjdk.java.net])
AM_INIT_AUTOMAKE([1.9 tar-pax foreign])
AM_MAINTAINER_MODE([enable])
AC_CONFIG_FILES([Makefile])
diff -r 2b5024a64ce9 -r 121ad7411fd1 hotspot.map.in
--- a/hotspot.map.in Thu Oct 02 01:04:25 2014 +0100
+++ b/hotspot.map.in Tue Oct 14 22:11:50 2014 +0100
@@ -1,3 +1,3 @@
# version type(drop/hg) url changeset sha256sum
-default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 7ce2690d2182 a46fa777ee7bdf5ef60231b105745e1c4e4cddc356cdc677b615a843705499b5
-aarch64 drop http://icedtea.classpath.org/download/drops/aarch64/2.5.1 a03843f2ff15 e88ca1ef9eeafa9bac7f0e5277a927129288547f241f0ed1e53969c6888177f2
+default drop http://icedtea.classpath.org/download/drops/icedtea7/@ICEDTEA_RELEASE@ 1d0d98e7c981 8c8e1f7e97f47fe4029e0b0ba42b3515474adabe64e1fbee15c0e2e22a13aa28
+aarch64 drop http://icedtea.classpath.org/download/drops/aarch64/@ICEDTEA_RELEASE@ 116bc9da35de b9e7f67079184310450c9b461b492f340aa7824c27079b430c8f25b58b327ec5
diff -r 2b5024a64ce9 -r 121ad7411fd1 patches/boot/ecj-multicatch.patch
--- a/patches/boot/ecj-multicatch.patch Thu Oct 02 01:04:25 2014 +0100
+++ b/patches/boot/ecj-multicatch.patch Tue Oct 14 22:11:50 2014 +0100
@@ -1,6 +1,38 @@
+diff -Nru openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java
+--- openjdk-boot.orig/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-05-12 22:18:02.000000000 +0100
++++ openjdk-boot/jaxp/src/com/sun/org/apache/xml/internal/serializer/Encodings.java 2014-10-14 19:21:56.737171023 +0100
+@@ -145,7 +145,9 @@
+ final String name = c.name();
+ ei = new EncodingInfo(name, name);
+ _encodingInfos.putEncoding(normalizedEncoding, ei);
+- } catch (IllegalCharsetNameException | UnsupportedCharsetException x) {
++ } catch (IllegalCharsetNameException x) {
++ ei = new EncodingInfo(null,null);
++ } catch (UnsupportedCharsetException x) {
+ ei = new EncodingInfo(null,null);
+ }
+ }
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java
+--- openjdk-boot.orig/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/com/sun/jmx/remote/internal/ArrayNotificationBuffer.java 2014-10-14 19:21:56.733170968 +0100
+@@ -402,7 +402,13 @@
+ try {
+ ServerNotifForwarder.checkMBeanPermission(this.mBeanServer,
+ candidate.getObjectName(),"addNotificationListener");
+- } catch (InstanceNotFoundException | SecurityException e) {
++ } catch (InstanceNotFoundException e) {
++ if (logger.debugOn()) {
++ logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
++ }
++ ++nextSeq;
++ continue;
++ } catch (SecurityException e) {
+ if (logger.debugOn()) {
+ logger.debug("fetchNotifications", "candidate: " + candidate + " skipped. exception " + e);
+ }
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/PrintStream.java openjdk-boot/jdk/src/share/classes/java/io/PrintStream.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/PrintStream.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/PrintStream.java 2013-04-04 13:42:21.263677653 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/PrintStream.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/PrintStream.java 2014-10-14 19:21:56.729170913 +0100
@@ -91,7 +91,10 @@
requireNonNull(csn, "charsetName");
try {
@@ -14,8 +46,8 @@
throw new UnsupportedEncodingException(csn);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/io/PrintWriter.java openjdk-boot/jdk/src/share/classes/java/io/PrintWriter.java
---- openjdk-boot.orig/jdk/src/share/classes/java/io/PrintWriter.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/io/PrintWriter.java 2013-04-04 13:42:21.275677843 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/io/PrintWriter.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/io/PrintWriter.java 2014-10-14 19:21:56.729170913 +0100
@@ -85,7 +85,10 @@
Objects.requireNonNull(csn, "charsetName");
try {
@@ -29,9 +61,9 @@
throw new UnsupportedEncodingException(csn);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2013-04-04 13:42:21.315678473 +0100
-@@ -747,7 +747,9 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/BoundMethodHandle.java 2014-10-14 19:21:56.729170913 +0100
+@@ -748,7 +748,9 @@
Class<?> fieldType = Wrapper.forBasicType(types.charAt(index)).primitiveType();
try {
return LOOKUP.findGetter(cbmhClass, fieldName, fieldType);
@@ -42,7 +74,7 @@
throw newInternalError(e);
}
}
-@@ -801,7 +803,13 @@
+@@ -802,7 +804,13 @@
static MethodHandle makeCbmhCtor(Class<? extends BoundMethodHandle> cbmh, String types) {
try {
return linkConstructor(LOOKUP.findConstructor(cbmh, MethodType.fromMethodDescriptorString(makeSignature(types, true), null)));
@@ -58,8 +90,8 @@
}
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2013-04-04 13:42:21.323678600 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/LambdaForm.java 2014-10-14 19:21:56.729170913 +0100
@@ -456,9 +456,11 @@
traceInterpreter("compileToBytecode", this);
isCompiled = true;
@@ -89,9 +121,9 @@
Name n = new Name(zcon).newIndex(0);
assert(n.type == ALL_TYPES.charAt(tn));
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-04-04 13:34:02.223748460 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2013-04-04 13:42:21.323678600 +0100
-@@ -263,7 +263,12 @@
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2014-10-14 19:21:18.664639686 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/invoke/MethodHandleNatives.java 2014-10-14 19:21:56.729170913 +0100
+@@ -264,7 +264,12 @@
continue;
}
throw new InternalError(err);
@@ -106,8 +138,8 @@
// ignore exotic ops the JVM cares about; we just wont issue them
//System.err.println("warning: "+err);
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java
---- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2013-04-04 13:42:21.279677906 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/management/ManagementFactory.java 2014-10-14 19:21:56.729170913 +0100
@@ -606,7 +606,9 @@
// create an MXBean proxy
return JMX.newMXBeanProxy(connection, objName, mxbeanInterface,
@@ -119,9 +151,71 @@
throw new IllegalArgumentException(e);
}
}
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/ProcessBuilder.java 2014-10-14 19:21:56.737171023 +0100
+@@ -1030,10 +1030,10 @@
+ dir,
+ redirects,
+ redirectErrorStream);
+- } catch (IOException | IllegalArgumentException e) {
++ } catch (IOException e) {
+ String exceptionInfo = ": " + e.getMessage();
+ Throwable cause = e;
+- if ((e instanceof IOException) && security != null) {
++ if (security != null) {
+ // Can not disclose the fail reason for read-protected files.
+ try {
+ security.checkRead(prog);
+@@ -1045,6 +1045,16 @@
+ // It's much easier for us to create a high-quality error
+ // message than the low-level C code which found the problem.
+ throw new IOException(
++ "Cannot run program \"" + prog + "\""
++ + (dir == null ? "" : " (in directory \"" + dir + "\")")
++ + exceptionInfo,
++ cause);
++ } catch (IllegalArgumentException e) {
++ String exceptionInfo = ": " + e.getMessage();
++ Throwable cause = e;
++ // It's much easier for us to create a high-quality error
++ // message than the low-level C code which found the problem.
++ throw new IOException(
+ "Cannot run program \"" + prog + "\""
+ + (dir == null ? "" : " (in directory \"" + dir + "\")")
+ + exceptionInfo,
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/lang/reflect/Proxy.java 2014-10-14 19:21:56.733170968 +0100
+@@ -762,7 +762,9 @@
+ private static Object newInstance(Constructor<?> cons, InvocationHandler h) {
+ try {
+ return cons.newInstance(new Object[] {h} );
+- } catch (IllegalAccessException | InstantiationException e) {
++ } catch (IllegalAccessException e) {
++ throw new InternalError(e.toString());
++ } catch (InstantiationException e) {
+ throw new InternalError(e.toString());
+ } catch (InvocationTargetException e) {
+ Throwable t = e.getCause();
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/nio/charset/Charset.java openjdk-boot/jdk/src/share/classes/java/nio/charset/Charset.java
+--- openjdk-boot.orig/jdk/src/share/classes/java/nio/charset/Charset.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/nio/charset/Charset.java 2014-10-14 19:21:56.737171023 +0100
+@@ -440,8 +440,9 @@
+ } catch (ClassNotFoundException x) {
+ // Extended charsets not available
+ // (charsets.jar not present)
+- } catch (InstantiationException |
+- IllegalAccessException x) {
++ } catch (InstantiationException x) {
++ throw new Error(x);
++ } catch (IllegalAccessException x) {
+ throw new Error(x);
+ }
+ return null;
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java openjdk-boot/jdk/src/share/classes/java/util/Formatter.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2013-04-04 13:42:21.283677969 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Formatter.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/Formatter.java 2014-10-14 19:21:56.729170913 +0100
@@ -1857,7 +1857,10 @@
Objects.requireNonNull(csn, "charsetName");
try {
@@ -135,8 +229,8 @@
throw new UnsupportedEncodingException(csn);
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/java/util/Scanner.java openjdk-boot/jdk/src/share/classes/java/util/Scanner.java
---- openjdk-boot.orig/jdk/src/share/classes/java/util/Scanner.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/java/util/Scanner.java 2013-04-04 13:42:21.299678221 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/java/util/Scanner.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/java/util/Scanner.java 2014-10-14 19:21:56.733170968 +0100
@@ -633,7 +633,10 @@
Objects.requireNonNull(csn, "charsetName");
try {
@@ -160,9 +254,54 @@
throw new IllegalArgumentException(charsetName);
}
}
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CipherInputStream.java openjdk-boot/jdk/src/share/classes/javax/crypto/CipherInputStream.java
+--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CipherInputStream.java 2014-10-14 19:58:01.679349189 +0100
++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CipherInputStream.java 2014-10-14 19:58:59.096156147 +0100
+@@ -110,7 +110,10 @@
+ done = true;
+ try {
+ obuffer = cipher.doFinal();
+- } catch (IllegalBlockSizeException | BadPaddingException e) {
++ } catch (IllegalBlockSizeException e) {
++ obuffer = null;
++ throw new IOException(e);
++ } catch (BadPaddingException e) {
+ obuffer = null;
+ throw new IOException(e);
+ }
+@@ -314,7 +317,14 @@
+ cipher.doFinal();
+ }
+ }
+- catch (BadPaddingException | IllegalBlockSizeException ex) {
++ catch (BadPaddingException ex) {
++ /* If no data has been read from the stream to be en/decrypted,
++ we supress any exceptions, and close quietly. */
++ if (read) {
++ throw new IOException(ex);
++ }
++ }
++ catch (IllegalBlockSizeException ex) {
+ /* If no data has been read from the stream to be en/decrypted,
+ we supress any exceptions, and close quietly. */
+ if (read) {
+diff -Nru openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CipherOutputStream.java openjdk-boot/jdk/src/share/classes/javax/crypto/CipherOutputStream.java
+--- openjdk-boot.orig/jdk/src/share/classes/javax/crypto/CipherOutputStream.java 2014-10-14 19:57:56.383275536 +0100
++++ openjdk-boot/jdk/src/share/classes/javax/crypto/CipherOutputStream.java 2014-10-14 19:59:16.160397935 +0100
+@@ -208,7 +208,9 @@
+ closed = true;
+ try {
+ obuffer = cipher.doFinal();
+- } catch (IllegalBlockSizeException | BadPaddingException e) {
++ } catch (IllegalBlockSizeException e) {
++ obuffer = null;
++ } catch (BadPaddingException e) {
+ obuffer = null;
+ }
+ try {
diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2013-04-04 13:42:21.303678284 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/invoke/util/ValueConversions.java 2014-10-14 19:21:56.733170968 +0100
@@ -482,7 +482,9 @@
FILL_NEW_TYPED_ARRAY = IMPL_LOOKUP
.findStatic(THIS_CLASS, "fillNewTypedArray",
@@ -175,8 +314,8 @@
}
}
diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2013-04-04 13:42:21.327678663 +0100
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/ActivationGroupImpl.java 2014-10-14 19:21:56.733170968 +0100
@@ -296,7 +296,16 @@
active.put(id, entry);
return entry.mobj;
@@ -196,9 +335,9 @@
* or code recompiled and user forgot to provide
* activatable constructor?
diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java
---- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2013-04-03 14:18:05.000000000 +0100
-+++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2013-04-04 13:42:21.327678663 +0100
-@@ -261,11 +261,14 @@
+--- openjdk-boot.orig/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2014-10-02 03:17:19.000000000 +0100
++++ openjdk-boot/jdk/src/share/classes/sun/rmi/server/LoaderHandler.java 2014-10-14 19:21:56.733170968 +0100
+@@ -262,11 +262,14 @@
annotation = urlsToPath(urls);
}
@@ -215,8 +354,8 @@
* to be thrown by openConnection() and getPermission(). If it
* does happen, forget about this class loader's URLs and
diff -Nru openjdk-boot.orig/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java openjdk-boot/jdk/src/share/classes/sun/rmi/transport/proxy/RMIMasterSocketFactory.java
More information about the distro-pkg-dev
mailing list