summaryrefslogtreecommitdiffabout
authorSergey Poznyakoff <gray@gnu.org>2018-12-10 13:28:28 (GMT)
committer Sergey Poznyakoff <gray@gnu.org>2018-12-10 13:28:28 (GMT)
commit7443b68a9899bd8120f69593a9e361524f10b9f3 (patch) (side-by-side diff)
treeaf5b4c600a8c677a0145c4c898a2c695696a8587
parente85dac41c9bacb8bcd56f56f55c282434ecd8c80 (diff)
downloadvmod-geoip-7443b68a9899bd8120f69593a9e361524f10b9f3.tar.gz
vmod-geoip-7443b68a9899bd8120f69593a9e361524f10b9f3.tar.bz2
Version 1.0; Support Varnish 6.0.2release-1.0
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--NEWS9
-rw-r--r--README3
m---------acvmod0
-rw-r--r--configure.ac8
-rw-r--r--src/vmod_geoip.c20
5 files changed, 26 insertions, 14 deletions
diff --git a/NEWS b/NEWS
index 34d9cd0..7f44be9 100644
--- a/NEWS
+++ b/NEWS
@@ -1,16 +1,19 @@
-Vmod-geoip NEWS -- history of user-visible changes. 2017-05-09
-Copyright (C) 2017 Sergey Poznyakoff
+Vmod-geoip NEWS -- history of user-visible changes. 2018-12-10
See the end of file for copying conditions.
Please send Vmod-geoip bug reports to <gray@gnu.org>
+Version 1.0, 2018-12-10
+
+* Support for Varnish 6.0.2
+
Version 0.90 (Git)
Initial release
Copyright information:
-Copyright (C) 2017 Sergey Poznyakoff
+Copyright (C) 2017-2018 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/README b/README
index 7ebf976..3b9108b 100644
--- a/README
+++ b/README
@@ -1,5 +1,4 @@
Vmod-geoip README
-Copyright (C) 2017 Sergey Poznyakoff
See the end of file for copying conditions.
* Overview
@@ -58,7 +57,7 @@ Send bug reports and suggestions to <gray@gnu.org>
* Copyright information:
-Copyright (C) 2017 Sergey Poznyakoff
+Copyright (C) 2017-2018 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 ba32780019480b89cd9d796b93a76cae6afe99a
+Subproject 5b214e3d72f9e261a37cf31deb41e7f8a61a181
diff --git a/configure.ac b/configure.ac
index 6ed462f..ede46f9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1,5 +1,5 @@
# This file is part of vmod-geoip -*- autoconf -*-
-# Copyright (C) 2017 Sergey Poznyakoff
+# Copyright (C) 2017-2018 Sergey Poznyakoff
#
# Vmod-geoip is free software; you can redistribute it and/or modify
# it under the terms of the GNU General Public License as published by
@@ -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], 0.91, [gray@gnu.org])
+AC_INIT([vmod-geoip], 1.0, [gray@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(src/vmod_geoip.vcc)
@@ -42,7 +42,9 @@ AC_PROG_MAKE_SET
AC_HEADER_STDC
AC_CHECK_HEADERS([sys/stdlib.h])
-AM_VARNISHAPI
+AM_VARNISHAPI([5.1], [6.0.2])
+AC_DEFINE_UNQUOTED([VARNISHAPI_MAJOR],[$VARNISHAPI_MAJOR],
+ [Varnish API major version number])
PKG_CHECK_MODULES([MMDB], [libmaxminddb])
diff --git a/src/vmod_geoip.c b/src/vmod_geoip.c
index b7e30ba..5c1a2d4 100644
--- a/src/vmod_geoip.c
+++ b/src/vmod_geoip.c
@@ -8,12 +8,20 @@
#include <errno.h>
#include <string.h>
#include <inttypes.h>
-#include "vcl.h"
-#include "vrt.h"
-#include "vtcp.h"
-#include "vsa.h"
-#include "vcc_if.h"
-#include "cache/cache.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 <vtcp.h>
+#include <vsa.h>
+
#include <maxminddb.h>
#include <assert.h>

Return to:

Send suggestions and report system problems to the System administrator.