diff --git a/.gitignore b/.gitignore index f5b548a..c4cb328 100644 --- a/.gitignore +++ b/.gitignore @@ -1,4 +1 @@ -/vmod-querystring-1.0.1.tar.gz -/vmod-querystring-1.0.2.tar.gz -/vmod-querystring-1.0.3.tar.gz -/vmod-querystring-1.0.5.tar.gz +vmod-querystring-*.tar.gz diff --git a/Move-away-from-VRT_re_fini.patch b/Move-away-from-VRT_re_fini.patch new file mode 100644 index 0000000..ab0ec6f --- /dev/null +++ b/Move-away-from-VRT_re_fini.patch @@ -0,0 +1,41 @@ +From fffe7583af018e9a9424139d9fc4080586cf3f90 Mon Sep 17 00:00:00 2001 +From: Dridi Boukelmoune +Date: Sat, 23 Jan 2021 08:52:26 +0100 +Subject: [PATCH] Move away from VRT_re_fini + +It will be gone in the next Varnish release. +--- + src/vmod_querystring.c | 13 ++++++++++++- + 1 file changed, 12 insertions(+), 1 deletion(-) + +diff --git a/src/vmod_querystring.c b/src/vmod_querystring.c +index f5ef7f0..b156643 100644 +--- a/src/vmod_querystring.c ++++ b/src/vmod_querystring.c +@@ -208,6 +208,17 @@ qs_match_regex(VRT_CTX, const struct qs_filter *qsf, const char *s, + 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 VPFX(querystring_filter) *obj, + } + + qsf->match = qs_match_regex; +- qsf->free = VRT_re_fini; ++ qsf->free = qs_free_regex; + VTAILQ_INSERT_TAIL(&obj->filters, qsf, list); + } + diff --git a/sources b/sources index cfb68f5..63b4e68 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (vmod-querystring-1.0.5.tar.gz) = c421905c410fff7ed710a2891c4e74672e91fb3fb725e59e34f62900b281a6f7a64ca8ffc06e3e0535928afcefb8bacb17ec9c0e2df8ba809ca8cb09b317e13e +SHA512 (vmod-querystring-2.0.3.tar.gz) = 32b43e716a5a8ec5f9fed165564718e761ef18804ff3cf6342f74ac61a3b34c1360eef07cdf3c43b0a1935e1cd878facd74d89608910796ccf70d6babb459d64 diff --git a/vmod-querystring.spec b/vmod-querystring.spec index 2629ac0..c53103b 100644 --- a/vmod-querystring.spec +++ b/vmod-querystring.spec @@ -1,19 +1,21 @@ %global vmoddir %{_libdir}/varnish/vmods Name: vmod-querystring -Version: 1.0.5 -Release: 3%{?dist} +Version: 2.0.3 +Release: 14%{?dist} Summary: QueryString module for Varnish Cache URL: https://github.com/dridi/libvmod-querystring -License: GPLv3+ +# Automatically converted from old format: GPLv3+ - review is highly recommended. +License: GPL-3.0-or-later Source: %{url}/releases/download/v%{version}/%{name}-%{version}.tar.gz -BuildRequires: python3 -BuildRequires: varnish >= 4.1.3 -BuildRequires: pkgconfig(varnishapi) >= 4.1.3 +BuildRequires: make +BuildRequires: python +BuildRequires: varnish >= 6 +BuildRequires: pkgconfig(varnishapi) >= 6 -Requires: varnish >= 4.1.3 +Requires: varnish >= 6 %description @@ -33,11 +35,11 @@ with this kind of query-strings. %prep -%setup -q +%autosetup -p1 %build -%configure CFLAGS="%{optflags}" PYTHON=python3 +%configure CFLAGS="%{optflags}" %make_build @@ -58,25 +60,95 @@ rm %{buildroot}%{vmoddir}/*.la %changelog +* Fri Jul 17 2026 Fedora Release Engineering - 2.0.3-14 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild + +* Tue Jun 02 2026 Dridi Boukelmoune - 2.0.3-13 +- Rebuilt for varnish-8.0.2.1 + +* Sat Jan 17 2026 Fedora Release Engineering - 2.0.3-12 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild + +* Fri Sep 19 2025 Dridi Boukelmoune - 2.0.3-11 +- Rebuild for Varnish 7.7.3 + +* Fri Jul 25 2025 Fedora Release Engineering - 2.0.3-10 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild + +* Sun Jan 19 2025 Fedora Release Engineering - 2.0.3-9 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild + +* Thu Jul 25 2024 Miroslav Suchý - 2.0.3-8 +- convert license to SPDX + +* Sat Jul 20 2024 Fedora Release Engineering - 2.0.3-7 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild + +* Sat Jan 27 2024 Fedora Release Engineering - 2.0.3-6 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild + +* Sat Jul 22 2023 Fedora Release Engineering - 2.0.3-5 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild + +* Sat Jan 21 2023 Fedora Release Engineering - 2.0.3-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild + +* Sat Jul 23 2022 Fedora Release Engineering - 2.0.3-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild + +* Sat Jan 22 2022 Fedora Release Engineering - 2.0.3-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild + +* Tue Nov 02 2021 Dridi Boukelmoune - 2.0.3-1 +- Bump to 2.0.3 +- Drop the temporary patch for 2.0.2-5 + +* Fri Aug 06 2021 Dridi Boukelmoune - 2.0.2-5 +- Add patch for Varnish 6.6 + +* Fri Jul 23 2021 Fedora Release Engineering - 2.0.2-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild + +* Wed Jan 27 2021 Fedora Release Engineering - 2.0.2-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild + +* Sun Oct 11 2020 Dridi Boukelmoune - 2.0.2-2 +- Rebuild for Varnish 6.5.1 + +* Mon Sep 21 2020 Dridi Boukelmoune - 2.0.2-1 +- Bump to 2.0.2 for Varnish 6.5.0 + +* Wed Jul 29 2020 Fedora Release Engineering - 2.0.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild + +* Fri Jan 31 2020 Fedora Release Engineering - 2.0.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild + +* Sat Jul 27 2019 Fedora Release Engineering - 2.0.1-2 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild + +* Sat Mar 16 2019 Dridi Boukelmoune - 2.0.1-1 +- Bump to 2.0.1 + * Sun Feb 03 2019 Fedora Release Engineering - 1.0.5-3 - Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild * Sat Jul 14 2018 Fedora Release Engineering - 1.0.5-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild -* Tue Apr 17 2018 Dridi Boukelmoune - 1.0.5-1 +* Tue Apr 17 2018 Dridi Boukelmoune - 1.0.5-1 - Bump to 1.0.5 - Drop rst2man BR - Add python3 BR - Simplify %%configure step -* Thu Mar 15 2018 Dridi Boukelmoune - 1.0.3-3 +* Thu Mar 15 2018 Dridi Boukelmoune - 1.0.3-3 - Explicit python requirements (#1556533) * Fri Feb 09 2018 Fedora Release Engineering - 1.0.3-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild -* Sat Oct 21 2017 Dridi Boukelmoune - 1.0.3-1 +* Sat Oct 21 2017 Dridi Boukelmoune - 1.0.3-1 - Bump to 1.0.3 * Thu Aug 03 2017 Fedora Release Engineering - 1.0.2-3 @@ -85,9 +157,9 @@ rm %{buildroot}%{vmoddir}/*.la * Thu Jul 27 2017 Fedora Release Engineering - 1.0.2-2 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild -* Wed Apr 26 2017 Dridi Boukelmoune - 1.0.2-1 +* Wed Apr 26 2017 Dridi Boukelmoune - 1.0.2-1 - Bump to 1.0.2 - Set the optflags at configure time -* Sun Sep 25 2016 Dridi Boukelmoune - 1.0.1-1 +* Sun Sep 25 2016 Dridi Boukelmoune - 1.0.1-1 - Initial spec.