packages: gnutls/gnutls.spec, gnutls/non-fatal-handshake.patch (NEW) - fix ...

[patrys]

Author: patrys                       Date: Fri Sep 24 13:04:05 2010 GMT
Module: packages                      Tag: HEAD
---- Log message:
- fix handshake (makes telepathy work again)
- rel 2

---- Files affected:
packages/gnutls:
   gnutls.spec (1.113 -> 1.114) , non-fatal-handshake.patch (NONE -> 1.1)  (NEW)

---- Diffs:

================================================================
Index: packages/gnutls/gnutls.spec
diff -u packages/gnutls/gnutls.spec:1.113 packages/gnutls/gnutls.spec:1.114
--- packages/gnutls/gnutls.spec:1.113	Fri Aug  6 19:58:39 2010
+++ packages/gnutls/gnutls.spec	Fri Sep 24 15:03:57 2010
@@ -3,13 +3,14 @@
 Summary(pl.UTF-8):	Biblioteka GNU TLS (Transport Layer Security)
 Name:		gnutls
 Version:	2.10.1
-Release:	1
+Release:	2
 License:	LGPL v2.1+ (libgnutls), GPL v3+ (extra libs and tools)
 Group:		Libraries
 Source0:	ftp://ftp.gnutls.org/pub/gnutls/%{name}-%{version}.tar.bz2
 # Source0-md5:	b614448d7fb43ea0d4f727e6302bbf0f
 Patch0:		%{name}-info.patch
 Patch1:		%{name}-link.patch
+Patch2:		non-fatal-handshake.patch
 URL:		http://www.gnu.org/software/gnutls/
 BuildRequires:	autoconf >= 2.61
 BuildRequires:	automake >= 1:1.10.2-2
@@ -138,6 +139,7 @@
 %setup -q
 %patch0 -p1
 %patch1 -p1
+%patch2 -p1
 
 %build
 %{__libtoolize}
@@ -257,6 +259,10 @@
 All persons listed below can be reached at <cvs_login>@pld-linux.org
 
 $Log$
+Revision 1.114  2010/09/24 13:03:57  patrys
+- fix handshake (makes telepathy work again)
+- rel 2
+
 Revision 1.113  2010/08/06 17:58:39  qboosh
 - updated to 2.10.1
 

================================================================
Index: packages/gnutls/non-fatal-handshake.patch
diff -u /dev/null packages/gnutls/non-fatal-handshake.patch:1.1
--- /dev/null	Fri Sep 24 15:04:05 2010
+++ packages/gnutls/non-fatal-handshake.patch	Fri Sep 24 15:03:57 2010
@@ -0,0 +1,35 @@
+From 0d07d8432d57805a8354ebd6c1e7829f3ab159cb Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Thu, 23 Sep 2010 22:59:09 +0200
+Subject: [PATCH 1/1] No longer use is_fatal() during handshake. Explicitely treat
+ EAGAIN and INTERRUPTED as non-fatal during handshake. If the check_fatal
+ flag is set then GNUTLS_E_WARNING_ALERT_RECEIVED could interrupt
+ a handshake as well.
+
+---
+ lib/gnutls_handshake.c |    7 ++++++-
+ 1 files changed, 6 insertions(+), 1 deletions(-)
+
+diff --git a/lib/gnutls_handshake.c b/lib/gnutls_handshake.c
+index 84e6773..2bf2e1b 100644
+--- a/lib/gnutls_handshake.c
++++ b/lib/gnutls_handshake.c
+@@ -2731,9 +2731,14 @@ gnutls_handshake (gnutls_session_t session)
+   return 0;
+ }
+ 
++
+ #define IMED_RET( str, ret, check_fatal) do { \
+ 	if (ret < 0) { \
+-		if (check_fatal != 0 && gnutls_error_is_fatal(ret)==0) return ret; \
++		/* EAGAIN and INTERRUPTED are always non-fatal */ \
++		if (ret == GNUTLS_E_AGAIN || ret == GNUTLS_E_INTERRUPTED) \
++			return ret; \
++                /* a warning alert might interrupt handshake */ \
++		if (check_fatal != 0 && ret==GNUTLS_E_WARNING_ALERT_RECEIVED) return ret; \
+ 		gnutls_assert(); \
+ 		ERR( str, ret); \
+ 		_gnutls_handshake_hash_buffers_clear(session); \
+-- 
+1.7.1
+
================================================================

---- CVS-web:
    http://cvs.pld-linux.org/cgi-bin/cvsweb.cgi/packages/gnutls/gnutls.spec?r1=1.113&r2=1.114&f=u