From 58ed1c0fab88048597baf4e4d3874c11acf8c45b Mon Sep 17 00:00:00 2001 From: Jiri Skala Date: Mon, 23 Nov 2009 11:19:58 +0000 Subject: [PATCH] - fixed #532930 Syntactic error in /etc/init.d/squid - fixed #528453 cannot initialize cache_dir with user specified config file --- squid.init | 3 +-- squid.spec | 6 +++++- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/squid.init b/squid.init index c6dfbc9..b17c347 100644 --- a/squid.init +++ b/squid.init @@ -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 ;; *) diff --git a/squid.spec b/squid.spec index 6078931..4202286 100644 --- a/squid.spec +++ b/squid.spec @@ -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 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 - 7:3.1.0.14-1 - Update to 3.1.0.14