From 9cd419d3e90a71325eed8feccb247faa7467695c Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@redpill-linpro.com>
Date: Wed, 27 Jun 2018 15:03:09 +0200
Subject: [PATCH] New upstream release varnish-6.0.0

---
 .gitignore                                 |  2 ++
 sources                                    |  4 ++--
 varnish-6.0.0.fix_el6_fortify_source.patch | 20 ++++++++++++++++++++
 3 files changed, 24 insertions(+), 2 deletions(-)
 create mode 100644 varnish-6.0.0.fix_el6_fortify_source.patch

diff --git a/.gitignore b/.gitignore
index 360e96f..a91dd09 100644
--- a/.gitignore
+++ b/.gitignore
@@ -29,3 +29,5 @@ varnish-2.1.3.tar.gz
 /varnish-5.1.3.tar.gz
 /varnish-5.2.0.tgz
 /varnish-5.2.1.tgz
+/pkg-varnish-cache-0ad2f22.tar.gz
+/varnish-6.0.0.tgz
diff --git a/sources b/sources
index 93b89fa..9541cdf 100644
--- a/sources
+++ b/sources
@@ -1,2 +1,2 @@
-SHA512 (varnish-5.2.1.tgz) = 2e979983c7f2325e289768752cc474dc3032c3420de65ccfd5871098c076aecf18e962b04308ecb1860f542fd6f6418dc79220fdd6cf4a75f7476a733faa589c
-SHA512 (pkg-varnish-cache-5b97619.tar.gz) = 2577a320f6a569b4c07363d6be8a88e8a3a4d50e98f59e80aea302cb2026b9bc329812a720f096899ae77d568a3d775a55b2fed134cb3e54c7261466cdd730e8
+SHA512 (pkg-varnish-cache-0ad2f22.tar.gz) = b66c05f74f9bd62ddf16ab3e7904f4e74993bd1406aaebf20d4dca840198430da9f5e746af22778f1a73063113ac19b6f8127d77ff71c30c246fd5fab5ed78da
+SHA512 (varnish-6.0.0.tgz) = 39bae462fe40bda9b7c93114ab8256c838a7d67f1a9f7397c37ad090163a33232676120eb7609d0512684a563d8e02c1c2ff5e1b9da0ddedef2250db51c3cc79
diff --git a/varnish-6.0.0.fix_el6_fortify_source.patch b/varnish-6.0.0.fix_el6_fortify_source.patch
new file mode 100644
index 0000000..0fa9435
--- /dev/null
+++ b/varnish-6.0.0.fix_el6_fortify_source.patch
@@ -0,0 +1,20 @@
+--- bin/varnishtest/vtc_process.c.orig	2018-04-26 14:12:29.539178105 +0100
++++ bin/varnishtest/vtc_process.c	2018-04-26 15:27:49.851948252 +0100
+@@ -216,7 +216,7 @@
+ 		vtc_dump(p->vl, 4, "stdout", buf, i);
+ 	else if (p->log == 3)
+ 		vtc_hexdump(p->vl, 4, "stdout", buf, i);
+-	(void)write(p->f_stdout, buf, i);
++	assert(write(p->f_stdout, buf, i) == i);
+ 	Term_Feed(p->term, buf, buf + i);
+ 	return (0);
+ }
+@@ -239,7 +239,7 @@
+ 	p->stderr_bytes += i;
+ 	AZ(pthread_mutex_unlock(&p->mtx));
+ 	vtc_dump(p->vl, 4, "stderr", buf, i);
+-	(void)write(p->f_stderr, buf, i);
++	assert(write(p->f_stdout, buf, i) == i);
+ 	return (0);
+ }
+