diff --git a/.gitignore b/.gitignore index c3b9d49..789acef 100644 --- a/.gitignore +++ b/.gitignore @@ -2,15 +2,3 @@ /varnish-modules-0.15.0.tar.gz /varnish-modules-0032ed8.tar.gz /varnish-modules-0.16.0.tar.gz -/varnish-modules-4d6593c.tar.gz -/varnish-modules-0.17.1.tar.gz -/varnish-modules-0.18.0.tar.gz -/varnish-modules-0.19.0.tar.gz -/varnish-modules-0.20.0.tar.gz -/varnish-modules-0.21.0.tar.gz -/varnish-modules-0.22.0.tar.gz -/varnish-modules-0.24.0.tar.gz -/varnish-modules-0.25.0.tar.gz -/varnish-modules-0.26.0.tar.gz -/varnish-modules-0.27.0.tar.gz -/varnish-modules-0.28.0.tar.gz diff --git a/sources b/sources index f25bbdd..90bd340 100644 --- a/sources +++ b/sources @@ -1 +1 @@ -SHA512 (varnish-modules-0.28.0.tar.gz) = 796f95ea6f8b69f6e4fb3daf327c4a6cccc9b6c927d8daace753aad7e443c1f937020465924e472ad65bb0a10e2e5bf85b6228afe3257dbfba0091750fbf300a +SHA512 (varnish-modules-0.16.0.tar.gz) = 614bb99cf48d33710f06ed52bacff092c8a60ddd8f5eb55470cf571e44ca01cc9696b4c8669dc6979ab7096762cb6ef80435e210aa38f9eaaf31a1dd73d858e2 diff --git a/varnish-modules.spec b/varnish-modules.spec index 1c05255..5375ef6 100644 --- a/varnish-modules.spec +++ b/varnish-modules.spec @@ -1,16 +1,20 @@ %global varnishver %(pkg-config --silence-errors --modversion varnishapi || echo 0) +%if 0%{?rhel} == 7 || 0%{?rhel} == 6 +%global docutils python34-docutils +%else %global docutils python3-docutils -%global rst2man rst2man +%endif Name: varnish-modules -Version: 0.28.0 -Release: 5%{?dist} +Version: 0.16.0 +Release: 3%{?dist} Summary: A collection of modules ("vmods") extending Varnish VCL -License: BSD-2-Clause -URL: https://github.com/varnish/varnish-modules -Source: https://github.com/varnish/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz +License: BSD +URL: https://github.com/varnish/%{name} +#Source: https://download.varnish-software.com/varnish-modules/#{name}-#{version}.tar.gz +Source: https://github.com/varnish/varnish-modules/releases/download/%{name}-%{version}/%{name}-%{version}.tar.gz BuildRequires: gcc BuildRequires: make @@ -18,28 +22,28 @@ BuildRequires: pkgconfig(varnishapi) BuildRequires: varnish # Build from a git checkout -#BuildRequires: automake -#BuildRequires: autoconf -#BuildRequires: libtool +BuildRequires: automake +BuildRequires: autoconf +BuildRequires: libtool BuildRequires: %docutils Requires: varnish = %varnishver -Provides: vmod(accept)%{_isa} = %{version}-%{release} -Provides: vmod(bodyaccess)%{_isa} = %{version}-%{release} -Provides: vmod(header)%{_isa} = %{version}-%{release} -Provides: vmod(saintmode)%{_isa} = %{version}-%{release} -Provides: vmod(tcp)%{_isa} = %{version}-%{release} -Provides: vmod(var)%{_isa} = %{version}-%{release} -Provides: vmod(vsthrottle)%{_isa} = %{version}-%{release} -Provides: vmod(xkey)%{_isa} = %{version}-%{release} -Provides: vmod(str)%{_isa} = %{version}-%{release} +Provides: vmod-bodyaccess = %{version}-%{release} +Provides: vmod-header = %{version}-%{release} +Provides: vmod-saintmode = %{version}-%{release} +Provides: vmod-tcp = %{version}-%{release} +Provides: vmod-var = %{version}-%{release} +Provides: vmod-vsthrottle = %{version}-%{release} +Provides: vmod-xkey = %{version}-%{release} + %description This is a collection of modules ("vmods") extending Varnish VCL used for describing HTTP request/response policies with additional -capabilities. This collection contains the following vmods: -bodyaccess, header, saintmode, tcp, var, vsthrottle, xkey +capabilities. This collection contains the following vmods (previously +kept individually): vsthrottle, header, saintmode, softpurge, +tcp, var, xkey %prep @@ -47,18 +51,15 @@ bodyaccess, header, saintmode, tcp, var, vsthrottle, xkey %build -#sh bootstrap -export RST2MAN=%{rst2man} %configure -%make_build +%make_build %install %make_install docdir=%_pkgdocdir find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro - %check %ifarch %ix86 %arm ppc # 64-bit specific test @@ -68,142 +69,12 @@ sed -i 's,tests/xkey/test12.vtc,,' src/Makefile %files -#doc docs AUTHORS CHANGES.rst COPYING README.rst -%doc AUTHORS CHANGES.rst COPYING README.md +%doc docs AUTHORS CHANGES.rst COPYING README.rst %license LICENSE %{_libdir}/varnish/vmods/* %{_mandir}/man3/*.3* - %changelog -* Fri Jul 17 2026 Fedora Release Engineering - 0.28.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_45_Mass_Rebuild - -* Thu May 21 2026 Ingvar Hagelund - 0.28.0-4 -- Built for varnish-9.0.3 - -* Fri May 15 2026 Ingvar Hagelund - 0.28.0-3 -- Built for varnish-9.0.2 - -* Thu Apr 30 2026 Ingvar Hagelund - 0.28.0-2 -- Built for varnish-9.0.1 - -* Mon Apr 13 2026 Ingvar Hagelund - 0.28.0-1 -- New upstream release varnish-modules-0.28.0, built for varnish-9.0.0 - -* Sat Jan 17 2026 Fedora Release Engineering - 0.27.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_44_Mass_Rebuild - -* Mon Jan 05 2026 Ingvar Hagelund - 0.27.0-1 -- New upstream release varnish-modules-0.27.0 - -* Wed Nov 19 2025 Ingvar Hagelund - 0.26.0-5 -- Rebuilt for varnish-7.7.3-2, rhbz#2407456 - -* Mon Sep 15 2025 Ingvar Hagelund - 0.26.0-4 -- Rebuilt for varnish-7.7.3 - -* Fri Jul 25 2025 Fedora Release Engineering - 0.26.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sun May 25 2025 Ingvar Hagelund - 0.26.1-2 -- Rebuilt for varnish-7.7.1 - -* Wed Mar 26 2025 Ingvar Hagelund - 0.26.0-1 -- New upstream release for varnish-7.7.0 - -* Sun Jan 19 2025 Fedora Release Engineering - 0.25.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - -* Fri Dec 06 2024 Ingvar Hagelund - 0.25.0-2 -- Rebuilt for varnish-7.6.1 - -* Tue Sep 17 2024 Ingvar Hagelund - 0.25.0-1 -- New upsteam release matching varnish-7.6.0 - -* Sat Jul 20 2024 Fedora Release Engineering - 0.24.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_41_Mass_Rebuild - -* Tue Apr 02 2024 Ingvar Hagelund - 0.24.0 -- New upstream release matching varnish-7.5.0 - -* Sat Jan 27 2024 Fedora Release Engineering - 0.22.0-5 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild - -* Wed Nov 15 2023 Ingvar Hagelund - 0.22.0-4 -- Rebuilt for varnish-7.4.2 - -* Sat Jul 22 2023 Fedora Release Engineering - 0.22.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild - -* Tue Jun 06 2023 Luboš Uhliarik - 0.22.0-2 -- SPDX migration - -* Sun Mar 19 2023 Ingvar Hagelund - 0.22.0-1 -- New upstream release -- Built for varnish-7.3.0 - -* Sat Jan 21 2023 Fedora Release Engineering - 0.21.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild - -* Sun Nov 13 2022 Ingvar Hagelund - 0.21.0-2 -- Built for varnish-7.2.1 - -* Mon Sep 26 2022 Ingvar Hagelund - 0.21.0-1 -- New upstream release -- Removed unused macros from specfile -- Built for varnish-7.2.0 - -* Mon Aug 15 2022 Ingvar Hagelund - 0.20.0-3 -- Built for varnish-7.1.1 - -* Sat Jul 23 2022 Fedora Release Engineering - 0.20.0-2 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild - -* Tue Mar 29 2022 Ingvar Hagelund - 0.20.0-1 -- Built for varnish-7.1.0 -- Now provides vmod(name) instead of vmod-name, matching varnish' provides - -* Thu Feb 10 2022 Ingvar Hagelund - 0.19.0-4 -- Built for varnish-7.0.2 - -* Sat Jan 22 2022 Fedora Release Engineering - 0.19.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild - -* Tue Jan 18 2022 Ingvar Hagelund - 0.19.0-2 -- Built for varnish-7.0.1 - -* Thu Sep 23 2021 Ingvar Hagelund - 0.19.0-1 -- New upstream release -- Built for varnish-7.0.0 - -* Fri Jul 23 2021 Fedora Release Engineering - 0.18.0-3 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild - -* Sat Jul 17 2021 Ingvar Hagelund 0.18.0-2 -- Rebuilt for varnish-6.6.1 - -* Tue May 18 2021 Ingvar Hagelund 0.18.0-1 -- New upstream release -- Rebuilt for varnish-6.6.0 - -* Wed Mar 17 2021 Ingvar Hagelund 0.17.1-1 -- New upstream release -- Switched back to original varnish github upstream, as it has catched up -- Includes fix for CVE-2021-28543, VSV00006, bz#1939669 - -* Wed Jan 27 2021 Fedora Release Engineering - 0.17.0-0.3.klarlack.20200916git4d6593c -- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild - -* Tue Sep 29 2020 Ingvar Hagelund - 0.17.0-0.2.klarlack.20200916git -- Rebuilt for varnish-6.5.1 - -* Wed Sep 16 2020 Ingvar Hagelund - 0.17.0-0.1.klarlack.20200916git -- Switched upstream to Nils Goroll's fork which is the defacto current upstream -- Synced description to reality -- This is a snapshot build that needs autotools for building -- Rebuilt for varnish-6.5.0 - * Mon Aug 17 2020 Ingvar Hagelund - 0.16.0-3 - Rebuilt for varnish-6.4.0