Dust off the wip/varnish* packages and bring them up to the latest version 4 and 5 resp. Introduce a Makefile.common framework as they two releases build almost identically.

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: Dust off the wip/varnish* packages and bring them up to the latest version 4 and 5 resp. Introduce a Makefile.common framework as they two releases build almost identically.
From: Filip Hajny <filip%joyent.com@localhost>
Date: Wed, 15 Mar 2017 15:35:04 +0000
Module Name:	pkgsrc-wip
Committed By:	Filip Hajny <filip%joyent.com@localhost>
Pushed By:	fhajny
Date:		Wed Mar 15 15:35:04 2017 +0000
Changeset:	7dd19daed32fc93e7a9172d74d0329fc19b5eacd

Modified Files:
	varnish/Makefile
	varnish/PLIST
	varnish/distinfo
	varnish4/Makefile
	varnish4/PLIST
	varnish4/distinfo
Added Files:
	varnish/Makefile.common
	varnish/patches/patch-bin_varnishd_cache_cache__panic.c
	varnish/patches/patch-etc_Makefile.in
	varnish4/patches/patch-bin_varnishd_cache_cache__panic.c
	varnish4/patches/patch-etc_Makefile.in
Removed Files:
	varnish/patches/patch-etc__Makefile.in
	varnish4/patches/patch-etc__Makefile.in
	varnish4/patches/patch-lib_libvarnish_vtcp.c

Log Message:
Dust off the wip/varnish* packages and bring them up to the latest
version 4 and 5 resp. Introduce a Makefile.common framework as they two
releases build almost identically.

Varnish Cache 5.0.0 (2016-09-15)
================================================================

- Documentation updates, especially the what's new and upgrade sections.
- Via: header made by Varnish now says 5.0.
- VMOD VRT ABI level increased.
- [vcl] obj.(ttl|age|grace|keep) is now readable in vcl_deliver.
- Latest devicedetect.vcl imported from upstream.
- New system wide VCL directory: /usr/share/varnish/vcl/
- std.integer() can now convert from REAL.

Bugs fixed
- Ignore H2 upgrades if the feature is not enabled.
- Introduce new macros for out-of-tree VMODs
- varnishstat -1 -f field inclusion glob doesn't allow VBE backend
  fields
- Panic: Assert error in VBE_Delete()
- PRIV_TASK in vcl_init/fini

Varnish Cache 5.0.0-beta1 (2016-09-09)
================================================================

This is the first beta release of the upcoming 5.0 release. The list of
changes are numerous and will not be expanded on in detail.

Major items:
- VCL labels, allowing for per-vhost (or per-anything) separate VCL
  files.
- (Very!) experimental support for HTTP/2.
- Always send the request body to the backend, making possible to cache
  responses of POST, PATCH requests etc with appropriate custom VCL
  and/or VMODs.
- hit-for-pass is now actually hit-for-miss.
- new shard director for loadbalancing by consistent hashing
- ban lurker performance improvements
- access to obj.ttl, obj.age, obj.grace and obj.keep in vcl_deliver

News for Vmod Authors
- workspace and PRIV_TASK for vcl cli events (init/fini methods)
- PRIV_* now also work for object methods with unchanged scope.

Varnish Cache 4.1.5 (2017-02-09)
================================================================

No code changes since 4.1.5-beta2.

Varnish Cache 4.1.5-beta2 (2017-02-08)
================================================================

- Update devicedetect.vcl

Bugs fixed
- Reverted the docfix and made the fech_failed counter do what the
  documentation says it should do
- Panic accessing beresp.backend.ip in vcl_backend_error
- VCC will not parse a literal negative number where INT is expected
- Cannot subtract a negative number

Varnish Cache 4.1.5-beta1 (2017-02-02)
================================================================

Bugs fixed
- (docfix) Clarify description of fetch_failed counter
- Panic in workspace exhaustion conditions
- 4.1.3: Varnish crashes with "Assert error in CNT_Request(),
  cache/cache_req_fsm.c line 820"
- Disable Nagle's
- varnishncsa cannot decode Authorization header if the format is
  incorrect.
- Compare 'bereq.backend' / 'req.backend_hint' myDirector.backend() does
  not work
- 4.1 branch does not compile on FreeBSD
- Fix vsm_free (never incremented)
- (docfix)varnishncsa: The %r formatter is NOT equivalent to...
- ESI parser panic on malformed src URL

Varnish Cache 4.1.4 (2016-12-01)
================================================================

Bugs fixed
- varnishd stalls with two consecutive Range requests using HTTP
  persistent connections

Varnish Cache 4.1.4-beta3 (2016-11-24)
================================================================

- Include the current time of the panic in the panic output
- Keep a reserve of idle threads for vital tasks

Bugs fixed
- clock-step related crash
- (docfix) What does -p flag for backend.list command means
- VSM temporary files are not always deleted
- (docfix) stack overflow with >4 level esi

