git: 845bfaf9d6b3 - main - www/varnish7: Update to 7.4.1

From: Danilo G. Baio <dbaio_at_FreeBSD.org>
Date: Tue, 03 Oct 2023 01:59:31 UTC
The branch main has been updated by dbaio:

URL: https://cgit.FreeBSD.org/ports/commit/?id=845bfaf9d6b36a6c8b0a81567ef3d032e605a3f3

commit 845bfaf9d6b36a6c8b0a81567ef3d032e605a3f3
Author:     Danilo G. Baio <dbaio@FreeBSD.org>
AuthorDate: 2023-10-03 01:28:21 +0000
Commit:     Danilo G. Baio <dbaio@FreeBSD.org>
CommitDate: 2023-10-03 01:54:29 +0000

    www/varnish7: Update to 7.4.1
    
    Release notes: https://varnish-cache.org/releases/rel7.4.0.html
                   https://varnish-cache.org/releases/rel7.4.1.html
---
 www/varnish7/Makefile                                    |  3 +--
 www/varnish7/distinfo                                    |  6 +++---
 .../files/patch-bin_varnishd_http2_cache__http2__hpack.c | 16 ----------------
 www/varnish7/files/pkg-message.in                        | 13 +++++++++++++
 www/varnish7/pkg-descr                                   |  2 +-
 www/varnish7/pkg-plist                                   | 13 ++++++++++++-
 6 files changed, 30 insertions(+), 23 deletions(-)

diff --git a/www/varnish7/Makefile b/www/varnish7/Makefile
index 14e9dc42e141..f362ce89c236 100644
--- a/www/varnish7/Makefile
+++ b/www/varnish7/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	varnish
-DISTVERSION=	7.3.0
-PORTREVISION=	1
+DISTVERSION=	7.4.1
 CATEGORIES=	www
 MASTER_SITES=	https://varnish-cache.org/downloads/
 PKGNAMESUFFIX=	7
