.gitignore

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

.varnish-modules.metadata

@@ -1 +1 @@
-6c8c86fa749cbade9627f71ac9b51ec016f7e006 SOURCES/varnish-modules-0.15.0.tar.gz
+ff070e6529cbe53974d42a0ac309631cc6516079 SOURCES/varnish-modules-0.18.0.tar.gz

SOURCES/varnish-modules-0.15.0-vmod-tcp-int.patch

@@ -1,13 +0,0 @@
-diff --git a/src/vmod_tcp.c b/src/vmod_tcp.c
-index fee4bd3..e1c5dfa 100644
---- a/src/vmod_tcp.c
-+++ b/src/vmod_tcp.c
-@@ -174,7 +174,7 @@ vmod_set_socket_pace(VRT_CTX, VCL_INT rate)
-             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 %d KB/s.", pacerate);
- 
- #  ifndef NDEBUG
-         int retval;

SPECS/varnish-modules.spec

@@ -1,46 +1,37 @@
-%define abi 6.1
+%global varnishver %(pkg-config --silence-errors --modversion varnishapi || echo 0)
+%global gittag 0.18.0
 
-%bcond_without python2
+%if 0%{?rhel} == 7 || 0%{?rhel} == 6
-%bcond_with python3
+%global docutils python34-docutils
-
+%global rst2man rst2man-3.4
-%if %{with python2} == %{with python3}
+%else
-%error Pick exactly one Python version
+%global docutils python3-docutils
+%global rst2man rst2man
 %endif
 
 Name:    varnish-modules
-Version: 0.15.0
+Version: 0.18.0
-Release: 6%{?dist}
+Release: 1%{?dist}
 Summary: A collection of modules ("vmods") extending Varnish VCL
 
-Group:   System Environment/Daemons
 License: BSD
-URL:     https://github.com/varnish/%{name}
+URL:     https://github.com/varnish/varnish-modules
-
+Source:  https://github.com/varnish/varnish-modules/archive/%{gittag}/%{name}-%{version}.tar.gz
-Source: https://download.varnish-software.com/varnish-modules/%{name}-%{version}.tar.gz
-BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
-Patch1: varnish-modules-0.15.0-vmod-tcp-int.patch
 
 BuildRequires: gcc
 BuildRequires: make
 BuildRequires: pkgconfig(varnishapi)
 BuildRequires: varnish
 
-%if %{with python3}
+# Build from a git checkout
-BuildRequires: python3-docutils
+BuildRequires: automake
-BuildRequires: python3-devel
+BuildRequires: autoconf
-%define rst2man %{_bindir}/rst2man
+BuildRequires: libtool
-%define vpython %{_bindir}/python3
+BuildRequires: %docutils
-%else
-BuildRequires: python-docutils
-BuildRequires: python2-devel
-%define rst2man %{_bindir}/rst2man
-%define vpython %{_bindir}/python2
-%endif
 
-Requires: varnish
+Requires: varnish = %varnishver
 
 Provides: vmod-bodyaccess = %{version}-%{release}
-Provides: vmod-cookie = %{version}-%{release}
 Provides: vmod-header = %{version}-%{release}
 Provides: vmod-saintmode = %{version}-%{release}
 Provides: vmod-tcp = %{version}-%{release}
@@ -52,53 +43,119 @@ 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 (previously
+capabilities. This collection contains the following vmods:
-kept individually): cookie, vsthrottle, header, saintmode, softpurge,
+bodyaccess, header, saintmode, tcp, var, vsthrottle, xkey
-tcp, var, xkey
 
 
 %prep
-%setup -q
+%autosetup -n %{name}-%{gittag}
 
-%patch1 -p1 -b .vmod-tcp-int
 
 %build
-%configure
+sh bootstrap
+export RST2MAN=%{rst2man}
+%configure 
 %make_build
 
 
 %install
-%make_install
+%make_install docdir=%_pkgdocdir
 find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';'
+rm %{buildroot}%{_pkgdocdir}/LICENSE # Rather use license macro
 
 
 %check
-make check VERBOSE=1
+%ifarch %ix86 %arm ppc
+# 64-bit specific test
+sed -i 's,tests/xkey/test12.vtc,,' src/Makefile
+%endif
+%make_build check VERBOSE=1
 
 
 %files
