Mon Nov 14 19:29:13 2022 UTC ()
varnish: update to 7.2.1

Security
  fixes VSV00011 Varnish HTTP/2 Request Forgery Vulnerability
VEXT
  Support Varnish Extensions
Parameters
  Duration values (with a unit in seconds) can optionally take a duration unit
Other changes in varnishd
  The metadata VMODs exposes to Varnishd has changed to a non-binary format
Changes to VCL
  ESI sub-requests can no longer inherit req.http.transfer-encoding
Bundled VMODs
  std: add std.now() and std.timed_call()
  cookie: generated headers no longer have a spurious trailing semi-colon
varnishlog
  The Begin log records may contain a 4th field with the sub-level of sub-tasks.
  The -k option from varnishlog is now available in varnishncsa.
varnishstat
  MAIN.fetch_no_thread renamed to MAIN.bgfetch_no_thread
  MAIN.shm_bytes added


(tnn)
diff -r1.38 -r1.39 pkgsrc/www/varnish/Makefile
diff -r1.12 -r1.13 pkgsrc/www/varnish/PLIST
diff -r1.4 -r1.5 pkgsrc/www/varnish/buildlink3.mk
diff -r1.22 -r1.23 pkgsrc/www/varnish/distinfo
cvs diff -r1.38 -r1.39 pkgsrc/www/varnish/Makefile (expand / switch to unified diff)

--- pkgsrc/www/varnish/Makefile 2022/09/04 12:04:02 1.38
+++ pkgsrc/www/varnish/Makefile 2022/11/14 19:29:13 1.39
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.38 2022/09/04 12:04:02 tnn Exp $ 1# $NetBSD: Makefile,v 1.39 2022/11/14 19:29:13 tnn Exp $
2 2
3DISTNAME= varnish-7.1.1 3DISTNAME= varnish-7.2.1
4CATEGORIES= www 4CATEGORIES= www
5MASTER_SITES= https://varnish-cache.org/_downloads/ 5MASTER_SITES= https://varnish-cache.org/_downloads/
6EXTRACT_SUFX= .tgz 6EXTRACT_SUFX= .tgz
7 7
8MAINTAINER= pkgsrc-users@NetBSD.org 8MAINTAINER= pkgsrc-users@NetBSD.org
9HOMEPAGE= https://varnish-cache.org/ 9HOMEPAGE= https://varnish-cache.org/
10COMMENT= High-performace HTTP accelerator 10COMMENT= High-performace HTTP accelerator
11LICENSE= modified-bsd 11LICENSE= modified-bsd
12 12
13BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils 13BUILD_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
14TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx 14TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
15 15
16PYTHON_VERSIONS_INCOMPATIBLE= 27 16PYTHON_VERSIONS_INCOMPATIBLE= 27
@@ -52,27 +52,27 @@ REPLACE_PYTHON+= lib/libvsc/vsctool.py @@ -52,27 +52,27 @@ REPLACE_PYTHON+= lib/libvsc/vsctool.py
52CONFIGURE_ARGS+= --localstatedir=${STATEDIR} 52CONFIGURE_ARGS+= --localstatedir=${STATEDIR}
53CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE} 53CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFBASE}
54CONFIGURE_ARGS+= --with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX} 54CONFIGURE_ARGS+= --with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}
55CONFIGURE_ARGS+= --with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX} 55CONFIGURE_ARGS+= --with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
56CONFIGURE_ARGS+= --with-sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX} 56CONFIGURE_ARGS+= --with-sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
57 57
58# Explicitly disable epoll on illumos, provided for Linux compat only. 58# Explicitly disable epoll on illumos, provided for Linux compat only.
59CONFIGURE_ARGS.SunOS+= --disable-epoll 59CONFIGURE_ARGS.SunOS+= --disable-epoll
60 60
61.include "../../mk/compiler.mk" 61.include "../../mk/compiler.mk"
62 62
63# Fixes build on at least SunOS/i386 63# Fixes build on at least SunOS/i386
64# See https://github.com/varnishcache/varnish-cache/issues/1875 64# See https://github.com/varnishcache/varnish-cache/issues/1875
65.if !empty(CC_VERSION:Mgcc*) && ${MACHINE_ARCH} == "i386" 65.if ${CC_VERSION:Mgcc*} && ${MACHINE_ARCH} == "i386"
66CFLAGS+= -fexcess-precision=standard 66CFLAGS+= -fexcess-precision=standard
67.endif 67.endif
68LDFLAGS.NetBSD+= -lm # for ldexp 68LDFLAGS.NetBSD+= -lm # for ldexp
69 69
70INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR} 70INSTALL_MAKE_FLAGS+= sysconfdir=${EGDIR}
71 71
72# not signed/unsigned char safe 72# not signed/unsigned char safe
73BUILDLINK_TRANSFORM+= rm:-Werror 73BUILDLINK_TRANSFORM+= rm:-Werror
74 74
75PKGCONFIG_OVERRIDE+= varnishapi.pc.in 75PKGCONFIG_OVERRIDE+= varnishapi.pc.in
76 76
77RCD_SCRIPTS= varnishd varnishlog varnishncsa 77RCD_SCRIPTS= varnishd varnishlog varnishncsa
78 78
cvs diff -r1.12 -r1.13 pkgsrc/www/varnish/PLIST (expand / switch to unified diff)

