Updated to 2.1.5, provided by Matthew Sporleder in PR 44520.

Summary of changes from 2.1.4 to 2.1.5

  * Two bugs relating to Content-Length and possible duplication of Content-Length headers have been resolved.
  * Support for bourne-like "here"-documents in the command line interface, allowing <<__EOF__ and similar schemes.
  * Fixed an issue with re-using connections after Chunked-Encoding.
  * Fix a bug that would inflate the "lost header" count and could cause problems during heavy traffic over a single connection, typically seen by load testing.
  * Use the time of cache-insertion for "If-Modified-Since" requests if a "Last-Modified" header isn't provided by the backend.
  * Merge multi-line Vary and Cache-Control headers from clients, which Google Chromium seem to split up.
  * Various build fixes and documentation improvements
  * Various bug fixes.

6 files changed, 23 insertions, 38 deletions

diff --git a/www/varnish/Makefile b/www/varnish/Makefile
index 244621d9443..7f6ea39b6eb 100644
--- a/www/varnish/Makefile
+++ b/www/varnish/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.8 2010/12/06 14:25:44 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2011/04/01 18:59:41 zafer Exp $
 #
 
-DISTNAME=	varnish-2.1.4
+DISTNAME=	varnish-2.1.5
 CATEGORIES=	www
