varnish: update to 6.6.0

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: varnish: update to 6.6.0
From: Tobias Nygren <tnn%NetBSD.org@localhost>
Date: Wed, 23 Jun 2021 21:36:51 +0000
Module Name:	pkgsrc-wip
Committed By:	Tobias Nygren <tnn%NetBSD.org@localhost>
Pushed By:	tnn
Date:		Wed Jun 23 23:36:51 2021 +0200
Changeset:	4dfe2a36f804c4b0b26124288fc7205c836929f1

Modified Files:
	varnish/Makefile
	varnish/Makefile.common
	varnish/PLIST
	varnish/buildlink3.mk
	varnish/distinfo
	varnish/patches/patch-bin_varnishd_cache_cache__panic.c
	varnish/patches/patch-etc_Makefile.in
Added Files:
	varnish/patches/patch-include_tbl_params.h

Log Message:
varnish: update to 6.6.0

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=4dfe2a36f804c4b0b26124288fc7205c836929f1

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

diffstat:
 varnish/Makefile                                   |  2 +-
 varnish/Makefile.common                            | 18 +++++-----
 varnish/PLIST                                      | 42 ++++++++++++++++------
 varnish/buildlink3.mk                              |  2 +-
 varnish/distinfo                                   | 13 +++----
 .../patch-bin_varnishd_cache_cache__panic.c        | 10 +++---
 varnish/patches/patch-etc_Makefile.in              | 10 +++---
 varnish/patches/patch-include_tbl_params.h         | 24 +++++++++++++
 8 files changed, 84 insertions(+), 37 deletions(-)

diffs:
diff --git a/varnish/Makefile b/varnish/Makefile
index 84a52d5648..7719666bd1 100644
--- a/varnish/Makefile
+++ b/varnish/Makefile
@@ -1,6 +1,6 @@
 # $NetBSD$
 
-DISTNAME=	varnish-5.1.2
+DISTNAME=	varnish-6.6.0
 
 .include "../../wip/varnish/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/varnish/Makefile.common b/varnish/Makefile.common
index 323d56182b..8860f80064 100644
--- a/varnish/Makefile.common
+++ b/varnish/Makefile.common
@@ -1,16 +1,16 @@
 # $NetBSD$
-# used by wip/varnish/Makefile
-# used by wip/varnish4/Makefile
 
 CATEGORIES=	www
-MASTER_SITES=	http://repo.varnish-cache.org/source/
+MASTER_SITES=	https://varnish-cache.org/_downloads/
 
 MAINTAINER?=	pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=	https://varnish-cache.org/
 COMMENT=	High-performace HTTP accelerator
 LICENSE=	modified-bsd
+EXTRACT_SUFX=	.tgz
 
 BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+PYTHON_VERSIONED_DEPENDENCIES=	sphinx:tool
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
@@ -46,11 +46,13 @@ FILES_SUBST+=		VRNUSER=${VRNUSER}
 FILES_SUBST+=		VRNGROUP=${VRNGROUP}
 
 REPLACE_PYTHON+=	lib/libvcc/vmodtool.py
+REPLACE_PYTHON+=	lib/libvcc/vsctool.py
 
 CONFIGURE_ARGS+=	--localstatedir=${STATEDIR}
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFBASE}
-CONFIGURE_ARGS+=	--with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
-CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
+CONFIGURE_ARGS+=	--with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}
+CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}
+CONFIGURE_ARGS+=	--with-sphinx-build=${PREFIX}/bin/sphinx-build-${PYVERSSUFFIX}
 
 # Explicitly disable epoll on illumos, provided for Linux compat only.
 CONFIGURE_ARGS.SunOS+=	--disable-epoll
@@ -59,9 +61,10 @@ CONFIGURE_ARGS.SunOS+=	--disable-epoll
 
 # Fixes build on at least SunOS/i386
 # See https://github.com/varnishcache/varnish-cache/issues/1875
-.if !empty(CC_VERSION:Mgcc*)
+.if !empty(CC_VERSION:Mgcc*) && ${MACHINE_ARCH} == "i386"
 CFLAGS+=		-fexcess-precision=standard
 .endif
+LDFLAGS+=		-lm # for ldexp
 
 INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/varnish
 
@@ -74,11 +77,10 @@ RCD_SCRIPTS=		varnishd varnishlog varnishncsa
 
 TEST_TARGET=		check
 
