summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2017-08-10 11:55:36 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2017-08-10 11:58:12 (GMT)
commita29737fc04272ac38d639ac25841183db1052fbc (patch) (unidiff)
tree33c1234eab272d9f08c0307882bd5edbd1948a54
parent75a077fa0ee4b0094b6d43619cd0a068a82ebfd7 (diff)
downloadvmod-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.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS7
-rw-r--r--README3
m---------acvmod0
-rw-r--r--configure.ac5
-rw-r--r--tests/Makefile.am1
-rw-r--r--tests/atlocal.in2
-rw-r--r--tests/ci.at2
-rw-r--r--tests/cs.at2
8 files changed, 15 insertions, 7 deletions
diff --git a/NEWS b/NEWS
index 3a8e71e..ca8f679 100644
--- a/NEWS
+++ b/NEWS
@@ -1,13 +1,18 @@
1vmod_dict -- history of user-visible changes. 2017-08-06 1vmod_dict -- history of user-visible changes. 2017-08-10
2Copyright (C) 2017 Sergey Poznyakoff 2Copyright (C) 2017 Sergey Poznyakoff
3See the end of file for copying conditions. 3See the end of file for copying conditions.
4 4
5Please send vmod_dict bug reports to <gray@gnu.org> 5Please send vmod_dict bug reports to <gray@gnu.org>
6 6
7 7
8Version 1.1, 2017-08-10
9
10* Support for Varnish 5.1
11
12
8Version 1.0, 2017-08-06 13Version 1.0, 2017-08-06
9 14
10Initial release 15Initial release
11 16
12========================================================================= 17=========================================================================
13Copyright information: 18Copyright information:
diff --git a/README b/README
index bf98aab..2109a6b 100644
--- a/README
+++ b/README
@@ -38,13 +38,14 @@ as follows:
38 38
39 set req.http.X-Value = dict.lookup("key"); 39 set req.http.X-Value = dict.lookup("key");
40 40
41* Installation 41* Installation
42 42
43In order to compile the package you need to have installed 43In order to compile the package you need to have installed
44varnishd and varnishapi package. 44varnishd and varnishapi package. The module has been tested with
45Varnish versions 4.1 and 5.1.
45 46
46Supposing that condition is met, run: 47Supposing that condition is met, run:
47 48
48 ./configure 49 ./configure
49 50
50It should be able to automatically find the necessary components. In case 51It should be able to automatically find the necessary components. In case
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
@@ -12,18 +12,19 @@
12# GNU General Public License for more details. 12# GNU General Public License for more details.
13# 13#
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_dict. If not, see <http://www.gnu.org/licenses/>. 15# along with vmod_dict. If not, see <http://www.gnu.org/licenses/>.
16 16
17AC_PREREQ(2.69) 17AC_PREREQ(2.69)
18AC_INIT([vmod-dict], [1.0], [gray@gnu.org]) 18AC_INIT([vmod-dict], [1.1], [gray@gnu.org])
19AC_CONFIG_AUX_DIR([build-aux]) 19AC_CONFIG_AUX_DIR([build-aux])
20AC_CONFIG_MACRO_DIR([m4]) 20AC_CONFIG_MACRO_DIR([m4])
21AC_CONFIG_SRCDIR(src/vmod_dict.vcc) 21AC_CONFIG_SRCDIR(src/vmod_dict.vcc)
22AM_CONFIG_HEADER(config.h) 22AM_CONFIG_HEADER(config.h)
23 23
24AC_SUBST([AC_VMOD_BASENAME],[dict])
24AC_CANONICAL_SYSTEM 25AC_CANONICAL_SYSTEM
25AC_LANG(C) 26AC_LANG(C)
26 27
27AM_INIT_AUTOMAKE([1.14 gnu tar-ustar silent-rules]) 28AM_INIT_AUTOMAKE([1.14 gnu tar-ustar silent-rules])
28AM_SILENT_RULES([yes]) 29AM_SILENT_RULES([yes])
29 30
@@ -41,13 +42,13 @@ AC_PROG_MAKE_SET
41 42
42# Checks for header files. 43# Checks for header files.
43AC_HEADER_STDC 44AC_HEADER_STDC
44 45
45# Check for functions 46# Check for functions
46 47
47AM_VARNISHAPI([4.1]) 48AM_VARNISHAPI([4.1],[5.1])
48 49
49AC_CONFIG_TESTDIR(tests) 50AC_CONFIG_TESTDIR(tests)
50AC_CONFIG_FILES([tests/Makefile tests/atlocal]) 51AC_CONFIG_FILES([tests/Makefile tests/atlocal])
51AM_MISSING_PROG([AUTOM4TE], [autom4te]) 52AM_MISSING_PROG([AUTOM4TE], [autom4te])
52 53
53AC_CONFIG_FILES([ 54AC_CONFIG_FILES([
diff --git a/tests/Makefile.am b/tests/Makefile.am
index d70517f..6c5967c 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -28,12 +28,13 @@ $(srcdir)/package.m4: $(top_srcdir)/configure.ac
28 echo '# Signature of the current package.'; \ 28 echo '# Signature of the current package.'; \
29 echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \ 29 echo 'm4_define([AT_PACKAGE_NAME], [@PACKAGE_NAME@])'; \
30 echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \ 30 echo 'm4_define([AT_PACKAGE_TARNAME], [@PACKAGE_TARNAME@])'; \
31 echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \ 31 echo 'm4_define([AT_PACKAGE_VERSION], [@PACKAGE_VERSION@])'; \
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
36# 37#
37 38
38## ------------ ## 39## ------------ ##
39## Test suite. ## 40## Test suite. ##
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 142b9ed..5d6b7f3 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -1,7 +1,7 @@
1# @configure_input@ -*- shell-script -*- 1# @configure_input@ -*- shell-script -*-
2# Configurable variable values for vmod_dict test suite. 2# Configurable variable values for vmod_dict test suite.
3# Copyright (C) 2017 Sergey Poznyakoff 3# Copyright (C) 2017 Sergey Poznyakoff
4 4
5PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:$PATH 5PATH=@abs_builddir@:@abs_top_builddir@/src:@abs_top_srcdir@/build-aux:$top_srcdir:$srcdir:@VARNISH_SBINDIR@:$PATH
6VARNISHTEST=@VARNISHTEST@ 6VARNISHTEST=@VARNISHTEST@
7VARNISHD=@VARNISHD@ 7VARNISHD=@VARNISHD@
diff --git a/tests/ci.at b/tests/ci.at
index d486188..1115316 100644
--- a/tests/ci.at
+++ b/tests/ci.at
@@ -1,9 +1,9 @@
1AT_SETUP([case-insensitive]) 1AT_SETUP([case-insensitive])
2AT_KEYWORDS([case-insensitive]) 2AT_KEYWORDS([case-insensitive])
3AT_VARNISHTEST([dict],[ 3AT_VARNISHTEST([
4 sub vcl_init { 4 sub vcl_init {
5 dict.ci(true); 5 dict.ci(true);
6 dict.collisions(0); 6 dict.collisions(0);
7 dict.load("\${vmod_topsrc}/tests/num.dict"); 7 dict.load("\${vmod_topsrc}/tests/num.dict");
8 } 8 }
9 sub vcl_recv { 9 sub vcl_recv {
diff --git a/tests/cs.at b/tests/cs.at
index 0333943..11366c4 100644
--- a/tests/cs.at
+++ b/tests/cs.at
@@ -1,9 +1,9 @@
1AT_SETUP([case-sensitive]) 1AT_SETUP([case-sensitive])
2AT_KEYWORDS([case-sensitive]) 2AT_KEYWORDS([case-sensitive])
3AT_VARNISHTEST([dict],[ 3AT_VARNISHTEST([
4 sub vcl_init { 4 sub vcl_init {
5 dict.collisions(0); 5 dict.collisions(0);
6 dict.load("\${vmod_topsrc}/tests/num.dict"); 6 dict.load("\${vmod_topsrc}/tests/num.dict");
7 } 7 }
8 sub vcl_recv { 8 sub vcl_recv {
9 set req.http.X-result = dict.lookup(regsub(req.url, "^/(.*)", "\1")); 9 set req.http.X-result = dict.lookup(regsub(req.url, "^/(.*)", "\1"));

Return to:

Send suggestions and report system problems to the System administrator.