[patch] auditd-init.d-2.1.3.patch

auditd-init.d-2.1.3.patch (text/plain), 2.90 KB, created by Coacher on 2015-07-29 15:23:30 UTC

diff --git a/var/portage/sys-process/audit/files/auditd-init.d-2.1.3 b/sys-process/audit/files/auditd-init.d-2.1.3
index 6ac218d..dfabc29 100644
--- a/var/portage/sys-process/audit/files/auditd-init.d-2.1.3
+++ b/sys-process/audit/files/auditd-init.d-2.1.3
@@ -1,7 +1,7 @@
 #!/sbin/runscript
-# Copyright 1999-2011 Gentoo Foundation
+# Copyright 1999-2015 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/sys-process/audit/files/auditd-init.d-2.1.3,v 1.1 2011/09/11 02:58:55 robbat2 Exp $
+# $Header: $
 
 extra_started_commands='reload reload_auditd reload_rules'
 description='Linux Auditing System'
@@ -14,31 +14,31 @@ 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  
+	# Env handling was 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}
+	start-stop-daemon --start --quiet \
+		--exec ${command} --pidfile ${pidfile} \
+		-- ${EXTRAOPTIONS}
 	local ret=$?
 	eend $ret
 	return $ret
 }
 
-stop_auditd() {	
+stop_auditd() {
 	ebegin "Stopping ${name}"
 	start-stop-daemon --stop --quiet --pidfile ${pidfile}
 	local ret=$?
@@ -62,7 +62,7 @@ start() {
 	start_auditd
 	local ret=$?
 	if [ $ret -eq 0 -a "${RC_CMD}" != "restart" ]; then
-		touch /var/lock/subsys/${name}
+		touch /var/lock/${name}.lock
 		loadfile "${RULEFILE_STARTUP}"
 	fi
 	return $ret
@@ -73,7 +73,7 @@ reload_rules() {
 }
 
 reload_auditd() {
-	[ -f ${pidfile} ] && kill -HUP `cat ${pidfile}`
+	[ -f ${pidfile} ] && kill -HUP "$(cat ${pidfile})"
 }
 
 reload() {
@@ -84,7 +84,7 @@ reload() {
 stop() {
 	[ "${RC_CMD}" != "restart" ] && loadfile "${RULEFILE_STOP_PRE}"
 	stop_auditd
-	rm -f /var/lock/subsys/${name}
+	rm -f /var/lock/${name}.lock
 	local ret=$?
 	[ "${RC_CMD}" != "restart" ] && loadfile "${RULEFILE_STOP_POST}"
 	return $ret