--- pkgsrc/www/varnish/PLIST 2022/04/12 22:13:36 1.12
+++ pkgsrc/www/varnish/PLIST 2022/11/14 19:29:13 1.13
@@ -1,59 +1,61 @@ @@ -1,59 +1,61 @@
1@comment $NetBSD: PLIST,v 1.12 2022/04/12 22:13:36 tnn Exp $ 1@comment $NetBSD: PLIST,v 1.13 2022/11/14 19:29:13 tnn Exp $
2bin/varnishadm 2bin/varnishadm
3bin/varnishhist 3bin/varnishhist
4bin/varnishlog 4bin/varnishlog
5bin/varnishncsa 5bin/varnishncsa
6bin/varnishstat 6bin/varnishstat
7bin/varnishstat_help_gen 7bin/varnishstat_help_gen
8bin/varnishtest 8bin/varnishtest
9bin/varnishtop 9bin/varnishtop
10include/varnish/cache/cache.h 10include/varnish/cache/cache.h
11include/varnish/cache/cache_backend.h 11include/varnish/cache/cache_backend.h
12include/varnish/cache/cache_director.h 12include/varnish/cache/cache_director.h
13include/varnish/cache/cache_filter.h 13include/varnish/cache/cache_filter.h
14include/varnish/cache/cache_varnishd.h 14include/varnish/cache/cache_varnishd.h
15include/varnish/common/common_param.h 15include/varnish/common/common_param.h
16include/varnish/miniobj.h 16include/varnish/miniobj.h
17include/varnish/tbl/acct_fields_bereq.h 17include/varnish/tbl/acct_fields_bereq.h
18include/varnish/tbl/acct_fields_req.h 18include/varnish/tbl/acct_fields_req.h
19include/varnish/tbl/backend_poll.h 19include/varnish/tbl/backend_poll.h
20include/varnish/tbl/ban_arg_oper.h 20include/varnish/tbl/ban_arg_oper.h
21include/varnish/tbl/ban_oper.h 21include/varnish/tbl/ban_oper.h
22include/varnish/tbl/ban_vars.h 22include/varnish/tbl/ban_vars.h
23include/varnish/tbl/bo_flags.h 23include/varnish/tbl/bereq_flags.h
 24include/varnish/tbl/beresp_flags.h
24include/varnish/tbl/boc_state.h 25include/varnish/tbl/boc_state.h
25include/varnish/tbl/body_status.h 26include/varnish/tbl/body_status.h
26include/varnish/tbl/cli_cmds.h 27include/varnish/tbl/cli_cmds.h
27include/varnish/tbl/debug_bits.h 28include/varnish/tbl/debug_bits.h
28include/varnish/tbl/experimental_bits.h 29include/varnish/tbl/experimental_bits.h
29include/varnish/tbl/feature_bits.h 30include/varnish/tbl/feature_bits.h
30include/varnish/tbl/h2_error.h 31include/varnish/tbl/h2_error.h
31include/varnish/tbl/h2_frames.h 32include/varnish/tbl/h2_frames.h
32include/varnish/tbl/h2_settings.h 33include/varnish/tbl/h2_settings.h
33include/varnish/tbl/h2_stream.h 34include/varnish/tbl/h2_stream.h
34include/varnish/tbl/htc.h 35include/varnish/tbl/htc.h
35include/varnish/tbl/http_headers.h 36include/varnish/tbl/http_headers.h
36include/varnish/tbl/http_response.h 37include/varnish/tbl/http_response.h
37include/varnish/tbl/locks.h 38include/varnish/tbl/locks.h
38include/varnish/tbl/mgt_vcc.h 
39include/varnish/tbl/obj_attr.h 39include/varnish/tbl/obj_attr.h
40include/varnish/tbl/oc_exp_flags.h 40include/varnish/tbl/oc_exp_flags.h
41include/varnish/tbl/oc_flags.h 41include/varnish/tbl/oc_flags.h
42include/varnish/tbl/params.h 42include/varnish/tbl/params.h
 43include/varnish/tbl/req_bereq_flags.h
