Git-Url: http://git.frugalware.org/gitweb/gitweb.cgi?p=frugalware-current.git;a=commitdiff;h=18b085043359d41bcf3623ba96f4d7aab22e3aed
commit 18b085043359d41bcf3623ba96f4d7aab22e3aed Author: Christian Hamar alias krix <[EMAIL PROTECTED]> Date: Tue Mar 25 16:28:54 2008 +0100 squid-2.6.STABLE19-2-x86_64 * Release bump - Added delay to rc.squid when stopping squid. This is needed for proper usage :p - Yeah yeah its ugly, fix it pls! :p thanks :P diff --git a/source/network-extra/squid/FrugalBuild b/source/network-extra/squid/FrugalBuild index 1c00718..c44065e 100644 --- a/source/network-extra/squid/FrugalBuild +++ b/source/network-extra/squid/FrugalBuild @@ -3,7 +3,7 @@ pkgname=squid pkgver=2.6.STABLE19 -pkgrel=1 +pkgrel=2 pkgdesc="Squid Web Proxy Cache" url="http://www.squid-cache.org/"; depends=('openssl' 'perl') @@ -19,7 +19,7 @@ sha1sums=('cd031a3ba672a53054b512bbe43bbe6a58a13d53' \ 'a1482482406661090951fa4c4304ca6604db2d14' \ '8eacf8bd974c461162aaba72b5bc4109cc1104c7' \ '7dbae27eeee7b62e685f6758a06d984b0b62668e' \ - 'a6d755b4ac0002d9a29c05795fff7c2574fc7f69' \ + '3a8ce41ac3e6b48d0340a5577093a345cfae9242' \ '53042dd86e482d4a6eff9e34ecb01352439c5026') build() @@ -54,4 +54,3 @@ build() } # optimization OK - diff --git a/source/network-extra/squid/rc.squid b/source/network-extra/squid/rc.squid index 39a6238..18a203e 100644 --- a/source/network-extra/squid/rc.squid +++ b/source/network-extra/squid/rc.squid @@ -12,6 +12,20 @@ if [ "$1" = "stop" ]; then stop "$stopsquid" squid -k shutdown &> /dev/null + sleep 1 + if [ -f /var/log/squid/run/squid.pid ] ; then + cnt=0 + while [ -f /var/log/squid/run/squid.pid ] ; do + cnt=$(expr $cnt + 1) + if [ $cnt -gt 60 ] ; then + echo + echo "Failed" + break + fi + sleep 2 + echo -n "." + done + fi ok $? elif [ "$1" = "restart" ]; then "$0" stop _______________________________________________ Frugalware-git mailing list [email protected] http://frugalware.org/mailman/listinfo/frugalware-git
