4 files changed, 44 insertions, 13 deletions

diff --git a/www/varnish-ip2location/Makefile b/www/varnish-ip2location/Makefile
index 577eca0b3c13..01f20b0d28ed 100644
--- a/www/varnish-ip2location/Makefile
+++ b/www/varnish-ip2location/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ip2location
 PORTVERSION=	1.0.3
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	varnish-
 
@@ -14,7 +15,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.TXT
 LIB_DEPENDS=	libIP2Location.so:net/ip2location
 BUILD_DEPENDS=	rst2man:textproc/py-docutils@${PY_FLAVOR}
 
-USES=		autoreconf:build libtool pkgconfig python:build varnish:6
+USES=		autoreconf:build libtool pkgconfig python:build varnish:7
 USE_LDCONFIG=	yes
 
 PLIST_FILES=	lib/varnish/vmods/libvmod_ip2location.so
@@ -30,7 +31,7 @@ CFLAGS+=	-I${WRKSRC}/src
 USE_GITHUB=	yes
 GH_ACCOUNT=	ip2location
 GH_PROJECT=	${PORTNAME}-varnish
-GH_TAGNAME=	25928cf
+GH_TAGNAME=	b24b36e
 
 OPTIONS_DEFINE=	DOCS
 
diff --git a/www/varnish-ip2location/distinfo b/www/varnish-ip2location/distinfo
index d7fff7a2c57c..f9aa9c41c473 100644
--- a/www/varnish-ip2location/distinfo
+++ b/www/varnish-ip2location/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1649178745
-SHA256 (ip2location-ip2location-varnish-1.0.3-25928cf_GH0.tar.gz) = d10c85a42efa5aed788fe6fc30e5761a057b63e99643e6a466dd2aca736a6111
-SIZE (ip2location-ip2location-varnish-1.0.3-25928cf_GH0.tar.gz) = 7056
+TIMESTAMP = 1649431734
+SHA256 (ip2location-ip2location-varnish-1.0.3-b24b36e_GH0.tar.gz) = 3c8e5220c6a1807cde5dc53a76201ef3674e73afee94b61e1180edbe707e930f
+SIZE (ip2location-ip2location-varnish-1.0.3-b24b36e_GH0.tar.gz) = 6667
diff --git a/www/varnish-ip2location/files/patch-Makefile.am b/www/varnish-ip2location/files/patch-Makefile.am
index 1b317c8a93c8..4ebde7be637f 100644
--- a/www/varnish-ip2location/files/patch-Makefile.am
+++ b/www/varnish-ip2location/files/patch-Makefile.am
@@ -1,4 +1,4 @@
---- Makefile.am.orig	2020-07-31 00:31:08 UTC
+--- Makefile.am.orig	2020-11-29 23:51:52 UTC
 +++ Makefile.am
 @@ -5,18 +5,11 @@ SUBDIRS = src
  DISTCHECK_CONFIGURE_FLAGS = \
@@ -17,9 +17,9 @@
 -if HAVE_RST2MAN
 -	${RST2MAN} README.rst $@
 -else
--	@echo "========================================"
--	@echo "You need rst2man installed to make dist"
 +vmod_ip2location.3:
  	@echo "========================================"
+-	@echo "You need rst2man installed to make dist"
+-	@echo "========================================"
 -	@false
 -endif
diff --git a/www/varnish-ip2location/files/patch-src_vmod__ip2location.c b/www/varnish-ip2location/files/patch-src_vmod__ip2location.c
index 3808b3447dc6..3f2ff55e821a 100644
--- a/www/varnish-ip2location/files/patch-src_vmod__ip2location.c
+++ b/www/varnish-ip2location/files/patch-src_vmod__ip2location.c
@@ -1,8 +1,8 @@
---- src/vmod_ip2location.c.orig	2020-07-24 05:30:13 UTC
+--- src/vmod_ip2location.c.orig	2020-11-29 23:51:52 UTC
 +++ src/vmod_ip2location.c
-@@ -12,6 +12,11 @@
- #include <unistd.h>
- #include <pthread.h>
+@@ -6,6 +6,11 @@
+ 
+ #include <IP2Location.h>
  
 +#ifdef __FreeBSD__
 +#include <stdio.h>
@@ -11,4 +11,34 @@
 +
  #include "cache/cache.h"
  
- /* Varnish < 6.2 compat */
+ #ifndef VRT_H_INCLUDED
+@@ -13,12 +18,19 @@
+ #endif
+ 
+ void
+-i2pl_free(void *obj)
++ip2l_free(VRT_CTX, void *obj)
+ {
+ 	AN(obj);
++	CHECK_OBJ_NOTNULL(ctx, VRT_CTX_MAGIC);
+ 	IP2Location_close((IP2Location *)obj);
+ }
+ 
++static const struct vmod_priv_methods ip2l_methods[1] = {{
++	.magic = VMOD_PRIV_METHODS_MAGIC,
++	.type = "vmod_std_ip2location",
++	.fini = ip2l_free
++}};
++
+ VCL_VOID
+ vmod_init_db(VRT_CTX, struct vmod_priv *priv, char *filename, char *memtype)
+ {
+@@ -51,7 +63,7 @@ vmod_init_db(VRT_CTX, struct vmod_priv *priv, char *fi
+ 	IP2Location_set_lookup_mode(IP2LocationObj, mtype);
+ 
+ 	priv->priv = IP2LocationObj;
+-	priv->free = i2pl_free;
++	priv->methods = ip2l_methods;
+ }
+ 
+ static VCL_STRING