Mon Dec 6 14:25:45 2010 UTC ()
Update to 2.1.4, provided by Matthew Sporleder in PR 44165.
Includes new startup scripts.

Summary of changes from 2.1.3 to 2.1.4

    * A bug in the binary heap layout caused inflated object counts, this has been fixed.
    * Much more comprehensive documentation.
    * A DNS director that uses DNS lookups for choosing which backend to route requests to has been added.
    * The client director now uses the variable client.identity for choosing which backend to send a given request to.
    * String representation of now, making it easier to add Expires headers
    * Portability fixes for Solaris.
    * Various bug fixes.

Summary of changes from 2.1.2 to 2.1.3

    * The scalability of critbit, the default hashing method, has been improved.
    * A bug in varnishd would in some cases confuse varnishncsa leading to lost or wrong log lines.
    * Some bugs in the handling of Range requests has been fixed. This only matters if you enable Range support.
    * Add 束log損 command to VCL which will log to the Varnish log.

Summary of changes from 2.1.1 to 2.1.2

    * When adding Range support in 2.1.1 an error was introduced. Garbage was appended to some objects. This affected some load balancers - but clients seemed not to be affected.

Summary of changes from 2.1.0 to 2.1.1

    * Experimental support for the Range header, must be enabled with the http_range_support parameter.
    * A bug in workspace rollback prevented ESI from working correctly in all situations. This is now fixed.
    * A race condition and a deadlock in the critbit hasher have been fixed.
    * HEAD requests are no longer converted to GET requests for pass and pipe.
    * Support for completely obliterating objects including all variants (束nuke損). See http://varnish-cache.org/changeset/4668 for details

Summary of changes from 2.0.6 to 2.1.0

Varnish 2.1.0 has just been released. It contains lots of changes relative to 2.0.6, the most important ones being:

    * Experimental support for persistent cache
    * The regular expression engine is now PCRE
    * Saint mode, where we can serve a cached object if the backend is down or otherwise faulty.
    * A more scalable hashing method called critbit
    * Increased scalability, removing a limitation of maximum 64k connections
    * obj_workspace is removed, this is now scaled automatically
    * Hashing and client IP based directors

Note: The release has some syntaxchanges in VCL, please read the full changelog


(wiz)
diff -r1.7 -r1.8 pkgsrc/www/varnish/Makefile
diff -r1.4 -r1.5 pkgsrc/www/varnish/PLIST
diff -r1.5 -r1.6 pkgsrc/www/varnish/distinfo
diff -r0 -r1.1 pkgsrc/www/varnish/files/varnishd.sh
diff -r0 -r1.1 pkgsrc/www/varnish/files/varnishlog.sh
diff -r0 -r1.1 pkgsrc/www/varnish/files/varnishncsa.sh
diff -r0 -r1.3 pkgsrc/www/varnish/patches/patch-ac

cvs diff -r1.7 -r1.8 pkgsrc/www/varnish/Makefile (expand / switch to unified diff)

