summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2020-03-27 09:39:10 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2020-03-27 09:39:20 (GMT)
commit7627493093ae82ee476038e22e537b8803c35755 (patch) (side-by-side diff)
treec3694d0253f3355a8854cab4a9c995525560669a
parent0166a0ec575e9e4d65719a94aef99427c2b05263 (diff)
downloadvmod-geoip-7627493093ae82ee476038e22e537b8803c35755.tar.gz
vmod-geoip-7627493093ae82ee476038e22e537b8803c35755.tar.bz2
Drop support for Varnish versions prior to 6.0
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS7
-rw-r--r--README2
m---------acvmod0
-rw-r--r--configure.ac4
-rw-r--r--src/vmod_geoip.c13
5 files changed, 12 insertions, 14 deletions
diff --git a/NEWS b/NEWS
index e5e0501..3a6efa9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,8 +1,13 @@
-Vmod-geoip NEWS -- history of user-visible changes. 2020-03-03
+Vmod-geoip NEWS -- history of user-visible changes. 2020-03-27
See the end of file for copying conditions.
Please send Vmod-geoip bug reports to <gray@gnu.org>
+Version 1.1.90 (git)
+
+* Drop support for Varnish versions prior to 6.0.0
+
+
Version 1.1, 2020-03-03
* Support for Varnish 6.3.1
diff --git a/README b/README
index 3b9108b..acc0132 100644
--- a/README
+++ b/README
@@ -57,7 +57,7 @@ Send bug reports and suggestions to <gray@gnu.org>
* Copyright information:
-Copyright (C) 2017-2018 Sergey Poznyakoff
+Copyright (C) 2017-2020 Sergey Poznyakoff
Permission is granted to anyone to make or distribute verbatim copies
of this document as received, in any medium, provided that the
diff --git a/acvmod b/acvmod
-Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
+Subproject 99b8dd21c7d1a91021b0a63c0d846ac35c4b009
diff --git a/configure.ac b/configure.ac
index a3ef08a..06538a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with vmod-geoip. If not, see <http://www.gnu.org/licenses/>.
AC_PREREQ(2.69)
-AC_INIT([vmod-geoip], 1.1, [gray@gnu.org])
+AC_INIT([vmod-geoip], 1.1.90, [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vmod_geoip.vcc)
@@ -42,7 +42,7 @@ AC_PROG_MAKE_SET
AC_HEADER_STDC
AC_CHECK_HEADERS([sys/stdlib.h])
-AM_VARNISHAPI([5.1], [6.3.2])
+AM_VARNISHAPI([6.0.0], [6.3.2])
AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
[Varnish API major version number])
diff --git a/src/vmod_geoip.c b/src/vmod_geoip.c
index de26eea..d704915 100644
--- a/src/vmod_geoip.c
+++ b/src/vmod_geoip.c
@@ -9,16 +9,9 @@
#include <string.h>
#include <inttypes.h>
-#if VARNISHAPI_MAJOR > 5
-# include <cache/cache.h>
-# include <vcl.h>
-# include <vcc_if.h>
-#else
-# include <vcl.h>
-# include <vrt.h>
-# include <vcc_if.h>
-# include <cache/cache.h>
-#endif
+#include <cache/cache.h>
+#include <vcl.h>
+#include <vcc_if.h>
#ifdef VPFX
# define VEVENT(a) VPFX(a)

Return to:

Send suggestions and report system problems to the System administrator.