rpms/varnish/devel varnish.cs3157.patch, NONE, 1.1 varnish.spec, 1.10, 1.11

[Ingvar Hagelund]

Author: ingvar

Update of /cvs/pkgs/rpms/varnish/devel
In directory cvs1.fedora.phx.redhat.com:/tmp/cvs-serv27497

Modified Files:
	varnish.spec 
Added Files:
	varnish.cs3157.patch 
Log Message:
Added a patch from svn r3156 and r3157, hiding a legit errno in make check


varnish.cs3157.patch:

--- NEW FILE varnish.cs3157.patch ---
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");


Index: varnish.spec
===================================================================
RCS file: /cvs/pkgs/rpms/varnish/devel/varnish.spec,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- varnish.spec	2 Sep 2008 17:54:03 -0000	1.10
+++ varnish.spec	2 Sep 2008 20:37:08 -0000	1.11
@@ -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 @@
 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 @@
 %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 @@
 %postun libs -p /sbin/ldconfig
 
 %changelog
+* Tue Sep 02 2008 Ingvar Hagelund <ingvar at 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 at 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