[Pkg-gnutls-commits] r1538 - in /packages/gnutls28/trunk/debian: changelog patches/41_use-errno.diff patches/42_dump-the-errno.diff patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sun Sep  2 11:51:32 2012
New Revision: 1538

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1538
Log:
41_use-errno.diff 42_dump-the-errno.diff: Get more info for debugging the
testsuite error.

Added:
    packages/gnutls28/trunk/debian/patches/41_use-errno.diff
    packages/gnutls28/trunk/debian/patches/42_dump-the-errno.diff
Modified:
    packages/gnutls28/trunk/debian/changelog
    packages/gnutls28/trunk/debian/patches/series

Modified: packages/gnutls28/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/changelog?rev=1538&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Sun Sep  2 11:51:32 2012
@@ -1,8 +1,9 @@
-gnutls28 (3.1.0-4) UNRELEASED; urgency=low
-
-  * NOT RELEASED YET
-
- -- Andreas Metzler <ametzler at debian.org>  Sat, 01 Sep 2012 10:15:37 +0200
+gnutls28 (3.1.0-4) experimental; urgency=low
+
+  * 41_use-errno.diff 42_dump-the-errno.diff: Get more info for debugging the
+    testsuite error.
+
+ -- Andreas Metzler <ametzler at debian.org>  Sun, 02 Sep 2012 13:28:55 +0200
 
 gnutls28 (3.1.0-3) experimental; urgency=low
 

Added: packages/gnutls28/trunk/debian/patches/41_use-errno.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/41_use-errno.diff?rev=1538&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/patches/41_use-errno.diff (added)
+++ packages/gnutls28/trunk/debian/patches/41_use-errno.diff Sun Sep  2 11:51:32 2012
@@ -1,0 +1,33 @@
+From 43e14e8a5cef27f319316bb7ff0de8b86272ac99 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Sun, 2 Sep 2012 10:36:12 +0200
+Subject: [PATCH 1/4] use errno_to_gerr() in _gnutls_io_check_recv().
+
+---
+ lib/gnutls_buffers.c |   10 +++-------
+ 1 file changed, 3 insertions(+), 7 deletions(-)
+
+diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
+index c714519..44b09cb 100644
+--- a/lib/gnutls_buffers.c
++++ b/lib/gnutls_buffers.c
+@@ -663,13 +663,9 @@ _gnutls_io_check_recv (gnutls_session_t session, unsigned int ms)
+   ret = session->internals.pull_timeout_func(fd, ms);
+ 
+   err = get_errno (session);
+-  if (ret == -1 && err == EINTR)
+-    return GNUTLS_E_INTERRUPTED;
+-  else if (ret == -1 && err == EAGAIN)
+-    return GNUTLS_E_AGAIN;
+-  else if (ret == -1)
+-    return gnutls_assert_val(GNUTLS_E_PULL_ERROR);
+-  
++  if (ret == -1)                 
++    return errno_to_gerr(err);
++
+   if (ret > 0)
+     return 0;
+   else return GNUTLS_E_TIMEDOUT;
+-- 
+1.7.10.4
+

Added: packages/gnutls28/trunk/debian/patches/42_dump-the-errno.diff
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/42_dump-the-errno.diff?rev=1538&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/patches/42_dump-the-errno.diff (added)
+++ packages/gnutls28/trunk/debian/patches/42_dump-the-errno.diff Sun Sep  2 11:51:32 2012
@@ -1,0 +1,31 @@
+From ef9d0e356c191db966b7eb5ed8e55e7155b029c3 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Sun, 2 Sep 2012 10:59:16 +0200
+Subject: [PATCH 3/4] dump the errno received by select
+
+---
+ lib/gnutls_buffers.c |    8 ++++++--
+ 1 file changed, 6 insertions(+), 2 deletions(-)
+
+diff --git a/lib/gnutls_buffers.c b/lib/gnutls_buffers.c
+index 546293f..ea7a77a 100644
+--- a/lib/gnutls_buffers.c
++++ b/lib/gnutls_buffers.c
+@@ -657,8 +657,12 @@ _gnutls_io_check_recv (gnutls_session_t session, unsigned int ms)
+   ret = session->internals.pull_timeout_func(fd, ms);
+ 
+   err = get_errno (session);
+-  if (ret == -1)                 
+-    return errno_to_gerr(err);
++  if (ret == -1)
++    {
++      _gnutls_read_log ("READ_TIMEOUT: %d returned from %p, errno=%d (timeout: %u)\n",
++			(int) ret, fd, err, ms);
++      return errno_to_gerr(err);
++    }
+ 
+   if (ret > 0)
+     return 0;
+-- 
+1.7.10.4
+

Modified: packages/gnutls28/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/series?rev=1538&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/patches/series (original)
+++ packages/gnutls28/trunk/debian/patches/series Sun Sep  2 11:51:32 2012
@@ -2,3 +2,5 @@
 20_test-select.diff
 30_forcesystemlibopts.diff
 40_debugtestsuite
+41_use-errno.diff
+42_dump-the-errno.diff