.gitignore

@@ -1 +1 @@
-SOURCES/varnish-modules-0.25.0.tar.gz
+SOURCES/varnish-modules-0.18.0.tar.gz

.varnish-modules.metadata

@@ -1 +1 @@
-a113999e5bb08a171d0961b8ddbac980304c9285 SOURCES/varnish-modules-0.25.0.tar.gz
+ff070e6529cbe53974d42a0ac309631cc6516079 SOURCES/varnish-modules-0.18.0.tar.gz

SPECS/varnish-modules.spec

@@ -1,6 +1,7 @@
 %global varnishver %(pkg-config --silence-errors --modversion varnishapi || echo 0)
+%global gittag 0.18.0
 
-%if 0%{?rhel} == 7
+%if 0%{?rhel} == 7 || 0%{?rhel} == 6
 %global docutils python34-docutils
 %global rst2man rst2man-3.4
 %else
@@ -9,13 +10,13 @@
 %endif
 
 Name:    varnish-modules
-Version: 0.25.0
+Version: 0.18.0
 Release: 1%{?dist}
 Summary: A collection of modules ("vmods") extending Varnish VCL
 
-License: BSD-2-Clause
+License: BSD
 URL:     https://github.com/varnish/varnish-modules
-Source:  https://github.com/varnish/%{name}/releases/download/%{version}/%{name}-%{version}.tar.gz
+Source:  https://github.com/varnish/varnish-modules/archive/%{gittag}/%{name}-%{version}.tar.gz
 
 BuildRequires: gcc
 BuildRequires: make
@@ -23,22 +24,21 @@ BuildRequires: pkgconfig(varnishapi)
 BuildRequires: varnish
 
 # Build from a git checkout
-#BuildRequires: automake
+BuildRequires: automake
-#BuildRequires: autoconf
+BuildRequires: autoconf
-#BuildRequires: libtool
+BuildRequires: libtool
 BuildRequires: %docutils
 
 Requires: varnish = %varnishver
 
-Provides: vmod(accept)%{_isa} = %{version}-%{release}
+Provides: vmod-bodyaccess = %{version}-%{release}
-Provides: vmod(bodyaccess)%{_isa} = %{version}-%{release}
+Provides: vmod-header = %{version}-%{release}
-Provides: vmod(header)%{_isa} = %{version}-%{release}
+Provides: vmod-saintmode = %{version}-%{release}
-Provides: vmod(saintmode)%{_isa} = %{version}-%{release}
+Provides: vmod-tcp = %{version}-%{release}
-Provides: vmod(tcp)%{_isa} = %{version}-%{release}
+Provides: vmod-var = %{version}-%{release}
-Provides: vmod(var)%{_isa} = %{version}-%{release}
+Provides: vmod-vsthrottle = %{version}-%{release}
-Provides: vmod(vsthrottle)%{_isa} = %{version}-%{release}
+Provides: vmod-xkey = %{version}-%{release}
-Provides: vmod(xkey)%{_isa} = %{version}-%{release}
+
-Provides: vmod(str)%{_isa} = %{version}-%{release}
 
 %description
 This is a collection of modules ("vmods") extending Varnish VCL used
@@ -48,11 +48,11 @@ bodyaccess, header, saintmode, tcp, var, vsthrottle, xkey
 
 
 %prep
-%autosetup
+%autosetup -n %{name}-%{gittag}
 
 
 %build
-#sh bootstrap
+sh bootstrap
 export RST2MAN=%{rst2man}
 %configure 
 %make_build
@@ -81,78 +81,23 @@ sed -i 's,tests/xkey/test12.vtc,,' src/Makefile
 
 
 %changelog
-* Thu Nov 21 2024 Luboš Uhliarik <luhliari@redhat.com> - 0.25.0-1
+* Mon Feb 21 2022 Luboš Uhliarik <luhliari@redhat.com> - 0.18.0-1
-- Resolves: RHEL-59267 - varnish rebase to 7.6.0
+- Resolves: #2056622 - rebase varnish-modules to 18.0
-
+- new version 18.0
-* Tue Oct 29 2024 Troy Dawson <tdawson@redhat.com> - 0.22.0-7
-- Bump release for October 2024 mass rebuild:
-  Resolves: RHEL-64018
-
-* Fri Oct 25 2024 MSVSphere Packaging Team <packager@msvsphere-os.ru> - 0.22.0-6
-- Rebuilt for MSVSphere 10
-
-* Mon Jun 24 2024 Troy Dawson <tdawson@redhat.com> - 0.22.0-6
-- Bump release for June 2024 mass rebuild
-
-* Sat Jan 27 2024 Fedora Release Engineering <releng@fedoraproject.org> - 0.22.0-5
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_40_Mass_Rebuild
-
-* Wed Nov 15 2023 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.22.0-4
-- Rebuilt for varnish-7.4.2
-
-* Sat Jul 22 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.22.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_39_Mass_Rebuild
-
-* Tue Jun 06 2023 Luboš Uhliarik <luhliari@redhat.com> - 0.22.0-2
-- SPDX migration
-
-* Sun Mar 19 2023 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.22.0-1
-- New upstream release
-- Built for varnish-7.3.0
-
-* Sat Jan 21 2023 Fedora Release Engineering <releng@fedoraproject.org> - 0.21.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_38_Mass_Rebuild
 
-* Sun Nov 13 2022 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.21.0-2
+* Thu Aug 19 2021 Luboš Uhliarik <luhliari@redhat.com> - 0.17.1-6
-- Built for varnish-7.2.1
+- Resolves: #1995450 - rebuild
 
-* Mon Sep 26 2022 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.21.0-1
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.17.1-5
-- New upstream release
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
-- Removed unused macros from specfile
+  Related: rhbz#1991688
-- Built for varnish-7.2.0
-
-* Mon Aug 15 2022 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.20.0-3
-- Built for varnish-7.1.1
-
-* Sat Jul 23 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.20.0-2
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_37_Mass_Rebuild
-
-* Tue Mar 29 2022 Ingvar Hagelund <ingvar@redpill-linpro.com> - 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 <ingvar@redpill-linpro.com> - 0.19.0-4
-- Built for varnish-7.0.2
-
-* Sat Jan 22 2022 Fedora Release Engineering <releng@fedoraproject.org> - 0.19.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_36_Mass_Rebuild
 
-* Tue Jan 18 2022 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.19.0-2
+* Tue Jul 27 2021 Luboš Uhliarik <luhliari@redhat.com> - 0.17.1-4
-- Built for varnish-7.0.1
+- Resolves: #1986346 - Rebase varnish-modules to the latest release
+- Rebuild for varnish 6.5.2
 
-* Thu Sep 23 2021 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.19.0-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.17.1-2
-- New upstream release
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
-- Built for varnish-7.0.0
-
-* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 0.18.0-3
-- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild
-
-* Sat Jul 17 2021 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.18.0-2
-- Rebuilt for varnish-6.6.1
-
-* Tue May 18 2021 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.18.0-1
-- New upstream release
-- Rebuilt for varnish-6.6.0
 
 * Wed Mar 17 2021 Ingvar Hagelund <ingvar@redpill-linpro.com> 0.17.1-1
 - New upstream release