Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=24c13133576deb1198920dcc6db95ffd8a32eed3
commit 24c13133576deb1198920dcc6db95ffd8a32eed3 Author: Miklos Vajna <vmik...@frugalware.org> Date: Mon Jun 8 13:29:32 2009 +0200 squid-3.0.STABLE15-2-i686 - fix pidfile path in rc.squid and make it more silent - closes #3608 diff --git a/source/network-extra/squid/FrugalBuild b/source/network-extra/squid/FrugalBuild index ed08192..88c334e 100644 --- a/source/network-extra/squid/FrugalBuild +++ b/source/network-extra/squid/FrugalBuild @@ -3,7 +3,7 @@ pkgname=squid pkgver=3.0.STABLE15 -pkgrel=1 +pkgrel=2 pkgdesc="Squid Web Proxy Cache" url="http://www.squid-cache.org/"; depends=('openssl' 'perl') @@ -15,7 +15,7 @@ up2date="lynx -dump http://www.squid-cache.org/Versions/|grep Stable -A 4|sed -n source=(http://www.squid-cache.org/Versions/v3/3.0/$pkgname-$pkgver.tar.bz2 \ rc.squid squid) sha1sums=('f01697bee0af0084db62b87b0646298775f53c28' \ - '3a8ce41ac3e6b48d0340a5577093a345cfae9242' \ + '7afef636bbe28f598c4c80e500babd776a3d0a2c' \ '53042dd86e482d4a6eff9e34ecb01352439c5026') build() diff --git a/source/network-extra/squid/rc.squid b/source/network-extra/squid/rc.squid index 18a203e..4ae1375 100644 --- a/source/network-extra/squid/rc.squid +++ b/source/network-extra/squid/rc.squid @@ -11,11 +11,11 @@ if [ "$1" = "stop" ]; then stop "$stopsquid" - squid -k shutdown &> /dev/null + squid -k shutdown sleep 1 - if [ -f /var/log/squid/run/squid.pid ] ; then + if [ -f /var/squid/log/squid.pid ] ; then cnt=0 - while [ -f /var/log/squid/run/squid.pid ] ; do + while [ -f /var/squid/log/squid.pid ] ; do cnt=$(expr $cnt + 1) if [ $cnt -gt 60 ] ; then echo @@ -36,7 +36,7 @@ elif [ "$1" = "reload" ]; then else # start if [ ! -f /var/cache/squid/swap.state ]; then start "$createcache" - squid -z + squid -z 2>/dev/null 1>&2 ok $? fi start "$startsquid" _______________________________________________ Frugalware-git mailing list Frugalware-git@frugalware.org http://frugalware.org/mailman/listinfo/frugalware-git
