From 73c685e86c051e788bf2df94f4d444993fa7f370 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Mon, 25 Feb 2019 23:54:17 +0100 Subject: [PATCH 01/14] Rebuilt for varnish-6.0.3 --- varnish-modules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index a2f3e5b..5c82326 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -1,6 +1,6 @@ Name: varnish-modules Version: 0.15.0 -Release: 1%{?dist} +Release: 2%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL Group: System Environment/Daemons @@ -61,6 +61,9 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' %changelog +* Mon Feb 25 2019 Ingvar Hagelund 0.15.0-2 +- Rebuilt for varnish-6.0.3 + * Tue Jul 17 2018 Dridi Boukelmoune 0.15.0-1 - Update to 0.15.0 - Drop EPEL and older Fedora releases support From 920d026852f7409ffbde19988612b56ab468d8aa Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Tue, 26 Feb 2019 08:49:19 +0100 Subject: [PATCH 02/14] Added small format patch for 32bit --- varnish-modules-0.15.0_format_fix.patch | 11 +++++++++++ varnish-modules.spec | 7 ++++++- 2 files changed, 17 insertions(+), 1 deletion(-) create mode 100644 varnish-modules-0.15.0_format_fix.patch diff --git a/varnish-modules-0.15.0_format_fix.patch b/varnish-modules-0.15.0_format_fix.patch new file mode 100644 index 0000000..87ad7cb --- /dev/null +++ b/varnish-modules-0.15.0_format_fix.patch @@ -0,0 +1,11 @@ +--- src/vmod_tcp.c.orig 2018-10-10 20:21:14.324704356 +0200 ++++ src/vmod_tcp.c 2018-10-10 20:21:44.329466200 +0200 +@@ -174,7 +174,7 @@ + sizeof(pacerate)) != 0) + VSLb(ctx->vsl, SLT_VCL_Error, "set_socket_pace(): Error setting pace rate."); + else +- VSLb(ctx->vsl, SLT_VCL_Log, "vmod-tcp: Socket paced to %lu KB/s.", rate); ++ VSLb(ctx->vsl, SLT_VCL_Log, "vmod-tcp: Socket paced to %jd KB/s.", (intmax_t)rate); + + # ifndef NDEBUG + int retval; diff --git a/varnish-modules.spec b/varnish-modules.spec index 5c82326..7323499 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -8,6 +8,9 @@ License: BSD URL: https://github.com/varnish/%{name} Source: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz +# Upstream issue #122 +Patch1: varnish-modules-0.15.0_format_fix.patch + BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig(varnishapi) @@ -36,6 +39,7 @@ tcp, var, xkey %prep %setup -q +%patch1 -p0 %build @@ -44,7 +48,7 @@ tcp, var, xkey %install -%make_install +%make_install docdir=%{_pkgdocdir} find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' @@ -63,6 +67,7 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' %changelog * Mon Feb 25 2019 Ingvar Hagelund 0.15.0-2 - Rebuilt for varnish-6.0.3 +- Added small format patch for 32bit * Tue Jul 17 2018 Dridi Boukelmoune 0.15.0-1 - Update to 0.15.0 From 0ee40a83ebb3d5693f65ece555141b3f987a8bd4 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Wed, 18 Sep 2019 21:53:19 +0200 Subject: [PATCH 03/14] - Merge from rawhide - Rebuilt against varnish-6.0.4 --- varnish-modules.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 2c3d647..a0ed43d 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -3,7 +3,7 @@ Name: varnish-modules Version: 0.15.0 -Release: 6%{?dist} +Release: 7%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD @@ -11,8 +11,6 @@ URL: https://github.com/varnish/%{name} Source: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz # Upstream issue #122 -Patch1: varnish-modules-0.15.0_format_fix.patch - Patch10: varnish-modules-0.15.0_fix_saintmode_for_varnish_6.1.patch Patch11: varnish-modules-0.15.0_fix_simple_formatting_bug.patch BuildRequires: gcc @@ -42,9 +40,7 @@ tcp, var, xkey %prep %setup -q -%patch1 -p0 - -%if "%varnishver" >= "6.1" +%if "%varnishver" >= "6.1" %patch10 -p1 %endif %patch11 -p1 @@ -55,7 +51,7 @@ tcp, var, xkey %install -%make_install docdir=%{_pkgdocdir} +%make_install docdir=%_pkgdocdir find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro @@ -71,13 +67,16 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Wed Sep 18 2019 Ingvar Hagelund - 0.15.0-7 +- Rebuilt for varnish-6.0.4 + * Sat Jul 27 2019 Fedora Release Engineering - 0.15.0-6 - Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild * Mon Feb 25 2019 Ingvar Hagelund 0.15.0-2 - Rebuilt for varnish-6.0.3 - - Added small format patch for 32bit + * Fri Feb 15 2019 Ingvar Hagelund - 0.15.0-5 - Install docs in correct docdir From dda591d8c4ad77eed7919ad575e96dc6d3cf212f Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Fri, 15 Nov 2019 13:52:50 +0100 Subject: [PATCH 04/14] Rebuilt for varnish-6.0.5 --- varnish-modules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 7323499..936e730 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -1,6 +1,6 @@ Name: varnish-modules Version: 0.15.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL Group: System Environment/Daemons @@ -65,6 +65,9 @@ find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' %changelog +* Fri Nov 15 2019 Ingvar Hagelund 0.15.0-3 +- Rebuilt for varnish-6.0.5 + * Mon Feb 25 2019 Ingvar Hagelund 0.15.0-2 - Rebuilt for varnish-6.0.3 - Added small format patch for 32bit From adf189a15291a79ce7112ab9defbc811b8411613 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Thu, 13 Feb 2020 20:30:32 +0100 Subject: [PATCH 05/14] * Thu Feb 13 2020 Ingvar Hagelund 0.15.0-9 - Rebuilt for varnish-6.0.6 --- varnish-modules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 8fe1abd..13fb16e 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -3,7 +3,7 @@ Name: varnish-modules Version: 0.15.0 -Release: 8%{?dist} +Release: 9%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD @@ -67,6 +67,9 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Thu Feb 13 2020 Ingvar Hagelund 0.15.0-9 +- Rebuilt for varnish-6.0.6 + * Fri Nov 15 2019 Ingvar Hagelund 0.15.0-8 - Rebuilt for varnish-6.0.5 From d90ac86cad86070bf7eaffaedca796de98b7e421 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Tue, 17 Nov 2020 14:17:28 +0100 Subject: [PATCH 06/14] * Mon Nov 16 2020 Ingvar Hagelund 0.15.0-10 - Rebuilt for varnish-6.0.7 --- varnish-modules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 13fb16e..6168d50 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -3,7 +3,7 @@ Name: varnish-modules Version: 0.15.0 -Release: 9%{?dist} +Release: 10%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD @@ -67,6 +67,9 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Mon Nov 16 2020 Ingvar Hagelund 0.15.0-10 +- Rebuilt for varnish-6.0.7 + * Thu Feb 13 2020 Ingvar Hagelund 0.15.0-9 - Rebuilt for varnish-6.0.6 From bcddf850920f2bf9080a602382ae344aa47c7b89 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Sat, 17 Jul 2021 03:06:00 +0200 Subject: [PATCH 07/14] - Rebuilt for varnish-6.0.8 --- varnish-modules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 6168d50..46984c9 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -3,7 +3,7 @@ Name: varnish-modules Version: 0.15.0 -Release: 10%{?dist} +Release: 11%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD @@ -67,6 +67,9 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Sat Jul 17 2021 Ingvar Hagelund 0.15.0-11 +- Rebuilt for varnish-6.0.8 + * Mon Nov 16 2020 Ingvar Hagelund 0.15.0-10 - Rebuilt for varnish-6.0.7 From ff9c6f588a288bf696383de114cb62b7d71b158d Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Fri, 28 Jan 2022 09:57:14 +0100 Subject: [PATCH 08/14] Rebuilt for varnish-6.0.10 --- varnish-modules.spec | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 46984c9..479cd1d 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -3,7 +3,7 @@ Name: varnish-modules Version: 0.15.0 -Release: 11%{?dist} +Release: 12%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD @@ -46,7 +46,7 @@ tcp, var, xkey %patch11 -p1 %build -%configure +%configure PYTHON=python3 %make_build @@ -67,6 +67,9 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Fri Jan 28 2022 Ingvar Hagelund 0.15.0-12 +- Rebuilt for varnish-6.0.10 + * Sat Jul 17 2021 Ingvar Hagelund 0.15.0-11 - Rebuilt for varnish-6.0.8 From fda75326e8f9e567b206352c359fc77e4eab5bfc Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Thu, 3 Feb 2022 11:38:16 +0100 Subject: [PATCH 09/14] bind hard on varnish version. build now needs python3. --- varnish-modules.spec | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 479cd1d..2ac2018 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -16,9 +16,10 @@ Patch11: varnish-modules-0.15.0_fix_simple_formatting_bug.patch BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig(varnishapi) +BuildRequires: python3 BuildRequires: varnish -Requires: varnish +Requires: varnish = %varnishver Provides: vmod-bodyaccess = %{version}-%{release} Provides: vmod-cookie = %{version}-%{release} From 3fa73956fb047da858fe5f0b06500663b6e5c584 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Tue, 15 Nov 2022 16:38:58 +0100 Subject: [PATCH 10/14] * Tue Nov 15 2022 Ingvar Hagelund 0.15.0-13 - Rebuilt for varnish-6.0.11 --- varnish-modules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 2ac2018..2614249 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -3,7 +3,7 @@ Name: varnish-modules Version: 0.15.0 -Release: 12%{?dist} +Release: 13%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD @@ -68,6 +68,9 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Tue Nov 15 2022 Ingvar Hagelund 0.15.0-13 +- Rebuilt for varnish-6.0.11 + * Fri Jan 28 2022 Ingvar Hagelund 0.15.0-12 - Rebuilt for varnish-6.0.10 From 858ccb22a1e170aee976a9dea3fe0e7a1ff8ab5a Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Wed, 15 Nov 2023 11:48:04 +0100 Subject: [PATCH 11/14] Rebuild for new upstream LTS release varnish-6.0.12 --- varnish-modules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 2614249..b104e75 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -3,7 +3,7 @@ Name: varnish-modules Version: 0.15.0 -Release: 13%{?dist} +Release: 14%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD @@ -68,6 +68,9 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Tue Nov 14 2023 Ingvar Hagelund 0.15.0-14 +- Rebuilt for varnish-6.0.12 + * Tue Nov 15 2022 Ingvar Hagelund 0.15.0-13 - Rebuilt for varnish-6.0.11 From d1d174f25d9485cfbe1a8ca407ada42d760d5dd0 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Mon, 29 Apr 2024 16:41:38 +0200 Subject: [PATCH 12/14] * Mon Apr 29 2024 Ingvar Hagelund 0.15.1-1 - New upstream release, removing patches included upstream - Built for varnish-6.0.13 --- .gitignore | 1 + sources | 2 +- varnish-modules.spec | 31 ++++++++++++++++++------------- 3 files changed, 20 insertions(+), 14 deletions(-) diff --git a/.gitignore b/.gitignore index 47e6daa..d63b25e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,3 @@ /varnish-modules-0.12.1.tar.gz /varnish-modules-0.15.0.tar.gz +/varnish-modules-0d555b6.tar.gz diff --git a/sources b/sources index 220d464..634c0e3 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (varnish-modules-0.15.0.tar.gz) = f24bc7e00db8eb53e4730b9b6d9adb9442d26ad5b07f3e09541b686e41d437113b8bca75f9ac47bc0ec54475fafb0eefc46b98ccee92d9360aaf660b4826ec9e +SHA512 (varnish-modules-0d555b6.tar.gz) = 726e5726d254b4b4c72f21d6e33df1b93c25744b7f6afb919ce3086417404e2ec23ce8205a67d3ad5267d6b1fc8ec527791226a35634a0f12449732e99ea6321 diff --git a/varnish-modules.spec b/varnish-modules.spec index b104e75..6870460 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -1,23 +1,27 @@ %global varnishver %(pkg-config --silence-errors --modversion varnishapi || echo 0) - +%global commit 0d555b627333cd9190a40870f380ace5664f6d0d +%global gittag 0.15.1 +%global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: varnish-modules -Version: 0.15.0 -Release: 14%{?dist} +Version: 0.15.1 +Release: 1%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD URL: https://github.com/varnish/%{name} -Source: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz +#Source: https://download.varnish-software.com/varnish-modules/#{name}-#{version}.tar.gz +Source: https://github.com/varnish/varnish-cache/archive/%{commit}/%{name}-%{shortcommit}.tar.gz -# Upstream issue #122 -Patch10: varnish-modules-0.15.0_fix_saintmode_for_varnish_6.1.patch -Patch11: varnish-modules-0.15.0_fix_simple_formatting_bug.patch BuildRequires: gcc BuildRequires: make BuildRequires: pkgconfig(varnishapi) BuildRequires: python3 -BuildRequires: varnish +BuildRequires: varnish >= 6.0 +BuildRequires: varnish <= 6.1 + +BuildRequires: automake +BuildRequires: libtool Requires: varnish = %varnishver @@ -40,13 +44,10 @@ tcp, var, xkey %prep -%setup -q -%if "%varnishver" >= "6.1" -%patch10 -p1 -%endif -%patch11 -p1 +%autosetup -n %{name}-%{commit} %build +sh bootstrap %configure PYTHON=python3 %make_build @@ -68,6 +69,10 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Mon Apr 29 2024 Ingvar Hagelund 0.15.1-1 +- New upstream release, removing patches included upstream +- Built for varnish-6.0.13 + * Tue Nov 14 2023 Ingvar Hagelund 0.15.0-14 - Rebuilt for varnish-6.0.12 From a018c7e7c4ccf47609302eda0f6d4dcfe2b3eb93 Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Fri, 27 Mar 2026 17:40:43 +0100 Subject: [PATCH 13/14] varnish-modules 0.15.1-5: Build for varnish-6.0.17 --- varnish-modules.spec | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index 6870460..d71c85b 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -5,7 +5,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: varnish-modules Version: 0.15.1 -Release: 1%{?dist} +Release: 5%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD @@ -19,6 +19,7 @@ BuildRequires: pkgconfig(varnishapi) BuildRequires: python3 BuildRequires: varnish >= 6.0 BuildRequires: varnish <= 6.1 +buildrequires: python-docutils BuildRequires: automake BuildRequires: libtool @@ -69,6 +70,18 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Thu Mar 26 2026 Ingvar Hagelund 0.15.1-5 +- Build for varnish-6.0.17 + +* Fri Aug 29 2025 Ingvar Hagelund 0.15.1-4 +- Build for varnish-6.0.16 + +* Fri Aug 22 2025 Ingvar Hagelund 0.15.1-3 +- Build for varnish-6.0.15 + +* Tue Aug 12 2025 Ingvar Hagelund 0.15.1-2 +- Built for varnish-6.0.14 + * Mon Apr 29 2024 Ingvar Hagelund 0.15.1-1 - New upstream release, removing patches included upstream - Built for varnish-6.0.13 From ab5df0ddf35bca810a29e46844df0a185f42e1fc Mon Sep 17 00:00:00 2001 From: Ingvar Hagelund Date: Thu, 21 May 2026 13:12:41 +0200 Subject: [PATCH 14/14] Build for varnish-6.0.18 --- varnish-modules.spec | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/varnish-modules.spec b/varnish-modules.spec index d71c85b..c006271 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -5,7 +5,7 @@ %global shortcommit %(c=%{commit}; echo ${c:0:7}) Name: varnish-modules Version: 0.15.1 -Release: 5%{?dist} +Release: 6%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL License: BSD @@ -70,6 +70,9 @@ rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro %{_mandir}/man3/*.3* %changelog +* Wed May 20 2026 Ingvar Hagelund 0.15.1-6 +- Build for varnish-6.0.18 + * Thu Mar 26 2026 Ingvar Hagelund 0.15.1-5 - Build for varnish-6.0.17