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 | 36b3bc038bd5f2860caf2203b677e00db762c321 (patch) | |
| tree | a360fbdb6c233278fc09ebfa8fb59244a23a8589 /eclass | |
| parent | Use paxctl for pax marking as the fallback won't create the headers. Thanks t... (diff) | |
| download | historical-36b3bc038bd5f2860caf2203b677e00db762c321.tar.gz historical-36b3bc038bd5f2860caf2203b677e00db762c321.tar.bz2 historical-36b3bc038bd5f2860caf2203b677e00db762c321.zip | |
Add C to flags pass to pax-mark to ensure a header is created. Thanks to blueness. #427642
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 6 | ||||
| -rw-r--r-- | eclass/java-vm-2.eclass | 10 |
2 files changed, 11 insertions, 5 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index b5da6d749d78..16ba74c58ba8 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,10 @@ # ChangeLog for eclass directory # Copyright 1999-2012 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.351 2012/07/23 14:11:26 scarabeus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.352 2012/07/23 19:06:20 sera Exp $ + + 23 Jul 2012; Ralph Sennhauser <sera@gentoo.org> java-vm-2.eclass: + Add C to flags pass to pax-mark to ensure a header is created. Thanks to + blueness. #427642 23 Jul 2012; Tomáš Chvátal <scarabeus@gentoo.org> myspell-r2.eclass: More licenses removal 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[@]}") } |