-PYTHON_FOR_BUILD_ONLY=	yes
-
 .include "../../devel/pcre/buildlink3.mk"
 .include "../../devel/libexecinfo/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../lang/python/versioned_dependencies.mk"
 .include "../../mk/curses.buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/readline.buildlink3.mk"
diff --git a/varnish/PLIST b/varnish/PLIST
index 5ee742c26b..273a018069 100644
--- a/varnish/PLIST
+++ b/varnish/PLIST
@@ -4,18 +4,21 @@ bin/varnishhist
 bin/varnishlog
 bin/varnishncsa
 bin/varnishstat
+bin/varnishstat_help_gen
 bin/varnishtest
 bin/varnishtop
 include/varnish/cache/cache.h
 include/varnish/cache/cache_backend.h
 include/varnish/cache/cache_director.h
 include/varnish/cache/cache_filter.h
-include/varnish/common/com_params.h
-include/varnish/common/common.h
+include/varnish/cache/cache_varnishd.h
+include/varnish/common/common_param.h
 include/varnish/miniobj.h
 include/varnish/tbl/acct_fields_bereq.h
 include/varnish/tbl/acct_fields_req.h
 include/varnish/tbl/backend_poll.h
+include/varnish/tbl/ban_arg_oper.h
+include/varnish/tbl/ban_oper.h
 include/varnish/tbl/ban_vars.h
 include/varnish/tbl/bo_flags.h
 include/varnish/tbl/boc_state.h
@@ -27,45 +30,42 @@ include/varnish/tbl/h2_error.h
 include/varnish/tbl/h2_frames.h
 include/varnish/tbl/h2_settings.h
 include/varnish/tbl/h2_stream.h
+include/varnish/tbl/htc.h
 include/varnish/tbl/http_headers.h
 include/varnish/tbl/http_response.h
 include/varnish/tbl/locks.h
+include/varnish/tbl/mgt_vcc.h
 include/varnish/tbl/obj_attr.h
 include/varnish/tbl/oc_exp_flags.h
 include/varnish/tbl/oc_flags.h
 include/varnish/tbl/params.h
-include/varnish/tbl/req_body.h
 include/varnish/tbl/req_flags.h
 include/varnish/tbl/sess_attr.h
 include/varnish/tbl/sess_close.h
-include/varnish/tbl/steps.h
 include/varnish/tbl/symbol_kind.h
-include/varnish/tbl/vcc_types.h
 include/varnish/tbl/vcl_returns.h
+include/varnish/tbl/vcl_states.h
 include/varnish/tbl/vhd_fsm.h
 include/varnish/tbl/vhd_fsm_funcs.h
 include/varnish/tbl/vhd_return.h
 include/varnish/tbl/vhp_huffman.h
 include/varnish/tbl/vhp_static.h
 include/varnish/tbl/vrt_stv_var.h
-include/varnish/tbl/vsc_all.h
-include/varnish/tbl/vsc_f_main.h
-include/varnish/tbl/vsc_fields.h
 include/varnish/tbl/vsc_levels.h
-include/varnish/tbl/vsc_types.h
+include/varnish/tbl/vsig_list.h
 include/varnish/tbl/vsl_tags.h
 include/varnish/tbl/vsl_tags_http.h
 include/varnish/tbl/waiters.h
 include/varnish/vapi/vapi_options.h
 include/varnish/vapi/voptget.h
 include/varnish/vapi/vsc.h
-include/varnish/vapi/vsc_int.h
+include/varnish/vapi/vsig.h
 include/varnish/vapi/vsl.h
 include/varnish/vapi/vsl_int.h
 include/varnish/vapi/vsm.h
-include/varnish/vapi/vsm_int.h
 include/varnish/vas.h
 include/varnish/vav.h
+include/varnish/vbh.h
 include/varnish/vbm.h
 include/varnish/vcl.h
 include/varnish/vcli.h
@@ -82,11 +82,21 @@ include/varnish/vsb.h
 include/varnish/vsha256.h
 include/varnish/vtcp.h
 include/varnish/vtim.h
+include/varnish/vtree.h
+include/varnish/vut.h
+include/varnish/vut_options.h
 include/varnish/waiter/waiter.h
 lib/libvarnishapi.la
 lib/pkgconfig/varnishapi.pc
+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_proxy.la
+lib/varnish/vmods/libvmod_purge.la
 lib/varnish/vmods/libvmod_std.la
