Control: tags 971142 + pending Dear maintainer,
I've prepared an NMU for varnish-modules (versioned as 0.16.0-2.1) and uploaded it to DELAYED/14. Please feel free to tell me if I should cancel it. cu Adrian
diff -Nru varnish-modules-0.16.0/debian/changelog varnish-modules-0.16.0/debian/changelog --- varnish-modules-0.16.0/debian/changelog 2020-07-22 12:11:28.000000000 +0300 +++ varnish-modules-0.16.0/debian/changelog 2020-11-10 10:21:35.000000000 +0200 @@ -1,3 +1,11 @@ +varnish-modules (0.16.0-2.1) unstable; urgency=low + + * Non-maintainer upload. + * Backport upstream fix for FTBFS with Varnish 6.5. + (Closes: #971142) + + -- Adrian Bunk <b...@debian.org> Tue, 10 Nov 2020 10:21:35 +0200 + varnish-modules (0.16.0-2) unstable; urgency=medium * Fix FTBFS issue with Varnish ABI dependency (Closes: #963452) diff -Nru varnish-modules-0.16.0/debian/patches/0001-Update-call-from-VSB_delete-to-VSB_destroy-see-c502f.patch varnish-modules-0.16.0/debian/patches/0001-Update-call-from-VSB_delete-to-VSB_destroy-see-c502f.patch --- varnish-modules-0.16.0/debian/patches/0001-Update-call-from-VSB_delete-to-VSB_destroy-see-c502f.patch 1970-01-01 02:00:00.000000000 +0200 +++ varnish-modules-0.16.0/debian/patches/0001-Update-call-from-VSB_delete-to-VSB_destroy-see-c502f.patch 2020-11-10 10:20:57.000000000 +0200 @@ -0,0 +1,49 @@ +From fed6c862118ca34374b0284a1838cc49cea5b4d1 Mon Sep 17 00:00:00 2001 +From: Xavier De Cock <xdec...@gmail.com> +Date: Mon, 19 Oct 2020 17:03:50 +0200 +Subject: Update call from VSB_delete to VSB_destroy see + c502f536077668e5a88a2383458ab829873c80e5 + +--- + src/vmod_bodyaccess.c | 4 ++-- + src/vmod_saintmode.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) + +diff --git a/src/vmod_bodyaccess.c b/src/vmod_bodyaccess.c +index 8899257..b173397 100644 +--- a/src/vmod_bodyaccess.c ++++ b/src/vmod_bodyaccess.c +@@ -154,7 +154,7 @@ vmod_hash_req_body(VRT_CTX) + txtbody.e = txtbody.b + VSB_len(vsb); + SHA256_Update(ctx->specific, txtbody.b, txtbody.e - txtbody.b); + VSLbt(ctx->vsl, SLT_Hash, txtbody); +- VSB_delete(vsb); ++ VSB_destroy(&vsb); + } + + VCL_INT +@@ -227,7 +227,7 @@ vmod_rematch_req_body(VRT_CTX, struct vmod_priv *priv_call, VCL_STRING re) + i = VRE_exec(priv_call->priv, VSB_data(vsb), VSB_len(vsb), 0, 0, NULL, + 0, NULL); + +- VSB_delete(vsb); ++ VSB_destroy(&vsb); + + if (i > 0) + return (1); +diff --git a/src/vmod_saintmode.c b/src/vmod_saintmode.c +index b0e4ac6..7009bfb 100644 +--- a/src/vmod_saintmode.c ++++ b/src/vmod_saintmode.c +@@ -186,7 +186,7 @@ vmod_status(VRT_CTX, struct vmod_priv *priv) + if (p == NULL) + VSLb(ctx->vsl, SLT_VCL_Log, + "saintmode.vmod_status: workspace overflow"); +- VSB_delete(vsb); ++ VSB_destroy(&vsb); + return (p); + } + +-- +2.20.1 + diff -Nru varnish-modules-0.16.0/debian/patches/series varnish-modules-0.16.0/debian/patches/series --- varnish-modules-0.16.0/debian/patches/series 1970-01-01 02:00:00.000000000 +0200 +++ varnish-modules-0.16.0/debian/patches/series 2020-11-10 10:21:30.000000000 +0200 @@ -0,0 +1 @@ +0001-Update-call-from-VSB_delete-to-VSB_destroy-see-c502f.patch
