From 971f3de43e42041b30506c39401522725d84f585 Mon Sep 17 00:00:00 2001
From: Ingvar Hagelund <ingvar@fedoraproject.org>
Date: Tue, 2 Sep 2008 20:37:08 +0000
Subject: [PATCH] Added a patch from svn r3156 and r3157, hiding a legit errno
 in make check

---
 varnish.cs3157.patch | 13 +++++++++++++
 varnish.spec         |  7 ++++++-
 2 files changed, 19 insertions(+), 1 deletion(-)
 create mode 100644 varnish.cs3157.patch

diff --git a/varnish.cs3157.patch b/varnish.cs3157.patch
new file mode 100644
index 0000000..0c8941f
--- /dev/null
+++ b/varnish.cs3157.patch
@@ -0,0 +1,13 @@
+Index: bin/varnishtest/vtc_server.c
+===================================================================
+--- bin/varnishtest/vtc_server.c	(revision 3155)
++++ bin/varnishtest/vtc_server.c	(revision 3157)
+@@ -97,7 +97,7 @@
+ 		vtc_log(vl, 3, "Accepted socket fd is %d", fd);
+ 		http_process(vl, s->spec, fd, 0);
+ 		vtc_log(vl, 3, "shutting fd %d", fd);
+-		AZ(shutdown(fd, SHUT_WR));
++		assert((shutdown(fd, SHUT_WR) == 0) || errno == ENOTCONN);
+ 		TCP_close(&fd);
+ 	}
+ 	vtc_log(vl, 2, "Ending");
diff --git a/varnish.spec b/varnish.spec
index da1b904..08f236d 100644
--- a/varnish.spec
+++ b/varnish.spec
@@ -1,7 +1,7 @@
 Summary: Varnish is a high-performance HTTP accelerator
 Name: varnish
 Version: 2.0
-Release: 0.6.beta1%{?dist}
+Release: 0.7.beta1%{?dist}
 License: BSD
 Group: System Environment/Daemons
 URL: http://www.varnish-cache.org/
@@ -11,6 +11,7 @@ Source0: http://downloads.sourceforge.net/varnish/varnish-2.0-beta1.tar.gz
 Patch0: varnish.lockfile.patch
 Patch1: varnish.coresize.patch
 Patch2: varnish.vcl_changes.patch
+Patch3: varnish.cs3157.patch
 BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-root-%(%{__id_u} -n)
 # The svn sources needs autoconf, automake and libtool to generate a suitable
 # configure script. Release tarballs would not need this
@@ -71,6 +72,7 @@ Varnish is a high-performance HTTP accelerator
 %patch0 -p0
 %patch1 -p0
 %patch2 -p0
+%patch3 -p0
 
 # The svn sources needs to generate a suitable configure script
 # Release tarballs would not need this
@@ -208,6 +210,9 @@ fi
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 02 2008 Ingvar Hagelund <ingvar@linpro.no> - 2.0-0.7.beta1
+- Added a patch from r3156 and r3157, hiding a legit errno in make check
+
 * Tue Sep 02 2008 Ingvar Hagelund <ingvar@linpro.no> - 2.0-0.6.beta1
 - Added a commented option for max coresize in the sysconfig script
 - Added a comment in README.redhat about upgrading from 1.x to 2.0