aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--Makefile.am14
-rw-r--r--NEWS17
m---------acvmod0
-rw-r--r--configure.ac4
-rw-r--r--git2chg.awk75
-rw-r--r--src/Makefile.am11
-rw-r--r--src/binlog.c25
-rw-r--r--tests/atlocal.in5
8 files changed, 32 insertions, 119 deletions
diff --git a/Makefile.am b/Makefile.am
index 9c03c59..2e8bde2 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of vmod-binlog 1# This file is part of vmod-binlog
2# Copyright (C) 2013-2014, 2016 Sergey Poznyakoff 2# Copyright (C) 2013-2014, 2016, 2017 Sergey Poznyakoff
3# 3#
4# Vmod-binlog is free software; you can redistribute it and/or modify 4# Vmod-binlog is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -17,14 +17,4 @@ ACLOCAL_AMFLAGS = -I m4 -I acvmod
17 17
18SUBDIRS = libltdl src tests doc 18SUBDIRS = libltdl src tests doc
19 19
20AM_DISTCHECK_CONFIGURE_FLAGS=--without-vmoddir 20include acvmod/top.am
21
22EXTRA_DIST=git2chg.awk
23
24.PHONY: ChangeLog
25ChangeLog:
26 $(AM_V_GEN)if test -d .git; then \
27 git log --pretty='format:%ct %an <%ae>%n%n%s%n%n%b%n' | \
28 awk -f $(top_srcdir)/git2chg.awk > ChangeLog; \
29 fi
30
diff --git a/NEWS b/NEWS
index 27b4772..ed890ca 100644
--- a/NEWS
+++ b/NEWS
@@ -1,17 +1,18 @@
1Vmod-binlog NEWS -- history of user-visible changes. 2016-01-24 1Vmod-binlog NEWS -- history of user-visible changes. 2017-08-05
2Copyright (C) 2013-2016 Sergey Poznyakoff 2Copyright (C) 2013-2017 Sergey Poznyakoff
3See the end of file for copying conditions. 3See the end of file for copying conditions.
4 4
5Please send Vmod-binlog bug reports to <gray@gnu.org> 5Please send Vmod-binlog bug reports to <gray@gnu.org>
6 6
7Version 2.0.90-4.1.0 (Git) 7Version 2.0.92 (Git)
8 8
9* Versioning changes 9* Support for Varnish 4.1
10 10
11Starting with this release, the version number includes version 11* The --with-varnish-source option has been withdrawn
12of Varnish API the release was designed for. 12
13The configure script relies on pkg-config to determine the location of
14Varnish header files and libraries.
13 15
14* Support for Varnish 4,1
15 16
16Version 2,0, 2014-11-13 17Version 2,0, 2014-11-13
17 18
@@ -25,7 +26,7 @@ Initial release.
25 26
26* Copyright information: 27* Copyright information:
27 28
28Copyright (C) 2013-2016 Sergey Poznyakoff 29Copyright (C) 2013-2017 Sergey Poznyakoff
29 30
30 Permission is granted to anyone to make or distribute verbatim copies 31 Permission is granted to anyone to make or distribute verbatim copies
31 of this document as received, in any medium, provided that the 32 of this document as received, in any medium, provided that the
diff --git a/acvmod b/acvmod
Subproject f064cf4d7aa1ead1f8607b8b72baf883f015ffc Subproject ba32780019480b89cd9d796b93a76cae6afe99a
diff --git a/configure.ac b/configure.ac
index 3be0b79..4a72590 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
1# This file is part of vmod-binlog 1# This file is part of vmod-binlog
2# Copyright (C) 2013, 2014, 2016 Sergey Poznyakoff 2# Copyright (C) 2013-2017 Sergey Poznyakoff
3# 3#
4# Vmod-binlog is free software; you can redistribute it and/or modify 4# Vmod-binlog is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -14,7 +14,7 @@
14# You should have received a copy of the GNU General Public License 14# You should have received a copy of the GNU General Public License
15# along with vmod-binlog. If not, see <http://www.gnu.org/licenses/>. 15# along with vmod-binlog. If not, see <http://www.gnu.org/licenses/>.
16AC_PREREQ(2.69) 16AC_PREREQ(2.69)
17AC_INIT([vmod-binlog], 2.0.90-4.1.0, [gray@gnu.org]) 17AC_INIT([vmod-binlog], 2.0.92, [gray@gnu.org])
18AC_CONFIG_AUX_DIR([build-aux]) 18AC_CONFIG_AUX_DIR([build-aux])
19AC_CONFIG_MACRO_DIR([m4]) 19AC_CONFIG_MACRO_DIR([m4])
20AC_CONFIG_SRCDIR(src/binlog.c) 20AC_CONFIG_SRCDIR(src/binlog.c)
diff --git a/git2chg.awk b/git2chg.awk
deleted file mode 100644
index 6dad87e..0000000
--- a/git2chg.awk
+++ /dev/null
@@ -1,75 +0,0 @@
1# This file is part of grecs
2# Copyright (C) 2007-2014 Sergey Poznyakoff
3#
4# Grecs is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by
6# the Free Software Foundation; either version 3, or (at your option)
7# any later version.
8#
9# Grecs is distributed in the hope that it will be useful,
10# but WITHOUT ANY WARRANTY; without even the implied warranty of
11# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12# GNU General Public License for more details.
13#
14# You should have received a copy of the GNU General Public License
15# along with Grecs. If not, see <http://www.gnu.org/licenses/>.
16
17BEGIN {
18 if (since)
19 split(since,since_a,"-")
20}
21
22function timeok(t, a) {
23 if (!since)
24 return 1
25 split(t,a,"-")
26 if (a[1] < since_a[1])
27 return 0
28 if (a[1] > since_a[1])
29 return 1
30 if (a[2] < since_a[2])
31 return 0
32 if (a[2] > since_a[2])
33 return 1
34 return a[3] > since_a[3]
35}
36
37/^[0-9]+ .* +<[^>]+>/ {
38 s = strftime("%F", $1)
39 if (!timeok(s))
40 exit
41 sub(/^[0-9]+ +/,"")
42 if (s == datestr && author == $0)
43 next
44 datestr = s
45 author = $0
46 if (runlen) { runlen = 0; print "" }
47 printf("%s %s\n", datestr, author)
48 next
49}
50/^Signed-off-by:/ { next }
51/^<unknown>$/ { next }
52NF==0 {
53 runlen++
54 next
55}
56{ if (runlen) { runlen = 0; print "" }
57 print "\t" $0 }
58
59END {
60 if (append) {
61 print ""
62 while ((getline < append) > 0) {
63 if (match($0, /^Local *Variables:/))
64 break
65 print
66 }
67 }
68 print "\f"
69 # Make sure Emacs won't recognize this line:
70 print "Local", "Variables:"
71 print "mode: change-log"
72 print "version-control: never"
73 print "buffer-read-only: t"
74 print "End:"
75}
diff --git a/src/Makefile.am b/src/Makefile.am
index 5a525de..2b0f953 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -1,5 +1,5 @@
1# This file is part of vmod-binlog 1# This file is part of vmod-binlog
2# Copyright (C) 2013-2014, 2016 Sergey Poznyakoff 2# Copyright (C) 2013-2017 Sergey Poznyakoff
3# 3#
4# Vmod-binlog is free software; you can redistribute it and/or modify 4# Vmod-binlog is free software; you can redistribute it and/or modify
5# it under the terms of the GNU General Public License as published by 5# it under the terms of the GNU General Public License as published by
@@ -14,10 +14,8 @@
14# You should have received a copy of the GNU General Public License 14# You should have received a copy of the GNU General Public License
15# along with vmod-binlog. If not, see <http://www.gnu.org/licenses/>. 15# along with vmod-binlog. If not, see <http://www.gnu.org/licenses/>.
16 16
17AM_CPPFLAGS =\ 17AM_CPPFLAGS=\
18 -I$(VARNISHSRC)/include\ 18 $(VARNISHAPI_CFLAGS)
19 -I$(VARNISHSRC)/bin/varnishd\
20 -I$(VARNISHSRC)
21 19
22noinst_LIBRARIES = libbinlog.a 20noinst_LIBRARIES = libbinlog.a
23libbinlog_a_SOURCES = pack.c err.c parse-datetime.y xalloc.c 21libbinlog_a_SOURCES = pack.c err.c parse-datetime.y xalloc.c
@@ -49,12 +47,11 @@ binlog.lo: vcc_if.c vcc_if.h
49 47
50CLEANFILES = vcc_if.c vcc_if.h *.rst 48CLEANFILES = vcc_if.c vcc_if.h *.rst
51 49
52vmodtool = $(VARNISHSRC)/lib/libvcc/vmodtool.py
53vmodtoolargs = --strict 50vmodtoolargs = --strict
54vccfile = $(top_srcdir)/src/vmod.vcc 51vccfile = $(top_srcdir)/src/vmod.vcc
55 52
56vcc_if.c vcc_if.h: $(vmodtool) $(vccfile) 53vcc_if.c vcc_if.h: $(vmodtool) $(vccfile)
57 $(AM_V_GEN)$(PYTHON) $(vmodtool) $(vmodtoolargs) $(vccfile) 54 $(AM_V_GEN)$(PYTHON) $(VARNISHAPI_VMODTOOL) $(vmodtoolargs) $(vccfile)
58 55
59EXTRA_DIST = vmod.vcc 56EXTRA_DIST = vmod.vcc
60 57
diff --git a/src/binlog.c b/src/binlog.c
index 1bf5950..b2d581c 100644
--- a/src/binlog.c
+++ b/src/binlog.c
@@ -1,5 +1,5 @@
1/* This file is part of vmod-binlog 1/* This file is part of vmod-binlog
2 Copyright (C) 2013, 2014, 2016 Sergey Poznyakoff 2 Copyright (C) 2013, 2014, 2016, 2017 Sergey Poznyakoff
3 3
4 Vmod-binlog is free software; you can redistribute it and/or modify 4 Vmod-binlog is free software; you can redistribute it and/or modify
5 it under the terms of the GNU General Public License as published by 5 it under the terms of the GNU General Public License as published by
@@ -31,8 +31,7 @@
31#include "vrt.h" 31#include "vrt.h"
32#include "vcc_if.h" 32#include "vcc_if.h"
33 33
34#include "bin/varnishd/cache/cache.h" 34#include "cache/cache.h"
35#define MOD_CTX const struct vrt_ctx *
36#define WSPTR(s) ((s)->ws) 35#define WSPTR(s) ((s)->ws)
37 36
38#include "vmod-binlog.h" 37#include "vmod-binlog.h"
@@ -270,7 +269,7 @@ make_key()
270} 269}
271