5 files changed, 56 insertions, 30 deletions
diff --git a/network/squid/README b/network/squid/README
index 7756f08719..9c36fcc1b9 100644
--- a/network/squid/README
+++ b/network/squid/README
@@ -1,17 +1,13 @@
 Squid is a high-performance proxy caching server for web clients,
-supporting FTP, gopher, and HTTP data objects.  Unlike traditional caching
-software, squid handles all requests in a single, non-blocking, I/O-driven
-process.
+supporting FTP, gopher, and HTTP data objects. Unlike traditional
+caching software, squid handles all requests in a single,
+non-blocking, I/O-driven process.
 
-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.
+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-*/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.
-
-To build squid with ICAP client support, specify the option "ICAP=yes",
-for example:
-
-  ICAP=yes ./squid.SlackBuild
+Note that the default files in /etc/squid and /etc/logrotate.d may
+change between releases, so be sure to merge the changes into place.
diff --git a/network/squid/README.SBo b/network/squid/README.SBo
index 5dcc214a06..5a93ccda45 100644
--- a/network/squid/README.SBo
+++ b/network/squid/README.SBo
@@ -10,7 +10,7 @@ executable and add the following to /etc/rc.d/rc.local:
 
 ==============================================================================
 
-Uncomment and edit the following lines in /etc/squid.conf:
+Uncomment and edit the following lines in /etc/squid/squid.conf:
 
 http_port <port> <option>
 
diff --git a/network/squid/doinst.sh b/network/squid/doinst.sh
index 664a873749..b79c23655f 100644
--- a/network/squid/doinst.sh
+++ b/network/squid/doinst.sh
@@ -26,5 +26,6 @@ preserve_perms etc/rc.d/rc.squid.new
 preserve_perms etc/squid/mime.conf.new
 preserve_perms etc/squid/squid.conf.new
 preserve_perms etc/squid/cachemgr.conf.new
+preserve_perms etc/squid/errorpage.css.new
 preserve_perms etc/logrotate.d/squid.new
 
diff --git a/network/squid/squid.SlackBuild b/network/squid/squid.SlackBuild
index 2f8ef8fce1..d59cbd5cd7 100644
--- a/network/squid/squid.SlackBuild
+++ b/network/squid/squid.SlackBuild
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for squid
 # http://www.squid-cache.org/
@@ -23,10 +23,13 @@
 # OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF
 # ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=squid
-VERSION=${VERSION:-4.13}
+VERSION=${VERSION:-6.9}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -36,7 +39,14 @@ if [ -z "$ARCH" ]; then
   esac
 fi
 
-CWD=$(pwd)
+# If the variable PRINT_PACKAGE_NAME is set, then this script will report what
+# the name of the created package would be, and then exit. This information
+# could be useful to other scripts.
+if [ ! -z "${PRINT_PACKAGE_NAME}" ]; then
+  echo "$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE"
+  exit 0
+fi
+
 TMP=${TMP:-/tmp/SBo}
 PKG=$TMP/package-$PRGNAM
 OUTPUT=${OUTPUT:-/tmp}
@@ -73,11 +83,6 @@ find -L . \
  \( -perm 666 -o -perm 664 -o -perm 640 -o -perm 600 -o -perm 444 \
   -o -perm 440 -o -perm 400 \) -exec chmod 644 {} \;
 
-OPT_ICAP=""
-if [ "${ICAP:-no}" = "yes" ]; then
-  OPT_ICAP="--enable-icap-client"
-fi
-
 # last option is needed on current
 CFLAGS="$SLKCFLAGS" \
 CXXFLAGS="$SLKCFLAGS" \
@@ -93,11 +98,34 @@ CXXFLAGS="$SLKCFLAGS" \
   --enable-snmp \
   --enable-auth \
   --enable-auth-basic \
+  --enable-auth-ntlm \
+  --enable-auth-digest \
+  --enable-auth-negotiate \
+  --enable-removal-policies="lru,heap" \
+  --enable-storeio="aufs,ufs,diskd,rock" \
+  --enable-delay-pools \
+  --enable-arp-acl \
+  --with-openssl \
+  --enable-snmp \
   --enable-linux-netfilter \
+  --enable-ident-lookups \
+  --enable-useragent-log \
+  --enable-cache-digests \
+  --enable-referer-log \
+  --enable-arp-acl \
+  --enable-htcp \
+  --enable-carp \
+  --enable-epoll \
+  --with-large-files \
+  --enable-arp-acl \
+  --with-default-user=$SQUIDUSER \
   --enable-async-io \
-  $OPT_ICAP \
-  --build=$ARCH-slackware-linux \
-  --disable-strict-error-checking
+  --enable-truncate \
+  --enable-icap-client \
+  --enable-ssl-crtd \
+  --disable-arch-native \
+  --disable-strict-error-checking \
+  --enable-wccpv2
 
 make all
 make install DESTDIR=$PKG
@@ -125,7 +153,8 @@ sed -e "s,@SQUIDUSER@,$SQUIDUSER," -e "s,@SQUIDGROUP@,$SQUIDGROUP," $CWD/squid.l
   > $PKG/etc/logrotate.d/squid.new
 
 ( cd $PKG/etc/squid
-  for i in mime cachemgr squid ; do mv $i.conf $i.conf.new ; done )
+  for i in mime cachemgr squid ; do mv $i.conf $i.conf.new ; done
+  mv errorpage.css errorpage.css.new )
 cp src/squid.conf.documented $PKG/etc/squid/squid.conf.documented
 
 mkdir -p $PKG/var/{cache,lib,run}/squid
@@ -142,4 +171,4 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 cd $PKG
-/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.${PKGTYPE:-tgz}
+/sbin/makepkg -l y -c n $OUTPUT/$PRGNAM-$VERSION-$ARCH-$BUILD$TAG.$PKGTYPE
diff --git a/network/squid/squid.info b/network/squid/squid.info
index b8cace6555..3e3b86fd47 100644
--- a/network/squid/squid.info
+++ b/network/squid/squid.info
@@ -1,8 +1,8 @@
 PRGNAM="squid"
-VERSION="4.13"
+VERSION="6.9"
 HOMEPAGE="http://www.squid-cache.org/"
-DOWNLOAD="http://www.squid-cache.org/Versions/v4/squid-4.13.tar.xz"
-MD5SUM="492e54afc15821141ff1d1d9903854d6"
+DOWNLOAD="http://www.squid-cache.org/Versions/v6/squid-6.9.tar.xz"
+MD5SUM="4888e9dc75c0daa0ed526b34c055cb67"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES=""