[sys-process/audit] sync with tree

This commit is contained in:
Robert Förster 2017-05-29 15:11:00 +02:00
parent e4c9105be9
commit e88709d2d3
1 changed files with 16 additions and 11 deletions

View File

@ -1,10 +1,9 @@
# Copyright 1999-2016 Gentoo Foundation # Copyright 1999-2017 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2 # Distributed under the terms of the GNU General Public License v2
# $Id$
EAPI="6" EAPI=6
PYTHON_COMPAT=( python{2_7,3_3,3_4,3_5} ) PYTHON_COMPAT=( python{2_7,3_4,3_5,3_6} )
inherit autotools multilib multilib-minimal toolchain-funcs python-r1 linux-info systemd inherit autotools multilib multilib-minimal toolchain-funcs python-r1 linux-info systemd
@ -24,12 +23,10 @@ RDEPEND="apparmor? ( sys-apps/apparmor )
ldap? ( net-nds/openldap ) ldap? ( net-nds/openldap )
tcpd? ( sys-apps/tcp-wrappers ) tcpd? ( sys-apps/tcp-wrappers )
sys-libs/libcap-ng" sys-libs/libcap-ng"
python? ( ${PYTHON_DEPS} )
DEPEND="${RDEPEND} DEPEND="${RDEPEND}
>=sys-kernel/linux-headers-2.6.34 >=sys-kernel/linux-headers-2.6.34
python? ( python? ( dev-lang/swig:0 )"
${PYTHON_DEPS}
dev-lang/swig:0
)"
# Do not use os-headers as this is linux specific # Do not use os-headers as this is linux specific
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )" REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@ -79,7 +76,7 @@ src_prepare() {
multilib_src_configure() { multilib_src_configure() {
local ECONF_SOURCE=${S} local ECONF_SOURCE=${S}
econf \ econf \
--sbindir=${EPREFIX}/sbin \ --sbindir="${EPREFIX}/sbin" \
$(use_enable gssapi gssapi-krb5) \ $(use_enable gssapi gssapi-krb5) \
$(use_enable static-libs static) \ $(use_enable static-libs static) \
--enable-systemd \ --enable-systemd \
@ -104,6 +101,14 @@ multilib_src_configure() {
fi fi
} }
src_configure() {
tc-export_build_env BUILD_{CC,CPP}
export CC_FOR_BUILD="${BUILD_CC}"
export CPP_FOR_BUILD="${BUILD_CPP}"
multilib-minimal_src_configure
}
multilib_src_compile() { multilib_src_compile() {
if multilib_is_native_abi; then if multilib_is_native_abi; then
default default
@ -221,8 +226,8 @@ pkg_postinst() {
} }
lockdown_perms() { lockdown_perms() {
# upstream wants these to have restrictive perms. # Upstream wants these to have restrictive perms.
# should not || die, maybe not all paths exist. # should not || die, as not all paths may exist.
local basedir="$1" local basedir="$1"
chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null chmod 0750 "${basedir}"/sbin/au{ditctl,report,dispd,ditd,search,trace} 2>/dev/null
chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null chmod 0750 "${basedir}"/var/log/audit/ 2>/dev/null