Varnish Cache 4.1.4-beta2 (2016-10-13)
================================================================

Bugs fixed
- VSL API: "duplicate link" errors in request grouping when vsl_buffer
  is increased
- varnishadm CLI behaving weirdly
- varnishncsa docfix: "%r" field is wrong
- (docfix) HEAD requestes changed to GET

Varnish Cache 4.1.4-beta1 (2016-09-14)
================================================================

- [varnishhist] Various improvements
- [varnishtest] A cmd feature for custom shell-based checks
- Documentation improvements (do_stream, sess_herd, timeout_linger,
  thread_pools)
- [varnishtop] Documented behavior when both -p and -1 are specified

Bugs fixed
- Racy backend selection
- panic vmod_rr_resolve() round_robin.c line 75 (be) != NULL
- VBE.*.conn (concurrent connections to backend) not working as expected
- Assert error in VBE_Delete()
- Update documentation part about CLI/management port authentication
  paramater
- std.cache_req_body() w/ return(pipe) is broken

Varnish Cache 4.1.3 (2016-07-06)
================================================================

- Be stricter when parsing request headers to harden against smuggling
  attacks.

Varnish Cache 4.1.3-beta2 (2016-06-28)
================================================================

- New parameter vsm_free_cooldown. Specifies how long freed VSM memory
  (shared log) will be kept around before actually being freed.
- varnishncsa now accepts -L argument to configure the limit on
  incomplete transactions kept. (Issue 1994)

Bugs fixed
- Make the counter vsm_cooling act according to spec
- Avoid abort when changing to a VCL name which is a path
- Don't trust dlopen refcounting

Varnish Cache 4.1.3-beta1 (2016-06-15)
================================================================