43include/varnish/tbl/req_flags.h 44include/varnish/tbl/req_flags.h
44include/varnish/tbl/sess_attr.h 45include/varnish/tbl/sess_attr.h
45include/varnish/tbl/sess_close.h 46include/varnish/tbl/sess_close.h
46include/varnish/tbl/symbol_kind.h 47include/varnish/tbl/symbol_kind.h
 48include/varnish/tbl/vcc_feature_bits.h
47include/varnish/tbl/vcl_returns.h 49include/varnish/tbl/vcl_returns.h
48include/varnish/tbl/vcl_states.h 50include/varnish/tbl/vcl_states.h
49include/varnish/tbl/vhd_fsm.h 51include/varnish/tbl/vhd_fsm.h
50include/varnish/tbl/vhd_fsm_funcs.h 52include/varnish/tbl/vhd_fsm_funcs.h
51include/varnish/tbl/vhd_return.h 53include/varnish/tbl/vhd_return.h
52include/varnish/tbl/vhp_huffman.h 54include/varnish/tbl/vhp_huffman.h
53include/varnish/tbl/vhp_static.h 55include/varnish/tbl/vhp_static.h
54include/varnish/tbl/vrt_stv_var.h 56include/varnish/tbl/vrt_stv_var.h
55include/varnish/tbl/vsc_levels.h 57include/varnish/tbl/vsc_levels.h
56include/varnish/tbl/vsig_list.h 58include/varnish/tbl/vsig_list.h
57include/varnish/tbl/vsl_tags.h 59include/varnish/tbl/vsl_tags.h
58include/varnish/tbl/vsl_tags_http.h 60include/varnish/tbl/vsl_tags_http.h
59include/varnish/tbl/waiters.h 61include/varnish/tbl/waiters.h
@@ -63,26 +65,27 @@ include/varnish/vapi/vsc.h @@ -63,26 +65,27 @@ include/varnish/vapi/vsc.h
63include/varnish/vapi/vsig.h 65include/varnish/vapi/vsig.h
64include/varnish/vapi/vsl.h 66include/varnish/vapi/vsl.h
65include/varnish/vapi/vsl_int.h 67include/varnish/vapi/vsl_int.h
66include/varnish/vapi/vsm.h 68include/varnish/vapi/vsm.h
67include/varnish/vas.h 69include/varnish/vas.h
68include/varnish/vav.h 70include/varnish/vav.h
69include/varnish/vbh.h 71include/varnish/vbh.h
70include/varnish/vbm.h 72include/varnish/vbm.h
71include/varnish/vcl.h 73include/varnish/vcl.h
72include/varnish/vcli.h 74include/varnish/vcli.h
73include/varnish/vcs.h 75include/varnish/vcs.h
74include/varnish/vdef.h 76include/varnish/vdef.h
75include/varnish/vmod_abi.h 77include/varnish/vmod_abi.h
 78include/varnish/vnum.h
76include/varnish/vqueue.h 79include/varnish/vqueue.h
77include/varnish/vre.h 80include/varnish/vre.h
78include/varnish/vre_pcre2.h 81include/varnish/vre_pcre2.h
79include/varnish/vrnd.h 82include/varnish/vrnd.h
80include/varnish/vrt.h 83include/varnish/vrt.h
81include/varnish/vrt_obj.h 84include/varnish/vrt_obj.h
82include/varnish/vsa.h 85include/varnish/vsa.h
83include/varnish/vsb.h 86include/varnish/vsb.h
84include/varnish/vsha256.h 87include/varnish/vsha256.h
85include/varnish/vtcp.h 88include/varnish/vtcp.h
86include/varnish/vtim.h 89include/varnish/vtim.h
87include/varnish/vtree.h 90include/varnish/vtree.h
88include/varnish/vut.h 91include/varnish/vut.h
cvs diff -r1.4 -r1.5 pkgsrc/www/varnish/buildlink3.mk (expand / switch to unified diff)

