pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/www/varnish varnish: update to 6.6.0
details: https://anonhg.NetBSD.org/pkgsrc/rev/152d63169e61
branches: trunk
changeset: 455000:152d63169e61
user: tnn <tnn%pkgsrc.org@localhost>
date: Fri Jun 25 12:21:08 2021 +0000
description:
varnish: update to 6.6.0
Based on pkgsrc-wip 5.1.1 package by Filip Hajny.
Changes in Varnish 6.0
Support for UDS (Unix Domain Sockets)
Because UNIX Domain Sockets have nothing like IP numbers, we were forced to
define a new level of the VCL language vcl 4.1 to cope with UDS.
The HTTP/2 code has received a lot of attention from Dag Haavi Finstad
(Varnish Software) and it holds up in production on several large sites now.
There are new and improved VMODs:
vmod_directors – Much work on the shard director
vmod_proxy – Proxy protocol information
vmod_unix – Unix Domain Socket information
vmod_vtc – Utility functions for writing varnishtest cases.
The umem stevedore has been brought back on Solaris and it is the default
storage method there now.
More error situations now get vcl failure handling, this should make life
simpler for everybody we hope.
And it goes without saying that we have fixed a lot of bugs too.
Changes in Varnish 5.0
Varnish 5.0 changes some (mostly) internal APIs and adds some major new
features over Varnish 4.1.
Separate VCL files and VCL labels
Very Experimental HTTP/2 support
The Shard Director
Hit-For-Pass is now actually Hit-For-Miss
Ban Lurker Improvements
Request Body sent always / "cacheable POST"
ESI and Backend Request Coalescing ("waitinglist") Improvement
Backend PROXY protocol requests
Default VCL search path
devicedetect.vcl
varnishtest
misc
News for VMOD authors
Changes in Varnish 4
Varnish 4 is quite an extensive update to Varnish 3, with some very big
improvements to central parts of varnish.
Client/backend split
diffstat:
www/varnish/Makefile | 74 ++++--
www/varnish/PLIST | 125 ++++++++++-
www/varnish/buildlink3.mk | 10 +-
www/varnish/distinfo | 14 +-
www/varnish/patches/patch-bin_varnishd_cache_cache__panic.c | 17 +
www/varnish/patches/patch-etc_Makefile.in | 48 ++++
www/varnish/patches/patch-etc__Makefile.in | 15 -
www/varnish/patches/patch-include_tbl_params.h | 24 ++
8 files changed, 254 insertions(+), 73 deletions(-)
diffs (truncated from 430 to 300 lines):
diff -r 9dd17c13c1b3 -r 152d63169e61 www/varnish/Makefile
--- a/www/varnish/Makefile Fri Jun 25 11:46:05 2021 +0000
+++ b/www/varnish/Makefile Fri Jun 25 12:21:08 2021 +0000
@@ -1,31 +1,37 @@
-# $NetBSD: Makefile,v 1.30 2020/01/26 17:32:25 rillig Exp $
-#
+# $NetBSD: Makefile,v 1.31 2021/06/25 12:21:08 tnn Exp $
-DISTNAME= varnish-3.0.6
-PKGREVISION= 3
+DISTNAME= varnish-6.6.0
CATEGORIES= www
-MASTER_SITES= http://repo.varnish-cache.org/source/
+MASTER_SITES= https://varnish-cache.org/_downloads/
+EXTRACT_SUFX= .tgz
MAINTAINER= pkgsrc-users%NetBSD.org@localhost
HOMEPAGE= https://varnish-cache.org/
COMMENT= High-performace HTTP accelerator
LICENSE= modified-bsd
+BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+PYTHON_VERSIONED_DEPENDENCIES= sphinx:tool
+
GNU_CONFIGURE= yes
USE_LIBTOOL= yes
USE_TOOLS+= pkg-config gmake
+
BUILD_DEFS+= VARBASE
+BUILD_DEFS+= PKG_SYSCONFBASE
+PKG_SYSCONFSUBDIR= varnish
EGDIR= ${PREFIX}/share/examples/varnish
-CONF_FILES= ${EGDIR}/default.vcl ${PKG_SYSCONFDIR}/default.vcl
+CONF_FILES= ${EGDIR}/builtin.vcl \
+ ${PKG_SYSCONFDIR}/builtin.vcl
+
+.include "../../mk/bsd.prefs.mk"
VRNUSER?= varnish
VRNGROUP?= ${VRNUSER}
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
@@ -38,30 +44,42 @@
FILES_SUBST+= VRNUSER=${VRNUSER}
FILES_SUBST+= VRNGROUP=${VRNGROUP}
-RCD_SCRIPTS= varnishd varnishlog varnishncsa
-PYTHON_FOR_BUILD_ONLY= yes
+REPLACE_PYTHON+= lib/libvcc/vmodtool.py
+REPLACE_PYTHON+= lib/libvcc/vsctool.py
+
+CONFIGURE_ARGS+= --localstatedir=${STATEDIR}
+CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
+CONFIGURE_ARGS+= --with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}
+CONFIGURE_ARGS+= --with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
+CONFIGURE_ARGS+= --with-sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
+
+# Explicitly disable epoll on illumos, provided for Linux compat only.
+CONFIGURE_ARGS.SunOS+= --disable-epoll
+
+.include "../../mk/compiler.mk"
-REPLACE_PYTHON+= lib/libvcl/generate.py
-REPLACE_PYTHON+= lib/libvmod_std/vmod.py
+# Fixes build on at least SunOS/i386
+# See https://github.com/varnishcache/varnish-cache/issues/1875
+.if !empty(CC_VERSION:Mgcc*) && ${MACHINE_ARCH} == "i386"
+CFLAGS+= -fexcess-precision=standard
+.endif
+LDFLAGS.NetBSD+= -lm # for ldexp
+
+INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
-.include "../../lang/python/pyversion.mk"
-BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
-CONFIGURE_ARGS+= --with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
-CONFIGURE_ARGS+= --with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}
+# not signed/unsigned char safe
+BUILDLINK_TRANSFORM+= rm:-Werror
+
+PKGCONFIG_OVERRIDE+= varnishapi.pc.in
+
+RCD_SCRIPTS= varnishd varnishlog varnishncsa
+
+TEST_TARGET= check
.include "../../devel/pcre/buildlink3.mk"
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-# Explicitly disable epoll on illumos, provided for Linux compat only.
-CONFIGURE_ENV+= ac_cv_func_epoll_ctl=no
-. if ${PKGSRC_COMPILER:Msunpro}
-CONFIGURE_ENV+= VCC_CC="cc ${_COMPILER_ABI_FLAG.${ABI}} -Kpic -G -o %o %s"
-. else
-CONFIGURE_ENV+= VCC_CC="gcc ${_COMPILER_ABI_FLAG.${ABI}} -fpic -shared -o %o %s"
-. endif
-.endif
-
+.include "../../devel/libexecinfo/buildlink3.mk"
+.include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
.include "../../mk/curses.buildlink3.mk"
.include "../../mk/pthread.buildlink3.mk"
.include "../../mk/readline.buildlink3.mk"
diff -r 9dd17c13c1b3 -r 152d63169e61 www/varnish/PLIST
--- a/www/varnish/PLIST Fri Jun 25 11:46:05 2021 +0000
+++ b/www/varnish/PLIST Fri Jun 25 12:21:08 2021 +0000
@@ -1,41 +1,132 @@
-@comment $NetBSD: PLIST,v 1.9 2014/03/11 14:05:18 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.10 2021/06/25 12:21:08 tnn Exp $
bin/varnishadm
bin/varnishhist
bin/varnishlog
bin/varnishncsa
-bin/varnishreplay
-bin/varnishsizes
bin/varnishstat
+bin/varnishstat_help_gen
bin/varnishtest
bin/varnishtop
-include/varnish/varnishapi.h
+include/varnish/cache/cache.h
+include/varnish/cache/cache_backend.h
+include/varnish/cache/cache_director.h
+include/varnish/cache/cache_filter.h
+include/varnish/cache/cache_varnishd.h
+include/varnish/common/common_param.h
+include/varnish/miniobj.h
+include/varnish/tbl/acct_fields_bereq.h
+include/varnish/tbl/acct_fields_req.h
+include/varnish/tbl/backend_poll.h
+include/varnish/tbl/ban_arg_oper.h
+include/varnish/tbl/ban_oper.h
+include/varnish/tbl/ban_vars.h
+include/varnish/tbl/bo_flags.h
+include/varnish/tbl/boc_state.h
+include/varnish/tbl/body_status.h
+include/varnish/tbl/cli_cmds.h
+include/varnish/tbl/debug_bits.h
+include/varnish/tbl/feature_bits.h
+include/varnish/tbl/h2_error.h
+include/varnish/tbl/h2_frames.h
+include/varnish/tbl/h2_settings.h
+include/varnish/tbl/h2_stream.h
+include/varnish/tbl/htc.h
+include/varnish/tbl/http_headers.h
+include/varnish/tbl/http_response.h
+include/varnish/tbl/locks.h
+include/varnish/tbl/mgt_vcc.h
+include/varnish/tbl/obj_attr.h
+include/varnish/tbl/oc_exp_flags.h
+include/varnish/tbl/oc_flags.h
+include/varnish/tbl/params.h
+include/varnish/tbl/req_flags.h
+include/varnish/tbl/sess_attr.h
+include/varnish/tbl/sess_close.h
+include/varnish/tbl/symbol_kind.h
+include/varnish/tbl/vcl_returns.h
+include/varnish/tbl/vcl_states.h
+include/varnish/tbl/vhd_fsm.h
+include/varnish/tbl/vhd_fsm_funcs.h
+include/varnish/tbl/vhd_return.h
+include/varnish/tbl/vhp_huffman.h
+include/varnish/tbl/vhp_static.h
+include/varnish/tbl/vrt_stv_var.h
+include/varnish/tbl/vsc_levels.h
+include/varnish/tbl/vsig_list.h
+include/varnish/tbl/vsl_tags.h
+include/varnish/tbl/vsl_tags_http.h
+include/varnish/tbl/waiters.h
+include/varnish/vapi/vapi_options.h
+include/varnish/vapi/voptget.h
+include/varnish/vapi/vsc.h
+include/varnish/vapi/vsig.h
+include/varnish/vapi/vsl.h
+include/varnish/vapi/vsl_int.h
+include/varnish/vapi/vsm.h
+include/varnish/vas.h
+include/varnish/vav.h
+include/varnish/vbh.h
+include/varnish/vbm.h
+include/varnish/vcl.h
include/varnish/vcli.h
-include/varnish/vsc.h
-include/varnish/vsc_all.h
-include/varnish/vsc_fields.h
-include/varnish/vsl.h
-include/varnish/vsl_tags.h
-include/varnish/vsm.h
+include/varnish/vcs.h
+include/varnish/vdef.h
+include/varnish/vmod_abi.h
+include/varnish/vqueue.h
+include/varnish/vre.h
+include/varnish/vrnd.h
+include/varnish/vrt.h
+include/varnish/vrt_obj.h
+include/varnish/vsa.h
+include/varnish/vsb.h
+include/varnish/vsha256.h
+include/varnish/vtcp.h
+include/varnish/vtim.h
+include/varnish/vtree.h
+include/varnish/vut.h
+include/varnish/vut_options.h
+include/varnish/waiter/waiter.h
lib/libvarnishapi.la
lib/pkgconfig/varnishapi.pc
-lib/varnish/libvarnish.la
-lib/varnish/libvarnishcompat.la
-lib/varnish/libvcl.la
-lib/varnish/libvgz.la
+lib/varnish/vmods/libvmod_blob.la
+lib/varnish/vmods/libvmod_cookie.la
+lib/varnish/vmods/libvmod_debug.la
+lib/varnish/vmods/libvmod_directors.la
+lib/varnish/vmods/libvmod_proxy.la
+lib/varnish/vmods/libvmod_purge.la
lib/varnish/vmods/libvmod_std.la
+lib/varnish/vmods/libvmod_unix.la
+lib/varnish/vmods/libvmod_vtc.la
man/man1/varnishadm.1
man/man1/varnishd.1
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/man3/vmod_blob.3
+man/man3/vmod_cookie.3
+man/man3/vmod_directors.3
+man/man3/vmod_proxy.3
+man/man3/vmod_purge.3
man/man3/vmod_std.3
+man/man3/vmod_unix.3
+man/man3/vmod_vtc.3
man/man7/varnish-cli.7
man/man7/varnish-counters.7
+man/man7/vcl-backend.7
+man/man7/vcl-probe.7
+man/man7/vcl-var.7
man/man7/vcl.7
+man/man7/vsl-query.7
+man/man7/vsl.7
+man/man7/vtc.7
sbin/varnishd
-share/examples/varnish/default.vcl
+share/aclocal/varnish-legacy.m4
+share/aclocal/varnish.m4
+share/examples/varnish/builtin.vcl
+share/examples/varnish/example.vcl
+share/varnish/vcl/devicedetect.vcl
+share/varnish/vmodtool.py
+share/varnish/vsctool.py
diff -r 9dd17c13c1b3 -r 152d63169e61 www/varnish/buildlink3.mk
--- a/www/varnish/buildlink3.mk Fri Jun 25 11:46:05 2021 +0000
+++ b/www/varnish/buildlink3.mk Fri Jun 25 12:21:08 2021 +0000
@@ -1,19 +1,15 @@
-# $NetBSD: buildlink3.mk,v 1.1 2020/07/13 18:43:22 wiz Exp $
+# $NetBSD: buildlink3.mk,v 1.2 2021/06/25 12:21:08 tnn Exp $
BUILDLINK_TREE+= varnish
.if !defined(VARNISH_BUILDLINK3_MK)
VARNISH_BUILDLINK3_MK:=
-BUILDLINK_API_DEPENDS.varnish+= varnish>=3.0.6nb3
+BUILDLINK_API_DEPENDS.varnish+= varnish>=6.6.0
BUILDLINK_PKGSRCDIR.varnish?= ../../www/varnish
-BUILDLINK_INCDIRS.varnish= include/varnish
-BUILDLINK_LIBDIRS.varnish= lib/varnish
+.include "../../devel/libexecinfo/buildlink3.mk"
.include "../../devel/pcre/buildlink3.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
.endif # VARNISH_BUILDLINK3_MK
diff -r 9dd17c13c1b3 -r 152d63169e61 www/varnish/distinfo
--- a/www/varnish/distinfo Fri Jun 25 11:46:05 2021 +0000
+++ b/www/varnish/distinfo Fri Jun 25 12:21:08 2021 +0000
@@ -1,7 +1,9 @@
-$NetBSD: distinfo,v 1.14 2015/11/04 02:47:41 agc Exp $
+$NetBSD: distinfo,v 1.15 2021/06/25 12:21:08 tnn Exp $
-SHA1 (varnish-3.0.6.tar.gz) = c58590f87f0981c3c10c4066d739e93352678824
-RMD160 (varnish-3.0.6.tar.gz) = 29b298800bff08ff471e081fa64e49e34d484bcd
Home |
Main Index |
Thread Index |
Old Index