squid: add pre-install, slightly improved start script

squid/.md5sum

@@ -1,2 +1,2 @@
-681213fd48103fb4ce707afcbe21f362  squid
+13b538001b51f903cd2e337bcae1eed6  squid
 929f7a3988fe63ec188d2ad920d92d82  squid-3.2.1.tar.bz2

squid/Pkgfile

@@ -4,7 +4,7 @@
 
 name=squid
 version=3.2.1
-release=1
+release=2
 source=(http://www.squid-cache.org/Versions/v3/3.2/$name-$version.tar.bz2 \
         squid)
 

squid/README

@@ -10,7 +10,7 @@ PRE-INSTALL
 
 POST-INSTALL
 1. add a cache_dir entry to /etc/squid/squid.conf:
-   cache_dir diskd /var/squid 2000 16 256
+   cache_dir aufs /var/squid 2000 16 256
 2. run '/usr/sbin/squid -z' to build the cache structure
 
 PRECAUTION

squid/pre-install

@@ -0,0 +1,6 @@
+#!/bin/sh
+
+getent group squid || /usr/sbin/groupadd -g 40 squid
+getent passwd squid || /usr/sbin/useradd -g squid -u 40 -d /var/squid -s /bin/false squid
+/usr/bin/passwd -l squid
+

squid/squid

@@ -8,13 +8,24 @@ start)
 	/usr/sbin/squid -Y
 	;;
 stop)
+	/usr/sbin/squid -k interrupt
+	;;
+shutdown)
 	/usr/sbin/squid -k shutdown
+	while [[ $(pidof /usr/sbin/squid) ]]; do
+		sleep 2
+	done
 	;;
 reload)
 	/usr/sbin/squid -k reconfigure
 	;;
+restart)
+	$0 stop
+	sleep 2
+	$0 start
+	;;
 *)
-	echo "usage: $0 [start|stop|reload]"
+	echo "usage: $0 [start|stop|shutdown|reload|restart]"
 	;;
 esac