packages: audit/audit.spec, audit/auditd.init - fixed audit.rules location ...

[sls]

Author: sls                          Date: Sat Jan 22 14:23:40 2011 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fixed audit.rules location in auditd.init script
- rel. 2

---- Files affected:
packages/audit:
   audit.spec (1.77 -> 1.78) , auditd.init (1.6 -> 1.7) 

---- Diffs:

================================================================
Index: packages/audit/audit.spec
diff -u packages/audit/audit.spec:1.77 packages/audit/audit.spec:1.78
--- packages/audit/audit.spec:1.77	Fri Sep 24 20:35:12 2010
+++ packages/audit/audit.spec	Sat Jan 22 15:23:35 2011
@@ -9,7 +9,7 @@
 Summary(pl.UTF-8):	Narzędzia przestrzeni użytkownika do audytu jąder 2.6
 Name:		audit
 Version:	2.0.5
-Release:	1
+Release:	2
 License:	GPL v2+
 Group:		Daemons
 Source0:	http://people.redhat.com/sgrubb/audit/%{name}-%{version}.tar.gz
@@ -308,6 +308,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.78  2011/01/22 14:23:35  sls
+- fixed audit.rules location in auditd.init script
+- rel. 2
+
 Revision 1.77  2010/09/24 18:35:12  arekm
 - up to 2.0.5
 

================================================================
Index: packages/audit/auditd.init
diff -u packages/audit/auditd.init:1.6 packages/audit/auditd.init:1.7
--- packages/audit/auditd.init:1.6	Fri May  1 01:24:41 2009
+++ packages/audit/auditd.init	Sat Jan 22 15:23:35 2011
@@ -17,6 +17,7 @@
 
 AUDITD_CLEAN_STOP=yes
 EXTRAOPTIONS=
+AUDIT_RULES=/etc/audit/audit.rules
 
 # Get service config - may override defaults
 [ -f /etc/sysconfig/auditd ] && . /etc/sysconfig/auditd
@@ -29,7 +30,7 @@
 		RETVAL=$?
 		[ $RETVAL -eq 0 ] && touch /var/lock/subsys/auditd
 		# Load the default rules
-		[ -f /etc/audit.rules ] && /sbin/auditctl -R /etc/audit.rules >/dev/null
+		[ -f $AUDIT_RULES ] && /sbin/auditctl -R $AUDIT_RULES >/dev/null
 	else
 		msg_already_running auditd
 	fi
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audit/audit.spec?r1=1.77&r2=1.78&f=u
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/audit/auditd.init?r1=1.6&r2=1.7&f=u