commit:     eb09a477def3bb335cf516caef0c5677a3127555
Author:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
AuthorDate: Mon Jan 23 20:43:31 2017 +0000
Commit:     James Le Cuirot <chewi <AT> gentoo <DOT> org>
CommitDate: Mon Jan 23 22:52:03 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb09a477

java-vm-2.eclass: PT PaX markings are no longer supported, bug #592856

The -C flag to paxctl has been stripped out by pax-utils.eclass for
ages anyway.

 eclass/java-vm-2.eclass | 8 +++-----
 1 file changed, 3 insertions(+), 5 deletions(-)

diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
index e2d77ad..ea09c7b 100644
--- a/eclass/java-vm-2.eclass
+++ b/eclass/java-vm-2.eclass
@@ -1,4 +1,4 @@
-# Copyright 1999-2016 Gentoo Foundation
+# Copyright 1999-2017 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
 # $Id$
 
@@ -280,10 +280,8 @@ java-vm_set-pax-markings() {
        local executables=( "${1}"/bin/* )
        [[ -d "${1}"/jre ]] && executables+=( "${1}"/jre/bin/* )
 
-       # Ensure a PaX header is created.
-       local pax_markings="C"
-       # Usally disabeling MPROTECT is sufficent.
-       local pax_markings+="m"
+       # Usually disabling MPROTECT is sufficient.
+       local pax_markings="m"
        # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as 
well.
        use x86 && pax_markings+="sp"
 

Reply via email to