main/varnish: upgrade to 4.0.0

3 files changed, 24 insertions, 46 deletions

diff --git a/main/varnish/APKBUILD b/main/varnish/APKBUILD
index bfd126011..28f2ebbb7 100644
--- a/main/varnish/APKBUILD
+++ b/main/varnish/APKBUILD
@@ -2,15 +2,15 @@
 # Contributor: V.Krishn <vkrishn4@gmail.com>
 # Maintainer: Natanael Copa <ncopa@alpinelinux.org>
 pkgname=varnish
-pkgver=3.0.5
-pkgrel=1
+pkgver=4.0.0
+pkgrel=0
 pkgdesc="High-performance HTTP accelerator"
 url="http://www.varnish-cache.org/"
 arch="all"
 license="BSD"
 depends="gcc libc-dev"
 depends_dev=
-makedepends="$depends_dev pcre-dev ncurses-dev readline-dev"
+makedepends="$depends_dev pcre-dev ncurses-dev libedit-dev py-docutils"
 install="varnish.pre-install"
 subpackages="$pkgname-dev $pkgname-doc $pkgname-libs $pkgname-geoip"
 pkgusers="varnish"
@@ -20,7 +20,8 @@ source="http://repo.varnish-cache.org/source/varnish-$pkgver.tar.gz
 	varnishd.confd
 	varnishd.logrotate
 	maxminddb.vcl
