diff --git a/www/varnish-libvmod-querystring/Makefile b/www/varnish-libvmod-querystring/Makefile index 2837dcb101b6..8e4f79016d0d 100644 --- a/www/varnish-libvmod-querystring/Makefile +++ b/www/varnish-libvmod-querystring/Makefile @@ -1,38 +1,37 @@ PORTNAME= libvmod-querystring -DISTVERSION= v2.0.2 -PORTREVISION= 1 +DISTVERSION= v2.0.3 CATEGORIES= www PKGNAMEPREFIX= varnish- MAINTAINER= zi@FreeBSD.org COMMENT= Varnish Module (vmod) for query string manipulation LICENSE= GPLv1 LICENSE_FILE= ${WRKSRC}/LICENSE BUILD_DEPENDS= rst2man:textproc/py-docutils@${PY_FLAVOR} -USES= autoreconf libtool pkgconfig python:3.5+,build varnish:6 +USES= autoreconf libtool pkgconfig python:3.5+,build varnish:7 USE_LDCONFIG= yes GNU_CONFIGURE= yes CONFIGURE_ARGS= --disable-static INSTALL_TARGET= install-strip DOCSDIR= ${PREFIX}/share/doc/vmod-querystring CFLAGS+= -I${WRKSRC}/src USE_GITHUB= yes GH_ACCOUNT= Dridi OPTIONS_DEFINE= DOCS post-patch: ${REINPLACE_CMD} 's|$${VARNISHAPI_DATAROOTDIR}|${LOCALBASE}/share|' \ ${WRKSRC}/Makefile.am post-build: (cd ${WRKSRC}/src && ${LOCALBASE}/bin/rst2man \ vmod_querystring.man.rst vmod_querystring.3) .include diff --git a/www/varnish-libvmod-querystring/distinfo b/www/varnish-libvmod-querystring/distinfo index bcb781113cf2..759c1560932a 100644 --- a/www/varnish-libvmod-querystring/distinfo +++ b/www/varnish-libvmod-querystring/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1603992320 -SHA256 (Dridi-libvmod-querystring-v2.0.2_GH0.tar.gz) = fc8ef6259bb048b79977843f348ba8cdccec786b9528a4b245d6094e3a067896 -SIZE (Dridi-libvmod-querystring-v2.0.2_GH0.tar.gz) = 27681 +TIMESTAMP = 1649430745 +SHA256 (Dridi-libvmod-querystring-v2.0.3_GH0.tar.gz) = 4f7f54778bf808949cedcb360b925a3251c84a8d3a0d9ffdc722342f5ea6e89b +SIZE (Dridi-libvmod-querystring-v2.0.3_GH0.tar.gz) = 28082 diff --git a/www/varnish-libvmod-querystring/files/patch-src_vmod__querystring.c b/www/varnish-libvmod-querystring/files/patch-src_vmod__querystring.c deleted file mode 100644 index 8287e1d791d9..000000000000 --- a/www/varnish-libvmod-querystring/files/patch-src_vmod__querystring.c +++ /dev/null @@ -1,29 +0,0 @@ ---- 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); - } -