network/squid: Updated for version 3.1.6.

Signed-off-by: Michiel van Wessem <michiel@slackbuilds.org>

network/squid/README

@@ -7,6 +7,6 @@ Squid supports SSL, extensive access controls, and full request logging.
 By using the lightweight Internet Cache Protocol, squid caches can be 
 arranged in a hierarchy or mesh for additional bandwidth savings.
 
-See /usr/doc/squid-3.0.STABLE21/README.SBo for configuration help.
+See /usr/doc/squid-3.1.6/README.SBo for configuration help.
 Note that the default squid.conf and /etc/logrotate.d/squid files have
 changed in this release, so be sure to merge the changes into place.

network/squid/rc.squid

@@ -32,8 +32,8 @@ squid_start() {
     fi
   done
 
-  echo "Starting Squid:  $SQUIDCMD -DF"
-  $SQUIDCMD -DF
+  echo "Starting Squid:  $SQUIDCMD -F"
+  $SQUIDCMD -F
 }
 
 squid_stop() {

network/squid/squid.SlackBuild

@@ -24,7 +24,7 @@
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 PRGNAM=squid
-VERSION=3.0.STABLE24
+VERSION=3.1.6
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
 
@@ -83,7 +83,9 @@ CXXFLAGS="$SLKCFLAGS" \
   --sysconfdir=/etc/squid \
   --localstatedir=/var/log/squid \
   --datadir=/usr/share/squid \
+  --with-pidfile=/var/run/squid \
   --mandir=/usr/man \
+  --with-logdir=/var/log/squid \
   --enable-snmp \
   --enable-auth="basic" \
   --enable-basic-auth-helpers="NCSA" \
@@ -97,10 +99,8 @@ make install DESTDIR=$PKG
 find $PKG | xargs file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
-( cd $PKG/usr/man
-  find . -type f -exec gzip -9 {} \;
-  for i in $( find . -type l ) ; do ln -s $( readlink $i ).gz $i.gz ; rm $i ; done
-)
+find $PKG/usr/man -type f -exec gzip -9 {} \;
+for i in $(find $PKG/usr/man -type l); do ln -s $(readlink $i).gz $i.gz; rm $i; done
 
 mkdir -p $PKG/usr/doc/$PRGNAM-$VERSION 
 cp -a \
@@ -124,7 +124,6 @@ rm $PKG/etc/squid/squid.conf
 cat $CWD/squid.conf > $PKG/etc/squid/squid.conf.new
 
 mkdir -p $PKG/var/{cache,run}/squid
-rmdir $PKG/var/log/squid/logs
 chown $SQUIDUSER:$SQUIDGROUP $PKG/var/{cache,log,run}/squid
 
 ## Edit the config file to set the user and group to run as

network/squid/squid.info

@@ -1,10 +1,10 @@
 PRGNAM="squid"
-VERSION="3.0.STABLE24"
+VERSION="3.1.6"
 HOMEPAGE="http://www.squid-cache.org/"
-DOWNLOAD="http://www.squid-cache.org/Versions/v3/3.0/squid-3.0.STABLE24.tar.bz2"
-MD5SUM="325c8977b64397666bf538d54bb6f128"
+DOWNLOAD="http://www.squid-cache.org/Versions/v3/3.1/squid-3.1.6.tar.bz2"
+MD5SUM="e9e2e9a9b5a305ba717be93ebb85f245"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 MAINTAINER="David Somero"
 EMAIL="dsomero@hotmail.com"
-APPROVED="Erik Hanson"
+APPROVED="Michiel"