From 64853618b1c0ae890772aaad3ef75ffe6fdce67a Mon Sep 17 00:00:00 2001 From: Sergey Poznyakoff Date: Mon, 10 Dec 2018 13:34:26 +0200 Subject: Version 2.3 Support for Varnish API 6.0.2 --- .gitignore | 1 + NEWS | 10 +++++++--- README | 5 ++--- acvmod | 2 +- configure.ac | 9 +++++---- doc/vmod-binlog.3 | 6 +++--- src/binlog.c | 18 ++++++++++++------ 7 files changed, 31 insertions(+), 20 deletions(-) diff --git a/.gitignore b/.gitignore index 506e185..4ae0169 100644 --- a/.gitignore +++ b/.gitignore @@ -23,6 +23,7 @@ config.log config.status configure core +libltdl libtool m4 stamp-h1 diff --git a/NEWS b/NEWS index be596dd..4e3b1fb 100644 --- a/NEWS +++ b/NEWS @@ -1,9 +1,13 @@ -Vmod-binlog NEWS -- history of user-visible changes. 2017-08-10 -Copyright (C) 2013-2017 Sergey Poznyakoff +Vmod-binlog NEWS -- history of user-visible changes. 2018-12-10 See the end of file for copying conditions. Please send Vmod-binlog bug reports to +Version 2.3, 2018-12-10 + +* Support for Varnish 6.0.2 + + Version 2.2, 2017-08-10 * Support for Varnish 5.1 @@ -31,7 +35,7 @@ Initial release. * Copyright information: -Copyright (C) 2013-2017 Sergey Poznyakoff +Copyright (C) 2013-2018 Sergey Poznyakoff Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/README b/README index c1d552b..ff926e0 100644 --- a/README +++ b/README @@ -1,5 +1,4 @@ Vmod-binlog README -Copyright (C) 2013-2017 Sergey Poznyakoff See the end of file for copying conditions. * Introduction @@ -23,7 +22,7 @@ big amounts of information arriving at high rates. The package provides the module itself and the utilities for listing and searching in binary log files. -The module was tested with Varnish versions 4.1, and 5.1. +The module was tested with Varnish versions 4.1 through 6.0.2. * Installation @@ -92,7 +91,7 @@ Send bug reports and suggestions to * Copyright information: -Copyright (C) 2013-2017 Sergey Poznyakoff +Copyright (C) 2013-2018 Sergey Poznyakoff Permission is granted to anyone to make or distribute verbatim copies of this document as received, in any medium, provided that the diff --git a/acvmod b/acvmod index 5f6dce2..5b214e3 160000 --- a/acvmod +++ b/acvmod @@ -1 +1 @@ -Subproject commit 5f6dce2f7dd35a154333bb42d134a018b981f812 +Subproject commit 5b214e3d72f9e261a37cf31deb41e7f8a61a1811 diff --git a/configure.ac b/configure.ac index 1ad400d..bdb25c1 100644 --- a/configure.ac +++ b/configure.ac @@ -1,5 +1,5 @@ # This file is part of vmod-binlog -# Copyright (C) 2013-2017 Sergey Poznyakoff +# Copyright (C) 2013-2018 Sergey Poznyakoff # # Vmod-binlog is free software; you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -14,7 +14,7 @@ # You should have received a copy of the GNU General Public License # along with vmod-binlog. If not, see . AC_PREREQ(2.69) -AC_INIT([vmod-binlog], 2.2, [gray@gnu.org]) +AC_INIT([vmod-binlog], 2.3, [gray@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) AC_CONFIG_MACRO_DIR([m4]) AC_CONFIG_SRCDIR(src/binlog.c) @@ -52,8 +52,9 @@ AC_SYS_LARGEFILE AC_HEADER_STDC AC_CHECK_HEADERS([sys/stdlib.h]) -AM_VARNISHAPI([4.1],[5.1]) - +AM_VARNISHAPI([4.1],[6.0.2]) +AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR], + [Varnish API major version number]) AC_SUBST(BINLOGSEL_MODDIR,'$(libdir)/$(PACKAGE)') # Initialize the test suite. diff --git a/doc/vmod-binlog.3 b/doc/vmod-binlog.3 index 66dbc5a..97b942a 100644 --- a/doc/vmod-binlog.3 +++ b/doc/vmod-binlog.3 @@ -1,5 +1,5 @@ .\" This file is part of Vmod-binlog -*- nroff -*- -.\" Copyright (C) 2013-2014 Sergey Poznyakoff +.\" Copyright (C) 2013-2018 Sergey Poznyakoff .\" .\" Vmod-binlog is free software; you can redistribute it and/or modify .\" it under the terms of the GNU General Public License as published by @@ -13,7 +13,7 @@ .\" .\" You should have received a copy of the GNU General Public License .\" along with vmod-binlog. If not, see . -.TH VMOD-BINLOG 1 "November 1, 2014" "VMOD-BINLOG" "User Reference" +.TH VMOD-BINLOG 1 "December 10, 2018" "VMOD-BINLOG" "User Reference" .SH NAME vmod\-binlog \- binary log file support for Varnish Cache. .SH SYNOPSIS @@ -257,7 +257,7 @@ the repeat count. .\" for man-based doc pages. .if "\V[MANCGI]"WEBDOC" \{\ . ds package vmod-binlog -. ds version 1.0 +. ds version 2.3 . so download.inc \} .SH "SEE ALSO" diff --git a/src/binlog.c b/src/binlog.c index b2d581c..8263c12 100644 --- a/src/binlog.c +++ b/src/binlog.c @@ -1,5 +1,5 @@ /* This file is part of vmod-binlog - Copyright (C) 2013, 2014, 2016, 2017 Sergey Poznyakoff + Copyright (C) 2013-2018 Sergey Poznyakoff Vmod-binlog is free software; you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -27,11 +27,17 @@ #include #include #include -#include "vcl.h" -#include "vrt.h" -#include "vcc_if.h" - -#include "cache/cache.h" +#include +#if VARNISHAPI_MAJOR > 5 +# include "cache/cache.h" +# include "vcl.h" +# include "vcc_if.h" +#else +# include "vcl.h" +# include "vrt.h" +# include "vcc_if.h" +# include "cache/cache.h" +#endif #define WSPTR(s) ((s)->ws) #include "vmod-binlog.h" -- cgit v1.2.1