From 42153a66790bf351dcaf5f8c5eeed986cee9c8d3 Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@redpill-linpro.com>
Date: Tue, 11 Feb 2020 00:04:59 +0100
Subject: [PATCH] Added simple compilation fix for gcc-10.0.1/s390x

---
 varnish-6.3.2_fix_s390x.patch | 11 +++++++++++
 varnish.spec                  | 12 ++++++++++--
 2 files changed, 21 insertions(+), 2 deletions(-)
 create mode 100644 varnish-6.3.2_fix_s390x.patch

diff --git a/varnish-6.3.2_fix_s390x.patch b/varnish-6.3.2_fix_s390x.patch
new file mode 100644
index 0000000..4a75148
--- /dev/null
+++ b/varnish-6.3.2_fix_s390x.patch
@@ -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);
diff --git a/varnish.spec b/varnish.spec
index 8dc048c..bab6961 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -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