aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am8
-rw-r--r--NEWS23
-rw-r--r--README2
m---------acvmod0
-rw-r--r--configure.ac6
-rw-r--r--doc/Makefile.am2
-rw-r--r--doc/binlogcat.14
-rw-r--r--doc/binlogsel.14
-rw-r--r--doc/vmod-binlog.38
-rw-r--r--src/Makefile.am2
-rw-r--r--src/binlog.c30
-rw-r--r--src/binlogcat.c2
-rw-r--r--src/binlogsel.c2
-rw-r--r--src/err.c4
-rw-r--r--src/err.h2
-rw-r--r--src/pack.c2
-rw-r--r--src/pack.h2
-rw-r--r--src/vmod-binlog.h2
-rw-r--r--src/vmod.vcc4
-rw-r--r--src/xalloc.c2
-rw-r--r--tests/Makefile.am2
-rw-r--r--tests/atlocal.in2
-rw-r--r--tests/binpack.c2
-rw-r--r--tests/pack.at2
-rw-r--r--tests/test01.at2
-rw-r--r--tests/test02.at2
-rw-r--r--tests/testsuite.at2
27 files changed, 75 insertions, 50 deletions
diff --git a/Makefile.am b/Makefile.am
index 2e8bde2..4827d59 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -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
@@ -18,3 +18,9 @@ ACLOCAL_AMFLAGS = -I m4 -I acvmod
SUBDIRS = libltdl src tests doc
include acvmod/top.am
+
+# Work around a bug in automake 1.16: when generating disclean rule
+# for libltdl, it ignores lt__strl.o and lt__strl.o which causes
+# distclean failure.
+distclean-local:
+ rm -rf ./libltdl/.deps
diff --git a/NEWS b/NEWS
index 4e3b1fb..cf3fd55 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,27 @@
-Vmod-binlog NEWS -- history of user-visible changes. 2018-12-10
+Vmod-binlog NEWS -- history of user-visible changes. 2022-08-21
See the end of file for copying conditions.
Please send Vmod-binlog bug reports to <gray@gnu.org>
+Version 2.7, 2022-08-21
+
+* Support for Varnish 7.1
+
+
+Version 2.6, 2020-04-09
+
+* Dropped support for Varnish versions prior to 6.0
+
+
+Version 2.5, 2020-03-10
+
+* Restore backward compatibility with Varnish versions prior to 6.2.
+
+Version 2.4, 2020-03-03
+
+* Support for Varnish 6.3.1
+
+
Version 2.3, 2018-12-10
* Support for Varnish 6.0.2
@@ -35,7 +54,7 @@ Initial release.
* Copyright information:
-Copyright (C) 2013-2018 Sergey Poznyakoff
+Copyright (C) 2013-2020 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 ff926e0..1e00c9f 100644
--- a/README
+++ b/README
@@ -22,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 through 6.0.2.
+The module was tested with Varnish versions 6.0.2 through 6.4.0.
* Installation
diff --git a/acvmod b/acvmod
-Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
+Subproject 0516e2461e8f2e3b33a7fffa13705cdb1de77c5
diff --git a/configure.ac b/configure.ac
index bdb25c1..898f013 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# This file is part of vmod-binlog
-# Copyright (C) 2013-2018 Sergey Poznyakoff
+# Copyright (C) 2013-2022 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 <http://www.gnu.org/licenses/>.
AC_PREREQ(2.69)
-AC_INIT([vmod-binlog], 2.3, [gray@gnu.org])
+AC_INIT([vmod-binlog], 2.7, [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/binlog.c)
@@ -52,7 +52,7 @@ AC_SYS_LARGEFILE
AC_HEADER_STDC
AC_CHECK_HEADERS([sys/stdlib.h])
-AM_VARNISHAPI([4.1],[6.0.2])
+AM_VARNISHAPI([6.0],[7.1])
AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
[Varnish API major version number])
AC_SUBST(BINLOGSEL_MODDIR,'$(libdir)/$(PACKAGE)')
diff --git a/doc/Makefile.am b/doc/Makefile.am
index 340a384..f0a3d4e 100644
--- a/doc/Makefile.am
+++ b/doc/Makefile.am
@@ -1,5 +1,5 @@
# This file is part of vmod-binlog
-# 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
diff --git a/doc/binlogcat.1 b/doc/binlogcat.1
index ba54077..dd24dd6 100644
--- a/doc/binlogcat.1
+++ b/doc/binlogcat.1
@@ -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
@@ -57,7 +57,7 @@ Sergey Poznyakoff
.SH "BUG REPORTS"
Report bugs to <gray@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2013 Sergey Poznyakoff
+Copyright \(co 2013-2018 Sergey Poznyakoff
.br
.na
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
diff --git a/doc/binlogsel.1 b/doc/binlogsel.1
index ddc19fa..224349b 100644
--- a/doc/binlogsel.1
+++ b/doc/binlogsel.1
@@ -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
@@ -240,7 +240,7 @@ Sergey Poznyakoff
.SH "BUG REPORTS"
Report bugs to <gray@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2013 Sergey Poznyakoff
+Copyright \(co 2013-2018 Sergey Poznyakoff
.br
.na
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
diff --git a/doc/vmod-binlog.3 b/doc/vmod-binlog.3
index 97b942a..84621e2 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-2018 Sergey Poznyakoff
+.\" Copyright (C) 2013-2022 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 <http://www.gnu.org/licenses/>.
-.TH VMOD-BINLOG 1 "December 10, 2018" "VMOD-BINLOG" "User Reference"
+.TH VMOD-BINLOG 3 "April 9, 2020" "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 2.3
+. ds version 2.7
. so download.inc
\}
.SH "SEE ALSO"
@@ -270,7 +270,7 @@ Sergey Poznyakoff
.SH "BUG REPORTS"
Report bugs to <gray@gnu.org>.
.SH COPYRIGHT
-Copyright \(co 2013-2014 Sergey Poznyakoff
+Copyright \(co 2013-2022 Sergey Poznyakoff
.br
.na
License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>
diff --git a/src/Makefile.am b/src/Makefile.am
index 2b0f953..7885fdd 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -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
diff --git a/src/binlog.c b/src/binlog.c
index 8263c12..196c3c1 100644
--- a/src/binlog.c
+++ b/src/binlog.c
@@ -1,5 +1,5 @@
/* This file is part of vmod-binlog
- Copyright (C) 2013-2018 Sergey Poznyakoff
+ Copyright (C) 2013-2020 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
@@ -28,17 +28,17 @@
#include <ctype.h>
#include <time.h>
#include <string.h>
-#if VARNISHAPI_MAJOR > 5
-# include "cache/cache.h"
-# include "vcl.h"
-# include "vcc_if.h"
+
+#include <cache/cache.h>
+#include <vcl.h>
+#include <vcc_if.h>
+
+#ifdef VPFX
+# define VEVENT(a) VPFX(a)
#else
-# include "vcl.h"
-# include "vrt.h"
-# include "vcc_if.h"
-# include "cache/cache.h"
+/* For compatibility with varnish prior to 6.2 */
+# define VEVENT(a) a
#endif
-#define WSPTR(s) ((s)->ws)
#include "vmod-binlog.h"
#include "pack.h"
@@ -155,7 +155,7 @@ packerror(const char *fmt, ...)
}
int
-binlog_event(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e)
+VEVENT(binlog_event)(VRT_CTX, struct vmod_priv *priv, enum vcl_event_e e)
{
if (e == VCL_EVENT_LOAD) {
struct binlog_config *conf = calloc(1, sizeof(*conf));
@@ -447,16 +447,16 @@ mkfilename(VRT_CTX, struct binlog_config *conf)
if (conf->flags & BLF_ROUNDTS)
ts -= ts % conf->interval;
- u = WS_Reserve(WSPTR(ctx), 0);
- p = WSPTR(ctx)->f;
+ u = WS_ReserveAll(ctx->ws);
+ p = ctx->ws->f;
n = strftime(p, u, conf->pattern, gmtime(&ts));
if (n == 0) {
- WS_Release(WSPTR(ctx), 0);
+ WS_Release(ctx->ws, 0);
return NULL;
}
q = strdup(p);
AN(q);
- WS_Release(WSPTR(ctx), 0);
+ WS_Release(ctx->ws, 0);
return q;
}
diff --git a/src/binlogcat.c b/src/binlogcat.c
index db51762..7d97ae3 100644
--- a/src/binlogcat.c
+++ b/src/binlogcat.c
@@ -1,5 +1,5 @@
/* This file is part of vmod-binlog
- 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
diff --git a/src/binlogsel.c b/src/binlogsel.c
index 9587c2b..d095239 100644
--- a/src/binlogsel.c
+++ b/src/binlogsel.c
@@ -1,5 +1,5 @@
/* This file is part of vmod-binlog
- 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
diff --git a/src/err.c b/src/err.c
index a658e95..2d65f38 100644
--- a/src/err.c
+++ b/src/err.c
@@ -1,5 +1,5 @@
/* This file is part of vmod-binlog
- 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
@@ -64,7 +64,7 @@ void
version(void)
{
printf("%s (%s) %s\n", progname, PACKAGE_TARNAME, PACKAGE_VERSION);
- printf("Copyright (C) 2013 Sergey Poznyakoff\n");
+ printf("Copyright (C) 2013-2018 Sergey Poznyakoff\n");
printf("License GPLv3+: GNU GPL version 3 or later <http://gnu.org/licenses/gpl.html>\n");
printf("This is free software: you are free to change and redistribute it.\n");
printf("There is NO WARRANTY, to the extent permitted by law.\n");
diff --git a/src/err.h b/src/err.h
index d3d9f3e..5bc495c 100644
--- a/src/err.h
+++ b/src/err.h
@@ -1,5 +1,5 @@
/* This file is part of vmod-binlog
- 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
diff --git a/src/pack.c b/src/pack.c
index 3998595..5a1083b 100644
--- a/src/pack.c
+++ b/src/pack.c
@@ -1,5 +1,5 @@
/* This file is part of vmod-binlog
- 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
diff --git a/src/pack.h b/src/pack.h
index fb9f1ea..23ab2f7 100644
--- a/src/pack.h
+++ b/src/pack.h
@@ -1,5 +1,5 @@
/* This file is part of vmod-binlog
- 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
diff --git a/src/vmod-binlog.h b/src/vmod-binlog.h
index fec8d24..cbf7593 100644
--- a/src/vmod-binlog.h
+++ b/src/vmod-binlog.h
@@ -1,5 +1,5 @@
/* This file is part of vmod-binlog
- 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
diff --git a/src/vmod.vcc b/src/vmod.vcc
index eb1a42c..d9dd8c6 100644
--- a/src/vmod.vcc
+++ b/src/vmod.vcc
@@ -1,5 +1,5 @@
# This file is part of vmod-binlog
-# Copyright (C) 2013-2014, 2016 Sergey Poznyakoff
+# Copyright (C) 2013-2020 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 <http://www.gnu.org/licenses/>.
-$Module binlog 3 Binary Log File Support
+$Module binlog 3 "Binary Log File Support"
COLOPHON
========
diff --git a/src/xalloc.c b/src/xalloc.c
index 551d6c6..1dbaf6a 100644
--- a/src/xalloc.c
+++ b/src/xalloc.c
@@ -1,5 +1,5 @@
/* This file is part of vmod-binlog
- 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
diff --git a/tests/Makefile.am b/tests/Makefile.am
index ddb7dd7..8052a0e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,5 +1,5 @@
# This file is part of vmod-binlog
-# 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
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 955d915..11947dd 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,6 +1,6 @@
# @configure_input@ -*- shell-script -*-
# Configurable variable values for vmod-binlog test suite.
-# Copyright (C) 2013-2017 Sergey Poznyakoff
+# Copyright (C) 2013-2018 Sergey Poznyakoff
PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:@VARNISH_SBINDIR@:$PATH
VARNISHD=@VARNISHD@
diff --git a/tests/binpack.c b/tests/binpack.c
index fbf16dc..17b2d07 100644
--- a/tests/binpack.c
+++ b/tests/binpack.c
@@ -1,5 +1,5 @@
/* This file is part of vmod-binlog
- 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
diff --git a/tests/pack.at b/tests/pack.at
index 37299c0..c86ee7b 100644
--- a/tests/pack.at
+++ b/tests/pack.at
@@ -1,5 +1,5 @@
# This file is part of vmod-binlog testsuite -*- autotest -*-
-# 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
diff --git a/tests/test01.at b/tests/test01.at
index d92c726..6fd8fc5 100644
--- a/tests/test01.at
+++ b/tests/test01.at
@@ -1,5 +1,5 @@
# This file is part of vmod-binlog testsuite -*- autotest -*-
-# 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
diff --git a/tests/test02.at b/tests/test02.at
index 0313719..71ee236 100644
--- a/tests/test02.at
+++ b/tests/test02.at
@@ -1,5 +1,5 @@
# This file is part of vmod-binlog testsuite -*- autotest -*-
-# 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
diff --git a/tests/testsuite.at b/tests/testsuite.at
index 9dee99d..240fc0d 100644
--- a/tests/testsuite.at
+++ b/tests/testsuite.at
@@ -1,5 +1,5 @@
# This file is part of vmod-binlog -*- autotest -*-
-# 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

Return to:

Send suggestions and report system problems to the System administrator.