rpms/varnish
7
0
Fork 0
Code Issues Pull Requests Releases Activity

Added simple compilation fix for gcc-10.0.1/s390x

Browse Source
This commit is contained in:
Ingvar Hagelund 2020-02-11 00:04:59 +01:00
parent eaeab2ccb1
commit 42153a6679
2 changed files with 21 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
varnish-6.3.2_fix_s390x.patch Normal file
View File

@ -0,0 +1,11 @@
--- bin/varnishtest/vtc_varnish.c.orig 2020-02-10 23:29:22.765650634 +0100
+++ bin/varnishtest/vtc_varnish.c 2020-02-10 23:30:04.179140158 +0100
@@ -117,7 +117,7 @@
cmd, errno, strerror(errno));
}
i = VCLI_ReadResult(v->cli_fd, &retval, &r, vtc_maxdur);
- if (i != 0 && !vtc_stop)
+ if (i != 0 && !vtc_stop && cmd != NULL)
vtc_fatal(v->vl, "CLI failed (%s) = %d %u %s",
cmd, i, retval, r);
vtc_log(v->vl, 3, "CLI RX %u", retval);

12
varnish.spec
View File

@ -24,7 +24,7 @@
Summary: High-performance HTTP accelerator
Name: varnish
Version: 6.3.2
Release: 1%{?dist}
Release: 2%{?dist}
License: BSD
URL: https://www.varnish-cache.org/
Source0: http://varnish-cache.org/_downloads/%{name}-%{version}%{?vd_rc}.tgz
@ -62,6 +62,9 @@ Patch16: varnish-6.3.0_el6_fix_warning_from_old_gcc.patch
# Patch 017: Fix stack size on ppc64 in test c_00057, upstream commit 88948d9
#Patch17: varnish-6.2.0_fix_ppc64_for_test_c00057.patch
# Patch 018: gcc-10.0.1/s390x compilation fix
Patch18: varnish-6.3.2_fix_s390x.patch
%if 0%{?fedora} > 29
Provides: varnish%{_isa} = %{version}-%{release}
Provides: varnishd(abi)%{_isa} = %{abi}
@ -95,7 +98,7 @@ BuildRequires: make
BuildRequires: nghttp2
# haproxy is broken in rawhide now
#if 0%{?fedora} || 0%{?rhel} >= 8
#if 0#{?fedora} || 0#{?rhel} >= 8
#BuildRequires: haproxy
#endif
@ -188,6 +191,8 @@ sed -i '8 i\RPM_BUILD_ROOT=%{buildroot}' find-provides
%patch16 -p1
%endif
%patch18 -p0
%build
%if 0%{?rhel} == 6
export CFLAGS="%{optflags} -fPIC"
@ -421,6 +426,9 @@ fi
%changelog
* Tue Feb 11 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.3.2-2
- Added simple compilation fix for gcc-10.0.1/s390x
* Tue Feb 11 2020 Ingvar Hagelund <ingvar@redpill-linpro.com> - 6.3.2-1
- New upstream release, a security release. Includes fix for VSV00005
- Added new checkout of pkg-varnish