------------------------------------------------------------ revno: 667 committer: Matthias Klose <[email protected]> branch nick: openjdk8 timestamp: Sat 2016-01-23 21:45:24 +0100 message: openjdk-8 (8u72-b15-1) unstable; urgency=medium * Update to 8u72-b15. - Addresses CVE-2016-0483 (8139017), CVE-2016-0494 (8140543), CVE-2015-8126 (8143941), CVE-2016-0475 (8138589), CVE-2016-0402 (8059054), CVE-2016-0466 (8133962), CVE-2016-0448 (8130710), CVE-2015-7575 (8144773). * Apply proposed patch for JDK-8141491: Unaligned memory access in Bits.c. * Fix zero on m68k, introduced by 8046246 (patch suggested by Michael Karcher). -- Matthias Klose <[email protected]> Fri, 22 Jan 2016 11:03:19 +0100 added: debian/patches/8141491.diff modified: corba.tar.xz debian/changelog debian/patches/m68k-support.diff debian/rules hotspot-aarch64.tar.xz hotspot.tar.xz jaxp.tar.xz jaxws.tar.xz jdk.tar.xz langtools.tar.xz nashorn.tar.xz root.tar.xz
-- lp:~openjdk/openjdk/openjdk8 https://code.launchpad.net/~openjdk/openjdk/openjdk8 Your team Debian Java Maintainers is subscribed to branch lp:~openjdk/openjdk/openjdk8. To unsubscribe from this branch go to https://code.launchpad.net/~openjdk/openjdk/openjdk8/+edit-subscription
=== modified file 'corba.tar.xz' Binary files corba.tar.xz 2015-10-31 02:06:26 +0000 and corba.tar.xz 2016-01-23 20:45:24 +0000 differ === modified file 'debian/changelog' --- debian/changelog 2015-12-16 04:24:41 +0000 +++ debian/changelog 2016-01-23 20:45:24 +0000 @@ -1,3 +1,15 @@ +openjdk-8 (8u72-b15-1) unstable; urgency=medium + + * Update to 8u72-b15. + - Addresses CVE-2016-0483 (8139017), CVE-2016-0494 (8140543), + CVE-2015-8126 (8143941), CVE-2016-0475 (8138589), + CVE-2016-0402 (8059054), CVE-2016-0466 (8133962), + CVE-2016-0448 (8130710), CVE-2015-7575 (8144773). + * Apply proposed patch for JDK-8141491: Unaligned memory access in Bits.c. + * Fix zero on m68k, introduced by 8046246 (patch suggested by Michael Karcher). + + -- Matthias Klose <[email protected]> Fri, 22 Jan 2016 11:03:19 +0100 + openjdk-8 (8u72-b05-5) unstable; urgency=medium * Fix applying patches on arm64. === added file 'debian/patches/8141491.diff' --- debian/patches/8141491.diff 1970-01-01 00:00:00 +0000 +++ debian/patches/8141491.diff 2016-01-23 20:45:24 +0000 @@ -0,0 +1,117 @@ +# DP: JDK-8141491: Unaligned memory access in Bits.c + +Index: b/jdk/src/share/native/java/nio/Bits.c +=================================================================== +--- a/jdk/src/share/native/java/nio/Bits.c ++++ b/jdk/src/share/native/java/nio/Bits.c +@@ -67,16 +67,38 @@ + #define SWAPLONG(x) ((jlong)(((jlong)SWAPINT((jint)(x)) << 32) | \ + ((jlong)SWAPINT((jint)((x) >> 32)) & 0xffffffff))) + ++/* The destination buffer passed to Java_java_nio_Bits_copyFromShor<type>tArray ++ * function and the source buffer passed to Java_java_nio_Bits_copyTo<type>Array ++ * may not be aligned on <type>'s boundary. Inform the compiler about this via ++ * 'unaligned' attribute, provided it supports this attribute. For recent ++ * compilers, use __has_attribute preprocessor predicate; if it is not available, ++ * we know that GCC supports it. ++ */ ++#ifndef __has_attribute ++#define __has_attribute(x) 0 ++#endif ++ ++#if defined(__GNUC__) || __has_attribute(aligned) ++typedef jshort __attribute__((aligned(1))) jshort_unaligned; ++typedef jint __attribute__((aligned(1))) jint_unaligned; ++typedef jlong __attribute__((aligned(1))) jlong_unaligned; ++#else ++typedef jshort jshort_unaligned; ++typedef jint jint_unaligned; ++typedef jlong jlong_unaligned; ++#endif ++ + JNIEXPORT void JNICALL + Java_java_nio_Bits_copyFromShortArray(JNIEnv *env, jobject this, jobject src, + jlong srcPos, jlong dstAddr, jlong length) + { + jbyte *bytes; + size_t size; +- jshort *srcShort, *dstShort, *endShort; ++ jshort *srcShort, *endShort; ++ jshort_unaligned *dstShort; + jshort tmpShort; + +- dstShort = (jshort *)jlong_to_ptr(dstAddr); ++ dstShort = (jshort_unaligned *)jlong_to_ptr(dstAddr); + + while (length > 0) { + /* do not change this if-else statement, see WARNING above */ +@@ -108,10 +130,11 @@ Java_java_nio_Bits_copyToShortArray(JNIE + { + jbyte *bytes; + size_t size; +- jshort *srcShort, *dstShort, *endShort; ++ jshort_unaligned *srcShort, *endShort; ++ jshort *dstShort; + jshort tmpShort; + +- srcShort = (jshort *)jlong_to_ptr(srcAddr); ++ srcShort = (jshort_unaligned *)jlong_to_ptr(srcAddr); + + while (length > 0) { + /* do not change this if-else statement, see WARNING above */ +@@ -143,10 +166,11 @@ Java_java_nio_Bits_copyFromIntArray(JNIE + { + jbyte *bytes; + size_t size; +- jint *srcInt, *dstInt, *endInt; ++ jint *srcInt, *endInt; ++ jint_unaligned *dstInt; + jint tmpInt; + +- dstInt = (jint *)jlong_to_ptr(dstAddr); ++ dstInt = (jint_unaligned *)jlong_to_ptr(dstAddr); + + while (length > 0) { + /* do not change this code, see WARNING above */ +@@ -178,10 +202,11 @@ Java_java_nio_Bits_copyToIntArray(JNIEnv + { + jbyte *bytes; + size_t size; +- jint *srcInt, *dstInt, *endInt; ++ jint_unaligned *srcInt, *endInt; ++ jint *dstInt; + jint tmpInt; + +- srcInt = (jint *)jlong_to_ptr(srcAddr); ++ srcInt = (jint_unaligned *)jlong_to_ptr(srcAddr); + + while (length > 0) { + /* do not change this code, see WARNING above */ +@@ -213,10 +238,11 @@ Java_java_nio_Bits_copyFromLongArray(JNI + { + jbyte *bytes; + size_t size; +- jlong *srcLong, *dstLong, *endLong; ++ jlong *srcLong, *endLong; ++ jlong_unaligned *dstLong; + jlong tmpLong; + +- dstLong = (jlong *)jlong_to_ptr(dstAddr); ++ dstLong = (jlong_unaligned *)jlong_to_ptr(dstAddr); + + while (length > 0) { + /* do not change this code, see WARNING above */ +@@ -248,10 +274,11 @@ Java_java_nio_Bits_copyToLongArray(JNIEn + { + jbyte *bytes; + size_t size; +- jlong *srcLong, *dstLong, *endLong; ++ jlong_unaligned *srcLong, *endLong; ++ jlong *dstLong; + jlong tmpLong; + +- srcLong = (jlong *)jlong_to_ptr(srcAddr); ++ srcLong = (jlong_unaligned *)jlong_to_ptr(srcAddr); + + while (length > 0) { + /* do not change this code, see WARNING above */ === modified file 'debian/patches/m68k-support.diff' --- debian/patches/m68k-support.diff 2015-09-04 14:59:08 +0000 +++ debian/patches/m68k-support.diff 2016-01-23 20:45:24 +0000 @@ -1258,3 +1258,15 @@ +XTextProperty.nitems 12 +XTextProperty 16 +--- a/hotspot/src/share/vm/oops/constMethod.hpp ++++ b/hotspot/src/share/vm/oops/constMethod.hpp +@@ -223,6 +223,9 @@ + u2 _max_locals; // Number of local variables used by this method + u2 _size_of_parameters; // size of the parameter block (receiver + arguments) in words + u2 _orig_method_idnum; // Original unique identification number for the method ++#ifdef __m68k__ ++ u2 _padding; // pad the structure to a multiple of 32bit ++#endif + + // Constructor + ConstMethod(int byte_code_size, === modified file 'debian/rules' --- debian/rules 2015-12-15 07:51:17 +0000 +++ debian/rules 2016-01-23 20:45:24 +0000 @@ -401,6 +401,7 @@ m68k-support.diff \ javadoc-sort-enum-and-annotation-types.diff \ 8087120.diff \ + 8141491.diff \ # FIXME: update patches #accessible-toolkit.patch # update for 8 @@ -2261,14 +2262,14 @@ is_release = is_release = yes hg_project = jdk8u -hg_tag = jdk8u72-b05 +hg_tag = jdk8u72-b15 package_version = $(subst jdk,,$(hg_tag)) ifneq ($(is_release),yes) package_version := $(subst -,~,$(package_version)) endif hg_url = http://hg.openjdk.java.net/jdk8u/$(hg_project) -hg_project_aarch64 = jdk8 -hg_tag_aarch64 = tip +hg_project_aarch64 = jdk8u +hg_tag_aarch64 = aarch64-jdk8u72-b15 hg_url_aarch64 = http://hg.openjdk.java.net/aarch64-port/$(hg_project_aarch64) origdir = ../openjdk-8-$(package_version).orig get-orig: === modified file 'hotspot-aarch64.tar.xz' Binary files hotspot-aarch64.tar.xz 2015-10-31 02:06:26 +0000 and hotspot-aarch64.tar.xz 2016-01-23 20:45:24 +0000 differ === modified file 'hotspot.tar.xz' Binary files hotspot.tar.xz 2015-10-31 02:06:26 +0000 and hotspot.tar.xz 2016-01-23 20:45:24 +0000 differ === modified file 'jaxp.tar.xz' Binary files jaxp.tar.xz 2015-10-31 02:06:26 +0000 and jaxp.tar.xz 2016-01-23 20:45:24 +0000 differ === modified file 'jaxws.tar.xz' Binary files jaxws.tar.xz 2015-10-31 02:06:26 +0000 and jaxws.tar.xz 2016-01-23 20:45:24 +0000 differ === modified file 'jdk.tar.xz' Binary files jdk.tar.xz 2015-10-31 02:06:26 +0000 and jdk.tar.xz 2016-01-23 20:45:24 +0000 differ === modified file 'langtools.tar.xz' Binary files langtools.tar.xz 2015-10-31 02:06:26 +0000 and langtools.tar.xz 2016-01-23 20:45:24 +0000 differ === modified file 'nashorn.tar.xz' Binary files nashorn.tar.xz 2015-10-31 02:06:26 +0000 and nashorn.tar.xz 2016-01-23 20:45:24 +0000 differ === modified file 'root.tar.xz' Binary files root.tar.xz 2015-10-31 02:06:26 +0000 and root.tar.xz 2016-01-23 20:45:24 +0000 differ
__ This is the maintainer address of Debian's Java team <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use [email protected] for discussions and questions.
