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 changelogdiff -r1.7 -r1.8 pkgsrc/www/varnish/Makefile
(wiz)
@@ -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 | |||
4 | DISTNAME= varnish-2.0.6 | 4 | DISTNAME= varnish-2.1.4 | |
5 | PKGREVISION= 1 | |||
6 | CATEGORIES= www | 5 | CATEGORIES= www | |
7 | MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=varnish/} | 6 | MASTER_SITES= http://www.varnish-software.com/sites/default/files/ | |
8 | 7 | |||
9 | MAINTAINER= pkgsrc-users@NetBSD.org | 8 | MAINTAINER= pkgsrc-users@NetBSD.org | |
10 | HOMEPAGE= http://varnish-cache.org/ | 9 | HOMEPAGE= http://varnish-cache.org/ | |
11 | COMMENT= High-performace HTTP accelerator | 10 | COMMENT= High-performace HTTP accelerator | |
12 | LICENSE= modified-bsd | 11 | LICENSE= modified-bsd | |
13 | 12 | |||
14 | PKG_DESTDIR_SUPPORT= user-destdir | 13 | PKG_DESTDIR_SUPPORT= user-destdir | |
15 | 14 | |||
16 | GNU_CONFIGURE= yes | 15 | GNU_CONFIGURE= yes | |
17 | USE_LIBTOOL= yes | 16 | USE_LIBTOOL= yes | |
18 | USE_TOOLS+= autoconf | 17 | USE_TOOLS+= autoconf pkg-config gmake | |
19 | BUILD_DEFS+= VARBASE | 18 | BUILD_DEFS+= VARBASE | |
20 | 19 | |||
21 | EGDIR= ${PREFIX}/share/examples/varnish | 20 | EGDIR= ${PREFIX}/share/examples/varnish | |
22 | PKG_SYSCONFSUBDIR= varnish | 21 | PKG_SYSCONFSUBDIR= varnish | |
23 | CONF_FILES= ${EGDIR}/default.vcl ${PKG_SYSCONFDIR}/default.vcl | 22 | CONF_FILES= ${EGDIR}/default.vcl ${PKG_SYSCONFDIR}/default.vcl | |
24 | 23 | |||
25 | VRNUSER?= varnish | 24 | VRNUSER?= varnish | |
26 | VRNGROUP?= ${VRNUSER} | 25 | VRNGROUP?= ${VRNUSER} | |
27 | STATEDIR= ${VARBASE}/db | 26 | STATEDIR= ${VARBASE}/db | |
28 | VRNDIR= ${STATEDIR}/${PKGBASE} | 27 | VRNDIR= ${STATEDIR}/${PKGBASE} | |
29 | 28 | |||
30 | CONFIGURE_ARGS+= --localstatedir=${STATEDIR} | 29 | CONFIGURE_ARGS+= --localstatedir=${STATEDIR} | |
31 | OWN_DIRS+= ${VRNDIR} | 30 | OWN_DIRS+= ${VRNDIR} | |
32 | OWN_DIRS_PERMS+= ${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770 | 31 | OWN_DIRS_PERMS+= ${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770 | |
33 | 32 | |||
34 | PKG_GROUPS+= ${VRNGROUP} | 33 | PKG_GROUPS+= ${VRNGROUP} | |
35 | PKG_USERS+= ${VRNUSER}:${VRNGROUP} | 34 | PKG_USERS+= ${VRNUSER}:${VRNGROUP} | |
36 | PKG_HOME.${VRNUSER}= ${VRNDIR} | 35 | PKG_HOME.${VRNUSER}= ${VRNDIR} | |
37 | PKG_SHELL.${VRNUSER}= ${SH} | 36 | PKG_SHELL.${VRNUSER}= ${SH} | |
38 | PKG_GECOS.${VRNUSER}= Varnish daemon user | 37 | PKG_GECOS.${VRNUSER}= Varnish daemon user | |
39 | 38 | |||
40 | SUBST_CLASSES+= pkg | 39 | RCD_SCRIPTS= varnishd varnishlog varnishncsa | |
41 | SUBST_STAGE.pkg= post-patch | |||
42 | SUBST_MESSAGE.pkg= Fixing pkgsrc paths | |||
43 | SUBST_FILES.pkg= etc/Makefile.in | |||
44 | SUBST_SED.pkg= -e 's,@EGDIR@,${EGDIR},' | |||
45 | 40 | |||
41 | .include "../../lang/python/pyversion.mk" | |||
42 | BUILD_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" | |
50 | CONFIGURE_ENV+= VCC="cc -Kpic -G -o %o %s" | 49 | CONFIGURE_ENV+= VCC="cc -Kpic -G -o %o %s" | |
51 | . else | 50 | . else | |
52 | CONFIGURE_ENV+= VCC_CC="gcc -fpic -shared -o %o %s" | 51 | CONFIGURE_ENV+= VCC_CC="gcc -fpic -shared -o %o %s" | |
53 | . endif | 52 | . endif | |
54 | .endif | 53 | .endif | |
55 | 54 | |||
56 | pre-configure: | 55 | pre-configure: | |
57 | cd ${WRKSRC} && autoconf | 56 | cd ${WRKSRC} && autoconf | |
58 | 57 |
@@ -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 $ | |
2 | bin/varnishadm | 2 | bin/varnishadm | |
3 | bin/varnishhist | 3 | bin/varnishhist | |
4 | bin/varnishlog | 4 | bin/varnishlog | |
5 | bin/varnishncsa | 5 | bin/varnishncsa | |
6 | bin/varnishreplay | 6 | bin/varnishreplay | |
7 | bin/varnishstat | 7 | bin/varnishstat | |
8 | bin/varnishtest | 8 | bin/varnishtest | |
9 | bin/varnishtop | 9 | bin/varnishtop | |
10 | bin/varnishtest | |||
11 | bin/varnishsizes | |||
10 | include/varnish/shmlog.h | 12 | include/varnish/shmlog.h | |
11 | include/varnish/shmlog_tags.h | 13 | include/varnish/shmlog_tags.h | |
12 | include/varnish/stat_field.h | 14 | include/varnish/stat_field.h | |
13 | include/varnish/stats.h | 15 | include/varnish/stats.h | |
14 | include/varnish/varnishapi.h | 16 | include/varnish/varnishapi.h | |
15 | lib/libvarnish.la | 17 | lib/libvarnish.la | |
16 | lib/libvarnishapi.la | 18 | lib/libvarnishapi.la | |
17 | lib/libvarnishcompat.la | 19 | lib/libvarnishcompat.la | |
18 | lib/libvcl.la | 20 | lib/libvcl.la | |
19 | lib/pkgconfig/varnishapi.pc | 21 | lib/pkgconfig/varnishapi.pc | |
20 | man/man1/varnishadm.1 | 22 | man/man1/varnishadm.1 | |
21 | man/man1/varnishd.1 | 23 | man/man1/varnishd.1 | |
22 | man/man1/varnishhist.1 | 24 | man/man1/varnishhist.1 | |
23 | man/man1/varnishlog.1 | 25 | man/man1/varnishlog.1 | |
24 | man/man1/varnishncsa.1 | 26 | man/man1/varnishncsa.1 | |
25 | man/man1/varnishreplay.1 | 27 | man/man1/varnishreplay.1 | |
26 | man/man1/varnishstat.1 | 28 | man/man1/varnishstat.1 | |
27 | man/man1/varnishtest.1 | 29 | man/man1/varnishtest.1 | |
28 | man/man1/varnishtop.1 | 30 | man/man1/varnishtop.1 | |
31 | man/man1/varnishadm.1 | |||
32 | man/man1/varnishsizes.1 | |||
29 | man/man7/vcl.7 | 33 | man/man7/vcl.7 | |
30 | sbin/varnishd | 34 | sbin/varnishd | |
31 | share/examples/varnish/default.vcl | 35 | share/examples/varnish/default.vcl | |
36 | share/examples/rc.d/varnishd | |||
37 | share/examples/rc.d/varnishlog | |||
38 | share/examples/rc.d/varnishncsa |
@@ -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 | |||
3 | SHA1 (varnish-2.0.6.tar.gz) = c688d7825d52b2f21a368cb332564abe62227595 | 3 | SHA1 (varnish-2.1.4.tar.gz) = 3e3734f7795880a90a0514e9fb40d76fd170221b | |
4 | RMD160 (varnish-2.0.6.tar.gz) = 5b3827ae4de7be27442d68283bd8e4bd57a13199 | 4 | RMD160 (varnish-2.1.4.tar.gz) = f5d9bea792f7d2f9ca8dec8bc96c3ac88f0a45a9 | |
5 | Size (varnish-2.0.6.tar.gz) = 810518 bytes | 5 | Size (varnish-2.1.4.tar.gz) = 1539241 bytes | |
6 | SHA1 (patch-aa) = c0216a4b4c73b43567a6402a14a64c7597d5c4b9 | 6 | SHA1 (patch-aa) = c0216a4b4c73b43567a6402a14a64c7597d5c4b9 | |
7 | SHA1 (patch-ab) = 5908f0fbeed7ba7261f67088e7bb9f6423d18e26 | 7 | SHA1 (patch-ab) = 5908f0fbeed7ba7261f67088e7bb9f6423d18e26 | |
8 | SHA1 (patch-ac) = 796dcbcfaf546e7e7077e59c84f97a38f2ff1edf |
#!@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"
#!@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"
#!@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"
$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