From: Kirill A. Korinsky <kirill@korins.ky>
Subject: www/varnish: update to 8.0.0
To: OpenBSD ports <ports@openbsd.org>, "Gonzalo L. Rodriguez" <gonzalo@openbsd.org>
Date: Thu, 13 Nov 2025 11:11:12 +0100

Gonzalo,

I'd like to update www/varnish to 8.0.0 which was released two months ago.

We don't need any patches anymore.

I also brifley tested in on -current/amd64, it works.

Ok?

Index: Makefile
===================================================================
RCS file: /home/cvs/ports/www/varnish/Makefile,v
diff -u -p -r1.87 Makefile
--- Makefile	17 Sep 2025 10:28:33 -0000	1.87
+++ Makefile	13 Nov 2025 10:08:06 -0000
@@ -1,10 +1,10 @@
 COMMENT =		high-performance HTTP accelerator
 
-DISTNAME =		varnish-7.7.3
+DISTNAME =		varnish-8.0.0
 
 CATEGORIES =		www
 
-SHARED_LIBS =		varnishapi      4.0     # 3.0
+SHARED_LIBS =		varnishapi      5.0     # 8.0
 
 HOMEPAGE =		https://www.vinyl-cache.org/
 
@@ -30,10 +30,7 @@ LIB_DEPENDS =		devel/pcre2
 USE_GMAKE =		Yes
 SEPARATE_BUILD =	Yes
 
-# requires to patch configure.ac
-AUTOCONF_VERSION =	2.72
-AUTOMAKE_VERSION=	1.16
-CONFIGURE_STYLE =	autoreconf
+CONFIGURE_STYLE =	gnu
 
 CONFIGURE_ENV =		CPPFLAGS="-I${LOCALBASE}/include" \
 			LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \
Index: distinfo
===================================================================
RCS file: /home/cvs/ports/www/varnish/distinfo,v
diff -u -p -r1.42 distinfo
--- distinfo	17 Sep 2025 10:28:33 -0000	1.42
+++ distinfo	13 Nov 2025 10:02:55 -0000
@@ -1,2 +1,2 @@
-SHA256 (varnish-7.7.3.tgz) = 6W7q/Ez+KlWO0vtU8eIr46PZlfRvjADaVF1YOq74AjY=
-SIZE (varnish-7.7.3.tgz) = 4235804
+SHA256 (varnish-8.0.0.tgz) = YzuMRwZZHOriQchDLvhPfF75eH9O6lNbq/X8bGERrVs=
+SIZE (varnish-8.0.0.tgz) = 4385715
Index: patches/patch-bin_varnishd_acceptor_cache_acceptor_h
===================================================================
RCS file: patches/patch-bin_varnishd_acceptor_cache_acceptor_h
diff -N patches/patch-bin_varnishd_acceptor_cache_acceptor_h
--- patches/patch-bin_varnishd_acceptor_cache_acceptor_h	14 Apr 2025 17:48:17 -0000	1.1
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-https://github.com/varnishcache/varnish-cache/pull/4231
-
-Index: bin/varnishd/acceptor/cache_acceptor.h
---- bin/varnishd/acceptor/cache_acceptor.h.orig
-+++ bin/varnishd/acceptor/cache_acceptor.h
-@@ -30,6 +30,8 @@
-  *
-  */
- 
-+#include <pthread.h>
-+
- /* cache_acceptor.c */
- struct listen_sock;
- struct listen_arg;
Index: patches/patch-bin_varnishd_cache_cache_main_c
===================================================================
RCS file: patches/patch-bin_varnishd_cache_cache_main_c
diff -N patches/patch-bin_varnishd_cache_cache_main_c
--- patches/patch-bin_varnishd_cache_cache_main_c	14 Apr 2025 17:48:17 -0000	1.2
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,14 +0,0 @@
-https://github.com/varnishcache/varnish-cache/pull/4231
-
-Index: bin/varnishd/cache/cache_main.c
---- bin/varnishd/cache/cache_main.c.orig
-+++ bin/varnishd/cache/cache_main.c
-@@ -163,6 +163,8 @@ THR_SetName(const char *name)
- #  else
- 	thr_setname_generic(name);
- #  endif
-+#elif defined(HAVE_PTHREAD_SET_NAME_NP)
-+	(void)pthread_set_name_np(pthread_self(), name);
- #endif
- }
- 
Index: patches/patch-configure_ac
===================================================================
RCS file: patches/patch-configure_ac
diff -N patches/patch-configure_ac
--- patches/patch-configure_ac	14 Apr 2025 17:48:17 -0000	1.4
+++ /dev/null	1 Jan 1970 00:00:00 -0000
@@ -1,13 +0,0 @@
-https://github.com/varnishcache/varnish-cache/pull/4231
-
-Index: configure.ac
---- configure.ac.orig
-+++ configure.ac
-@@ -232,6 +232,7 @@ AC_CHECK_FUNCS([fnmatch], [], [AC_MSG_ERROR([fnmatch(3
- save_LIBS="${LIBS}"
- LIBS="${PTHREAD_LIBS}"
- AC_CHECK_FUNCS([pthread_setname_np])
-+AC_CHECK_FUNCS([pthread_set_name_np])
- AC_CHECK_FUNCS([pthread_mutex_isowned_np])
- AC_CHECK_FUNCS([pthread_getattr_np])
- LIBS="${save_LIBS}"
Index: pkg/PLIST
===================================================================
RCS file: /home/cvs/ports/www/varnish/pkg/PLIST,v
diff -u -p -r1.27 PLIST
--- pkg/PLIST	8 Jan 2024 08:16:49 -0000	1.27
+++ pkg/PLIST	13 Nov 2025 10:06:50 -0000
@@ -10,6 +10,7 @@ bin/varnishreload
 @bin bin/varnishstat_help_gen
 @bin bin/varnishtest
 @bin bin/varnishtop
+@bin bin/vtest
 include/varnish/
 include/varnish/cache/
 include/varnish/cache/cache.h
@@ -110,7 +111,6 @@ lib/varnish/
 lib/varnish/vmods/
 @so lib/varnish/vmods/libvmod_blob.so
 @so lib/varnish/vmods/libvmod_cookie.so
-@so lib/varnish/vmods/libvmod_debug.so
 @so lib/varnish/vmods/libvmod_directors.so
 @so lib/varnish/vmods/libvmod_h2.so
 @so lib/varnish/vmods/libvmod_proxy.so


-- 
wbr, Kirill