rpms/squid/F-12 squid.init,1.15,1.16 squid.spec,1.148,1.149

[Jiri Skala]

Author: jskala

Update of /cvs/extras/rpms/squid/F-12
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv12247

Modified Files:
	squid.init squid.spec 
Log Message:
* Mon Nov 23 2009 Jiri Skala <jskala at redhat.com> 7:3.1.0.14-2
- fixed #532930 Syntactic error in /etc/init.d/squid
- fixed #528453 cannot initialize cache_dir with user specified config file



Index: squid.init
===================================================================
RCS file: /cvs/extras/rpms/squid/F-12/squid.init,v
retrieving revision 1.15
retrieving revision 1.16
diff -u -p -r1.15 -r1.16
--- squid.init	15 Sep 2009 17:56:14 -0000	1.15
+++ squid.init	23 Nov 2009 11:19:01 -0000	1.16
@@ -70,7 +70,7 @@ start() {
 	for adir in $CACHE_SWAP; do
 		if [ ! -d $adir/00 ]; then
 			echo -n "init_cache_dir $adir... "
-			$SQUID -z -F >> /var/log/squid/squid.out 2>&1
+			$SQUID -z -F -f $SQUID_CONF >> /var/log/squid/squid.out 2>&1
 		fi
 	done
 	echo -n $"Starting $prog: "
@@ -169,7 +169,6 @@ status)
 
 probe)
 	probe
-		return 0
 	;;
 
 *)


Index: squid.spec
===================================================================
RCS file: /cvs/extras/rpms/squid/F-12/squid.spec,v
retrieving revision 1.148
retrieving revision 1.149
diff -u -p -r1.148 -r1.149
--- squid.spec	27 Sep 2009 20:49:39 -0000	1.148
+++ squid.spec	23 Nov 2009 11:19:01 -0000	1.149
@@ -4,7 +4,7 @@
 
 Name:     squid
 Version:  3.1.0.14
-Release:  1%{?dist}
+Release:  2%{?dist}
 Summary:  The Squid proxy caching server
 Epoch:    7
 License:  GPLv2+
@@ -252,6 +252,10 @@ fi
     chgrp squid /var/cache/samba/winbindd_privileged >/dev/null 2>&1 || :
 
 %changelog
+* Mon Nov 23 2009 Jiri Skala <jskala at redhat.com> 7:3.1.0.14-2
+- fixed #532930 Syntactic error in /etc/init.d/squid
+- fixed #528453 cannot initialize cache_dir with user specified config file
+
 * Sun Sep 27 2009 Henrik Nordstrom <henrik at henriknordstrom.net> - 7:3.1.0.14-1
 - Update to 3.1.0.14