rpms/squid/FC-6 squid.init,1.6,1.7 squid.spec,1.75,1.76

[fedora-cvs-commits at redhat.com]

Author: stransky

Update of /cvs/dist/rpms/squid/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv1585

Modified Files:
	squid.init squid.spec 
Log Message:
added fix for #183869 - squid can abort when getting status, work in progress


Index: squid.init
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-6/squid.init,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- squid.init	9 Sep 2004 12:45:46 -0000	1.6
+++ squid.init	25 Oct 2006 11:48:54 -0000	1.7
@@ -119,8 +119,7 @@
 }
 
 rhstatus() { 
-    status $SQUID
-    $SQUID -k check
+    status $SQUID && $SQUID -k check
 }
 
 probe() {


Index: squid.spec
===================================================================
RCS file: /cvs/dist/rpms/squid/FC-6/squid.spec,v
retrieving revision 1.75
retrieving revision 1.76
diff -u -r1.75 -r1.76
--- squid.spec	17 Oct 2006 14:57:15 -0000	1.75
+++ squid.spec	25 Oct 2006 11:48:54 -0000	1.76
@@ -5,7 +5,7 @@
 Summary: The Squid proxy caching server.
 Name: squid
 Version: 2.6.STABLE4
-Release: 2%{?dist}
+Release: 3%{?dist}
 Epoch: 7
 License: GPL
 Group: System Environment/Daemons
@@ -349,6 +349,9 @@
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Tue Oct 25 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE4-3
+- added fix for #183869 - squid can abort when getting status
+
 * Tue Oct 17 2006 Martin Stransky <stransky at redhat.com> - 7:2.6.STABLE4-2
 - upstream fixes:
   * Accept 00:00-24:00 as a valid time specification (upstream BZ #1794)