diff options
| author |   Magnus Granberg <zorry@gentoo.org> | 2013-04-09 23:43:53 +0000 |
|---|---|---|
| committer | Magnus Granberg <zorry@gentoo.org> | 2013-04-09 23:43:53 +0000 |
| commit | d8c1b03d27c1d9eebd68140556cb7490b6784b8d (patch) | |
| tree | 502cb97c78bc8ad245de2187a09216b50d695b87 /eclass | |
| parent | Mask media-video/nvidia-settings on hardened profile (diff) | |
| download | gentoo-2-d8c1b03d27c1d9eebd68140556cb7490b6784b8d.tar.gz gentoo-2-d8c1b03d27c1d9eebd68140556cb7490b6784b8d.tar.bz2 gentoo-2-d8c1b03d27c1d9eebd68140556cb7490b6784b8d.zip | |
Make PT default for pax marking (pax-utils.eclass)
Diffstat (limited to 'eclass')
| -rw-r--r-- | eclass/ChangeLog | 5 | ||||
| -rw-r--r-- | eclass/pax-utils.eclass | 16 |
2 files changed, 12 insertions, 9 deletions
diff --git a/eclass/ChangeLog b/eclass/ChangeLog index 9279d2a32209..b75cd257e012 100644 --- a/eclass/ChangeLog +++ b/eclass/ChangeLog @@ -1,6 +1,9 @@ # ChangeLog for eclass directory # Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.777 2013/04/08 08:11:29 olemarkus Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/ChangeLog,v 1.778 2013/04/09 23:43:53 zorry Exp $ + + 10 Apr 2013; Magnus Granberg <zorry@gentoo.org> pax-utils.eclass: + Make PT default pax marking and change ewarn to elog 08 Apr 2013; Ole Markus With <olemarkus@gentoo.org> php-ext-source-r2.eclass: Fix for installing ini files in the tree. Bug 464900 diff --git a/eclass/pax-utils.eclass b/eclass/pax-utils.eclass index ced174b0808d..2044f68bfa09 100644 --- a/eclass/pax-utils.eclass +++ b/eclass/pax-utils.eclass @@ -1,6 +1,6 @@ # Copyright 1999-2013 Gentoo Foundation # Distributed under the terms of the GNU General Public License v2 -# $Header: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v 1.19 2013/04/05 02:08:36 blueness Exp $ +# $Header: /var/cvsroot/gentoo-x86/eclass/pax-utils.eclass,v 1.20 2013/04/09 23:43:53 zorry Exp $ # @ECLASS: pax-utils.eclass # @MAINTAINER: @@ -29,8 +29,8 @@ ___ECLASS_ONCE_PAX_UTILS="recur -_+^+_- spank" # @DESCRIPTION: # Control which markings are made: # PT = PT_PAX markings, XT = XATTR_PAX markings -# Default to both PT and XT markings. -PAX_MARKINGS=${PAX_MARKINGS:="PT XT"} +# Default to PT markings. +PAX_MARKINGS=${PAX_MARKINGS:="PT"} # @FUNCTION: pax-mark # @USAGE: <flags> {<ELF files>} @@ -118,8 +118,8 @@ pax-mark() { fi if [[ ${pt_fail} == 1 ]]; then - ewarn "Failed to set PT_PAX markings -${flags} for:" - _pax_list_files ewarn ${pt_failures} + elog "Failed to set PT_PAX markings -${flags} for:" + _pax_list_files elog ${pt_failures} ret=1 fi fi @@ -159,13 +159,13 @@ pax-mark() { fi if [[ ${xt_fail} == 1 ]]; then - ewarn "Failed to set XATTR_PAX markings -${flags} for:" - _pax_list_files ewarn ${xt_failures} + elog "Failed to set XATTR_PAX markings -${flags} for:" + _pax_list_files elog ${xt_failures} ret=1 fi fi - [[ ${ret} == 1 ]] && ewarn "Executables may be killed by PaX kernels." + # [[ ${ret} == 1 ]] && elog "Executables may be killed by PaX kernels." return ${ret} } |