4 files changed, 29 insertions, 15 deletions
diff --git a/network/varnish/README b/network/varnish/README
index d8c1194ce9..4d742ff527 100644
--- a/network/varnish/README
+++ b/network/varnish/README
@@ -4,5 +4,3 @@ HTTP and configure it to cache the contents.
 
 Varnish is free software licensed under a two-clause BSD licence, also
 known as the FreeBSD licence.  The project was initiated in 2005.
-
-Homepage: https://www.varnish-cache.org/
diff --git a/network/varnish/rc.varnishd b/network/varnish/rc.varnishd
index b6354687f7..b8e0d16c5a 100644
--- a/network/varnish/rc.varnishd
+++ b/network/varnish/rc.varnishd
@@ -33,11 +33,13 @@ VARNISH_OPTS="-f $CONF \
               -T $ADMIN_IP:${ADMIN_PORT} \
               -a $HTTP_IP:${HTTP_PORT} \
               -t $DEFAULT_TTL \
-              -w${MIN_THREADS},${MAX_THREADS},${THREAD_TIMEOUT} \
               -P $PID"
 
-VARNISH_PARAMS="-p http_headers=$HTTP_HEADERS \
-               -p connect_timeout=$CONNECT_TIMEOUT"
+VARNISH_PARAMS="-p http_max_hdr=$HTTP_HEADERS \
+              -p thread_pool_min=${MIN_THREADS} \
+              -p thread_pool_max=${MAX_THREADS} \
+              -p thread_pool_timeout=${THREAD_TIMEOUT} \
+              -p connect_timeout=$CONNECT_TIMEOUT"
 
 varnish_start() {
 	if [ -e $PID ];then
@@ -51,7 +53,7 @@ varnish_start() {
 	fi
 	ulimit -n $FILE_DESCRIPTORS
 	echo "starting varnish..."
-	$BIN $VARNISH_OPTS $VARNISH_PARAMS
+  $BIN $VARNISH_OPTS $VARNISH_PARAMS
 }
 varnish_stop() {
 	echo "stopping varnish..."
diff --git a/network/varnish/varnish.SlackBuild b/network/varnish/varnish.SlackBuild
index 269f74dff2..2b76da61da 100644
--- a/network/varnish/varnish.SlackBuild
+++ b/network/varnish/varnish.SlackBuild
@@ -1,14 +1,17 @@
-#!/bin/sh
+#!/bin/bash
 
 # Slackware build script for varnish-cache
 
 # Written by Matt Schurenko <matt.schurenko@gmail.com>
 # Updated by Emmanuel N. Millan
 
+cd $(dirname $0) ; CWD=$(pwd)
+
 PRGNAM=varnish
-VERSION=${VERSION:-6.5.0}
+VERSION=${VERSION:-7.5.0}
 BUILD=${BUILD:-1}
 TAG=${TAG:-_SBo}
+PKGTYPE=${PKGTYPE:-tgz}
 
 if [ -z "$ARCH" ]; then
   case "$( uname -m )" in
@@ -18,7 +21,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}
@@ -45,6 +55,8 @@ cd $TMP
 rm -rf $PRGNAM-$VERSION
 tar xvf $CWD/$PRGNAM-$VERSION.tgz
 cd $PRGNAM-$VERSION
+#patch -p1 -i $CWD/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch
+#patch -p1 -i $CWD/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch
 chown -R root:root .
 find -L . \
  \( -perm 777 -o -perm 775 -o -perm 750 -o -perm 711 -o -perm 555 \
@@ -68,6 +80,8 @@ CXXFLAGS="$SLKCFLAGS" \
 make
 make install DESTDIR=$PKG
 
+rm -f $PKG/{,usr/}lib${LIBDIRSUFFIX}/*.la
+
 find $PKG -print0 | xargs -0 file | grep -e "executable" -e "shared object" | grep ELF \
   | cut -f 1 -d : | xargs strip --strip-unneeded 2> /dev/null || true
 
@@ -83,9 +97,9 @@ cat $CWD/slack-desc > $PKG/install/slack-desc
 cat $CWD/doinst.sh > $PKG/install/doinst.sh
 
 mkdir -p $PKG/etc/varnish/
-cp $PKG/usr/doc/$PRGNAM-$VERSION/example.vcl $PKG/etc/varnish/default.vcl.new
+cat $PKG/usr/doc/$PRGNAM-$VERSION/example.vcl > $PKG/etc/varnish/default.vcl.new
 mkdir -p $PKG/etc/rc.d/
-cp -p $CWD/rc.varnishd $PKG/etc/rc.d/rc.varnishd.new
+cat $CWD/rc.varnishd > $PKG/etc/rc.d/rc.varnishd.new
 
 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/varnish/varnish.info b/network/varnish/varnish.info
index 6c4841b69b..92c8b03f7c 100644
--- a/network/varnish/varnish.info
+++ b/network/varnish/varnish.info
@@ -1,8 +1,8 @@
 PRGNAM="varnish"
-VERSION="6.5.0"
+VERSION="7.5.0"
 HOMEPAGE="https://www.varnish-cache.org/"
-DOWNLOAD="https://varnish-cache.org/_downloads/varnish-6.5.0.tgz"
-MD5SUM="9cf1b50bee82119cc2cf315277534d35"
+DOWNLOAD="https://varnish-cache.org/downloads/varnish-7.5.0.tgz"
+MD5SUM="160a9a1f5cb8bae594490567ee39bd4b"
 DOWNLOAD_x86_64=""
 MD5SUM_x86_64=""
 REQUIRES="Sphinx"