[arch-commits] CVS update of extra/network/squid (PKGBUILD squid)

[Kevin Piche]

    Date: Monday, September 24, 2007 @ 23:12:33
  Author: kevin
    Path: /home/cvs-extra/extra/network/squid

Modified: PKGBUILD (1.36 -> 1.37) squid (1.1 -> 1.2)

upgpkg: squid 2.6.STABLE16-1
Updated pkg and FS#7903: script now waits for squid to terminate on stop


----------+
 PKGBUILD |    8 ++++----
 squid    |    8 ++++++++
 2 files changed, 12 insertions(+), 4 deletions(-)


Index: extra/network/squid/PKGBUILD
diff -u extra/network/squid/PKGBUILD:1.36 extra/network/squid/PKGBUILD:1.37
--- extra/network/squid/PKGBUILD:1.36	Tue Jul 31 01:10:42 2007
+++ extra/network/squid/PKGBUILD	Mon Sep 24 23:12:33 2007
@@ -1,9 +1,9 @@
-# $Id: PKGBUILD,v 1.36 2007/07/31 05:10:42 eric Exp $
+# $Id: PKGBUILD,v 1.37 2007/09/25 03:12:33 kevin Exp $
 # Maintainer: Kevin Piche <kevin at archlinux.org>
 # Contributor: Tom Newsom <Jeepster at gmx.co.uk>
 
 pkgname=squid
-pkgver=2.6.STABLE14
+pkgver=2.6.STABLE16
 pkgrel=1
 pkgdesc="A full-featured Web proxy cache server."
 arch=(i686 x86_64)
@@ -15,8 +15,8 @@
 source=(http://www.squid-cache.org/Versions/v2/2.6/$pkgname-$pkgver.tar.bz2 \
         squid-makefiles.patch squid squid.conf.d squid.pam \
         squid.cron)
-md5sums=('eadb138d48320df8b99349121159c6bf' '935309e73d2a9c34cf9871cf1ff2f893'\
-         '1eef6999ad31f17ac6046cd441577b44' '81f9a446d143f42c6a3f30304e91c39f'\
+md5sums=('849bee6f269e6c773f215fd4b41de0e3' '935309e73d2a9c34cf9871cf1ff2f893'
+         'd213b0cc1db72b749bb8c88716fdab39' '81f9a446d143f42c6a3f30304e91c39f'
          '270977cdd9b47ef44c0c427ab9034777' 'f47bb20c7be3089d78e6d2b491f7923b')
 
 build() {
Index: extra/network/squid/squid
diff -u extra/network/squid/squid:1.1 extra/network/squid/squid:1.2
--- extra/network/squid/squid:1.1	Sat Nov 22 07:45:26 2003
+++ extra/network/squid/squid	Mon Sep 24 23:12:33 2007
@@ -9,6 +9,7 @@
 
 PID=`pidof -o %PPID /usr/sbin/squid`
 case "$1" in
+
   start)
     if [ ! -f /var/cache/squid/swap.state ]; then
       stat_busy "Creating squid's swap directories"
@@ -23,16 +24,23 @@
       stat_done
     fi
     ;;
+
   stop)
     stat_busy "Stopping squid"
     [ ! -z "$PID" ]  && /usr/sbin/squid -k shutdown &> /dev/null
     if [ $? -gt 0 ]; then
       stat_fail
     else
+      # wait for squid to shutdown so we can safely do a restart
+      while [ ! -z "`pidof -o %PPID /usr/sbin/squid`" ]; do
+        stat_append "."
+        sleep 3
+      done
       rm_daemon squid
       stat_done
     fi
     ;;
+
   restart)
     $0 stop
     sleep 5