--- pkgsrc/www/varnish/Makefile 2010/03/17 17:45:44 1.7
+++ pkgsrc/www/varnish/Makefile 2010/12/06 14:25:44 1.8
@@ -1,58 +1,57 @@ @@ -1,58 +1,57 @@
1# $NetBSD: Makefile,v 1.7 2010/03/17 17:45:44 fhajny Exp $ 1# $NetBSD: Makefile,v 1.8 2010/12/06 14:25:44 wiz Exp $
2# 2#
3 3
4DISTNAME= varnish-2.0.6 4DISTNAME= varnish-2.1.4
5PKGREVISION= 1 
6CATEGORIES= www 5CATEGORIES= www
7MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=varnish/} 6MASTER_SITES= http://www.varnish-software.com/sites/default/files/
8 7
9MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
10HOMEPAGE= http://varnish-cache.org/ 9HOMEPAGE= http://varnish-cache.org/
11COMMENT= High-performace HTTP accelerator 10COMMENT= High-performace HTTP accelerator
12LICENSE= modified-bsd 11LICENSE= modified-bsd
13 12
14PKG_DESTDIR_SUPPORT= user-destdir 13PKG_DESTDIR_SUPPORT= user-destdir
15 14
16GNU_CONFIGURE= yes 15GNU_CONFIGURE= yes
17USE_LIBTOOL= yes 16USE_LIBTOOL= yes
18USE_TOOLS+= autoconf 17USE_TOOLS+= autoconf pkg-config gmake
19BUILD_DEFS+= VARBASE 18BUILD_DEFS+= VARBASE
20 19
21EGDIR= ${PREFIX}/share/examples/varnish 20EGDIR= ${PREFIX}/share/examples/varnish
22PKG_SYSCONFSUBDIR= varnish 21PKG_SYSCONFSUBDIR= varnish
23CONF_FILES= ${EGDIR}/default.vcl ${PKG_SYSCONFDIR}/default.vcl 22CONF_FILES= ${EGDIR}/default.vcl ${PKG_SYSCONFDIR}/default.vcl
24 23
25VRNUSER?= varnish 24VRNUSER?= varnish
26VRNGROUP?= ${VRNUSER} 25VRNGROUP?= ${VRNUSER}
27STATEDIR= ${VARBASE}/db 26STATEDIR= ${VARBASE}/db
28VRNDIR= ${STATEDIR}/${PKGBASE} 27VRNDIR= ${STATEDIR}/${PKGBASE}
29 28
30CONFIGURE_ARGS+= --localstatedir=${STATEDIR} 29CONFIGURE_ARGS+= --localstatedir=${STATEDIR}
31OWN_DIRS+= ${VRNDIR} 30OWN_DIRS+= ${VRNDIR}
32OWN_DIRS_PERMS+= ${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770 31OWN_DIRS_PERMS+= ${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
33 32
34PKG_GROUPS+= ${VRNGROUP} 33PKG_GROUPS+= ${VRNGROUP}
35PKG_USERS+= ${VRNUSER}:${VRNGROUP} 34PKG_USERS+= ${VRNUSER}:${VRNGROUP}
36PKG_HOME.${VRNUSER}= ${VRNDIR} 35PKG_HOME.${VRNUSER}= ${VRNDIR}
37PKG_SHELL.${VRNUSER}= ${SH} 36PKG_SHELL.${VRNUSER}= ${SH}
38PKG_GECOS.${VRNUSER}= Varnish daemon user 37PKG_GECOS.${VRNUSER}= Varnish daemon user
39 38
40SUBST_CLASSES+= pkg 39RCD_SCRIPTS= varnishd varnishlog varnishncsa
41SUBST_STAGE.pkg= post-patch 
42SUBST_MESSAGE.pkg= Fixing pkgsrc paths 
43SUBST_FILES.pkg= etc/Makefile.in 
44SUBST_SED.pkg= -e 's,@EGDIR@,${EGDIR},' 
45 40
 41.include "../../lang/python/pyversion.mk"
 42BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.5:../../textproc/py-docutils
 43
 44.include "../../devel/pcre/buildlink3.mk"
46.include "../../mk/bsd.prefs.mk" 45.include "../../mk/bsd.prefs.mk"
47 46
48.if ${OPSYS} == "SunOS" 47.if ${OPSYS} == "SunOS"
49. if ${PKGSRC_COMPILER} == "sunpro" 48. if ${PKGSRC_COMPILER} == "sunpro"
50CONFIGURE_ENV+= VCC="cc -Kpic -G -o %o %s" 49CONFIGURE_ENV+= VCC="cc -Kpic -G -o %o %s"
51. else 50. else
52CONFIGURE_ENV+= VCC_CC="gcc -fpic -shared -o %o %s" 51CONFIGURE_ENV+= VCC_CC="gcc -fpic -shared -o %o %s"
53. endif 52. endif
54.endif 53.endif
55 54
56pre-configure: 55pre-configure:
57 cd ${WRKSRC} && autoconf 56 cd ${WRKSRC} && autoconf
58 57

cvs diff -r1.4 -r1.5 pkgsrc/www/varnish/PLIST (expand / switch to unified diff)

--- pkgsrc/www/varnish/PLIST 2010/03/08 13:24:01 1.4
+++ pkgsrc/www/varnish/PLIST 2010/12/06 14:25:44 1.5
@@ -1,31 +1,38 @@ @@ -1,31 +1,38 @@
1@comment $NetBSD: PLIST,v 1.4 2010/03/08 13:24:01 fhajny Exp $ 1@comment $NetBSD: PLIST,v 1.5 2010/12/06 14:25:44 wiz Exp $
2bin/varnishadm 2bin/varnishadm
3bin/varnishhist 3bin/varnishhist
4bin/varnishlog 4bin/varnishlog
5bin/varnishncsa 5bin/varnishncsa
6bin/varnishreplay 6bin/varnishreplay
7bin/varnishstat 7bin/varnishstat
8bin/varnishtest 8bin/varnishtest
9bin/varnishtop 9bin/varnishtop
 10bin/varnishtest
 11bin/varnishsizes
10include/varnish/shmlog.h 12include/varnish/shmlog.h
11include/varnish/shmlog_tags.h 13include/varnish/shmlog_tags.h
12include/varnish/stat_field.h 14include/varnish/stat_field.h
13include/varnish/stats.h 15include/varnish/stats.h
14include/varnish/varnishapi.h 16include/varnish/varnishapi.h
15lib/libvarnish.la 17lib/libvarnish.la
16lib/libvarnishapi.la 18lib/libvarnishapi.la
17lib/libvarnishcompat.la 19lib/libvarnishcompat.la
18lib/libvcl.la 20lib/libvcl.la
19lib/pkgconfig/varnishapi.pc 21lib/pkgconfig/varnishapi.pc
20man/man1/varnishadm.1 22man/man1/varnishadm.1
21man/man1/varnishd.1 23man/man1/varnishd.1
22man/man1/varnishhist.1 24man/man1/varnishhist.1
23man/man1/varnishlog.1 25man/man1/varnishlog.1
24man/man1/varnishncsa.1 26man/man1/varnishncsa.1
25man/man1/varnishreplay.1 27man/man1/varnishreplay.1
26man/man1/varnishstat.1 28man/man1/varnishstat.1
27man/man1/varnishtest.1 29man/man1/varnishtest.1
28man/man1/varnishtop.1 30man/man1/varnishtop.1
 31man/man1/varnishadm.1
 32man/man1/varnishsizes.1
29man/man7/vcl.7 33man/man7/vcl.7
30sbin/varnishd 34sbin/varnishd
31share/examples/varnish/default.vcl 35share/examples/varnish/default.vcl
 36share/examples/rc.d/varnishd
 37share/examples/rc.d/varnishlog
 38share/examples/rc.d/varnishncsa

cvs diff -r1.5 -r1.6 pkgsrc/www/varnish/distinfo (expand / switch to unified diff)

--- pkgsrc/www/varnish/distinfo 2010/03/17 17:45:44 1.5
+++ pkgsrc/www/varnish/distinfo 2010/12/06 14:25:44 1.6
@@ -1,7 +1,8 @@ @@ -1,7 +1,8 @@
1$NetBSD: distinfo,v 1.5 2010/03/17 17:45:44 fhajny Exp $ 1$NetBSD: distinfo,v 1.6 2010/12/06 14:25:44 wiz Exp $
2 2
3SHA1 (varnish-2.0.6.tar.gz) = c688d7825d52b2f21a368cb332564abe62227595 3SHA1 (varnish-2.1.4.tar.gz) = 3e3734f7795880a90a0514e9fb40d76fd170221b
4RMD160 (varnish-2.0.6.tar.gz) = 5b3827ae4de7be27442d68283bd8e4bd57a13199 4RMD160 (varnish-2.1.4.tar.gz) = f5d9bea792f7d2f9ca8dec8bc96c3ac88f0a45a9
5Size (varnish-2.0.6.tar.gz) = 810518 bytes 5Size (varnish-2.1.4.tar.gz) = 1539241 bytes
6SHA1 (patch-aa) = c0216a4b4c73b43567a6402a14a64c7597d5c4b9 6SHA1 (patch-aa) = c0216a4b4c73b43567a6402a14a64c7597d5c4b9
7SHA1 (patch-ab) = 5908f0fbeed7ba7261f67088e7bb9f6423d18e26 7SHA1 (patch-ab) = 5908f0fbeed7ba7261f67088e7bb9f6423d18e26
 8SHA1 (patch-ac) = 796dcbcfaf546e7e7077e59c84f97a38f2ff1edf

File Added: pkgsrc/www/varnish/files/varnishd.sh
#!@RCD_SCRIPTS_SHELL@
#
# PROVIDE: varnishd
# REQUIRE: DAEMON

. /etc/rc.subr

name="varnishd"
rcvar=$name
command="@PREFIX@/sbin/varnishd"

load_rc_config $name
run_rc_command "$1"

File Added: pkgsrc/www/varnish/files/varnishlog.sh
#!@RCD_SCRIPTS_SHELL@
#
# PROVIDE: varnishlog
# REQUIRE: varnishd

. /etc/rc.subr

name="varnishlog"
rcvar=$name
command="@PREFIX@/bin/varnishlog"
commands_args="-D"

load_rc_config $name
run_rc_command "$1"

File Added: pkgsrc/www/varnish/files/varnishncsa.sh
#!@RCD_SCRIPTS_SHELL@
#
# PROVIDE: varnishncsa
# REQUIRE: varnishd

. /etc/rc.subr

name="varnishncsa"
rcvar=$name
command="@PREFIX@/bin/varnishncsa"
commands_args="-D"

load_rc_config $name
run_rc_command "$1"

File Added: pkgsrc/www/varnish/patches/Attic/patch-ac
$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