+lib/varnish/vmods/libvmod_unix.la
+lib/varnish/vmods/libvmod_vtc.la
 man/man1/varnishadm.1
 man/man1/varnishd.1
 man/man1/varnishhist.1
@@ -95,10 +105,19 @@ man/man1/varnishncsa.1
 man/man1/varnishstat.1
 man/man1/varnishtest.1
 man/man1/varnishtop.1
+man/man3/vmod_blob.3
+man/man3/vmod_cookie.3
 man/man3/vmod_directors.3
+man/man3/vmod_proxy.3
+man/man3/vmod_purge.3
 man/man3/vmod_std.3
+man/man3/vmod_unix.3
+man/man3/vmod_vtc.3
 man/man7/varnish-cli.7
 man/man7/varnish-counters.7
+man/man7/vcl-backend.7
+man/man7/vcl-probe.7
+man/man7/vcl-var.7
 man/man7/vcl.7
 man/man7/vsl-query.7
 man/man7/vsl.7
@@ -110,3 +129,4 @@ share/examples/varnish/builtin.vcl
 share/examples/varnish/example.vcl
 share/varnish/vcl/devicedetect.vcl
 share/varnish/vmodtool.py
+share/varnish/vsctool.py
diff --git a/varnish/buildlink3.mk b/varnish/buildlink3.mk
index 14dca60dac..dd0079c26a 100644
--- a/varnish/buildlink3.mk
+++ b/varnish/buildlink3.mk
@@ -5,7 +5,7 @@ BUILDLINK_TREE+=	varnish
 .if !defined(VARNISH_BUILDLINK3_MK)
 VARNISH_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.varnish+=	varnish>=5.1.2
+BUILDLINK_API_DEPENDS.varnish+=	varnish>=6.6.0
 BUILDLINK_PKGSRCDIR.varnish?=	../../wip/varnish
 
 .endif	# VARNISH_BUILDLINK3_MK
diff --git a/varnish/distinfo b/varnish/distinfo
index 2ff86d790b..effb7970c4 100644
--- a/varnish/distinfo
+++ b/varnish/distinfo
@@ -1,8 +1,9 @@
 $NetBSD: distinfo,v 1.13 2015/03/09 00:47:05 mspo Exp $
 
-SHA1 (varnish-5.1.2.tar.gz) = 602f5d4852385402f16e130049fb19c027da0b1c
-RMD160 (varnish-5.1.2.tar.gz) = 99adb4b130cd3446c109f8d9f6fc1d886bc66803
-SHA512 (varnish-5.1.2.tar.gz) = 6ee71c2678a34f7e3963547d8e79bd83e3b326ffe703ad60f0d6f8f218a3801849c870aa00e407008ef22cd2b2baf4cbe02625ce77018279afdb8208d43a743b
-Size (varnish-5.1.2.tar.gz) = 2597817 bytes
-SHA1 (patch-bin_varnishd_cache_cache__panic.c) = 08958f54c5ec5d70d9aa7fcbcf8fb97ce35533fa
-SHA1 (patch-etc_Makefile.in) = 02e500aeae7c3b293ddcf7d3ab8f03d7a267010f
+SHA1 (varnish-6.6.0.tgz) = c330a3cbdbb13586338d1419ef8913efbd3816ae
+RMD160 (varnish-6.6.0.tgz) = 550dfcf68597dc2937c7eafa7dd03ff805c3cdfa
+SHA512 (varnish-6.6.0.tgz) = 0f52e94dd866a7cf141f9333a9169b396627f169907acb2d64f18dcac3188f9d9f1e72ea9eb9f2c0c19a5f53df0c90446041eb2b1e52f4756ea257efb329d0d1
+Size (varnish-6.6.0.tgz) = 3519048 bytes
+SHA1 (patch-bin_varnishd_cache_cache__panic.c) = cf2b9c1f2c3ba15c7e20baca3c9af607a3e1fa82
+SHA1 (patch-etc_Makefile.in) = f4407cad5f9f6c6402ab3b7fce0e1577d70b36be
+SHA1 (patch-include_tbl_params.h) = 649355bb5a43bf2db6a40076be55fe165dd97edf
diff --git a/varnish/patches/patch-bin_varnishd_cache_cache__panic.c b/varnish/patches/patch-bin_varnishd_cache_cache__panic.c
index cdf87d43ac..3298566c7a 100644
--- a/varnish/patches/patch-bin_varnishd_cache_cache__panic.c
+++ b/varnish/patches/patch-bin_varnishd_cache_cache__panic.c
@@ -2,9 +2,9 @@ $NetBSD$
 
 Need sys/cdefs.h for __BEGIN_DECLS/__END_DECLS.
 
