From db2425ca6c53858ded3a945fbc8877028cd6bd12 Mon Sep 17 00:00:00 2001
From: Daniel J Walsh <dwalsh@fedoraproject.org>
Date: Mon, 21 Aug 2006 15:18:36 +0000
Subject: [PATCH] auto-import setroubleshoot-0.25-1 on branch devel from    
 setroubleshoot-0.25-1.src.rpm

---
 .cvsignore          |  2 +-
 setroubleshoot.init | 24 ++++++++++--------------
 setroubleshoot.spec |  9 ++++++++-
 sources             |  2 +-
 4 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/.cvsignore b/.cvsignore
index 30ce11a..041989c 100644
--- a/.cvsignore
+++ b/.cvsignore
@@ -1 +1 @@
-setroubleshoot-0.24.tar.gz
+setroubleshoot-0.25.tar.gz
diff --git a/setroubleshoot.init b/setroubleshoot.init
index 9d46bc8..6d09d4c 100755
--- a/setroubleshoot.init
+++ b/setroubleshoot.init
@@ -26,43 +26,39 @@ PATH=/sbin:/bin:/usr/bin:/usr/sbin
 
 
 # Silently exit is SELinux is not enabled
-[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 0
+[ -x /usr/sbin/selinuxenabled ] && /usr/sbin/selinuxenabled || exit 1
 
 # Check that we are root ... so non-root users stop here
 test `id -u` = 0  || exit 4
 
-# Check config
-test -x /usr/sbin/setroubleshoot  || exit 5
-
 RETVAL=0
 
-prog="setroubleshoot"
-exe="setroubleshootd"
+prog="setroubleshootd"
 
 start(){
     echo -n $"Starting $prog: "
     unset HOME MAIL USER USERNAME
-    daemon $exe "$EXTRAOPTIONS"
+    daemon $prog "$EXTRAOPTIONS"
     RETVAL=$?
     echo
     if test $RETVAL = 0 ; then
-        touch /var/lock/subsys/setroubleshoot
+        touch /var/lock/subsys/$prog
     fi
     return $RETVAL
 }
 
 stop(){
     echo -n $"Stopping $prog: "
-    killproc $exe
+    killproc $prog
     RETVAL=$?
     echo
-    rm -f /var/lock/subsys/setroubleshoot
+    rm -f /var/lock/subsys/$prog
     return $RETVAL
 }
 
 reload(){
     echo -n $"Reloading configuration: "	
-    killproc $exe -HUP
+    killproc $prog -HUP
     RETVAL=$?
     echo
     return $RETVAL
@@ -74,7 +70,7 @@ restart(){
 }
 
 condrestart(){
-    [ -e /var/lock/subsys/setroubleshoot ] && restart
+    [ -e /var/lock/subsys/$prog ] && restart
     return 0
 }
 
@@ -88,7 +84,7 @@ case "$1" in
 	stop
 	;;
     status)
-	status $exe
+	status $prog
 	;;
     restart)
 	restart
@@ -100,7 +96,7 @@ case "$1" in
 	condrestart
 	;;
     *)
-	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload|rotate}"
+	echo $"Usage: $0 {start|stop|status|restart|condrestart|reload}"
 	RETVAL=3
 esac
 
diff --git a/setroubleshoot.spec b/setroubleshoot.spec
index a294ff1..7168c35 100644
--- a/setroubleshoot.spec
+++ b/setroubleshoot.spec
@@ -1,6 +1,6 @@
 Summary: Helps troubleshoot SELinux problems
 Name: setroubleshoot
-Version: 0.24
+Version: 0.25
 Release: 1
 License: GPL
 Group: Applications/System
@@ -58,8 +58,10 @@ rm -rf %{buildroot}
 make DESTDIR=%{buildroot} install
 %{__install} -D -m755 %{SOURCE1} %{buildroot}/etc/rc.d/init.d/%{name}
 %{__install} -D -m644 %{SOURCE2} %{buildroot}%{_sysconfdir}/logrotate.d/%{name}
+touch %{buildroot}%{pkgvardatadir}/database.xml
 
 %post
+[ -f %{pkgvardatadir}/database.xml ] && chmod 644 %{pkgvardatadir}/database.xml
 /usr/bin/update-desktop-database %{_datadir}/applications
 /sbin/chkconfig --add %{name}
 /sbin/service %{name} condrestart >/dev/null 2>&1
@@ -92,12 +94,17 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %dir %{pkgrundir}
 %dir %{pkgvardatadir}
+%ghost %attr(0644,root,root) %{pkgvardatadir}/database.xml
+
 /etc/rc.d/init.d/%{name}
 %{_sysconfdir}/xdg/autostart/*
 #%{_datadir}/applications/*.desktop
 %{_datadir}/pixmaps/*png
 
 %changelog
+* Mon Aug 21 2006 Dan Walsh <dwalsh@redhat.com> - 0.25-1
+- Fix 64 bit issue that caused runaway problem
+
 * Sun Aug 20 2006 Dan Walsh <dwalsh@redhat.com> - 0.24-1
 - add missing runcmd
 
diff --git a/sources b/sources
index 929e800..9e6d707 100644
--- a/sources
+++ b/sources
@@ -1 +1 @@
-cb87682917d9567396c8d61c98cac8b9  setroubleshoot-0.24.tar.gz
+adfbe964a43e47c7afbcf7102f01f6d8  setroubleshoot-0.25.tar.gz