diff options
author | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-08-10 14:55:36 +0300 |
---|---|---|
committer | Sergey Poznyakoff <gray@gnu.org.ua> | 2017-08-10 14:58:12 +0300 |
commit | a29737fc04272ac38d639ac25841183db1052fbc (patch) | |
tree | 33c1234eab272d9f08c0307882bd5edbd1948a54 | |
parent | 75a077fa0ee4b0094b6d43619cd0a068a82ebfd7 (diff) | |
download | vmod-dict-a29737fc04272ac38d639ac25841183db1052fbc.tar.gz vmod-dict-a29737fc04272ac38d639ac25841183db1052fbc.tar.bz2 |
Support for varnish 5.1.release-1.1
* configure.ac: Set version 1.1
(AC_VMOD_BASENAME): New subst variable.
* NEWS: Document changes.
* README: Document changes.
* acvmod: Update.
* tests/Makefile.am: Define AT_VMOD_BASENAME in package.m4
* tests/atlocal.in: Add @VARNISH_SBINDIR@ to PATH.
* tests/ci.at: Update.
* tests/cs.at: Update.
-rw-r--r-- | NEWS | 7 | ||||
-rw-r--r-- | README | 3 | ||||
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/ci.at | 2 | ||||
-rw-r--r-- | tests/cs.at | 2 |
8 files changed, 15 insertions, 7 deletions
@@ -1,3 +1,3 @@ | |||
1 | vmod_dict -- history of user-visible changes. 2017-08-06 | 1 | vmod_dict -- history of user-visible changes. 2017-08-10 |
2 | Copyright (C) 2017 Sergey Poznyakoff | 2 | Copyright (C) 2017 Sergey Poznyakoff |
3 | See the end of file for copying conditions. | 3 | See the end of file for copying conditions. |
@@ -6,4 +6,9 @@ Please send vmod_dict bug reports to <gray@gnu.org> | |||
6 | 6 | ||
7 | 7 | ||
8 | Version 1.1, 2017-08-10 | ||
9 | |||
10 | * Support for Varnish 5.1 | ||
11 | |||
12 | |||
8 | Version 1.0, 2017-08-06 | 13 | Version 1.0, 2017-08-06 |
9 | 14 | ||
@@ -42,5 +42,6 @@ as follows: | |||
42 | 42 | ||
43 | In order to compile the package you need to have installed | 43 | In order to compile the package you need to have installed |
44 | varnishd and varnishapi package. | 44 | varnishd and varnishapi package. The module has been tested with |
45 | Varnish versions 4.1 and 5.1. | ||
45 | 46 | ||
46 | Supposing that condition is met, run: | 47 | Supposing that condition is met, run: |
diff --git a/acvmod b/acvmod | |||
Subproject ba32780019480b89cd9d796b93a76cae6afe99a | Subproject 5f6dce2f7dd35a154333bb42d134a018b981f81 | ||
diff --git a/configure.ac b/configure.ac index 30e9bc0..5d50849 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -16,5 +16,5 @@ | |||
16 | 16 | ||
17 | AC_PREREQ(2.69) | 17 | AC_PREREQ(2.69) |
18 | AC_INIT([vmod-dict], [1.0], [gray@gnu.org]) | 18 | AC_INIT([vmod-dict], [1.1], [gray@gnu.org]) |
19 | AC_CONFIG_AUX_DIR([build-aux]) | 19 | AC_CONFIG_AUX_DIR([build-aux]) |
20 | AC_CONFIG_MACRO_DIR([m4]) | 20 | AC_CONFIG_MACRO_DIR([m4]) |
@@ -22,4 +22,5 @@ AC_CONFIG_SRCDIR(src/vmod_dict.vcc) | |||
22 | AM_CONFIG_HEADER(config.h) | 22 | AM_CONFIG_HEADER(config.h) |
23 | 23 | ||
24 | AC_SUBST([AC_VMOD_BASENAME],[dict]) | ||
24 | AC_CANONICAL_SYSTEM | 25 | AC_CANONICAL_SYSTEM |
25 | AC_LANG(C) | 26 | AC_LANG(C) |
@@ -45,5 +46,5 @@ AC_HEADER_STDC | |||
45 | # Check for functions | 46 | # Check for functions |
46 | 47 | ||
47 | AM_VARNISHAPI([4.1]) | 48 | AM_VARNISHAPI([4.1],[5.1]) |
48 | 49 | ||
49 | AC_CONFIG_TESTDIR(tests) | 50 | AC_CONFIG_TESTDIR(tests) |
diff --git a/tests/Makefile.am b/tests/Makefile.am index d70517f..6c5967c 100644 --- a/tests/Makefile.am +++ b/tests/Makefile.am | |||
@@ -32,4 +32,5 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac | |||
32 | echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ | 32 | echo 'm4_define([AT_PACKAGE_STRING], [@PACKAGE_STRING@])'; \ |
33 | echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ | 33 | echo 'm4_define([AT_PACKAGE_BUGREPORT], [@PACKAGE_BUGREPORT@])'; \ |
34 | echo 'm4_define([AT_VMOD_BASENAME], [@AC_VMOD_BASENAME@])'; \ | ||
34 | } >$(srcdir)/package.m4 | 35 | } >$(srcdir)/package.m4 |
35 | 36 | ||
diff --git a/tests/atlocal.in b/tests/atlocal.in index 142b9ed..5d6b7f3 100644 --- a/tests/atlocal.in +++ b/tests/atlocal.in | |||
@@ -3,5 +3,5 @@ | |||
3 | # Copyright (C) 2017 Sergey Poznyakoff | 3 | # Copyright (C) 2017 Sergey Poznyakoff |
4 | 4 | ||
5 | PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH | 5 | PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:@VARNISH_SBINDIR@:$PATH |
6 | VARNISHTEST=@VARNISHTEST@ | 6 | VARNISHTEST=@VARNISHTEST@ |
7 | VARNISHD=@VARNISHD@ | 7 | VARNISHD=@VARNISHD@ |
diff --git a/tests/ci.at b/tests/ci.at index d486188..1115316 100644 --- a/tests/ci.at +++ b/tests/ci.at | |||
@@ -1,5 +1,5 @@ | |||
1 | AT_SETUP([case-insensitive]) | 1 | AT_SETUP([case-insensitive]) |
2 | AT_KEYWORDS([case-insensitive]) | 2 | AT_KEYWORDS([case-insensitive]) |
3 | AT_VARNISHTEST([dict],[ | 3 | AT_VARNISHTEST([ |
4 | sub vcl_init { | 4 | sub vcl_init { |
5 | dict.ci(true); | 5 | dict.ci(true); |
diff --git a/tests/cs.at b/tests/cs.at index 0333943..11366c4 100644 --- a/tests/cs.at +++ b/tests/cs.at | |||
@@ -1,5 +1,5 @@ | |||
1 | AT_SETUP([case-sensitive]) | 1 | AT_SETUP([case-sensitive]) |
2 | AT_KEYWORDS([case-sensitive]) | 2 | AT_KEYWORDS([case-sensitive]) |
3 | AT_VARNISHTEST([dict],[ | 3 | AT_VARNISHTEST([ |
4 | sub vcl_init { | 4 | sub vcl_init { |
5 | dict.collisions(0); | 5 | dict.collisions(0); |