commit 03cece6df1f53e673bdff9455e27af394489ee8f Author: CentOS Sources Date: Tue May 7 00:40:32 2019 -0400 import varnish-modules-0.15.0-4.module+el8+2481+4078e9d2 diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..e2d6450 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +SOURCES/varnish-modules-0.15.0.tar.gz diff --git a/.varnish-modules.metadata b/.varnish-modules.metadata new file mode 100644 index 0000000..6939df9 --- /dev/null +++ b/.varnish-modules.metadata @@ -0,0 +1 @@ +6c8c86fa749cbade9627f71ac9b51ec016f7e006 SOURCES/varnish-modules-0.15.0.tar.gz diff --git a/SOURCES/varnish-modules-0.15.0-vmod-tcp-int.patch b/SOURCES/varnish-modules-0.15.0-vmod-tcp-int.patch new file mode 100644 index 0000000..bc31cf4 --- /dev/null +++ b/SOURCES/varnish-modules-0.15.0-vmod-tcp-int.patch @@ -0,0 +1,13 @@ +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; diff --git a/SPECS/varnish-modules.spec b/SPECS/varnish-modules.spec new file mode 100644 index 0000000..2f5c207 --- /dev/null +++ b/SPECS/varnish-modules.spec @@ -0,0 +1,149 @@ +%define abi 6.1 + +%bcond_without python2 +%bcond_with python3 + +%if %{with python2} == %{with python3} +%error Pick exactly one Python version +%endif + +Name: varnish-modules +Version: 0.15.0 +Release: 4%{?dist} +Summary: A collection of modules ("vmods") extending Varnish VCL + +Group: System Environment/Daemons +License: BSD +URL: https://github.com/varnish/%{name} + +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} +BuildRequires: python3-docutils +BuildRequires: python3-devel +%define rst2man %{_bindir}/rst2man +%define vpython %{_bindir}/python3 +%else +BuildRequires: python-docutils +BuildRequires: python2-devel +%define rst2man %{_bindir}/rst2man +%define vpython %{_bindir}/python2 +%endif + +Requires: varnish + +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} +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 (previously +kept individually): cookie, vsthrottle, header, saintmode, softpurge, +tcp, var, xkey + + +%prep +%setup -q + +%patch1 -p1 -b .vmod-tcp-int + +%build +%configure +%make_build + + +%install +%make_install +find %{buildroot}/%{_libdir}/ -name '*.la' -exec rm -f {} ';' + + +%check +make check VERBOSE=1 + + +%files +%doc docs AUTHORS CHANGES.rst COPYING README.rst LICENSE +%license LICENSE +%{_libdir}/varnish/vmods/* +%{_mandir}/man3/*.3* +%{_pkgdocdir} + + +%changelog +* Mon Dec 03 2018 Lubos Uhliarik - 0.15.0-4 +- Resolves: #1649358 - Unable to install varnish module + +* Sun Aug 05 2018 Lubos Uhliarik - 0.15.0-2 +- Fixed i686 build failure + +* Sun Aug 05 2018 Lubos Uhliarik - 0.15.0-1 +- updated to newer version (0.15.0) +- Drop EPEL and older Fedora releases support +- Drop broken manual ABI dependency to Varnish +- Drop commented out references to past patches +- Verbose test suite +- Simplified configure step +- Dependencies cleanup + +* Tue Apr 24 2018 Luboš Uhliarik - 0.12.16 +- use rst2man binary for both python2 and python3 + +* Mon Apr 16 2018 Joe Orton - 0.12.1-4.4 +- fix abi requires (#1566046) + +* Thu Mar 29 2018 Joe Orton - 0.12.1-4.2 +- fix use of rst2man with python3-docutils + +* Wed Mar 28 2018 Joe Orton - 0.12.1-4.1 +- add Python build conditionals + +* Thu Aug 03 2017 Fedora Release Engineering - 0.12.1-4 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Binutils_Mass_Rebuild + +* Thu Jul 27 2017 Fedora Release Engineering - 0.12.1-3 +- Rebuilt for https://fedoraproject.org/wiki/Fedora_27_Mass_Rebuild + +* Thu Jun 01 2017 Ingvar Hagelund 0.12.1-2 +- Set correct varnishabi requirement for the different fedoras + +* Wed May 31 2017 Ingvar Hagelund 0.12.1-1 +- New uptream release +- Pull el5 support + +* Mon Mar 20 2017 Ingvar Hagelund 0.11.0-1 +- New upstream release + +* Sat Sep 24 2016 Ingvar Hagelund 0.9.2-0.1.20160924gitdaa4f1d +- Upstream git checkout with support for varnish-5.0 +- Removed patches that are included upstream +- el5 build fix + +* Fri Aug 05 2016 Ingvar Hagelund 0.9.1-1 +- New upstream release +- Build man pages, buildrequires python-docutils +- Added a patch for tests/cookie/08-overflow.vtc, upping workspace_client, + the default is too small on 32bit +- Removed extra cflags for el5, fixed with patch from upstream +- Force readable docs and debug files, they tend to end up with mode 600 + +* Tue Apr 05 2016 Ingvar Hagelund 0.9.0-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 + +