CVS commit: pkgsrc/www/varnish

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Tue Aug  6 01:34:41 UTC 2024

Modified Files:
        pkgsrc/www/varnish: Makefile PLIST distinfo
        pkgsrc/www/varnish/patches: patch-include_tbl_params.h

Log Message:
varnish: update to 7.5.0

- fixes for DoS CVEs: CVE-2023-44487, CVE-2024-30156
- new timeout options


To generate a diff of this commit:
cvs rdiff -u -r1.42 -r1.43 pkgsrc/www/varnish/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/www/varnish/PLIST
cvs rdiff -u -r1.23 -r1.24 pkgsrc/www/varnish/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/www/varnish/patches/patch-include_tbl_params.h

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/www/varnish/Makefile
diff -u pkgsrc/www/varnish/Makefile:1.42 pkgsrc/www/varnish/Makefile:1.43
--- pkgsrc/www/varnish/Makefile:1.42    Tue Nov  7 22:38:10 2023
+++ pkgsrc/www/varnish/Makefile Tue Aug  6 01:34:40 2024
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.42 2023/11/07 22:38:10 wiz Exp $
+# $NetBSD: Makefile,v 1.43 2024/08/06 01:34:40 tnn Exp $
 
-DISTNAME=      varnish-7.2.1
-PKGREVISION=   1
+DISTNAME=      varnish-7.5.0
 CATEGORIES=    www
 MASTER_SITES=  https://varnish-cache.org/_downloads/
 EXTRACT_SUFX=  .tgz
@@ -11,8 +10,8 @@ HOMEPAGE=     https://varnish-cache.org/
 COMMENT=       High-performace HTTP accelerator
 LICENSE=       modified-bsd
 
