rpms/rkhunter/F-9 01-rkhunter,1.3,1.4 rkhunter.spec,1.15,1.16

[Kevin Fenzi (kevin)]

Author: kevin

Update of /cvs/extras/rpms/rkhunter/F-9
In directory cvs-int.fedora.redhat.com:/tmp/cvs-serv32053

Modified Files:
	01-rkhunter rkhunter.spec 
Log Message:
Fix cron script to only mail on warn/error - bug #450703
Fix conditional to account for fc10 rsyslog



Index: 01-rkhunter
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-9/01-rkhunter,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- 01-rkhunter	27 Mar 2008 04:02:39 -0000	1.3
+++ 01-rkhunter	17 Jun 2008 18:55:09 -0000	1.4
@@ -40,7 +40,10 @@
     XITVAL=$?
     /bin/echo -e "\n----------------------- End Rootkit Hunter Scan -----------------------" \
       >> $TMPFILE1
-    /bin/cat $TMPFILE1 | /bin/mail -s 'rkhunter Daily Run' $MAILTO
+
+    if [ $XITVAL != 0 ]; then
+         /bin/cat $TMPFILE1 | /bin/mail -s 'rkhunter Daily Run' $MAILTO
+    fi
     /bin/cat $TMPFILE1 >> $LOGFILE
   fi
 


Index: rkhunter.spec
===================================================================
RCS file: /cvs/extras/rpms/rkhunter/F-9/rkhunter.spec,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -r1.15 -r1.16
--- rkhunter.spec	17 May 2008 21:11:55 -0000	1.15
+++ rkhunter.spec	17 Jun 2008 18:55:09 -0000	1.16
@@ -1,6 +1,6 @@
 Name:           rkhunter
 Version:        1.3.2
-Release:        3%{?dist}
+Release:        4%{?dist}
 Summary:        A host-based tool to scan for rootkits, backdoors and local exploits
 
 Group:          Applications/System
@@ -53,8 +53,8 @@
 echo "SCRIPTWHITELIST=/usr/bin/GET" >> files/%name.conf
 echo "SCRIPTWHITELIST=/sbin/ifup" >> files/%name.conf
 echo "SCRIPTWHITELIST=/sbin/ifdown" >> files/%name.conf
-# in f8/f9
-%if 0%{?fc8}%{?fc9}
+# in f8/f9/f10
+%if 0%{?fc8}%{?fc9}%{?fc10}
 echo "SYSLOG_CONFIG_FILE=/etc/rsyslog.conf" >> files/%name.conf
 echo "ALLOWDEVFILE=/dev/shm/pulse-shm-*" >> files/%name.conf
 %else
@@ -136,6 +136,10 @@
 %{_mandir}/man8/*
 
 %changelog
+* Mon Jun 16 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-4
+- Fix cron script to only mail on warn/error - bug #450703
+- Fix conditional to account for fc10 rsyslog
+
 * Mon Apr 28 2008 Kevin Fenzi <kevin at tummy.com> - 1.3.2-3
 - Change cron to run after prelink - bug #438622