main/varnish: upgrade to 6.0.2

fixes #9773

2 files changed, 4 insertions, 44 deletions

diff --git a/main/varnish/APKBUILD b/main/varnish/APKBUILD
index 8f2d1fa494..5c04e82f95 100644
--- a/main/varnish/APKBUILD
+++ b/main/varnish/APKBUILD
@@ -2,8 +2,8 @@
 # Contributor: V.Krishn <vkrishn4@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=varnish
-pkgver=6.0.0
-pkgrel=1
+pkgver=6.0.2
+pkgrel=0
 pkgdesc="High-performance HTTP accelerator"
 url="http://www.varnish-cache.org/"
 arch="all"
@@ -11,7 +11,7 @@ license="BSD"
 options="!check" # tests fail
 depends="gcc libc-dev libgcc"
 depends_dev=
-makedepends="$depends_dev pcre-dev ncurses-dev libedit-dev py-docutils
+makedepends="$depends_dev pcre-dev ncurses-dev libedit-dev py-docutils py-sphinx
         linux-headers libexecinfo-dev"
 install="$pkgname.pre-install"
 subpackages="$pkgname-dbg $pkgname-dev $pkgname-doc $pkgname-libs $pkgname-geoip::noarch"
@@ -20,7 +20,6 @@ pkggroups="varnish"
 source="http://varnish-cache.org/_downloads/$pkgname-$pkgver.tgz
         musl-include-vpf.patch
         musl-include-vsb.patch
-        musl-fix-stack-overflow.patch
 
         varnishd.initd
         varnishd.confd
@@ -100,10 +99,9 @@ geoip() {
                 "$subpkgdir"/usr/lib/varnish/plugins/maxminddb.vcl
 }
 
-sha512sums="39bae462fe40bda9b7c93114ab8256c838a7d67f1a9f7397c37ad090163a33232676120eb7609d0512684a563d8e02c1c2ff5e1b9da0ddedef2250db51c3cc79  varnish-6.0.0.tgz
+sha512sums="4bdd09f640805d061e19c7579b6f6fae908d7d9a21f268d239e38fb815c37f739068f92957ae827dfb0719e328652fb8de778374e757fa87002ceb2af6a21bd5  varnish-6.0.2.tgz
 2123668169b055f2d88f9b5b8e0877ca8b3cbfcd61e03d91fd7d0513b3267e4ef01a4d858cc6a3298cca0a49aaea2f92ff4fd9c0baf52a6c67b452a53f7e54d0  musl-include-vpf.patch
 c51c8964880990c2b01807b2a38d886b146736a918bda9ea2e032c50085bf6745cab3cccb4ee4c561ab936a8b7cfb278cfcb758543ea6c605c15b8973c9f10ce  musl-include-vsb.patch
-659d2593ecb98d1abf5cf08a0de7791dab484fc33dac518e154431c0cdbb11c5ff3385465f98fc0a14c3599524d3c7d5211b2ad5bfdeb1d7b83b8e7c625664f2  musl-fix-stack-overflow.patch
 5ac7867e85cbd721f903c524ed4b524423d9dada4acfeefb0e543214a208828df5cc4efe2f012991bea6b38c2b223c24b17d3890ec4ed2c57d2b441b8e5a6900  varnishd.initd
 98c8901e53f3c6adb908b9eb01fd441ea53f3c54d4a79aecb1fb1eddfa2fc93de3d0de403a4464a9baff15873b3a20623837e3a37cb225e924a329e32b9e37d6  varnishd.confd
 c67a7898f40849989edcbe74e1a418e196f48e178ca30126bc13db226e4f4c2c2ba74d9d0650ef68ed88732917fc06b80ef1f62c2d9d2c14a89f26fd25aed0f7  varnishlog.initd
diff --git a/main/varnish/musl-fix-stack-overflow.patch b/main/varnish/musl-fix-stack-overflow.patch
deleted file mode 100644
index aa83336ad4..0000000000
--- a/main/varnish/musl-fix-stack-overflow.patch
+++ /dev/null
@@ -1,38 +0,0 @@
-diff --git a/bin/varnishd/waiter/cache_waiter_epoll.c b/bin/varnishd/waiter/cache_waiter_epoll.c
-index 9e2e2a3..3b0105a 100644
---- a/bin/varnishd/waiter/cache_waiter_epoll.c
-+++ b/bin/varnishd/waiter/cache_waiter_epoll.c
-@@ -38,6 +38,7 @@
- #include <sys/epoll.h>
- 
- #include <errno.h>
-+#include <stdlib.h>
- 
- #include "cache/cache_varnishd.h"
- 
-@@ -69,7 +70,7 @@ struct vwe {
- static void *
- vwe_thread(void *priv)
- {
--       struct epoll_event ev[NEEV], *ep;
-+       struct epoll_event *ev, *ep;
-        struct waited *wp;
-        struct waiter *w;
-        double now, then;
-@@ -82,6 +83,8 @@ vwe_thread(void *priv)
-        CHECK_OBJ_NOTNULL(w, WAITER_MAGIC);
-        THR_SetName("cache-epoll");
-        THR_Init();
-+       ev = malloc(sizeof(struct epoll_event) * NEEV);
-+       AN(ev);
- 
-        now = VTIM_real();
-        while (1) {
-@@ -146,6 +149,7 @@ vwe_thread(void *priv)
-                if (vwe->nwaited == 0 && vwe->die)
-                        break;
-        }
-+       free(ev);
-        closefd(&vwe->pipe[0]);
-        closefd(&vwe->pipe[1]);
-        closefd(&vwe->epfd);