[gentoo-commits] repo/gentoo:master commit in: sys-process/audit/files/

[Robin H. Johnson]

commit:     17ff67b00883b6f1a2cd5fc63e673f9f15e122dc
Author:     Michael Mair-Keimberger (asterix) <m.mairkeimberger <AT> gmail <DOT> com>
AuthorDate: Sun Feb 12 15:59:59 2017 +0000
Commit:     Robin H. Johnson <robbat2 <AT> gentoo <DOT> org>
CommitDate: Mon Feb 13 22:36:59 2017 +0000
URL:        https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=17ff67b0

sys-process/audit: remove unused files

(cherry picked from commit b1294a19f5879c04c8088582b781a50dc3e01e9a)
Signed-off-by: Robin H. Johnson <robbat2 <AT> gentoo.org>

 sys-process/audit/files/auditd-conf.d-1.2.3  | 16 -----
 sys-process/audit/files/auditd-init.d-1.7.17 | 58 -----------------
 sys-process/audit/files/auditd-init.d-2.1.3  | 97 ----------------------------
 3 files changed, 171 deletions(-)

diff --git a/sys-process/audit/files/auditd-conf.d-1.2.3 b/sys-process/audit/files/auditd-conf.d-1.2.3
deleted file mode 100644
index a8250c5fd2..0000000000
--- a/sys-process/audit/files/auditd-conf.d-1.2.3
+++ /dev/null
@@ -1,16 +0,0 @@
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-# Configuration options for auditd
-# -f for foreground mode
-# There are some other options as well, but you'll have to look in the source
-# code to find them as they aren't ready for use yet.
-EXTRAOPTIONS=''
-
-# Audit rules file to run after starting auditd
-RULEFILE_STARTUP=/etc/audit/audit.rules
-
-# Audit rules file to run before and after stopping auditd
-RULEFILE_STOP_PRE=/etc/audit/audit.rules.stop.pre
-RULEFILE_STOP_POST=/etc/audit/audit.rules.stop.post

diff --git a/sys-process/audit/files/auditd-init.d-1.7.17 b/sys-process/audit/files/auditd-init.d-1.7.17
deleted file mode 100644
index 7a78e015e9..0000000000
--- a/sys-process/audit/files/auditd-init.d-1.7.17
+++ /dev/null
@@ -1,58 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2005 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-start_auditd() {
-	ebegin "Starting auditd"
-	start-stop-daemon \
-		--start --quiet --pidfile /var/run/auditd.pid \
-		--exec /sbin/auditd -- ${EXTRAOPTIONS}
-	local ret=$?
-	eend $ret
-	return $ret
-}
-
-stop_auditd() {	
-	ebegin "Stopping auditd"
-	start-stop-daemon \
-		--stop --quiet --pidfile /var/run/auditd.pid
-	local ret=$?
-	eend $ret
-	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
-		return $?
-	else
-		return 0
-	fi
-}
-
-start() {
-	start_auditd
-	local ret=$?
-	if [ $ret -eq 0 -a "${RC_CMD}" != "restart" ]; then
-		loadfile "${RULEFILE_STARTUP}"
-	fi
-	return $ret
-}
-
-stop() {
-	[ "${RC_CMD}" != "restart" ] && loadfile "${RULEFILE_STOP_PRE}"
-	stop_auditd
-	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
-}

diff --git a/sys-process/audit/files/auditd-init.d-2.1.3 b/sys-process/audit/files/auditd-init.d-2.1.3
deleted file mode 100644
index b918ab6705..0000000000
--- a/sys-process/audit/files/auditd-init.d-2.1.3
+++ /dev/null
@@ -1,97 +0,0 @@
-#!/sbin/openrc-run
-# Copyright 1999-2011 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Id$
-
-extra_started_commands='reload reload_auditd reload_rules'
-description='Linux Auditing System'
-description_reload='Reload daemon configuration and rules'
-description_reload_rules='Reload daemon rules'
-description_reload_auditd='Reload daemon configuration'
-
-name='auditd'
-pidfile='/var/run/auditd.pid'
-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  
-	unset HOME MAIL USER USERNAME
-
-	ebegin "Starting ${name}"
-	start-stop-daemon \
-		--start --quiet --pidfile ${pidfile} \
-		--exec ${command} -- ${EXTRAOPTIONS}
-	local ret=$?
-	eend $ret
-	return $ret
-}
-
-stop_auditd() {	
-	ebegin "Stopping ${name}"
-	start-stop-daemon --stop --quiet --pidfile ${pidfile}
-	local ret=$?
-	eend $ret
-	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
-		return $?
-	else
-		return 0
-	fi
-}
-
-start() {
-	start_auditd
-	local ret=$?
-	if [ $ret -eq 0 -a "${RC_CMD}" != "restart" ]; then
-		touch /var/lock/subsys/${name}
-		loadfile "${RULEFILE_STARTUP}"
-	fi
-	return $ret
-}
-
-reload_rules() {
-	loadfile "${RULEFILE_STARTUP}"
-}
-
-reload_auditd() {
-	[ -f ${pidfile} ] && kill -HUP `cat ${pidfile}`
-}
-
-reload() {
-	reload_auditd
-	reload_rules
-}
-
-stop() {
-	[ "${RC_CMD}" != "restart" ] && loadfile "${RULEFILE_STOP_PRE}"
-	stop_auditd
-	rm -f /var/lock/subsys/${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
-}