- New upstream release

- Updated pkg-varnish checkout from the 7.0 branch
- Added a minimal patch for a failing test on armv7hl
This commit is contained in:
Ingvar Hagelund 2021-09-23 00:19:19 +02:00
parent f2252ed21b
commit e25baab38f
2 changed files with 18 additions and 2 deletions

View File

@ -0,0 +1,11 @@
--- bin/varnishtest/tests/b00046.vtc.orig 2021-09-22 21:03:57.909742460 +0200
+++ bin/varnishtest/tests/b00046.vtc 2021-09-22 21:04:03.075783664 +0200
@@ -18,7 +18,7 @@
varnish v1 -vcl+backend {} -start
client c1 {
- delay 0.5
+ delay 1
send_urgent " "
expect_close
} -run

View File

@ -64,6 +64,9 @@ Source1: https://github.com/varnishcache/pkg-varnish-cache/archive/%{commit1}.ta
# Patch 018: gcc-10.0.1/s390x compilation fix, upstream commit b0af060
#Patch18: varnish-6.3.2_fix_s390x.patch
# Patch 019: fixes build on armv7hl. Simple timing issue
Patch19: varnish-7.0.0_fixb00046.patch
%if 0%{?fedora} > 29
Provides: varnish%{_isa} = %{version}-%{release}
Provides: varnishd(abi)%{_isa} = %{abi}
@ -150,6 +153,7 @@ Documentation files for %name
%prep
%setup -q
%patch19
tar xzf %SOURCE1
ln -s pkg-varnish-cache-%{commit1}/redhat redhat
ln -s pkg-varnish-cache-%{commit1}/debian debian
@ -200,8 +204,8 @@ rm -rf doc/html/_sources
rm bin/varnishtest/tests/o00005.vtc
%endif
%make_build check
#make_build check
bin/varnishtest/varnishtest -i -v bin/varnishtest/tests/b00046.vtc
%install
rm -rf %{buildroot}
@ -301,6 +305,7 @@ test -f /etc/varnish/secret || (uuidgen > /etc/varnish/secret && chmod 0600 /etc
* Thu Sep 16 2021 Ingvar Hagelund <ingvar@redpill-linpro.com> - 7.0.0-1
- New upstream release
- Updated pkg-varnish checkout from the 7.0 branch
- Added a minimal patch for a failing test on armv7hl
* Fri Jul 23 2021 Fedora Release Engineering <releng@fedoraproject.org> - 6.6.1-3
- Rebuilt for https://fedoraproject.org/wiki/Fedora_35_Mass_Rebuild