git: 7bcb26acbdec - main - www/varnish-libvmod-querystring: Fix compatibility with varnish 6.6, bump PORTREVISION

Ryan Steinmetz zi at FreeBSD.org
Thu May 13 17:59:31 UTC 2021


The branch main has been updated by zi:

URL: https://cgit.FreeBSD.org/ports/commit/?id=7bcb26acbdec7cdd64b9bb684b8ca3f453873e18

commit 7bcb26acbdec7cdd64b9bb684b8ca3f453873e18
Author:     Ryan Steinmetz <zi at FreeBSD.org>
AuthorDate: 2021-05-13 17:59:21 +0000
Commit:     Ryan Steinmetz <zi at FreeBSD.org>
CommitDate: 2021-05-13 17:59:21 +0000

    www/varnish-libvmod-querystring: Fix compatibility with varnish 6.6, bump PORTREVISION
---
 www/varnish-libvmod-querystring/Makefile           |  1 +
 .../files/patch-src_vmod__querystring.c            | 29 ++++++++++++++++++++++
 2 files changed, 30 insertions(+)

diff --git a/www/varnish-libvmod-querystring/Makefile b/www/varnish-libvmod-querystring/Makefile
index 6ede73062275..2837dcb101b6 100644
--- a/www/varnish-libvmod-querystring/Makefile
+++ b/www/varnish-libvmod-querystring/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	libvmod-querystring
 DISTVERSION=	v2.0.2
+PORTREVISION=	1
 CATEGORIES=	www
 PKGNAMEPREFIX=	varnish-
 
diff --git a/www/varnish-libvmod-querystring/files/patch-src_vmod__querystring.c b/www/varnish-libvmod-querystring/files/patch-src_vmod__querystring.c
new file mode 100644
index 000000000000..8287e1d791d9
--- /dev/null
+++ b/www/varnish-libvmod-querystring/files/patch-src_vmod__querystring.c
@@ -0,0 +1,29 @@
+--- src/vmod_querystring.c.orig	2020-09-21 14:52:07 UTC
++++ src/vmod_querystring.c
+@@ -208,6 +208,17 @@ qs_match_regex(VRT_CTX, const struct qs_
+ 	return (VRT_re_match(ctx, s, qsf->ptr));
+ }
+ 
++static void
++qs_free_regex(void *priv)
++{
++	vre_t *re;
++
++	AN(priv);
++	re = priv;
++	VRE_free(&re);
++	AZ(re);
++}
++
+ static int
+ qs_match_glob(VRT_CTX, const struct qs_filter *qsf, const char *s,
+     unsigned keep)
+@@ -595,7 +606,7 @@ vmod_filter_add_regex(VRT_CTX, struct VP
+ 	}
+ 
+ 	qsf->match = qs_match_regex;
+-	qsf->free = VRT_re_fini;
++	qsf->free = qs_free_regex;
+ 	VTAILQ_INSERT_TAIL(&obj->filters, qsf, list);
+ }
+ 


More information about the dev-commits-ports-all mailing list