------------------------------------------------------------
revno: 716
committer: Matthias Klose <d...@ubuntu.com>
branch nick: openjdk8
timestamp: Thu 2017-11-23 18:54:49 +0100
message:
* Disable Hotspot workaround for Exec Shield (Debian only).
Closes: #876051.
added:
debian/patches/hotspot-disable-exec-shield-workaround.patch
modified:
debian/changelog
debian/rules
--
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 'debian/changelog'
--- debian/changelog 2017-11-01 06:40:38 +0000
+++ debian/changelog 2017-11-23 17:54:49 +0000
@@ -1,3 +1,10 @@
+openjdk-8 (8u151-b12-2) UNRELEASED; urgency=medium
+
+ * Disable Hotspot workaround for Exec Shield (Debian only).
+ Closes: #876051.
+
+ -- Matthias Klose <d...@ubuntu.com> Thu, 23 Nov 2017 18:49:43 +0100
+
openjdk-8 (8u151-b12-1) unstable; urgency=high
* Update to 8u151-b12. Hotspot 8u144-b01 for aarch32 with 8u151 hotspot
=== added file 'debian/patches/hotspot-disable-exec-shield-workaround.patch'
--- debian/patches/hotspot-disable-exec-shield-workaround.patch 1970-01-01 00:00:00 +0000
+++ debian/patches/hotspot-disable-exec-shield-workaround.patch 2017-11-23 17:54:49 +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 'debian/rules'
--- debian/rules 2017-11-01 06:40:38 +0000
+++ debian/rules 2017-11-23 17:54:49 +0000
@@ -385,6 +385,11 @@
jdk-java-nio-bits-unligned-aarch64.diff \
jdk-S8165852-overlayfs.patch \
+ifeq ($(derivative),Debian)
+ COMMON_PATCHES += \
+ hotspot-disable-exec-shield-workaround.patch
+endif
+
# jdk-derived-font-size.diff \
# FIXME: update patches
#accessible-toolkit.patch # update for 8
__
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.
