diff options
-rw-r--r-- | NEWS | 6 | ||||
m--------- | acvmod | 0 | ||||
-rw-r--r-- | configure.ac | 5 | ||||
-rw-r--r-- | tests/Makefile.am | 1 | ||||
-rw-r--r-- | tests/atlocal.in | 2 | ||||
-rw-r--r-- | tests/check.at | 2 | ||||
-rw-r--r-- | tests/checkf.at | 2 | ||||
-rw-r--r-- | tests/dump.at | 2 | ||||
-rw-r--r-- | tests/rate.at | 2 | ||||
-rw-r--r-- | tests/ratef.at | 2 | ||||
-rw-r--r-- | tests/strftime.at | 2 |
11 files changed, 16 insertions, 10 deletions
@@ -1,2 +1,2 @@ -vmod-tbf -- history of user-visible changes. 2017-08-06 +vmod-tbf -- history of user-visible changes. 2017-08-10 Copyright (C) 2013-2017 Sergey Poznyakoff @@ -5,2 +5,6 @@ See the end of file for copying conditions. Please send vmod-tbf bug reports to <gray@gnu.org> + +Version 2.2, 2017-08-10 + +* Support for Varnish 5.1 diff --git a/acvmod b/acvmod -Subproject ba32780019480b89cd9d796b93a76cae6afe99a +Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81 diff --git a/configure.ac b/configure.ac index 04563c6..f42e2ef 100644 --- a/configure.ac +++ b/configure.ac @@ -16,3 +16,3 @@ AC_PREREQ(2.69) -AC_INIT([vmod-tbf], 2.1, [gray@gnu.org]) +AC_INIT([vmod-tbf], 2.2, [gray@gnu.org]) AC_CONFIG_AUX_DIR([build-aux]) @@ -22,2 +22,3 @@ AM_CONFIG_HEADER(config.h) +AC_SUBST([AC_VMOD_BASENAME],[tbf]) AC_CANONICAL_SYSTEM @@ -47,3 +48,3 @@ AC_CHECK_FUNCS(sysinfo getloadavg) -AM_VARNISHAPI +AM_VARNISHAPI([4.1],[5.1]) diff --git a/tests/Makefile.am b/tests/Makefile.am index 30b0360..23fa477 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am @@ -33,2 +33,3 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ + echo 'm4_define([AT_VMOD_BASENAME], [@AC_VMOD_BASENAME@])'; \ } >$(srcdir)/package.m4 diff --git a/tests/atlocal.in b/tests/atlocal.in index 9f80ebf..f901648 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in @@ -4,3 +4,3 @@ -PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH +PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:@VARNISH_SBINDIR@:$PATH VARNISHTEST=@VARNISHTEST@ diff --git a/tests/check.at b/tests/check.at index f45c1b1..9ed2974 100644 --- a/tests/check.at +++ b/tests/check.at @@ -17,3 +17,3 @@ AT_SETUP([check]) AT_KEYWORDS([check]) -AT_VARNISHTEST([tbf],[ +AT_VARNISHTEST([ sub vcl_recv { diff --git a/tests/checkf.at b/tests/checkf.at index c4155ba..f85c4a4 100644 --- a/tests/checkf.at +++ b/tests/checkf.at @@ -17,3 +17,3 @@ AT_SETUP([check flow]) AT_KEYWORDS([checkf flow]) -AT_VARNISHTEST([tbf],[ +AT_VARNISHTEST([ sub vcl_deliver { diff --git a/tests/dump.at b/tests/dump.at index b4230de..6602697 100644 --- a/tests/dump.at +++ b/tests/dump.at @@ -18,3 +18,3 @@ AT_SETUP([dump/load facilities]) AT_KEYWORDS([dump load]) -AT_VARNISHTEST([tbf],[ +AT_VARNISHTEST([ # sub vcl_init { diff --git a/tests/rate.at b/tests/rate.at index 75d9df4..e13473d 100644 --- a/tests/rate.at +++ b/tests/rate.at @@ -18,3 +18,3 @@ AT_SETUP([rate]) AT_KEYWORDS([rate]) -AT_VARNISHTEST([tbf],[ +AT_VARNISHTEST([ sub vcl_recv { diff --git a/tests/ratef.at b/tests/ratef.at index d0dc7ea..40a86e6 100644 --- a/tests/ratef.at +++ b/tests/ratef.at @@ -18,3 +18,3 @@ AT_SETUP([rate flow]) AT_KEYWORDS([ratef flow]) -AT_VARNISHTEST([tbf],[ +AT_VARNISHTEST([ sub vcl_deliver { diff --git a/tests/strftime.at b/tests/strftime.at index 58fc723..55b04fd 100644 --- a/tests/strftime.at +++ b/tests/strftime.at @@ -18,3 +18,3 @@ AT_SETUP([strftime]) AT_KEYWORDS([strftime]) -AT_VARNISHTEST([tbf],[ +AT_VARNISHTEST([ sub vcl_deliver { |