Merge remote-tracking branch 'uplex/master'

Unfortunately, we got out of sync, so I will need to push uplex/master

container/Makefile

@@ -49,7 +49,7 @@ VARNISH_POOL=varnish
 VARNISH_VMODS=libvmod-re2 libvmod-selector libvmod-dynamic libvmod-blobdigest \
 	varnish-objvar
 
-KLARLACK_VERSION=20240128
+KLARLACK_VERSION=20240530
 KLARLACK_DIST=bookworm
 KLARLACK_POOL=klarlack
 KLARLACK_VMODS=libvdfp-pipe libvfp-brotli libvmod-all-healthy \

examples/tls/hello/cafe.vtc

@@ -4,7 +4,7 @@ varnishtest "cafe example with TLS offload"
 
 feature ignore_unknown_macro
 
-feature cmd {haproxy --version 2>&1 | grep -q 'HA-Proxy version'}
+feature cmd {which haproxy}
 
 # Use haproxy to forward the non-TLS request from the VTC client below to
 # the Ingress TLS port.