diff --git a/www/varnish7/distinfo b/www/varnish7/distinfo
index 1146fe0d83dd..47408604c814 100644
--- a/www/varnish7/distinfo
+++ b/www/varnish7/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1679820905
-SHA256 (varnish-7.3.0.tgz) = e2dbbb0ec270a90647c386866e6e226993aed46e48de751a72bb819737f14ae7
-SIZE (varnish-7.3.0.tgz) = 3938449
+TIMESTAMP = 1696208682
+SHA256 (varnish-7.4.1.tgz) = 874d837aaf49b8f2718cb60b8c8c7900e9ea10c264f218c88cd672d596f4b89f
+SIZE (varnish-7.4.1.tgz) = 3970921
diff --git a/www/varnish7/files/patch-bin_varnishd_http2_cache__http2__hpack.c b/www/varnish7/files/patch-bin_varnishd_http2_cache__http2__hpack.c
deleted file mode 100644
index 5c3310815192..000000000000
--- a/www/varnish7/files/patch-bin_varnishd_http2_cache__http2__hpack.c
+++ /dev/null
@@ -1,16 +0,0 @@
---- bin/varnishd/http2/cache_http2_hpack.c.orig	2023-03-15 08:52:02 UTC
-+++ bin/varnishd/http2/cache_http2_hpack.c
-@@ -135,10 +135,9 @@ h2h_addhdr(struct http *hp, char *b, size_t namelen, s
- 			n = HTTP_HDR_URL;
- 			disallow_empty = 1;
- 
--			// rfc7540,l,3060,3071
--			if (((len > 0 && *b != '/') ||
--			    (len > 1 && *(b+1) == '/')) &&
--			    (strncmp(b, "*", len) != 0)) {
-+			// rfc9113,l,2693,2705
-+			if (len > 0 && *b != '/' &&
-+			    strncmp(b, "*", len) != 0) {
- 				VSLb(hp->vsl, SLT_BogoHeader,
- 				    "Illegal :path pseudo-header %.*s",
- 				    (int)len, b);
diff --git a/www/varnish7/files/pkg-message.in b/www/varnish7/files/pkg-message.in
index 735801e03c39..369014d32215 100644
--- a/www/varnish7/files/pkg-message.in
+++ b/www/varnish7/files/pkg-message.in
@@ -23,4 +23,17 @@ EOM
 	type: upgrade
 	maximum_version: "7.3.0"
 }
+{
+	message: <<EOM
+For information about updating your current Varnish deployment to the new
+version, see Upgrading to Varnish 7.4:
+  https://varnish-cache.org/docs/7.4/whats-new/upgrading-7.4.html
+
+For the complete release information, see the Varnish Cache 7.4.X release pages:
+  https://varnish-cache.org/releases/rel7.4.0.html
+  https://varnish-cache.org/releases/rel7.4.1.html
+EOM
+	type: upgrade
+	maximum_version: "7.4.1"
+}
 ]
diff --git a/www/varnish7/pkg-descr b/www/varnish7/pkg-descr
index 4eb34e28d0e8..f9fe81558771 100644
--- a/www/varnish7/pkg-descr
+++ b/www/varnish7/pkg-descr
@@ -1,7 +1,7 @@
 This is the Varnish high-performance HTTP accelerator.
 
 Documentation and additional information about Varnish is available on
-http://varnish-cache.org/docs/index.html
+https://varnish-cache.org/docs/index.html
 
 Technical questions about Varnish and this release should be addressed
 to <varnish-dev@varnish-cache.org>
diff --git a/www/varnish7/pkg-plist b/www/varnish7/pkg-plist
index 504e25257693..22080ba4ceb2 100644
--- a/www/varnish7/pkg-plist
+++ b/www/varnish7/pkg-plist
@@ -44,6 +44,7 @@ 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_context.h
 include/varnish/tbl/vcc_feature_bits.h
 include/varnish/tbl/vcl_returns.h
 include/varnish/tbl/vcl_states.h
@@ -85,6 +86,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_options.h
@@ -92,7 +94,7 @@ include/varnish/vut.h
 include/varnish/waiter/waiter.h
 lib/libvarnishapi.so
 lib/libvarnishapi.so.3
-lib/libvarnishapi.so.3.0.0
+lib/libvarnishapi.so.3.1.0
 lib/varnish/vmods/libvmod_blob.so
 lib/varnish/vmods/libvmod_cookie.so
 lib/varnish/vmods/libvmod_debug.so
@@ -123,6 +125,7 @@ man/man7/varnish-cli.7.gz
 man/man7/varnish-counters.7.gz
 man/man7/vcl-backend.7.gz
 man/man7/vcl-probe.7.gz
+man/man7/vcl-step.7.gz
 man/man7/vcl-var.7.gz
 man/man7/vcl.7.gz
 man/man7/vsl-query.7.gz
@@ -133,6 +136,14 @@ share/aclocal/varnish-legacy.m4
 share/aclocal/varnish.m4
 %%PORTDOCS%%%%DOCSDIR%%/builtin.vcl
 %%PORTDOCS%%%%DOCSDIR%%/example.vcl
+%%DATADIR%%/vcc/vmod_blob.vcc
+%%DATADIR%%/vcc/vmod_cookie.vcc
+%%DATADIR%%/vcc/vmod_directors.vcc
+%%DATADIR%%/vcc/vmod_proxy.vcc
+%%DATADIR%%/vcc/vmod_purge.vcc
+%%DATADIR%%/vcc/vmod_std.vcc
+%%DATADIR%%/vcc/vmod_unix.vcc
+%%DATADIR%%/vcc/vmod_vtc.vcc
 %%DATADIR%%/vcl/devicedetect.vcl
 %%DATADIR%%/vmodtool.py
 %%DATADIR%%/vsctool.py