- varnishncsa can now access and log backend requests. (PR #1905)
- [varnishncsa] New output formatters %{Varnish:vxid}x and %{VSL:Tag}x.
- [varnishlog] Added log tag BackendStart on backend transactions.
- On SmartOS, use ports instead of epoll by default.
- Add support for TCP Fast Open where available. Disabled by default.
- [varnishtest] New syncronization primitive barriers added, improving
  coordination when test cases call external programs.

Bugs fixed
- Add missing Wait_HeapDelete
- [ncsa] Remove implicit line feed when using formatfile
- 4.1.x sometimes duplicates Age and Accept-Ranges headers
- Correctly handle HTTP/1.1 EOF response
- Deal with fetch failures in ved_stripgzip
- Allow VCL set Last-Modified to be used for I-M-S processing
- req->task members must be set in case we get onto the waitinglist
- Make std.log() and std.syslog() work from vcl_{init,fini}
- Avoid ban lurker panic with empty olist
- Correctly handle EOF responses with HTTP/1.1
- Fix (insignificant) memory leak with mal-formed ESI directives.
- Release memory instead of crashing on malformed ESI
- [vmodtool] Method names should start with a period
- Correct handling of duplicate headers on IMS header merge
- Fix a ESI+gzip corner case which had escaped notice until now
- Check for overrun before looking at the next vsm record
- Missing error handling code in V1F_Setup_Fetch
- Remove temporary directory iff called with -C
- Only accept C identifiers as acls
- Truncate output if it's wider than 12 chars
- One minute delay on return (pipe) and a POST-Request
- Revive the backend_conn counter

Varnish Cache 4.1.2 (2016-03-04)
================================================================

- [vmods] vmodtool improvements for multiple VMODs in a single
  directory.

Bugs fixed
- ESI-related memory leaks
- Don't reset the oc->ban pointer from BAN_CheckObject
- Avoid panic if the lurker is working on a ban to be checked.

Varnish Cache 4.1.2-beta2 (2016-02-25)
================================================================

- [vmods] Passing VCL ACL to a VMOD is now possible.
- [vmods] VRT_MINOR_VERSION increase due to new function:
  VRT_acl_match()
- Some test case stabilization fixes and minor documentation updates.
- Improved handling of workspace exhaustion when fetching objects.

Bugs fixed

- Hit-for-pass objects are not IMS candidates

Varnish Cache 4.1.2-beta1 (2016-02-17)
================================================================

- Be stricter when parsing a HTTP request to avoid potential HTTP
  smuggling attacks against vulnerable backends.
- Some fixes to minor/trivial issues found with clang AddressSanitizer.
- Arithmetric on REAL data type in VCL is now possible.
- vmodtool.py improvements to allow VMODs for 4.0 and 4.1 to share a
  source tree.
- Off-by-one in WS_Reset() fixed.
- "https_scheme" parameter added. Enables graceful handling of compound
  request URLs with HTTPS scheme. (Bug 1847)

Bugs fixed
- Workspace overflow handling in VFP_Push()
- Error compiling VCL if probe is referenced before it is defined
- Replace alien FD's with /dev/null rather than just closing them
- Fail HTTP/1.0 POST and PUT requests without Content-Length
- Correct ENUM handling in object constructors
- Varnish 4.1.1 fails to build on i386
- Add a missing VDP flush operation after ESI:includes.
- Fix timeout calculation for session herding.

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

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

diffstat:
 varnish/Makefile                                   | 66 +-----------------
 varnish/Makefile.common                            | 78 ++++++++++++++++++++++
 varnish/PLIST                                      | 35 +++++++---
 varnish/distinfo                                   | 11 +--
 .../patch-bin_varnishd_cache_cache__panic.c        | 17 +++++
 varnish/patches/patch-etc_Makefile.in              | 48 +++++++++++++
 varnish/patches/patch-etc__Makefile.in             | 15 -----
 varnish4/Makefile                                  | 66 +-----------------
 varnish4/PLIST                                     | 26 +++++---
 varnish4/distinfo                                  | 12 ++--
 .../patch-bin_varnishd_cache_cache__panic.c        | 17 +++++
 varnish4/patches/patch-etc_Makefile.in             | 48 +++++++++++++
 varnish4/patches/patch-etc__Makefile.in            | 15 -----
 varnish4/patches/patch-lib_libvarnish_vtcp.c       | 12 ----
 14 files changed, 270 insertions(+), 196 deletions(-)

diffs:
diff --git a/varnish/Makefile b/varnish/Makefile
index 923db8e81e..f58bfd7710 100644
--- a/varnish/Makefile
+++ b/varnish/Makefile
@@ -1,66 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2015/08/18 07:31:20 wiz Exp $
+# $NetBSD$
 
-DISTNAME=	varnish-4.1.1
-CATEGORIES=	www
-MASTER_SITES=	http://repo.varnish-cache.org/source/
+DISTNAME=	varnish-5.0.0
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://varnish-cache.org/
-COMMENT=	High-performace HTTP accelerator
-LICENSE=	modified-bsd
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake
-BUILD_DEFS+=	VARBASE
-
-CONF_FILES=		${PREFIX}/share/doc/varnish/example.vcl ${PKG_SYSCONFDIR}/example.vcl
-
-VRNUSER?=		varnish
-VRNGROUP?=		${VRNUSER}
-STATEDIR=		${VARBASE}/db
-VRNDIR=			${STATEDIR}/${PKGBASE}
-
-CONFIGURE_ARGS+=	--localstatedir=${STATEDIR}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-OWN_DIRS+=		${VRNDIR}
-OWN_DIRS_PERMS+=	${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
-
-PKG_GROUPS+=		${VRNGROUP}
-PKG_USERS+=		${VRNUSER}:${VRNGROUP}
-PKG_HOME.${VRNUSER}=	${VRNDIR}
-PKG_SHELL.${VRNUSER}=	${SH}
-PKG_GECOS.${VRNUSER}=	Varnish daemon user
-
-FILES_SUBST+=		VRNUSER=${VRNUSER}
-FILES_SUBST+=		VRNGROUP=${VRNGROUP}
-
-RCD_SCRIPTS=		varnishd varnishlog varnishncsa
-PYTHON_FOR_BUILD_ONLY=	yes
-REPLACE_PYTHON+=	lib/libvcc/vmodtool.py
-
-BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
-CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
-CONFIGURE_ARGS+=	--with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-# Explicitly disable epoll on illumos, provided for Linux compat only.
-CONFIGURE_ENV+=	ac_cv_func_epoll_ctl=no
-.  if ${PKGSRC_COMPILER} == "sunpro"
-CONFIGURE_ENV+=	VCC_CC="cc ${_COMPILER_ABI_FLAG.${ABI}} -Kpic -G -o %o %s"
-.  else
-CONFIGURE_ENV+=	VCC_CC="gcc ${_COMPILER_ABI_FLAG.${ABI}} -fpic -shared -o %o %s"
-.  endif
-.endif
-
-# not signed/unsigned char safe
-BUILDLINK_TRANSFORM+=    rm:-Werror
-
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
+.include "../../wip/varnish/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/varnish/Makefile.common b/varnish/Makefile.common
new file mode 100644
index 0000000000..5127915d14
--- /dev/null
+++ b/varnish/Makefile.common
@@ -0,0 +1,78 @@
+# $NetBSD$
+# used by wip/varnish/Makefile
+# used by wip/varnish4/Makefile
+
+CATEGORIES=	www
+MASTER_SITES=	http://repo.varnish-cache.org/source/
+
+MAINTAINER?=	pkgsrc-users%NetBSD.org@localhost
+HOMEPAGE=	http://varnish-cache.org/
+COMMENT=	High-performace HTTP accelerator
+LICENSE=	modified-bsd
+
+BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config gmake
+
+BUILD_DEFS+=	VARBASE
+
+CONF_FILES=		share/examples/varnish/builtin.vcl \
+			${PKG_SYSCONFDIR}/builtin.vcl
+CONF_FILES+=		share/examples/varnish/example.vcl \
+			${PKG_SYSCONFDIR}/example.vcl
+
+.include "../../mk/bsd.prefs.mk"
+
+VRNUSER?=		varnish
+VRNGROUP?=		${VRNUSER}
+STATEDIR=		${VARBASE}/db
+VRNDIR=			${STATEDIR}/${PKGBASE}
+
+OWN_DIRS+=		${VRNDIR}
+OWN_DIRS_PERMS+=	${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
+
+PKG_GROUPS+=		${VRNGROUP}
+PKG_USERS+=		${VRNUSER}:${VRNGROUP}
+PKG_HOME.${VRNUSER}=	${VRNDIR}
+PKG_SHELL.${VRNUSER}=	${SH}
+PKG_GECOS.${VRNUSER}=	Varnish daemon user
+
+FILES_SUBST+=		VRNUSER=${VRNUSER}
+FILES_SUBST+=		VRNGROUP=${VRNGROUP}
+
+REPLACE_PYTHON+=	lib/libvcc/vmodtool.py
+
+CONFIGURE_ARGS+=	--localstatedir=${STATEDIR}
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
+CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
+
+.if ${OPSYS} == "SunOS"
+# Explicitly disable epoll on illumos, provided for Linux compat only.
+CONFIGURE_ENV+=		ac_cv_func_epoll_ctl=no
+.  if !empty(PKGSRC_COMPILER:Msunpro)
+CONFIGURE_ENV+=		VCC_CC="cc ${_COMPILER_ABI_FLAG.${ABI}} -Kpic -G -o %o %s"
+.  else
+CONFIGURE_ENV+=		VCC_CC="gcc ${_COMPILER_ABI_FLAG.${ABI}} -fpic -shared -o %o %s"
+.  endif
+.endif
+
+INSTALL_MAKE_FLAGS+=	sysconfdir=${PREFIX}/share/examples/varnish
+
+# not signed/unsigned char safe
+BUILDLINK_TRANSFORM+=	rm:-Werror
+
+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 "../../mk/curses.buildlink3.mk"
+.include "../../mk/pthread.buildlink3.mk"
+.include "../../mk/readline.buildlink3.mk"
diff --git a/varnish/PLIST b/varnish/PLIST
index 229d791f25..a417e62dc1 100644
--- a/varnish/PLIST
+++ b/varnish/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2014/03/11 14:05:18 jperkin Exp $
+@comment $NetBSD$
 bin/varnishadm
 bin/varnishhist
 bin/varnishlog
@@ -6,7 +6,6 @@ bin/varnishncsa
 bin/varnishstat
 bin/varnishtest
 bin/varnishtop
-include/varnish/vcli.h
 include/varnish/cache/cache.h
 include/varnish/cache/cache_backend.h
 include/varnish/cache/cache_director.h
@@ -19,13 +18,21 @@ include/varnish/tbl/acct_fields_req.h
 include/varnish/tbl/backend_poll.h
 include/varnish/tbl/ban_vars.h
 include/varnish/tbl/bo_flags.h
+include/varnish/tbl/boc_state.h
 include/varnish/tbl/body_status.h
+include/varnish/tbl/cli_cmds.h
 include/varnish/tbl/debug_bits.h
 include/varnish/tbl/feature_bits.h
+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/http_headers.h
 include/varnish/tbl/http_response.h
 include/varnish/tbl/locks.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
@@ -35,6 +42,11 @@ 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/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
@@ -55,11 +67,13 @@ include/varnish/vas.h
 include/varnish/vav.h
 include/varnish/vbm.h
 include/varnish/vcl.h
+include/varnish/vcli.h
 include/varnish/vcs.h
 include/varnish/vdef.h
 include/varnish/vmod_abi.h
 include/varnish/vqueue.h
 include/varnish/vre.h
+include/varnish/vrnd.h
 include/varnish/vrt.h
 include/varnish/vrt_obj.h
 include/varnish/vsa.h
@@ -70,11 +84,11 @@ include/varnish/vtim.h
 include/varnish/waiter/waiter.h
 lib/libvarnishapi.la
 lib/pkgconfig/varnishapi.pc
-lib/varnish/libvcc.la
-lib/varnish/vmods/libvmod_directors.la
 lib/varnish/libvarnish.la
 lib/varnish/libvarnishcompat.la
+lib/varnish/libvcc.la
 lib/varnish/libvgz.la
+lib/varnish/vmods/libvmod_directors.la
 lib/varnish/vmods/libvmod_std.la
 man/man1/varnishadm.1
 man/man1/varnishd.1
@@ -84,15 +98,18 @@ man/man1/varnishncsa.1
 man/man1/varnishstat.1
 man/man1/varnishtest.1
 man/man1/varnishtop.1
-man/man3/vmod_std.3
 man/man3/vmod_directors.3
-man/man7/vsl-query.7
-man/man7/vsl.7
+man/man3/vmod_std.3
 man/man7/varnish-cli.7
 man/man7/varnish-counters.7
 man/man7/vcl.7
+man/man7/vsl-query.7
+man/man7/vsl.7
+man/man7/vtc.7
 sbin/varnishd
+share/aclocal/varnish-legacy.m4
 share/aclocal/varnish.m4
-share/doc/varnish/builtin.vcl
-share/doc/varnish/example.vcl
+share/examples/varnish/builtin.vcl
+share/examples/varnish/example.vcl
+share/varnish/vcl/devicedetect.vcl
 share/varnish/vmodtool.py
diff --git a/varnish/distinfo b/varnish/distinfo
index 3054b37c3f..9370143e42 100644
--- a/varnish/distinfo
+++ b/varnish/distinfo
@@ -1,7 +1,8 @@
 $NetBSD: distinfo,v 1.13 2015/03/09 00:47:05 mspo Exp $
 
-SHA1 (varnish-4.1.1.tar.gz) = b4a0f98f7a245ef8fb3bd76100e57e2205ce2b48
-RMD160 (varnish-4.1.1.tar.gz) = bbfee999a51d34ffc432bf8f49e0cf7c9da02366
-SHA512 (varnish-4.1.1.tar.gz) = 8407fa049aafd3ae1c7dfe134a2ecaa10d1a0fb77359bd423cc97e90790eacf3b8a785926956a3d0842efbdeb1558ecb487181f093124b9698961f29d30f0b15
-Size (varnish-4.1.1.tar.gz) = 2009042 bytes
-SHA1 (patch-etc__Makefile.in) = 294da8aac5cc31d1d8e6a2714b48fbdbbe6c7f67
+SHA1 (varnish-5.0.0.tar.gz) = e5c88abc3744122f2d073547f18b061c5310e2ef
+RMD160 (varnish-5.0.0.tar.gz) = 6dcc13cc0f330c3e44c230f4e5ac3d5042d47ae7
+SHA512 (varnish-5.0.0.tar.gz) = 0694ad32595dc559bd044c5cf1bf12f002e4c0ab477b5fdc9d026d0bc3aec64d6dbe0b14dbab0b95a2180aa2ffe3871db22d0793b12c9d67350da05c25ae8e6c
+Size (varnish-5.0.0.tar.gz) = 2472963 bytes
+SHA1 (patch-bin_varnishd_cache_cache__panic.c) = ad26bff5822c5bd34c8895f4ae636ec54c35adbf
+SHA1 (patch-etc_Makefile.in) = 02e500aeae7c3b293ddcf7d3ab8f03d7a267010f
diff --git a/varnish/patches/patch-bin_varnishd_cache_cache__panic.c b/varnish/patches/patch-bin_varnishd_cache_cache__panic.c
new file mode 100644
index 0000000000..e6072efbe4
--- /dev/null
+++ b/varnish/patches/patch-bin_varnishd_cache_cache__panic.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Need sys/cdefs.h for __BEGIN_DECLS/__END_DECLS.
+
+--- bin/varnishd/cache/cache_panic.c.orig	2017-02-07 13:15:38.000000000 +0000
++++ bin/varnishd/cache/cache_panic.c
+@@ -29,6 +29,10 @@
+ 
+ #include "config.h"
+ 
++#ifdef __NetBSD__
++#include <sys/cdefs.h>
++#endif
++
+ #ifndef HAVE_EXECINFO_H
+ #include "compat/execinfo.h"
+ #else
diff --git a/varnish/patches/patch-etc_Makefile.in b/varnish/patches/patch-etc_Makefile.in
new file mode 100644
index 0000000000..5bdf10254d
--- /dev/null
+++ b/varnish/patches/patch-etc_Makefile.in
@@ -0,0 +1,48 @@
+$NetBSD$
+
+Use standard sysconfdir for vcl files.
+
+--- etc/Makefile.in.orig	2016-09-15 09:24:12.000000000 +0000
++++ etc/Makefile.in
+@@ -146,7 +146,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__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -347,18 +347,18 @@ clean-libtool:
+ 	-rm -rf .libs _libs
+ install-dist_docDATA: $(dist_doc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
++	@list='$(dist_doc_DATA)'; test -n "$(sysconfdir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
+ 	fi; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
+ 	done
+ 
+ uninstall-dist_docDATA:
+@@ -428,7 +428,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(docdir)" "$(DESTDIR)$(vcldir)"; do \
++	for dir in "$(DESTDIR)$(sysconfdir)" "$(DESTDIR)$(vcldir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
diff --git a/varnish/patches/patch-etc__Makefile.in b/varnish/patches/patch-etc__Makefile.in
deleted file mode 100644
index 7f0fa02347..0000000000
--- a/varnish/patches/patch-etc__Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Put config file in examples
-
---- etc/Makefile.in.orig	2015-09-30 11:39:21.000000000 +0000
-+++ etc/Makefile.in
-@@ -241,7 +241,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--varnishconfdir = @varnishconfdir@
-+varnishconfdir = @prefix@/share/examples/@PACKAGE@
- DISTCLEANFILES = builtin.vcl
- dist_doc_DATA = builtin.vcl \
- 		example.vcl
diff --git a/varnish4/Makefile b/varnish4/Makefile
index 13073535b5..01951e7c07 100644
--- a/varnish4/Makefile
+++ b/varnish4/Makefile
@@ -1,66 +1,6 @@
-# $NetBSD: Makefile,v 1.26 2015/08/18 07:31:20 wiz Exp $
+# $NetBSD$
 
-DISTNAME=	varnish-4.0.3
-CATEGORIES=	www
-MASTER_SITES=	http://repo.varnish-cache.org/source/
+DISTNAME=	varnish-4.1.5
 
-MAINTAINER=	pkgsrc-users%NetBSD.org@localhost
-HOMEPAGE=	http://varnish-cache.org/
-COMMENT=	High-performace HTTP accelerator
-LICENSE=	modified-bsd
-
-GNU_CONFIGURE=	yes
-USE_LIBTOOL=	yes
-USE_TOOLS+=	pkg-config gmake
-BUILD_DEFS+=	VARBASE
-
-CONF_FILES=		${PREFIX}/share/doc/varnish/example.vcl ${PKG_SYSCONFDIR}/example.vcl
-
-VRNUSER?=		varnish
-VRNGROUP?=		${VRNUSER}
-STATEDIR=		${VARBASE}/db
-VRNDIR=			${STATEDIR}/${PKGBASE}
-
-CONFIGURE_ARGS+=	--localstatedir=${STATEDIR}
-CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
-OWN_DIRS+=		${VRNDIR}
-OWN_DIRS_PERMS+=	${VRNDIR} ${VRNUSER} ${VRNGROUP} 0770
-
-PKG_GROUPS+=		${VRNGROUP}
-PKG_USERS+=		${VRNUSER}:${VRNGROUP}
-PKG_HOME.${VRNUSER}=	${VRNDIR}
-PKG_SHELL.${VRNUSER}=	${SH}
-PKG_GECOS.${VRNUSER}=	Varnish daemon user
-
-FILES_SUBST+=		VRNUSER=${VRNUSER}
-FILES_SUBST+=		VRNGROUP=${VRNGROUP}
-
-RCD_SCRIPTS=		varnishd varnishlog varnishncsa
-PYTHON_FOR_BUILD_ONLY=	yes
-REPLACE_PYTHON+=	lib/libvcc/vmodtool.py
-
-BUILD_DEPENDS+=		${PYPKGPREFIX}-docutils>=0.12:../../textproc/py-docutils
-CONFIGURE_ARGS+=	--with-rst2man=${PREFIX}/bin/rst2man-${PYVERSSUFFIX}.py
-CONFIGURE_ARGS+=	--with-rst2html=${PREFIX}/bin/rst2html-${PYVERSSUFFIX}.py
-
-.include "../../mk/bsd.prefs.mk"
-
-.if ${OPSYS} == "SunOS"
-# Explicitly disable epoll on illumos, provided for Linux compat only.
-CONFIGURE_ENV+=	ac_cv_func_epoll_ctl=no
-.  if ${PKGSRC_COMPILER} == "sunpro"
-CONFIGURE_ENV+=	VCC_CC="cc ${_COMPILER_ABI_FLAG.${ABI}} -Kpic -G -o %o %s"
-.  else
-CONFIGURE_ENV+=	VCC_CC="gcc ${_COMPILER_ABI_FLAG.${ABI}} -fpic -shared -o %o %s"
-.  endif
-.endif
-
-# not signed/unsigned char safe
-BUILDLINK_TRANSFORM+=    rm:-Werror
-
-.include "../../devel/pcre/buildlink3.mk"
-.include "../../lang/python/application.mk"
-.include "../../mk/curses.buildlink3.mk"
-.include "../../mk/pthread.buildlink3.mk"
-.include "../../mk/readline.buildlink3.mk"
+.include "../../wip/varnish/Makefile.common"
 .include "../../mk/bsd.pkg.mk"
diff --git a/varnish4/PLIST b/varnish4/PLIST
index ce944bd937..cfebb062bf 100644
--- a/varnish4/PLIST
+++ b/varnish4/PLIST
@@ -6,9 +6,10 @@ bin/varnishncsa
 bin/varnishstat
 bin/varnishtest
 bin/varnishtop
-include/varnish/vcli.h
 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/common.h
 include/varnish/common/params.h
 include/varnish/miniobj.h
@@ -23,7 +24,11 @@ include/varnish/tbl/feature_bits.h
 include/varnish/tbl/http_headers.h
 include/varnish/tbl/http_response.h
 include/varnish/tbl/locks.h
+include/varnish/tbl/obj_attr.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
@@ -49,6 +54,7 @@ include/varnish/vas.h
 include/varnish/vav.h
 include/varnish/vbm.h
 include/varnish/vcl.h
+include/varnish/vcli.h
 include/varnish/vcs.h
 include/varnish/vdef.h
 include/varnish/vmod_abi.h
@@ -59,13 +65,16 @@ include/varnish/vrt_obj.h
 include/varnish/vsa.h
 include/varnish/vsb.h
 include/varnish/vsha256.h
+include/varnish/vtcp.h
+include/varnish/vtim.h
+include/varnish/waiter/waiter.h
 lib/libvarnishapi.la
 lib/pkgconfig/varnishapi.pc
-lib/varnish/libvcc.la
-lib/varnish/vmods/libvmod_directors.la
 lib/varnish/libvarnish.la
 lib/varnish/libvarnishcompat.la
+lib/varnish/libvcc.la
 lib/varnish/libvgz.la
+lib/varnish/vmods/libvmod_directors.la
 lib/varnish/vmods/libvmod_std.la
 man/man1/varnishadm.1
 man/man1/varnishd.1
@@ -75,15 +84,16 @@ man/man1/varnishncsa.1
 man/man1/varnishstat.1
 man/man1/varnishtest.1
 man/man1/varnishtop.1
-man/man3/vmod_std.3
 man/man3/vmod_directors.3
-man/man7/vsl-query.7
-man/man7/vsl.7
+man/man3/vmod_std.3
 man/man7/varnish-cli.7
 man/man7/varnish-counters.7
 man/man7/vcl.7
+man/man7/vsl-query.7
+man/man7/vsl.7
 sbin/varnishd
+share/aclocal/varnish-legacy.m4
 share/aclocal/varnish.m4
-share/doc/varnish/builtin.vcl
-share/doc/varnish/example.vcl
+share/examples/varnish/builtin.vcl
+share/examples/varnish/example.vcl
 share/varnish/vmodtool.py
diff --git a/varnish4/distinfo b/varnish4/distinfo
index 60075b6b9e..406c6ad7eb 100644
--- a/varnish4/distinfo
+++ b/varnish4/distinfo
@@ -1,8 +1,8 @@
 $NetBSD: distinfo,v 1.13 2015/03/09 00:47:05 mspo Exp $
 
-SHA1 (varnish-4.0.3.tar.gz) = ba4668cb7d17f95c4c5e4baf964fe1412a269297
-RMD160 (varnish-4.0.3.tar.gz) = d9308329151ca2e0a2c7a494671b7903867deb63
-SHA512 (varnish-4.0.3.tar.gz) = db7bb141afd4617ac95573983dc30591b0eb9bc1af06df1094f2c1eeac539da936afb4a239d2f446d3c3a51b88a781b7f9f6d9a0b2028eaf0e7049ea2159d883
-Size (varnish-4.0.3.tar.gz) = 1866760 bytes
-SHA1 (patch-etc__Makefile.in) = 294da8aac5cc31d1d8e6a2714b48fbdbbe6c7f67
-SHA1 (patch-lib_libvarnish_vtcp.c) = 47d2da33ff566bb4c259a3b94a03698d04385ea6
+SHA1 (varnish-4.1.5.tar.gz) = c46a6573c8722181b6101593b452844d43e225a7
+RMD160 (varnish-4.1.5.tar.gz) = 66d46114350ee7a6f9bef0df69fc75bb39f1cd51
+SHA512 (varnish-4.1.5.tar.gz) = 8d54a59afbc9f485b313d2e036dcc8d874ec279e1dd2aab9daf2a169e169d15c98ff71307d44c6beb43968dcd7d69b9501486ea3b138c27d084bc4b16ed10d24
+Size (varnish-4.1.5.tar.gz) = 2199183 bytes
+SHA1 (patch-bin_varnishd_cache_cache__panic.c) = ad26bff5822c5bd34c8895f4ae636ec54c35adbf
+SHA1 (patch-etc_Makefile.in) = c2bc8dca2ff7bf47e8b8fdec58fc8aea220a4c3b
diff --git a/varnish4/patches/patch-bin_varnishd_cache_cache__panic.c b/varnish4/patches/patch-bin_varnishd_cache_cache__panic.c
new file mode 100644
index 0000000000..e6072efbe4
--- /dev/null
+++ b/varnish4/patches/patch-bin_varnishd_cache_cache__panic.c
@@ -0,0 +1,17 @@
+$NetBSD$
+
+Need sys/cdefs.h for __BEGIN_DECLS/__END_DECLS.
+
+--- bin/varnishd/cache/cache_panic.c.orig	2017-02-07 13:15:38.000000000 +0000
++++ bin/varnishd/cache/cache_panic.c
+@@ -29,6 +29,10 @@
+ 
+ #include "config.h"
+ 
++#ifdef __NetBSD__
++#include <sys/cdefs.h>
++#endif
++
+ #ifndef HAVE_EXECINFO_H
+ #include "compat/execinfo.h"
+ #else
diff --git a/varnish4/patches/patch-etc_Makefile.in b/varnish4/patches/patch-etc_Makefile.in
new file mode 100644
index 0000000000..9b0429f31b
--- /dev/null
+++ b/varnish4/patches/patch-etc_Makefile.in
@@ -0,0 +1,48 @@
+$NetBSD$
+
+Use standard sysconfdir for vcl files.
+
+--- etc/Makefile.in.orig	2017-02-09 13:02:19.000000000 +0000
++++ etc/Makefile.in
+@@ -146,7 +146,7 @@ am__uninstall_files_from_dir = { \
+     || { echo " ( cd '$$dir' && rm -f" $$files ")"; \
+          $(am__cd) "$$dir" && rm -f $$files; }; \
+   }
+-am__installdirs = "$(DESTDIR)$(docdir)"
++am__installdirs = "$(DESTDIR)$(sysconfdir)"
+ DATA = $(dist_doc_DATA)
+ am__tagged_files = $(HEADERS) $(SOURCES) $(TAGS_FILES) $(LISP)
+ DISTFILES = $(DIST_COMMON) $(DIST_SOURCES) $(TEXINFOS) $(EXTRA_DIST)
+@@ -343,18 +343,18 @@ clean-libtool:
+ 	-rm -rf .libs _libs
+ install-dist_docDATA: $(dist_doc_DATA)
+ 	@$(NORMAL_INSTALL)
+-	@list='$(dist_doc_DATA)'; test -n "$(docdir)" || list=; \
++	@list='$(dist_doc_DATA)'; test -n "$(sysconfdir)" || list=; \
+ 	if test -n "$$list"; then \
+-	  echo " $(MKDIR_P) '$(DESTDIR)$(docdir)'"; \
+-	  $(MKDIR_P) "$(DESTDIR)$(docdir)" || exit 1; \
++	  echo " $(MKDIR_P) '$(DESTDIR)$(sysconfdir)'"; \
++	  $(MKDIR_P) "$(DESTDIR)$(sysconfdir)" || exit 1; \
+ 	fi; \
+ 	for p in $$list; do \
+ 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
+ 	  echo "$$d$$p"; \
+ 	done | $(am__base_list) | \
+ 	while read files; do \
+-	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(docdir)'"; \
+-	  $(INSTALL_DATA) $$files "$(DESTDIR)$(docdir)" || exit $$?; \
++	  echo " $(INSTALL_DATA) $$files '$(DESTDIR)$(sysconfdir)'"; \
++	  $(INSTALL_DATA) $$files "$(DESTDIR)$(sysconfdir)" || exit $$?; \
+ 	done
+ 
+ uninstall-dist_docDATA:
+@@ -403,7 +403,7 @@ check-am: all-am
+ check: check-am
+ all-am: Makefile $(DATA)
+ installdirs:
+-	for dir in "$(DESTDIR)$(docdir)"; do \
++	for dir in "$(DESTDIR)$(sysconfdir)"; do \
+ 	  test -z "$$dir" || $(MKDIR_P) "$$dir"; \
+ 	done
+ install: install-am
diff --git a/varnish4/patches/patch-etc__Makefile.in b/varnish4/patches/patch-etc__Makefile.in
deleted file mode 100644
index 7f0fa02347..0000000000
--- a/varnish4/patches/patch-etc__Makefile.in
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD$
-
-Put config file in examples
-
---- etc/Makefile.in.orig	2015-09-30 11:39:21.000000000 +0000
-+++ etc/Makefile.in
-@@ -241,7 +241,7 @@ target_vendor = @target_vendor@
- top_build_prefix = @top_build_prefix@
- top_builddir = @top_builddir@
- top_srcdir = @top_srcdir@
--varnishconfdir = @varnishconfdir@
-+varnishconfdir = @prefix@/share/examples/@PACKAGE@
- DISTCLEANFILES = builtin.vcl
- dist_doc_DATA = builtin.vcl \
- 		example.vcl
diff --git a/varnish4/patches/patch-lib_libvarnish_vtcp.c b/varnish4/patches/patch-lib_libvarnish_vtcp.c
deleted file mode 100644
index 4d3b82e847..0000000000
--- a/varnish4/patches/patch-lib_libvarnish_vtcp.c
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD$
-
---- lib/libvarnish/vtcp.c.orig	2015-09-30 11:39:14.000000000 +0000
-+++ lib/libvarnish/vtcp.c
-@@ -32,6 +32,7 @@
- #include <sys/types.h>
- #include <sys/socket.h>
- #include <sys/ioctl.h>
-+#include <sys/time.h>
- #ifdef HAVE_SYS_FILIO_H
- #  include <sys/filio.h>
- #endif
Prev by Date: lldb-netbsd: Read process virtual memory mapping
Next by Date: +delve
Previous by Thread: lldb-netbsd: Read process virtual memory mapping
Next by Thread: +delve
Indexes:
Home | Main Index | Thread Index | Old Index