-%doc docs AUTHORS CHANGES.rst COPYING README.rst LICENSE
+#doc docs AUTHORS CHANGES.rst COPYING README.rst
+%doc AUTHORS CHANGES.rst COPYING README.md
 %license LICENSE
 %{_libdir}/varnish/vmods/*
 %{_mandir}/man3/*.3*
-%{_pkgdocdir}
 
 
 %changelog
-* Mon Jul 26 2021 Luboš Uhliarik <luhliari@redhat.com> - 0.15.0-6
+* Mon Feb 21 2022 Luboš Uhliarik <luhliari@redhat.com> - 0.18.0-1
-- Related: #1982862 - rebuild for new varnish version
+- Resolves: #2056622 - rebase varnish-modules to 18.0
+- new version 18.0
 
-* Thu Apr 16 2020 Lubos Uhliarik <luhliari@redhat.com> - 0.15.0-5
+* Thu Aug 19 2021 Luboš Uhliarik <luhliari@redhat.com> - 0.17.1-6
-- Related: #1795673 - RFE: rebase varnish:6 to latest 6.0.x LTS
+- Resolves: #1995450 - rebuild
 
-* Mon Dec 03 2018 Lubos Uhliarik <luhliari@redhat.com> - 0.15.0-4
+* Tue Aug 10 2021 Mohan Boddu <mboddu@redhat.com> - 0.17.1-5
-- Resolves: #1649358 - Unable to install varnish module
+- Rebuilt for IMA sigs, glibc 2.34, aarch64 flags
+  Related: rhbz#1991688
 
-* Sun Aug 05 2018 Lubos Uhliarik <luhliari@redhat.com> - 0.15.0-2
+* Tue Jul 27 2021 Luboš Uhliarik <luhliari@redhat.com> - 0.17.1-4
-- Fixed i686 build failure
+- Resolves: #1986346 - Rebase varnish-modules to the latest release
+- Rebuild for varnish 6.5.2
 
-* Sun Aug 05 2018 Lubos Uhliarik <luhliari@redhat.com> - 0.15.0-1
+* Fri Apr 16 2021 Mohan Boddu <mboddu@redhat.com> - 0.17.1-2
-- updated to newer version (0.15.0)
+- Rebuilt for RHEL 9 BETA on Apr 15th 2021. Related: rhbz#1947937
+
+* Wed Mar 17 2021 Ingvar Hagelund <ingvar@redpill-linpro.com> 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 <releng@fedoraproject.org> - 0.17.0-0.3.klarlack.20200916git4d6593c
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_34_Mass_Rebuild
+
+* Tue Sep 29 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.17.0-0.2.klarlack.20200916git
+- Rebuilt for varnish-6.5.1
+
+* Wed Sep 16 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 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 <ingvar@redpill-linpro.com> - 0.16.0-3
+- Rebuilt for varnish-6.4.0
+
+* Wed Jul 29 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.16.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_33_Mass_Rebuild
+
+* Sat Mar 28 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.16.0-1
+- New upstream release
+
+* Tue Mar 17 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.16.0-0.1.20200317git21d0c84
+- Snapshot from 6.4 branch, rebuilt against varnish-6.4.0
+- Removed patches merged upstream
+- Delete 64-bit specific test on 32-bit arches
+
+* Fri Jan 31 2020 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-8
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_32_Mass_Rebuild
+
+* Sun Sep 29 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.15.0-7
+- Added patch from Nils Goroll, compatibility for varnish-6.3, closes bz#1736943
+- Rebuilt against varnish-6.3.0
+
+* Sat Jul 27 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-6
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_31_Mass_Rebuild
+
+* Fri Feb 15 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.15.0-5
+- Install docs in correct docdir
+
+* Fri Feb 15 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.15.0-4
+- Added a simple patch from upstream, fixing a formatting bug trigged on 32bit
+- Removed dependency on docutils. It is not necessary on released tarballs
+
+* Thu Feb 14 2019 Ingvar Hagelund <ingvar@redpill-linpro.com> - 0.15.0-3
+- Added a proposed patch from Nils Goroll providing support for vmod_saintmode
+  on varnish-6.1.1 (closes rhbz #1676183)
+
+* Sun Feb 03 2019 Fedora Release Engineering <releng@fedoraproject.org> - 0.15.0-2
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_30_Mass_Rebuild
+
+* Tue Jul 17 2018 Dridi Boukelmoune <dridi@fedoraproject.org> 0.15.0-1
+- Update to 0.15.0
 - Drop EPEL and older Fedora releases support
 - Drop broken manual ABI dependency to Varnish
 - Drop commented out references to past patches
@@ -106,17 +163,14 @@ make check VERBOSE=1
 - Simplified configure step
 - Dependencies cleanup
 
-* Tue Apr 24 2018 Luboš Uhliarik <luhliari@redhat.com> - 0.12.16
+* Sat Jul 14 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.1-7
-- use rst2man binary for both python2 and python3
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_29_Mass_Rebuild
 
-* Mon Apr 16 2018 Joe Orton <jorton@redhat.com> - 0.12.1-4.4
+* Fri Feb 09 2018 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.1-6
-- fix abi requires (#1566046)
+- Rebuilt for https://fedoraproject.org/wiki/Fedora_28_Mass_Rebuild
 
-* Thu Mar 29 2018 Joe Orton <jorton@redhat.com> - 0.12.1-4.2
+* Sat Oct 21 2017 Dridi Boukelmoune <dridi@fedoraproject.org> 0.12.1-5
-- fix use of rst2man with python3-docutils
+- Update varnishabi requirement for f28
-
-* Wed Mar 28 2018 Joe Orton <jorton@redhat.com> - 0.12.1-4.1
-- add Python build conditionals
 
 * Thu Aug 03 2017 Fedora Release Engineering <releng@fedoraproject.org> - 0.12.1-4
 - Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild
@@ -151,5 +205,3 @@ make check VERBOSE=1
 - First wrap for fedora
 - Uses some old-style specfile components for el5 compatibility, including
   the usage of the BuildRoot header and cleaning the buildroot before install
-
-