diff options
Diffstat (limited to 'network/varnish')
| -rw-r--r-- | network/varnish/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch | 23 | ||||
| -rw-r--r-- | network/varnish/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch | 33 | ||||
| -rw-r--r-- | network/varnish/rc.varnishd | 10 | ||||
| -rw-r--r-- | network/varnish/varnish.SlackBuild | 8 | ||||
| -rw-r--r-- | network/varnish/varnish.info | 6 |
5 files changed, 13 insertions, 67 deletions
diff --git a/network/varnish/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch b/network/varnish/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch deleted file mode 100644 index a1cc4e65dd..0000000000 --- a/network/varnish/0051cbe3b9cc24586e0ad99cff72041c6df944b8.patch +++ /dev/null @@ -1,23 +0,0 @@ -From 0051cbe3b9cc24586e0ad99cff72041c6df944b8 Mon Sep 17 00:00:00 2001 -From: Poul-Henning Kamp <phk@FreeBSD.org> -Date: Thu, 15 Oct 2020 07:35:04 +0000 -Subject: [PATCH] Import from VTest: Don't use explicit buffer size with no - buffer - ---- - bin/varnishtest/vtc_main.c | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c -index 1deea4ab78..3c3887450c 100644 ---- a/bin/varnishtest/vtc_main.c -+++ b/bin/varnishtest/vtc_main.c -@@ -698,7 +698,7 @@ main(int argc, char * const *argv) - else - tmppath = strdup("/tmp"); - -- cwd = getcwd(NULL, PATH_MAX); -+ cwd = getcwd(NULL, 0); - extmacro_def("pwd", "%s", cwd); - - vmod_path = NULL; diff --git a/network/varnish/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch b/network/varnish/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch deleted file mode 100644 index fabb9aacb6..0000000000 --- a/network/varnish/f04d7df6e6d5b350740e01d24749a3930390b7a0.patch +++ /dev/null @@ -1,33 +0,0 @@ -From f04d7df6e6d5b350740e01d24749a3930390b7a0 Mon Sep 17 00:00:00 2001 -From: Nils Goroll <nils.goroll@uplex.de> -Date: Thu, 15 Oct 2020 12:01:35 +0200 -Subject: [PATCH] vtest: put cwd on the stack - -0051cbe3b9cc24586e0ad99cff72041c6df944b8 did not work on -solaris-descendents, the man page clearly states that the size argument -also determines the buffer to be malloc()ed for a NULL buffer argument. ---- - bin/varnishtest/vtc_main.c | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - -diff --git a/bin/varnishtest/vtc_main.c b/bin/varnishtest/vtc_main.c -index 3c3887450c..1b322f8dea 100644 ---- a/bin/varnishtest/vtc_main.c -+++ b/bin/varnishtest/vtc_main.c -@@ -686,6 +686,7 @@ main(int argc, char * const *argv) - int use_cleaner = 0; - uintmax_t bufsiz; - const char *p; -+ char buf[PATH_MAX]; - - argv0 = strrchr(argv[0], '/'); - if (argv0 == NULL) -@@ -698,7 +699,7 @@ main(int argc, char * const *argv) - else - tmppath = strdup("/tmp"); - -- cwd = getcwd(NULL, 0); -+ cwd = getcwd(buf, sizeof buf); - extmacro_def("pwd", "%s", cwd); - - vmod_path = NULL; 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 cad34e3806..2b76da61da 100644 --- a/network/varnish/varnish.SlackBuild +++ b/network/varnish/varnish.SlackBuild @@ -8,8 +8,8 @@ cd $(dirname $0) ; CWD=$(pwd) PRGNAM=varnish -VERSION=${VERSION:-6.5.1} -BUILD=${BUILD:-2} +VERSION=${VERSION:-7.5.0} +BUILD=${BUILD:-1} TAG=${TAG:-_SBo} PKGTYPE=${PKGTYPE:-tgz} @@ -55,8 +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 +#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 \ diff --git a/network/varnish/varnish.info b/network/varnish/varnish.info index 17e7902b96..92c8b03f7c 100644 --- a/network/varnish/varnish.info +++ b/network/varnish/varnish.info @@ -1,8 +1,8 @@ PRGNAM="varnish" -VERSION="6.5.1" +VERSION="7.5.0" HOMEPAGE="https://www.varnish-cache.org/" -DOWNLOAD="https://varnish-cache.org/_downloads/varnish-6.5.1.tgz" -MD5SUM="09304038cb3bb744a7c1742c8de848a1" +DOWNLOAD="https://varnish-cache.org/downloads/varnish-7.5.0.tgz" +MD5SUM="160a9a1f5cb8bae594490567ee39bd4b" DOWNLOAD_x86_64="" MD5SUM_x86_64="" REQUIRES="Sphinx" |