-	varnish-3.0.3-pthread-uclibc.patch"
+	musl-mode_t.patch
+	"
 
 _builddir="$srcdir"/varnish-$pkgver
 prepare() {
@@ -31,11 +32,12 @@ prepare() {
 		*.patch) msg $i; patch -p1 -i "$srcdir"/$i || return 1;;
 		esac
 	done
+	update_config_sub
 }
 
 build() {
 	cd "$_builddir"
-	./configure \
+	CFLAGS="$CFLAGS -D_GNU_SOURCE" ./configure \
 		--build=$CBUILD \
 		--host=$CHOST \
 		--prefix=/usr \
@@ -79,21 +81,21 @@ geoip() {
 	install -m755 -D "$srcdir"/maxminddb.vcl "$subpkgdir"/usr/lib/varnish/plugins/maxminddb.vcl
 }
 
-md5sums="674d44775cc927aee4601edb37f60198  varnish-3.0.5.tar.gz
+md5sums="05af2deae29f37b166392a0237756250  varnish-4.0.0.tar.gz
 d470dd6f893c1848c2d3f08ccb63d0d7  varnishd.initd
 df8e6eb5591be4ab916ef4504b3ea05d  varnishd.confd
 a6cb8a43c9465699cf956dc992998225  varnishd.logrotate
 2cbaa46b9da9f78ecf4c906730f7c5e3  maxminddb.vcl
-8c5532869bea7f668e2ce5d4585359f8  varnish-3.0.3-pthread-uclibc.patch"
-sha256sums="302fd6afc771524ca3912f5d945ab197a55762385c012b2054df7d86bf7ae2b7  varnish-3.0.5.tar.gz
+54d12d231c505c95ae3ae09487b5dde4  musl-mode_t.patch"
+sha256sums="4bbf73656be11687cbb8c7d4a7315786081687664b40a8ccbe67b36f8c0b1c17  varnish-4.0.0.tar.gz
 1f6473f3493a1ce9952218c96614e246445af17059fe06503f6532d5f5d65e3e  varnishd.initd
 24a9938a1d410579afd86507d645b4a27c36c99b3e73d966cdef15bd7f3c74ed  varnishd.confd
 017173cb42bb60f853063b7fbc843120c547e501233ce2299e1066b5d81e4d5e  varnishd.logrotate
 fd6c810a6099b1b0c2eb572aec239e3f51debc52a6c32fce715f265d7b1a1f85  maxminddb.vcl
-3e39323ff4d741a9a0337e84eee7ce9f8b5419722a3b905f09ccf2486a9ff24f  varnish-3.0.3-pthread-uclibc.patch"
-sha512sums="0fe8a0f45ebe3b159fde811ac374ef8fb5be7712d8a61474778c57ddf4e7fb0404c7b28abeb614a16255a1c9ef0c780db44d03b1c8fbfee54adc49d92cbf733d  varnish-3.0.5.tar.gz
+f96b6dab0e68e169cffceb63776e312d8585bc2a46dfcc5fa2b1ec5e953ad624  musl-mode_t.patch"
+sha512sums="5eb3806f6c7c46438b6ebbe30c42f5a6afc53a9fa9e8f4b809c7d18b465712640950601be9873810a0f408865fba6ae9d18e46e4f22c89cc3a2e0c351753ac71  varnish-4.0.0.tar.gz
 595b017bf890eaf6ffb9a35eef04983a85a1d90ddbfca835b4a003a7e78e1cf38d9910048fca5bb6a518e3480d6f1e23d1c3be1c1a47e7aafeac9b864c08e7c5  varnishd.initd
 fd3d7e6fb8d0849533c0ad1ec0ba1d5221ac03bd2093052b72cd09f2276b16b888a145402507d18f4defd4ec4fd9b198ef5f87347d92e5fca43add30bb91956e  varnishd.confd
 8fb1cba86ede5eff28a494f6b1da1a651d66383cdeb63922104407f28903dea0c643155b6d7ac8353b8c63d480a6c5b43a70c7252bc51ee73317c33a1844c52c  varnishd.logrotate
 69f088819cff6d4441813be284f4117f232d08908515bd15d96bd5bb9d41ba7100657a52fd408d44c396d004366062ae22fbf08e2a983cd8023b554539ccf596  maxminddb.vcl
-c06cd005ba04725ec69a9b5cb138fe2487bbd0b0e0aa4c6a39314b6473b160874d0c8452fca466e4efa907a998752e65940288a65a33b88cc4f206f1180b68d8  varnish-3.0.3-pthread-uclibc.patch"
+8758bef9039a2cca23b7302668bd49f1ea07f54835512a8a9558bb9ed5de1c0fca53f2085ccd298fe0c6579fc81c3b583a85f4f6b25b6ad85f89bf3be04afb70  musl-mode_t.patch"
diff --git a/main/varnish/musl-mode_t.patch b/main/varnish/musl-mode_t.patch
new file mode 100644
index 000000000..d69ca929e
--- /dev/null
+++ b/main/varnish/musl-mode_t.patch
@@ -0,0 +1,11 @@
+--- ./include/vpf.h.orig
++++ ./include/vpf.h
+@@ -30,6 +30,8 @@
+ #ifndef VPF_H_INCLUDED
+ #define VPF_H_INCLUDED
+ 
++#include <sys/stat.h>
++
+ struct vpf_fh;
+ 
+ struct vpf_fh *VPF_Open(const char *path, mode_t mode, pid_t *pidptr);
diff --git a/main/varnish/varnish-3.0.3-pthread-uclibc.patch b/main/varnish/varnish-3.0.3-pthread-uclibc.patch
deleted file mode 100644
index 93f3da3f8..000000000
--- a/main/varnish/varnish-3.0.3-pthread-uclibc.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-Refine header check in bin/varnishd/mgt/mgt.h, mgt_main.c for uClibc
-
-Because of the difference in how uClibc and glibc stack their header
-files, stdio.h indirectly brings in PTHREAD_CANCELED from pthread.h
-on a uClibc system, whereas it does not on a glibc system.  This happens
-in mgt.h and mgt_main.c.  This patch refines the check in those files
-to take this fact into consideration.
-
-X-Gentoo-Bug-URL: https://bugs.gentoo.org/444294
----
-
-diff --git a/bin/varnishd/mgt.h b/bin/varnishd/mgt.h
-index 905fbcc..5d3ab09 100644
---- a/bin/varnishd/mgt.h
-+++ b/bin/varnishd/mgt.h
-@@ -126,6 +126,6 @@ extern unsigned mgt_vcc_unsafe_path;
- 		syslog(pri, fmt, __VA_ARGS__);		\
- 	} while (0)
- 
--#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
-+#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT)
- #error "Keep pthreads out of in manager process"
- #endif
-diff --git a/bin/varnishd/varnishd.c b/bin/varnishd/varnishd.c
-index 1b7f1e3..dce42d9 100644
---- a/bin/varnishd/varnishd.c
-+++ b/bin/varnishd/varnishd.c
-@@ -656,6 +656,6 @@ main(int argc, char * const *argv)
- 	exit(exit_status);
- }
- 
--#if defined(PTHREAD_CANCELED) || defined(PTHREAD_MUTEX_DEFAULT)
-+#if (defined(PTHREAD_CANCELED) && !defined(__UCLIBC__)) || defined(PTHREAD_MUTEX_DEFAULT)
- #error "Keep pthreads out of in manager process"
- #endif