Gentoo Archives: gentoo-commits

From: James Le Cuirot <chewi@g.o>
To: gentoo-commits@l.g.o
Subject: [gentoo-commits] repo/gentoo:master commit in: eclass/
Date: Mon, 23 Jan 2017 22:52:43
Message-Id: 1485211923.eb09a477def3bb335cf516caef0c5677a3127555.chewi@gentoo
1 commit: eb09a477def3bb335cf516caef0c5677a3127555
2 Author: James Le Cuirot <chewi <AT> gentoo <DOT> org>
3 AuthorDate: Mon Jan 23 20:43:31 2017 +0000
4 Commit: James Le Cuirot <chewi <AT> gentoo <DOT> org>
5 CommitDate: Mon Jan 23 22:52:03 2017 +0000
6 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=eb09a477
7
8 java-vm-2.eclass: PT PaX markings are no longer supported, bug #592856
9
10 The -C flag to paxctl has been stripped out by pax-utils.eclass for
11 ages anyway.
12
13 eclass/java-vm-2.eclass | 8 +++-----
14 1 file changed, 3 insertions(+), 5 deletions(-)
15
16 diff --git a/eclass/java-vm-2.eclass b/eclass/java-vm-2.eclass
17 index e2d77ad..ea09c7b 100644
18 --- a/eclass/java-vm-2.eclass
19 +++ b/eclass/java-vm-2.eclass
20 @@ -1,4 +1,4 @@
21 -# Copyright 1999-2016 Gentoo Foundation
22 +# Copyright 1999-2017 Gentoo Foundation
23 # Distributed under the terms of the GNU General Public License v2
24 # $Id$
25
26 @@ -280,10 +280,8 @@ java-vm_set-pax-markings() {
27 local executables=( "${1}"/bin/* )
28 [[ -d "${1}"/jre ]] && executables+=( "${1}"/jre/bin/* )
29
30 - # Ensure a PaX header is created.
31 - local pax_markings="C"
32 - # Usally disabeling MPROTECT is sufficent.
33 - local pax_markings+="m"
34 + # Usually disabling MPROTECT is sufficient.
35 + local pax_markings="m"
36 # On x86 for heap sizes over 700MB disable SEGMEXEC and PAGEEXEC as well.
37 use x86 && pax_markings+="sp"