ports@, Gonzalo, Today a new version of varnish was released.
Changelog quite small: Varnish Cache 7.6.1 (2024-11-08) - Fixed a bug introduced in 7.6.0 that could trigger a panic when using dynamic backends (4183). - Resolved a race condition that caused Varnish to exceed the connection limit set to a backend with the .max_connections attribute (4154). - Fixed an assertion that was added in 7.6.0 and that could lead to a panic in the waiter code under certain conditions (4204). - Removed an assertion on the pid value of varnishd that could trigger a panic in container environments. - Added attempt to raise RLIMIT_MEMLOCK to infinity on startup and improved logging for VSM mlock() errors. (4193) update diff is inlined. Ok? On Thu, 07 Nov 2024 18:11:10 +0100, Kirill A. Korinsky <kir...@korins.ky> wrote: > > ports@, Gonzalo, > > I'd like to update www/varnish to 7.6.0 which was released 13 September. > > Based on: > - https://varnish-cache.org/docs/7.6/whats-new/changes-7.6.html > - https://varnish-cache.org/docs/7.6/whats-new/upgrading-7.6.html > upgrade for users should be simple. > > Anyway, to build it, it requires a few patches. > > Tested on -current/amd64. > > Ok? > Index: Makefile =================================================================== RCS file: /home/cvs/ports/www/varnish/Makefile,v diff -u -p -r1.81 Makefile --- Makefile 6 May 2024 12:24:16 -0000 1.81 +++ Makefile 8 Nov 2024 17:52:35 -0000 @@ -1,7 +1,6 @@ COMMENT = high-performance HTTP accelerator -DISTNAME = varnish-7.5.0 -REVISION = 0 +DISTNAME = varnish-7.6.1 CATEGORIES = www @@ -30,7 +29,12 @@ LIB_DEPENDS = devel/pcre2 USE_GMAKE = Yes SEPARATE_BUILD = Yes -CONFIGURE_STYLE = gnu + +# requires to patch configure.ac +AUTOCONF_VERSION = 2.72 +AUTOMAKE_VERSION= 1.16 +CONFIGURE_STYLE = autoreconf + CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}/include" \ LDFLAGS="-L${LOCALBASE}/lib ${LDFLAGS}" \ PYTHON="${MODPY_BIN}" \ Index: distinfo =================================================================== RCS file: /home/cvs/ports/www/varnish/distinfo,v diff -u -p -r1.37 distinfo --- distinfo 2 May 2024 06:26:56 -0000 1.37 +++ distinfo 8 Nov 2024 18:46:41 -0000 @@ -1,2 +1,2 @@ -SHA256 (varnish-7.5.0.tgz) = /KYbmDE54arGHEVG0SoaOrmAfbsdgxRXHjFIyT/3K10= -SIZE (varnish-7.5.0.tgz) = 4033962 +SHA256 (varnish-7.6.1.tgz) = Wpu1oUn/J4Z7VKZs4W0qS5Pt/6VHPLh8nHH3aZz4Rbo= +SIZE (varnish-7.6.1.tgz) = 4254330 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 --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-bin_varnishd_cache_cache_main_c 7 Nov 2024 15:34:03 -0000 @@ -0,0 +1,22 @@ +https://github.com/varnishcache/varnish-cache/pull/4103 +Index: bin/varnishd/cache/cache_main.c +--- bin/varnishd/cache/cache_main.c.orig ++++ bin/varnishd/cache/cache_main.c +@@ -134,12 +134,14 @@ THR_SetName(const char *name) + { + + PTOK(pthread_setspecific(name_key, name)); +-#if defined(__APPLE__) ++#if defined(HAVE_PTHREAD_SETNAME_NP) ++# if defined(__APPLE__) + (void)pthread_setname_np(name); +-#elif defined(__NetBSD__) ++# elif defined(__NetBSD__) + (void)pthread_setname_np(pthread_self(), "%s", (char *)(uintptr_t)name); +-#else ++# else + (void)pthread_setname_np(pthread_self(), name); ++# endif + #endif + } + Index: patches/patch-configure_ac =================================================================== RCS file: patches/patch-configure_ac diff -N patches/patch-configure_ac --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-configure_ac 7 Nov 2024 15:34:13 -0000 @@ -0,0 +1,12 @@ +https://github.com/varnishcache/varnish-cache/pull/4103 +Index: configure.ac +--- configure.ac.orig ++++ configure.ac +@@ -227,6 +227,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_mutex_isowned_np]) + AC_CHECK_FUNCS([pthread_getattr_np]) + LIBS="${save_LIBS}" Index: patches/patch-lib_libvarnish_vsha256_c =================================================================== RCS file: patches/patch-lib_libvarnish_vsha256_c diff -N patches/patch-lib_libvarnish_vsha256_c --- /dev/null 1 Jan 1970 00:00:00 -0000 +++ patches/patch-lib_libvarnish_vsha256_c 7 Nov 2024 17:01:46 -0000 @@ -0,0 +1,23 @@ +https://github.com/varnishcache/varnish-cache/pull/4226 +Index: lib/libvarnish/vsha256.c +--- lib/libvarnish/vsha256.c.orig ++++ lib/libvarnish/vsha256.c +@@ -35,8 +35,16 @@ + + #ifndef __DARWIN_BYTE_ORDER + # include <endian.h> +-# define VBYTE_ORDER __BYTE_ORDER +-# define VBIG_ENDIAN __BIG_ENDIAN ++# ifdef _BYTE_ORDER ++# define VBYTE_ORDER _BYTE_ORDER ++# else ++# define VBYTE_ORDER __BYTE_ORDER ++# endif ++# ifdef _BIG_ENDIAN ++# define VBIG_ENDIAN _BIG_ENDIAN ++# else ++# define VBIG_ENDIAN __BIG_ENDIAN ++# endif + #else + # define VBYTE_ORDER __DARWIN_BYTE_ORDER + # define VBIG_ENDIAN __DARWIN_BIG_ENDIAN -- wbr, Kirill
