rpms/audit/FC-5 audit-1.2.7-fc5.patch, NONE, 1.1 audit.spec, 1.88, 1.89

[fedora-cvs-commits at redhat.com]

Author: sgrubb

Update of /cvs/dist/rpms/audit/FC-5
In directory cvs.devel.redhat.com:/tmp/cvs-serv30740

Modified Files:
	audit.spec 
Added Files:
	audit-1.2.7-fc5.patch 
Log Message:
* Tue Sep 19 2006 Steve Grubb <sgrubb at redhat.com> 1.2.7-3.fc5
- Fix config file location


audit-1.2.7-fc5.patch:
 init.d/Makefile.am  |    2 +-
 init.d/auditd.init  |    6 +++---
 src/auditd-config.h |    2 +-
 3 files changed, 5 insertions(+), 5 deletions(-)

--- NEW FILE audit-1.2.7-fc5.patch ---
diff -ur audit-1.2.7.orig/init.d/auditd.init audit-1.2.7/init.d/auditd.init
--- audit-1.2.7.orig/init.d/auditd.init	2006-09-19 15:30:24.000000000 -0400
+++ audit-1.2.7/init.d/auditd.init	2006-09-19 15:32:28.000000000 -0400
@@ -7,7 +7,7 @@
 #
 # processname: /sbin/auditd
 # config: /etc/sysconfig/auditd
-# config: /etc/audit/auditd.conf
+# config: /etc/auditd.conf
 # pidfile: /var/run/auditd.pid
 #
 # Return values according to LSB for all commands but status:
@@ -32,7 +32,7 @@
 test -f /etc/sysconfig/auditd && . /etc/sysconfig/auditd
 
 test -x /sbin/auditd  || exit 5
-test -f /etc/audit/auditd.conf  || exit 6
+test -f /etc/auditd.conf  || exit 6
 
 RETVAL=0
 
@@ -62,7 +62,7 @@
         touch /var/lock/subsys/auditd
     fi
     # Load the default rules
-    test -f /etc/audit/audit.rules && /sbin/auditctl -R /etc/audit/audit.rules >/dev/null
+    test -f /etc/audit.rules && /sbin/auditctl -R /etc/audit.rules >/dev/null
     return $RETVAL
 }
 
diff -ur audit-1.2.7.orig/init.d/Makefile.am audit-1.2.7/init.d/Makefile.am
--- audit-1.2.7.orig/init.d/Makefile.am	2006-09-19 15:30:24.000000000 -0400
+++ audit-1.2.7/init.d/Makefile.am	2006-09-19 15:33:42.000000000 -0400
@@ -26,7 +26,7 @@
 initdir=$(sysconfdir)/rc.d/init.d
 sysconfigdir=$(sysconfdir)/sysconfig
 
-auditdir = $(sysconfdir)/audit
+auditdir = $(sysconfdir)
 dist_audit_DATA = auditd.conf audit.rules
 
 install-data-hook:
diff -ur audit-1.2.7.orig/src/auditd-config.h audit-1.2.7/src/auditd-config.h
--- audit-1.2.7.orig/src/auditd-config.h	2006-09-19 15:30:24.000000000 -0400
+++ audit-1.2.7/src/auditd-config.h	2006-09-19 15:30:49.000000000 -0400
@@ -25,7 +25,7 @@
 #define AUDITD_CONFIG_H
 
 #include "libaudit.h"
-#define CONFIG_FILE "/etc/audit/auditd.conf"
+#define CONFIG_FILE "/etc/auditd.conf"
 #define MEGABYTE 1048576UL
 
 typedef enum { D_FOREGROUND, D_BACKGROUND } daemon_t;


Index: audit.spec
===================================================================
RCS file: /cvs/dist/rpms/audit/FC-5/audit.spec,v
retrieving revision 1.88
retrieving revision 1.89
diff -u -r1.88 -r1.89
--- audit.spec	19 Sep 2006 14:37:43 -0000	1.88
+++ audit.spec	19 Sep 2006 19:39:10 -0000	1.89
@@ -1,11 +1,12 @@
 Summary: User space tools for 2.6 kernel auditing
 Name: audit
 Version: 1.2.7
-Release: 2.fc5
+Release: 3.fc5
 License: GPL
 Group: System Environment/Daemons
 URL: http://people.redhat.com/sgrubb/audit/
 Source0: %{name}-%{version}.tar.gz
+Patch1: audit-1.2.7-fc5.patch 
 BuildRoot: %{_tmppath}/%{name}-%{version}-root
 BuildRequires: libtool swig python-devel
 BuildRequires: glibc-kernheaders >= 3.0-5
@@ -54,6 +55,7 @@
 
 %prep
 %setup -q
+%patch1 -p1
 
 %build
 autoreconf -fv --install
@@ -153,6 +155,9 @@
 
 
 %changelog
+* Tue Sep 19 2006 Steve Grubb <sgrubb at redhat.com> 1.2.7-3.fc5
+- Fix config file location
+
 * Tue Sep 19 2006 Steve Grubb <sgrubb at redhat.com> 1.2.7-2.fc5
 - Remove the audit dispatcher since backport of setroubleshooter is not likely