Dessa/gentoo
1
0
Fork 0
Code Issues Pull Requests Wiki Activity

[sys-process/audit] sync with gentoo

Browse Source
This commit is contained in:
Robert Förster 2015-08-21 14:22:55 +02:00
parent 778a03981f
commit b8d4542d8a
6 changed files with 34 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
sys-process/audit/audit-2.4.3.ebuild → sys-process/audit/audit-2.4.3-r1.ebuild
View File

@ -1,6 +1,6 @@
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/audit-2.4.1-r1.ebuild,v 1.1 2015/05/16 05:56:03 robbat2 Exp $
# $Id$
EAPI="5"
@ -25,9 +25,11 @@ RDEPEND="apparmor? ( sys-apps/apparmor )
tcpd? ( sys-apps/tcp-wrappers )
sys-libs/libcap-ng"
DEPEND="${RDEPEND}
python? ( ${PYTHON_DEPS}
dev-lang/swig )
>=sys-kernel/linux-headers-2.6.34"
>=sys-kernel/linux-headers-2.6.34
python? (
${PYTHON_DEPS}
dev-lang/swig:0
)"
# Do not use os-headers as this is linux specific
REQUIRED_USE="python? ( ${PYTHON_REQUIRED_USE} )"
@ -80,7 +82,6 @@ src_prepare() {
multilib_src_configure() {
local ECONF_SOURCE=${S}
#append-flags -D'__attribute__(x)='
econf \
--sbindir=/sbin \
--enable-systemd \
@ -189,9 +190,11 @@ multilib_src_install_all() {
docinto contrib/plugin
dodoc contrib/plugin/*
newinitd "${FILESDIR}"/auditd-init.d-2.3.6 auditd
newinitd "${FILESDIR}"/auditd-init.d-2.4.3 auditd
newconfd "${FILESDIR}"/auditd-conf.d-2.3.6 auditd
chmod 644 "${D}/$(systemd_get_unitdir)"/auditd.service || die # 556436
[ -f "${D}"/sbin/audisp-remote ] && \
dodir /usr/sbin && \
mv "${D}"/{sbin,usr/sbin}/audisp-remote || die

2
sys-process/audit/files/audit.rules-2.1.3
View File

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/files/audit.rules-2.1.3,v 1.1 2011/09/11 02:58:55 robbat2 Exp $
# $Id$
#
# This file contains the auditctl rules that are loaded
# whenever the audit daemon is started via the initscripts.

2
sys-process/audit/files/audit.rules.stop.post
View File

@ -1,6 +1,6 @@
# Copyright 1999-2005 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/files/audit.rules.stop.post,v 1.1 2006/06/22 07:41:46 robbat2 Exp $
# $Id$
#
# This file contains the auditctl rules that are loaded immediately after the
# audit deamon is stopped via the initscripts.

2
sys-process/audit/files/audit.rules.stop.pre
View File

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/files/audit.rules.stop.pre,v 1.2 2011/09/11 02:58:55 robbat2 Exp $
# $Id$
#
# This file contains the auditctl rules that are loaded immediately before the
# audit deamon is stopped via the initscripts.

2
sys-process/audit/files/auditd-conf.d-2.3.6
View File

@ -1,6 +1,6 @@
# Copyright 1999-2011 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/files/auditd-conf.d-2.1.3,v 1.1 2011/09/11 02:58:55 robbat2 Exp $
# $Id$
# Configuration options for auditd
# -f for foreground mode

48
sys-process/audit/files/auditd-init.d-2.3.6 → sys-process/audit/files/auditd-init.d-2.4.3
View File

@ -1,7 +1,7 @@
#!/sbin/runscript
# Copyright 1999-2014 Gentoo Foundation
#!/sbin/openrc-run
# Copyright 1999-2015 Gentoo Foundation
# Distributed under the terms of the GNU General Public License v2
# $Header: $
# $Id$
extra_started_commands='reload reload_auditd reload_rules'
description='Linux Auditing System'
@ -15,18 +15,18 @@ command='/sbin/auditd'
start_auditd() {
# Env handling taken from the upstream init script
if [ -z "$AUDITD_LANG" -o "$AUDITD_LANG" = "none" -o "$AUDITD_LANG" = "NONE" ]; then
unset LANG LC_TIME LC_ALL LC_MESSAGES LC_NUMERIC LC_MONETARY LC_COLLATE
else
LANG="$AUDITD_LANG"
LC_TIME="$AUDITD_LANG"
LC_ALL="$AUDITD_LANG"
LC_MESSAGES="$AUDITD_LANG"
LC_NUMERIC="$AUDITD_LANG"
LC_MONETARY="$AUDITD_LANG"
LC_COLLATE="$AUDITD_LANG"
export LANG LC_TIME LC_ALL LC_MESSAGES LC_NUMERIC LC_MONETARY LC_COLLATE
fi
if [ -z "$AUDITD_LANG" -o "$AUDITD_LANG" = "none" -o "$AUDITD_LANG" = "NONE" ]; then
unset LANG LC_TIME LC_ALL LC_MESSAGES LC_NUMERIC LC_MONETARY LC_COLLATE
else
LANG="$AUDITD_LANG"
LC_TIME="$AUDITD_LANG"
LC_ALL="$AUDITD_LANG"
LC_MESSAGES="$AUDITD_LANG"
LC_NUMERIC="$AUDITD_LANG"
LC_MONETARY="$AUDITD_LANG"
LC_COLLATE="$AUDITD_LANG"
export LANG LC_TIME LC_ALL LC_MESSAGES LC_NUMERIC LC_MONETARY LC_COLLATE
fi
unset HOME MAIL USER USERNAME
ebegin "Starting ${name}"
@ -38,7 +38,7 @@ start_auditd() {
return $ret
}
stop_auditd() {
stop_auditd() {
ebegin "Stopping ${name}"
start-stop-daemon --stop --quiet --pidfile ${pidfile}
local ret=$?
@ -46,12 +46,11 @@ stop_auditd() {
return $ret
}
loadfile() {
local rules="$1"
if [ -n "${rules}" -a -f "${rules}" ]; then
einfo "Loading audit rules from ${rules}"
/sbin/auditctl -R "${rules}" 1>/dev/null
/sbin/auditctl -R "${rules}" >/dev/null
return $?
else
return 0
@ -62,7 +61,6 @@ start() {
start_auditd
local ret=$?
if [ $ret -eq 0 -a "${RC_CMD}" != "restart" ]; then
touch /var/lock/${name}
if yesno ${USE_AUGENRULES:-no}; then
test -d /etc/audit/rules.d && /sbin/augenrules
fi
@ -76,7 +74,10 @@ reload_rules() {
}
reload_auditd() {
[ -f ${pidfile} ] && kill -HUP `cat ${pidfile}`
ebegin "Reloading ${SVCNAME}"
start-stop-daemon --signal HUP \
--exec "${command}" --pidfile "${pidfile}"
eend $?
}
reload() {
@ -87,14 +88,7 @@ reload() {
stop() {
[ "${RC_CMD}" != "restart" ] && loadfile "${RULEFILE_STOP_PRE}"
stop_auditd
rm -f /var/lock/${name}
local ret=$?
[ "${RC_CMD}" != "restart" ] && loadfile "${RULEFILE_STOP_POST}"
return $ret
}
# This is a special case, we do not want to touch the rules at all
restart() {
stop_auditd
start_auditd
}