-TOOL_DEPENDS+=                 ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
-TOOL_DEPENDS+=                 ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
+TOOL_DEPENDS+= ${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+TOOL_DEPENDS+= ${PYPKGPREFIX}-sphinx-[0-9]*:../../textproc/py-sphinx
 
 PYTHON_VERSIONS_INCOMPATIBLE=  27 38
 

Index: pkgsrc/www/varnish/PLIST
diff -u pkgsrc/www/varnish/PLIST:1.13 pkgsrc/www/varnish/PLIST:1.14
--- pkgsrc/www/varnish/PLIST:1.13       Mon Nov 14 19:29:13 2022
+++ pkgsrc/www/varnish/PLIST    Tue Aug  6 01:34:40 2024
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2022/11/14 19:29:13 tnn Exp $
+@comment $NetBSD: PLIST,v 1.14 2024/08/06 01:34:40 tnn Exp $
 bin/varnishadm
 bin/varnishhist
 bin/varnishlog
@@ -46,6 +46,7 @@ include/varnish/tbl/sess_attr.h
 include/varnish/tbl/sess_close.h
 include/varnish/tbl/symbol_kind.h
 include/varnish/tbl/vcc_feature_bits.h
+include/varnish/tbl/vcl_context.h
 include/varnish/tbl/vcl_returns.h
 include/varnish/tbl/vcl_states.h
 include/varnish/tbl/vhd_fsm.h
@@ -86,6 +87,7 @@ include/varnish/vsa.h
 include/varnish/vsb.h
 include/varnish/vsha256.h
 include/varnish/vtcp.h
+include/varnish/vte.h
 include/varnish/vtim.h
 include/varnish/vtree.h
 include/varnish/vut.h
@@ -97,6 +99,7 @@ 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_h2.la
 lib/varnish/vmods/libvmod_proxy.la
 lib/varnish/vmods/libvmod_purge.la
 lib/varnish/vmods/libvmod_std.la
@@ -113,6 +116,7 @@ man/man1/varnishtop.1
 man/man3/vmod_blob.3
 man/man3/vmod_cookie.3
 man/man3/vmod_directors.3
+man/man3/vmod_h2.3
 man/man3/vmod_proxy.3
 man/man3/vmod_purge.3
 man/man3/vmod_std.3
@@ -122,6 +126,7 @@ man/man7/varnish-cli.7
 man/man7/varnish-counters.7
 man/man7/vcl-backend.7
 man/man7/vcl-probe.7
+man/man7/vcl-step.7
 man/man7/vcl-var.7
 man/man7/vcl.7
 man/man7/vsl-query.7
@@ -132,6 +137,15 @@ share/aclocal/varnish-legacy.m4
 share/aclocal/varnish.m4
 share/examples/varnish/builtin.vcl
 share/examples/varnish/example.vcl
+share/varnish/vcc/vmod_blob.vcc
+share/varnish/vcc/vmod_cookie.vcc
+share/varnish/vcc/vmod_directors.vcc
+share/varnish/vcc/vmod_h2.vcc
+share/varnish/vcc/vmod_proxy.vcc
+share/varnish/vcc/vmod_purge.vcc
+share/varnish/vcc/vmod_std.vcc
+share/varnish/vcc/vmod_unix.vcc
+share/varnish/vcc/vmod_vtc.vcc
 share/varnish/vcl/devicedetect.vcl
 share/varnish/vmodtool.py
 share/varnish/vsctool.py

Index: pkgsrc/www/varnish/distinfo
diff -u pkgsrc/www/varnish/distinfo:1.23 pkgsrc/www/varnish/distinfo:1.24
--- pkgsrc/www/varnish/distinfo:1.23    Mon Nov 14 19:29:13 2022
+++ pkgsrc/www/varnish/distinfo Tue Aug  6 01:34:40 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.23 2022/11/14 19:29:13 tnn Exp $
+$NetBSD: distinfo,v 1.24 2024/08/06 01:34:40 tnn Exp $
 
-BLAKE2s (varnish-7.2.1.tgz) = 1aff35f8500519d17497de0634aaa404e9190c200eba47495b510038e8421a90
-SHA512 (varnish-7.2.1.tgz) = 7b9b837a8bafdf5798e81bc38163457b3bca16d933a9492800cdd2cde35c9b524a10b7e5ec931217e11d72f32feb05157a7eecfd9cf2c5856e717b634e51d089
-Size (varnish-7.2.1.tgz) = 4019119 bytes
+BLAKE2s (varnish-7.5.0.tgz) = cfa340ff5375c78971d6ffb962e7e9224bbeecd9cffcce73a8c23f0b2fcba5ed
+SHA512 (varnish-7.5.0.tgz) = ca77abcb21299942b2bfd433e5f964d2e974cdae92d6a8889217fcd81933a3b7bc1e70ba87d7e842a4f90b59d7948242155380054d67ad49aab8dcea343055a2
+Size (varnish-7.5.0.tgz) = 4033962 bytes
 SHA1 (patch-bin_varnishd_cache_cache__panic.c) = cf2b9c1f2c3ba15c7e20baca3c9af607a3e1fa82
 SHA1 (patch-etc_Makefile.in) = f4407cad5f9f6c6402ab3b7fce0e1577d70b36be
-SHA1 (patch-include_tbl_params.h) = 7a52ef6a98ec29409c7284876adffdb5c53facff
+SHA1 (patch-include_tbl_params.h) = 3237e66d7b18f39fcd22e70edf6b10303627c243

Index: pkgsrc/www/varnish/patches/patch-include_tbl_params.h
diff -u pkgsrc/www/varnish/patches/patch-include_tbl_params.h:1.1 pkgsrc/www/varnish/patches/patch-include_tbl_params.h:1.2
--- pkgsrc/www/varnish/patches/patch-include_tbl_params.h:1.1   Fri Jun 25 12:21:08 2021
+++ pkgsrc/www/varnish/patches/patch-include_tbl_params.h       Tue Aug  6 01:34:41 2024
@@ -1,21 +1,21 @@
-$NetBSD: patch-include_tbl_params.h,v 1.1 2021/06/25 12:21:08 tnn Exp $
+$NetBSD: patch-include_tbl_params.h,v 1.2 2024/08/06 01:34:41 tnn Exp $
 
 Change some default limits to cover NetBSD defaults.
 
---- include/tbl/params.h.orig  2021-03-12 15:02:41.000000000 +0000
+--- include/tbl/params.h.orig  2024-03-18 13:37:59.000000000 +0000
 +++ include/tbl/params.h
-@@ -856,7 +856,7 @@ PARAM_SIMPLE(
+@@ -897,7 +897,7 @@ PARAM_SIMPLE(
        /* name */      tcp_keepalive_intvl,
-       /* type */      timeout,
+       /* type */      duration,
        /* min */       "1",
 -      /* max */       "100",
 +      /* max */       "150",
        /* def */       NULL,
        /* units */     "seconds",
        /* descr */
-@@ -889,7 +889,7 @@ PARAM_SIMPLE(
+@@ -930,7 +930,7 @@ PARAM_SIMPLE(
        /* name */      tcp_keepalive_time,
-       /* type */      timeout,
+       /* type */      duration,
        /* min */       "1",
 -      /* max */       "7200",
 +      /* max */       "14400",