[evolution-patches] soup gnutls patches

[Dan Winship <danw novell com>]

This fixes libsoup to compile against gnutls 1.2.x, and fixes a
CPU-sucking bug seen in rcd on SUSE 9.3 (which is probably actually a
"CPU-sucking bug when using gnutls 1.2.x")

This will be released as libsoup 2.2.3 imminentlyish, and evo 2.2.1 will
probably want to depend on that.

-- Dan

Index: ChangeLog
===================================================================
RCS file: /cvs/gnome/libsoup/ChangeLog,v
retrieving revision 1.444.2.6
diff -u -r1.444.2.6 ChangeLog
--- ChangeLog	24 Jan 2005 16:05:12 -0000	1.444.2.6
+++ ChangeLog	9 Mar 2005 18:48:01 -0000
@@ -1,3 +1,10 @@
+2005-03-09  Dan Winship  <danw novell com>
+
+	* libsoup/soup-gnutls.c (soup_gnutls_read): return G_IO_STATUS_EOF
+	if gnutls returns 0. [#73352]
+	(verify_certificate): put an #ifdef around
+	GNUTLS_CERT_NOT_TRUSTED so it works with gnutls 1.2.x. [#57811]
+
 2005-01-24  Dan Winship  <danw novell com>
 
 	* configure.in: bump version to 2.2.2
Index: libsoup/soup-gnutls.c
===================================================================
RCS file: /cvs/gnome/libsoup/libsoup/soup-gnutls.c,v
retrieving revision 1.15.2.2
diff -u -r1.15.2.2 soup-gnutls.c
--- libsoup/soup-gnutls.c	4 Nov 2004 16:45:24 -0000	1.15.2.2
+++ libsoup/soup-gnutls.c	9 Mar 2005 18:48:01 -0000
@@ -63,7 +63,9 @@
 	}
 
 	if (status & GNUTLS_CERT_INVALID ||
+#ifdef GNUTLS_CERT_NOT_TRUSTED
 	    status & GNUTLS_CERT_NOT_TRUSTED ||
+#endif
 	    status & GNUTLS_CERT_REVOKED)
 	{
 		g_set_error (err, SOUP_SSL_ERROR,
@@ -198,7 +200,7 @@
 	} else {
 		*bytes_read = result;
 
-		return G_IO_STATUS_NORMAL;
+		return (result > 0) ? G_IO_STATUS_NORMAL : G_IO_STATUS_EOF;
 	}
 }