---- bin/varnishd/cache/cache_panic.c.orig	2017-03-14 14:44:51.000000000 +0000
+--- bin/varnishd/cache/cache_panic.c.orig	2021-03-12 15:02:41.000000000 +0000
 +++ bin/varnishd/cache/cache_panic.c
-@@ -29,6 +29,10 @@
+@@ -31,6 +31,10 @@
  
  #include "config.h"
  
@@ -12,6 +12,6 @@ Need sys/cdefs.h for __BEGIN_DECLS/__END_DECLS.
 +#include <sys/cdefs.h>
 +#endif
 +
- #include <execinfo.h>
- #include <errno.h>
- #include <stdio.h>
+ #ifdef WITH_UNWIND
+ #  include <libunwind.h>
+ #else
diff --git a/varnish/patches/patch-etc_Makefile.in b/varnish/patches/patch-etc_Makefile.in
index 5bdf10254d..0ab081ce79 100644
--- a/varnish/patches/patch-etc_Makefile.in
+++ b/varnish/patches/patch-etc_Makefile.in
@@ -2,18 +2,18 @@ $NetBSD$
 
 Use standard sysconfdir for vcl files.
 
---- etc/Makefile.in.orig	2016-09-15 09:24:12.000000000 +0000
+--- etc/Makefile.in.orig	2021-03-15 11:36:30.000000000 +0000
 +++ etc/Makefile.in
-@@ -146,7 +146,7 @@ am__uninstall_files_from_dir = { \
+@@ -157,7 +157,7 @@ am__uninstall_files_from_dir = { \
      || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
           $(am__cd) "$$dir" && rm -f $$files; }; \
    }
 -am__installdirs = "$(DESTDIR)$(docdir)" "$(DESTDIR)$(vcldir)"
 +am__installdirs = "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(vcldir)"
  DATA = $(dist_doc_DATA) $(dist_vcl_DATA)
+ am__extra_recursive_targets = recheck-recursive
  am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
- DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
-@@ -347,18 +347,18 @@ clean-libtool:
+@@ -380,18 +380,18 @@ clean-libtool:
  	-rm -rf .libs _libs
  install-dist_docDATA: $(dist_doc_DATA)
  	@$(NORMAL_INSTALL)
@@ -37,7 +37,7 @@ Use standard sysconfdir for vcl files.
  	done
  
  uninstall-dist_docDATA:
-@@ -428,7 +428,7 @@ check-am: all-am
+@@ -465,7 +465,7 @@ check-am: all-am
  check: check-am
  all-am: Makefile $(DATA)
  installdirs:
diff --git a/varnish/patches/patch-include_tbl_params.h b/varnish/patches/patch-include_tbl_params.h
new file mode 100644
index 0000000000..3b21cfdcb3
--- /dev/null
+++ b/varnish/patches/patch-include_tbl_params.h
@@ -0,0 +1,24 @@
+$NetBSD$
+
+Change some defaults limits to cover NetBSD defaults.
+
+--- include/tbl/params.h.orig	2021-03-12 15:02:41.000000000 +0000
++++ include/tbl/params.h
+@@ -856,7 +856,7 @@ PARAM_SIMPLE(
+ 	/* name */	tcp_keepalive_intvl,
+ 	/* type */	timeout,
+ 	/* min */	"1",
+-	/* max */	"100",
++	/* max */	"150",
+ 	/* def */	NULL,
+ 	/* units */	"seconds",
+ 	/* descr */
+@@ -889,7 +889,7 @@ PARAM_SIMPLE(
+ 	/* name */	tcp_keepalive_time,
+ 	/* type */	timeout,
+ 	/* min */	"1",
+-	/* max */	"7200",
++	/* max */	"14400",
+ 	/* def */	NULL,
+ 	/* units */	"seconds",
+ 	/* descr */
Prev by Date: varnish4: remove outdated package
Next by Date: pkg-dev: Update to 0.3.0.12
Previous by Thread: varnish4: remove outdated package
Next by Thread: pkg-dev: Update to 0.3.0.12
Indexes:
Home | Main Index | Thread Index | Old Index