-MASTER_SITES=	http://www.varnish-software.com/sites/default/files/
+MASTER_SITES=	http://repo.varnish-cache.org/source/
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://varnish-cache.org/
@@ -27,6 +27,7 @@ STATEDIR=		${VARBASE}/db
 VRNDIR=			${STATEDIR}/${PKGBASE}
 
 CONFIGURE_ARGS+=	--localstatedir=${STATEDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 OWN_DIRS+=		${VRNDIR}
 OWN_DIRS_PERMS+=	${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
 
diff --git a/www/varnish/PLIST b/www/varnish/PLIST
index 342c7ed652f..e213ddd47e9 100644
--- a/www/varnish/PLIST
+++ b/www/varnish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2010/12/06 14:25:44 wiz Exp $
+@comment $NetBSD: PLIST,v 1.6 2011/04/01 18:59:41 zafer Exp $
 bin/varnishadm
 bin/varnishhist
 bin/varnishlog
@@ -7,7 +7,6 @@ bin/varnishreplay
 bin/varnishstat
 bin/varnishtest
 bin/varnishtop
-bin/varnishtest
 bin/varnishsizes
 include/varnish/shmlog.h
 include/varnish/shmlog_tags.h
@@ -25,11 +24,10 @@ man/man1/varnishhist.1
 man/man1/varnishlog.1
 man/man1/varnishncsa.1
 man/man1/varnishreplay.1
+man/man1/varnishsizes.1
 man/man1/varnishstat.1
 man/man1/varnishtest.1
 man/man1/varnishtop.1
-man/man1/varnishadm.1
-man/man1/varnishsizes.1
 man/man7/vcl.7
 sbin/varnishd
 share/examples/varnish/default.vcl
diff --git a/www/varnish/distinfo b/www/varnish/distinfo
index fce7e2827b4..9fd2ff51463 100644
--- a/www/varnish/distinfo
+++ b/www/varnish/distinfo
@@ -1,8 +1,7 @@
-$NetBSD: distinfo,v 1.6 2010/12/06 14:25:44 wiz Exp $
+$NetBSD: distinfo,v 1.7 2011/04/01 18:59:41 zafer Exp $
 
-SHA1 (varnish-2.1.4.tar.gz) = 3e3734f7795880a90a0514e9fb40d76fd170221b
-RMD160 (varnish-2.1.4.tar.gz) = f5d9bea792f7d2f9ca8dec8bc96c3ac88f0a45a9
-Size (varnish-2.1.4.tar.gz) = 1539241 bytes
-SHA1 (patch-aa) = c0216a4b4c73b43567a6402a14a64c7597d5c4b9
-SHA1 (patch-ab) = 5908f0fbeed7ba7261f67088e7bb9f6423d18e26
-SHA1 (patch-ac) = 796dcbcfaf546e7e7077e59c84f97a38f2ff1edf
+SHA1 (varnish-2.1.5.tar.gz) = 5c413ee7c4267d9fd4713fbff059d1be5fbba60f
+RMD160 (varnish-2.1.5.tar.gz) = 4619d4be920504388325f06afdbea9b40f5a806a
+Size (varnish-2.1.5.tar.gz) = 1530856 bytes
+SHA1 (patch-aa) = d0bce82fc6bc0bb7e078f61461a21172bb658d4a
+SHA1 (patch-ab) = 30a64ce77354df3f2e0e830f60f4c6d98ef3099c
diff --git a/www/varnish/patches/patch-aa b/www/varnish/patches/patch-aa
index a4fa97d4314..51fc14ebd53 100644
--- a/www/varnish/patches/patch-aa
+++ b/www/varnish/patches/patch-aa
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.3 2009/04/11 19:03:53 spz Exp $
+$NetBSD: patch-aa,v 1.4 2011/04/01 18:59:42 zafer Exp $
 
---- configure.ac.orig	2009-04-01 13:35:15.000000000 +0000
-+++ configure.ac
-@@ -55,6 +55,7 @@ AM_CONDITIONAL([HAVE_CURSES], [test x$ha
+--- configure.ac.orig	2011-01-25 06:48:58.000000000 -0500
++++ configure.ac	2011-02-04 18:38:25.000000000 -0500
+@@ -66,6 +66,7 @@
  save_LIBS="${LIBS}"
  LIBS=""
  AC_SEARCH_LIBS(pthread_create, [thr pthread c_r])
@@ -10,7 +10,7 @@ $NetBSD: patch-aa,v 1.3 2009/04/11 19:03:53 spz Exp $
  PTHREAD_LIBS="${LIBS}"
  LIBS="${save_LIBS}"
  AC_SUBST(PTHREAD_LIBS)
-@@ -195,7 +196,7 @@ AC_ARG_ENABLE(kqueue,
+@@ -257,7 +258,7 @@
  
  if test "$enable_kqueue" = yes; then
  	case $target in
diff --git a/www/varnish/patches/patch-ab b/www/varnish/patches/patch-ab
index 8ee7c4e16a8..ca2d2a8b983 100644
--- a/www/varnish/patches/patch-ab
+++ b/www/varnish/patches/patch-ab
@@ -1,11 +1,11 @@
-$NetBSD: patch-ab,v 1.3 2010/03/17 17:45:44 fhajny Exp $
+$NetBSD: patch-ab,v 1.4 2011/04/01 18:59:42 zafer Exp $
 
---- etc/Makefile.in.orig	2010-03-17 17:28:28.257760000 +0000
+--- etc/Makefile.in.orig	2011-02-05 13:57:36.000000000 +0000
 +++ etc/Makefile.in
-@@ -202,7 +202,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
+@@ -197,7 +197,7 @@ target_alias = @target_alias@
+ target_cpu = @target_cpu@
+ target_os = @target_os@
+ target_vendor = @target_vendor@
 -varnishconfdir = @varnishconfdir@
 +varnishconfdir = @prefix@/share/examples/@PACKAGE@
  EXTRA_DIST = zope-plone.vcl
diff --git a/www/varnish/patches/patch-ac b/www/varnish/patches/patch-ac
deleted file mode 100644
index fb7da461837..00000000000
--- a/www/varnish/patches/patch-ac
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-ac,v 1.3 2010/12/06 14:25:44 wiz Exp $
-
---- configure.ac.orig	2010-11-28 15:22:39.000000000 -0500
-+++ configure.ac
-@@ -30,7 +30,7 @@
-    AC_MSG_WARN([xsltproc not found – not building documentation])
- fi
- AM_CONDITIONAL(HAVE_XSLTPROC,[test "x$XSLTPROC" != "xno"])
--AC_CHECK_PROGS(RST2MAN, [rst2man], "no")
-+AC_CHECK_PROGS(RST2MAN, [rst2man rst2man.py], "no")
- if test "x$RST2MAN" = "xno"; then
-    AC_MSG_WARN([rst2man not found – not building man pages])
- fi