------------------------------------------------------------ revno: 619 committer: Matthias Klose <d...@ubuntu.com> branch nick: openjdk7 timestamp: Thu 2017-11-23 18:48:53 +0100 message: * Disable Hotspot workaround for Exec Shield (Debian only). Addresses: #876051. added: patches/hotspot-disable-exec-shield-workaround.patch modified: changelog rules
-- lp:~openjdk/openjdk/openjdk7 https://code.launchpad.net/~openjdk/openjdk/openjdk7 Your team Debian Java Maintainers is subscribed to branch lp:~openjdk/openjdk/openjdk7. To unsubscribe from this branch go to https://code.launchpad.net/~openjdk/openjdk/openjdk7/+edit-subscription
=== modified file 'changelog' --- changelog 2017-11-23 17:35:32 +0000 +++ changelog 2017-11-23 17:48:53 +0000 @@ -1,3 +1,10 @@ +openjdk-7 (7u151-2.6.11-4) UNRELEASED; urgency=medium + + * Disable Hotspot workaround for Exec Shield (Debian only). + Addresses: #876051. + + -- Matthias Klose <d...@ubuntu.com> Thu, 23 Nov 2017 18:46:39 +0100 + openjdk-7 (7u151-2.6.11-3) experimental; urgency=medium [ Matthias Klose ] === added file 'patches/hotspot-disable-exec-shield-workaround.patch' --- patches/hotspot-disable-exec-shield-workaround.patch 1970-01-01 00:00:00 +0000 +++ patches/hotspot-disable-exec-shield-workaround.patch 2017-11-23 17:48:53 +0000 @@ -0,0 +1,15 @@ +# DP: Hotspot: disable Exec Shield workaround (JDK-8023956). +# DP: This workaround interacts badly with kernel changes to enlarge the stack +# DP: gap, causing applications using JNI to crash (Debian bug #865303). +# DP: Debian has never applied the Exec Shield patches. +--- openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp ++++ openjdk/hotspot/src/os_cpu/linux_x86/vm/os_linux_x86.cpp +@@ -890,7 +890,7 @@ void os::verify_stack_alignment() { + * updates (JDK-8023956). + */ + void os::workaround_expand_exec_shield_cs_limit() { +-#if defined(IA32) && !defined(ZERO) ++#if 0 + size_t page_size = os::vm_page_size(); + /* + * Take the highest VA the OS will give us and exec === modified file 'rules' --- rules 2017-11-23 17:35:32 +0000 +++ rules 2017-11-23 17:48:53 +0000 @@ -346,6 +346,11 @@ debian/patches/javadoc-sort-enum-and-annotation-types.patch \ debian/patches/jdk-getAccessibleValue.diff \ +ifeq ($(derivative),Debian) + DISTRIBUTION_PATCHES += \ + debian/patches/hotspot-disable-exec-shield-workaround.patch +endif + ifeq (,$(filter $(DEB_HOST_ARCH),arm64)) DISTRIBUTION_PATCHES += \ debian/patches/no-pch-build.diff \
__ This is the maintainer address of Debian's Java team <http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-maintainers>. Please use debian-j...@lists.debian.org for discussions and questions.