summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org.ua>2017-08-10 08:49:47 (GMT)
committer Sergey Poznyakoff <gray@gnu.org.ua>2017-08-10 08:49:47 (GMT)
commit18326efa285e9352864a02b055a6f4f47cf529ec (patch) (side-by-side diff)
tree231d17363efcfd1b4ab90a72e03dffa58c1f3dc0
parent2fc7d47963afa1118f943aa3265237124f1b6747 (diff)
downloadvmod-basicauth-18326efa285e9352864a02b055a6f4f47cf529ec.tar.gz
vmod-basicauth-18326efa285e9352864a02b055a6f4f47cf529ec.tar.bz2
Support for varnish 5.1
* configure.ac: Set version 1.5 (AC_VMOD_BASENAME): New subst variable. * NEWS: Document changes. * README: Document changes. * acvmod: Updated. * tests/Makefile.am: Define AT_VMOD_BASENAME in package.m4 * tests/atlocal.in: Add @VARNISH_SBINDIR@ to PATH. * tests/aprmd5.at: Update. * tests/crypt.at: Update. * tests/plain.at: Update. * tests/sha1.at: Update.
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS7
-rw-r--r--README2
m---------acvmod0
-rw-r--r--configure.ac6
-rw-r--r--tests/Makefile.am1
-rw-r--r--tests/aprmd5.at2
-rw-r--r--tests/atlocal.in2
-rw-r--r--tests/crypt.at2
-rw-r--r--tests/plain.at2
-rw-r--r--tests/sha1.at2
10 files changed, 17 insertions, 9 deletions
diff --git a/NEWS b/NEWS
index d0286c2..3e5f67e 100644
--- a/NEWS
+++ b/NEWS
@@ -1,9 +1,14 @@
-Vmod-basicauth NEWS -- history of user-visible changes. 2017-08-06
+Vmod-basicauth NEWS -- 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-basicauth bug reports to <gray@gnu.org>
+Version 1.5, 2017-08-10
+
+* Support for Varnish 5.1
+
+
Version 1.4, 2017-08-06
* Support for Varnish 4.1
diff --git a/README b/README
index a5ee8fd..bb82cc8 100644
--- a/README
+++ b/README
@@ -8,6 +8,8 @@ This module implements basic HTTP authentication against the password file
created with the htpasswd(1) utility. The following password hashes are
supported: Apache MD5, crypt(3), SHA1, and plaintext.
+The module has been tested with Varnish versions 4.1, and 5.1.
+
* Example
import basicauth;
diff --git a/acvmod b/acvmod
-Subproject ba32780019480b89cd9d796b93a76cae6afe99a
+Subproject 01290b38b814d23a2e6fc8cb5a2d53582c51e30
diff --git a/configure.ac b/configure.ac
index 350e9a1..cc9a0d7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,12 +14,12 @@
# You should have received a copy of the GNU General Public License
# along with vmod-basicauth. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.69)
-AC_INIT([vmod-basicauth], 1.4, [gray@gnu.org])
+AC_INIT([vmod-basicauth], 1.5, [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vmod_basicauth.vcc)
AM_CONFIG_HEADER(config.h)
-
+AC_SUBST([AC_VMOD_BASENAME],[basicauth])
AC_CANONICAL_SYSTEM
AC_LANG(C)
@@ -42,7 +42,7 @@ AC_PROG_MAKE_SET
AC_HEADER_STDC
AC_CHECK_HEADERS([sys/stdlib.h])
-AM_VARNISHAPI
+AM_VARNISHAPI([4.1])
AC_CONFIG_TESTDIR(tests)
AC_CONFIG_FILES([tests/Makefile tests/atlocal])
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 28b98a7..a382004 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -30,6 +30,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/aprmd5.at b/tests/aprmd5.at
index ea827cb..9e8f6db 100644
--- a/tests/aprmd5.at
+++ b/tests/aprmd5.at
@@ -16,7 +16,7 @@
AT_SETUP([APR MD5])
AT_KEYWORDS([APR MD5])
-AT_VARNISHTEST([basicauth],[
+AT_VARNISHTEST([
sub vcl_deliver {
set resp.http.result = basicauth.match("\${vmod_topsrc}/tests/htpasswd", "Basic bWV0aG9kLW1kNTpndWVzc21lLW1kNQ==");
}
diff --git a/tests/atlocal.in b/tests/atlocal.in
index 0505e55..969da07 100644
--- a/tests/atlocal.in
+++ b/tests/atlocal.in
@@ -2,6 +2,6 @@
# Configurable variable values for vmod_basicauth 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/crypt.at b/tests/crypt.at
index 0dec8e5..b5e12f7 100644
--- a/tests/crypt.at
+++ b/tests/crypt.at
@@ -16,7 +16,7 @@
AT_SETUP([CRYPT])
AT_KEYWORDS([crypt])
-AT_VARNISHTEST([basicauth],[
+AT_VARNISHTEST([
sub vcl_deliver {
set resp.http.result = basicauth.match("\${vmod_topsrc}/tests/htpasswd", "Basic bWV0aG9kLWNyeXB0Omd1ZXNzbWUtY3J5cHQ=");
}
diff --git a/tests/plain.at b/tests/plain.at
index f8858ad..e6b056a 100644
--- a/tests/plain.at
+++ b/tests/plain.at
@@ -16,7 +16,7 @@
AT_SETUP([PLAIN])
AT_KEYWORDS([plain])
-AT_VARNISHTEST([basicauth],[
+AT_VARNISHTEST([
sub vcl_deliver {
set resp.http.result = basicauth.match("\${vmod_topsrc}/tests/htpasswd", "Basic bWV0aG9kLXBsYWluOmd1ZXNzbWUtcGxhaW4=");
}
diff --git a/tests/sha1.at b/tests/sha1.at
index 22d2d4c..1c4818a 100644
--- a/tests/sha1.at
+++ b/tests/sha1.at
@@ -16,7 +16,7 @@
AT_SETUP([SHA1])
AT_KEYWORDS([sha1])
-AT_VARNISHTEST([basicauth],[
+AT_VARNISHTEST([
sub vcl_deliver {
set resp.http.result = basicauth.match("\${vmod_topsrc}/tests/htpasswd", "Basic bWV0aG9kLXNoYTE6Z3Vlc3NtZS1zaGEx");
}

Return to:

Send suggestions and report system problems to the System administrator.