--- pkgsrc/www/varnish/buildlink3.mk 2022/09/23 09:07:23 1.4
+++ pkgsrc/www/varnish/buildlink3.mk 2022/11/14 19:29:13 1.5
@@ -1,18 +1,18 @@ @@ -1,18 +1,18 @@
1# $NetBSD: buildlink3.mk,v 1.4 2022/09/23 09:07:23 wiz Exp $ 1# $NetBSD: buildlink3.mk,v 1.5 2022/11/14 19:29:13 tnn Exp $
2 2
3BUILDLINK_TREE+= varnish 3BUILDLINK_TREE+= varnish
4 4
5.if !defined(VARNISH_BUILDLINK3_MK) 5.if !defined(VARNISH_BUILDLINK3_MK)
6VARNISH_BUILDLINK3_MK:= 6VARNISH_BUILDLINK3_MK:=
7 7
8BUILDLINK_API_DEPENDS.varnish+= varnish>=7.0.1 8BUILDLINK_API_DEPENDS.varnish+= varnish>=7.2.1
9BUILDLINK_PKGSRCDIR.varnish?= ../../www/varnish 9BUILDLINK_PKGSRCDIR.varnish?= ../../www/varnish
10 10
11BUILDLINK_INCDIRS.varnish+= include/varnish 11BUILDLINK_INCDIRS.varnish+= include/varnish
12 12
13.include "../../devel/libexecinfo/buildlink3.mk" 13.include "../../devel/libexecinfo/buildlink3.mk"
14.include "../../devel/pcre2/buildlink3.mk" 14.include "../../devel/pcre2/buildlink3.mk"
15 15
16.endif # VARNISH_BUILDLINK3_MK 16.endif # VARNISH_BUILDLINK3_MK
17 17
18BUILDLINK_TREE+= -varnish 18BUILDLINK_TREE+= -varnish
cvs diff -r1.22 -r1.23 pkgsrc/www/varnish/distinfo (expand / switch to unified diff)

--- pkgsrc/www/varnish/distinfo 2022/09/04 12:04:02 1.22
+++ pkgsrc/www/varnish/distinfo 2022/11/14 19:29:13 1.23
@@ -1,8 +1,8 @@ @@ -1,8 +1,8 @@
1$NetBSD: distinfo,v 1.22 2022/09/04 12:04:02 tnn Exp $ 1$NetBSD: distinfo,v 1.23 2022/11/14 19:29:13 tnn Exp $
2 2
3BLAKE2s (varnish-7.1.1.tgz) = 8d3904c1f7d0b20a924563dc84a039749401e7584a15814a68640968ce40486d 3BLAKE2s (varnish-7.2.1.tgz) = 1aff35f8500519d17497de0634aaa404e9190c200eba47495b510038e8421a90
4SHA512 (varnish-7.1.1.tgz) = 7c3c081bd37c63b429337a25ebc0c14d780b0c4fd235d18b9ac1004e0bb2f65e70664c5bd25c5d941deeb6bc078f344fa2629cf0d641a0149fe29dcfa07ffcd2 4SHA512 (varnish-7.2.1.tgz) = 7b9b837a8bafdf5798e81bc38163457b3bca16d933a9492800cdd2cde35c9b524a10b7e5ec931217e11d72f32feb05157a7eecfd9cf2c5856e717b634e51d089
5Size (varnish-7.1.1.tgz) = 3742869 bytes 5Size (varnish-7.2.1.tgz) = 4019119 bytes
6SHA1 (patch-bin_varnishd_cache_cache__panic.c) = cf2b9c1f2c3ba15c7e20baca3c9af607a3e1fa82 6SHA1 (patch-bin_varnishd_cache_cache__panic.c) = cf2b9c1f2c3ba15c7e20baca3c9af607a3e1fa82
7SHA1 (patch-etc_Makefile.in) = f4407cad5f9f6c6402ab3b7fce0e1577d70b36be 7SHA1 (patch-etc_Makefile.in) = f4407cad5f9f6c6402ab3b7fce0e1577d70b36be
8SHA1 (patch-include_tbl_params.h) = 7a52ef6a98ec29409c7284876adffdb5c53facff 8SHA1 (patch-include_tbl_params.h) = 7a52ef6a98ec29409c7284876adffdb5c53facff