summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2017-08-10 12:15:53 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2017-08-10 12:15:53 (GMT)
commit0e75d63c9aeacfedcffce7ff4e6c552c3cff227d (patch) (side-by-side diff)
treef645c17beed2dcf7253c8410f100d66342e48dd3
parentdc761f6a343b8688c2c10957a9e80e77a0e5e63c (diff)
downloadvmod-tbf-0e75d63c9aeacfedcffce7ff4e6c552c3cff227d.tar.gz
vmod-tbf-0e75d63c9aeacfedcffce7ff4e6c552c3cff227d.tar.bz2
Support for varnish 5.1.release-2.2
* configure.ac: Set version 2.2 (AC_VMOD_BASENAME): New subst variable. * NEWS: Document changes. * acvmod: Updated. * tests/Makefile.am: Define AT_VMOD_BASENAME in package.m4 * tests/atlocal.in: Add @VARNISH_SBINDIR@ to PATH. * tests/check.at: Change the use of AT_VARNISHTEST macro. * tests/checkf.at: Likewise. * tests/dump.at: Likewise. * tests/rate.at: Likewise. * tests/ratef.at: Likewise. * tests/strftime.at: Likewise.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS6
m---------acvmod0
-rw-r--r--configure.ac5
-rw-r--r--tests/Makefile.am1
-rw-r--r--tests/atlocal.in2
-rw-r--r--tests/check.at2
-rw-r--r--tests/checkf.at2
-rw-r--r--tests/dump.at2
-rw-r--r--tests/rate.at2
-rw-r--r--tests/ratef.at2
-rw-r--r--tests/strftime.at2
11 files changed, 16 insertions, 10 deletions
diff --git a/NEWS b/NEWS
index 27a6b20..980e243 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,12 @@
-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
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
Version 2.1, 2017-08-06
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
@@ -14,12 +14,13 @@
# You should have received a copy of the GNU General Public License
# along with vmod-tbf. If not, see <http://www.gnu.org/licenses/>.
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])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vmod_tbf.vcc)
AM_CONFIG_HEADER(config.h)
+AC_SUBST([AC_VMOD_BASENAME],[tbf])
AC_CANONICAL_SYSTEM
AC_LANG(C)
@@ -45,7 +46,7 @@ AC_CHECK_HEADERS(sys/sysinfo.h)
# Check for functions
AC_CHECK_FUNCS(sysinfo getloadavg)
-AM_VARNISHAPI
+AM_VARNISHAPI([4.1],[5.1])
AC_CONFIG_TESTDIR(tests)
AC_CONFIG_FILES([tests/Makefile tests/atlocal])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 30b0360..23fa477 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -31,6 +31,7 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \
echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \
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
@@ -2,6 +2,6 @@
# Configurable variable values for vmod_tbf test suite.
# Copyright (C) 2017 Sergey Poznyakoff
-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@
VARNISHD=@VARNISHD@
diff --git a/tests/check.at b/tests/check.at
index f45c1b1..9ed2974 100644
--- a/tests/check.at
+++ b/tests/check.at
@@ -15,7 +15,7 @@
# along with vmod-tbf. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([check])
AT_KEYWORDS([check])
-AT_VARNISHTEST([tbf],[
+AT_VARNISHTEST([
sub vcl_recv {
if (!tbf.check("url:"+req.url, "4 req/s")) {
return (synth(420, "Overlimit"));
diff --git a/tests/checkf.at b/tests/checkf.at
index c4155ba..f85c4a4 100644
--- a/tests/checkf.at
+++ b/tests/checkf.at
@@ -15,7 +15,7 @@
# along with vmod-tbf. If not, see <http://www.gnu.org/licenses/>.
AT_SETUP([check flow])
AT_KEYWORDS([checkf flow])
-AT_VARNISHTEST([tbf],[
+AT_VARNISHTEST([
sub vcl_deliver {
set resp.http.result = tbf.check("url:"+req.url, "4req/s");
}
diff --git a/tests/dump.at b/tests/dump.at
index b4230de..6602697 100644
--- a/tests/dump.at
+++ b/tests/dump.at
@@ -16,7 +16,7 @@
AT_SETUP([dump/load facilities])
AT_KEYWORDS([dump load])
-AT_VARNISHTEST([tbf],[
+AT_VARNISHTEST([
# sub vcl_init {
# tbf.debug(20);
# }
diff --git a/tests/rate.at b/tests/rate.at
index 75d9df4..e13473d 100644
--- a/tests/rate.at
+++ b/tests/rate.at
@@ -16,7 +16,7 @@
AT_SETUP([rate])
AT_KEYWORDS([rate])
-AT_VARNISHTEST([tbf],[
+AT_VARNISHTEST([
sub vcl_recv {
if (!tbf.rate("url:"+req.url, 1, 20 s, 5)) {
return (synth(420, "Overlimit"));
diff --git a/tests/ratef.at b/tests/ratef.at
index d0dc7ea..40a86e6 100644
--- a/tests/ratef.at
+++ b/tests/ratef.at
@@ -16,7 +16,7 @@
AT_SETUP([rate flow])
AT_KEYWORDS([ratef flow])
-AT_VARNISHTEST([tbf],[
+AT_VARNISHTEST([
sub vcl_deliver {
set resp.http.result = tbf.rate("url:"+req.url, 1, 1s, 5);
}
diff --git a/tests/strftime.at b/tests/strftime.at
index 58fc723..55b04fd 100644
--- a/tests/strftime.at
+++ b/tests/strftime.at
@@ -16,7 +16,7 @@
AT_SETUP([strftime])
AT_KEYWORDS([strftime])
-AT_VARNISHTEST([tbf],[
+AT_VARNISHTEST([
sub vcl_deliver {
set resp.http.result = tbf.strftime("%Y-%m-%d", 26697600);
}

Return to:

Send suggestions and report system problems to the System administrator.