diff options
author | Ralph Sennhauser <sera@gentoo.org> | 2012-07-23 19:06:20 +0000 |
---|---|---|
committer | Ralph Sennhauser <sera@gentoo.org> | 2012-07-23 19:06:20 +0000 |
commit | c430ec8db91f62d7e68d22adc59e270564bcaf40 (patch) | |
tree | 5102dc6702f64195faa5885944266c48232c12cc /eclass/java-vm-2.eclass | |
parent | Use paxctl for pax marking as the fallback won't create the headers. Thanks t... (diff) | |
download | gentoo-2-c430ec8db91f62d7e68d22adc59e270564bcaf40.tar.gz gentoo-2-c430ec8db91f62d7e68d22adc59e270564bcaf40.tar.bz2 gentoo-2-c430ec8db91f62d7e68d22adc59e270564bcaf40.zip |
Add C to flags pass to pax-mark to ensure a header is created. Thanks to blueness. #427642
Diffstat (limited to 'eclass/java-vm-2.eclass')
-rw-r--r-- | eclass/java-vm-2.eclass | 10 |
1 files changed, 6 insertions, 4 deletions
diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass index b7fa21d06d5c..7b00d679594c 100644 --- a/eclass/java-vm-2.eclass +++ b/eclass/java-vm-2.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2012 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.45 2012/07/18 16:54:55 sera Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/java-vm-2.eclass,v 1.46 2012/07/23 19:06:20 sera Exp $ # @ECLASS: java-vm-2.eclass # @MAINTAINER: @@ -277,10 +277,12 @@ java-vm_set-pax-markings() { local executables=( "${1}"/bin/* ) [[ -d "${1}"/jre ]] && executables+=( "${1}"/jre/bin/* ) - # Usally disabeling MPROTECT is sufficent - local pax_markings="m" + # Ensure a PaX header is created. + local pax_markings="C" + # Usally disabeling MPROTECT is sufficent. + local pax_markings+="m" # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well. - use x86 && pax_markings="msp" + use x86 && pax_markings+="sp" pax-mark ${pax_markings} $(list-paxables "${executables[@]}") } |