[Pkg-gnutls-commits] r1405 - in /packages/gnutls28/trunk/debian: changelog patches/30_microseconds-does-not-overflow.patch patches/31_provide-accurate-value-to-select.patch patches/series

[ametzler at users.alioth.debian.org]

Author: ametzler
Date: Sat Feb 25 14:19:54 2012
New Revision: 1405

URL: http://svn.debian.org/wsvn/pkg-gnutls/?sc=1&rev=1405
Log:
Pull 30_microseconds-does-not-overflow.patch and
31_provide-accurate-value-to-select.patch from GIT head, fixing testsuite
error (tests/mini-loss) on kfreebsd-*.

Added:
    packages/gnutls28/trunk/debian/patches/30_microseconds-does-not-overflow.patch
    packages/gnutls28/trunk/debian/patches/31_provide-accurate-value-to-select.patch
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=1405&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/changelog (original)
+++ packages/gnutls28/trunk/debian/changelog Sat Feb 25 14:19:54 2012
@@ -3,6 +3,9 @@
   * NOT RELEASED YET.
   * New upstream version.
     + Drop 30_force-kill-of-child.diff.
+  * Pull 30_microseconds-does-not-overflow.patch and
+    31_provide-accurate-value-to-select.patch from GIT head, fixing testsuite
+    error (tests/mini-loss) on kfreebsd-*.
 
  -- Andreas Metzler <ametzler at debian.org>  Mon, 20 Feb 2012 19:54:06 +0100
 

Added: packages/gnutls28/trunk/debian/patches/30_microseconds-does-not-overflow.patch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/30_microseconds-does-not-overflow.patch?rev=1405&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/patches/30_microseconds-does-not-overflow.patch (added)
+++ packages/gnutls28/trunk/debian/patches/30_microseconds-does-not-overflow.patch Sat Feb 25 14:19:54 2012
@@ -1,0 +1,29 @@
+From 93354fe965b79203c412c85c312c2fcf096264a7 Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Sat, 25 Feb 2012 12:55:35 +0100
+Subject: [PATCH 1/2] make sure that the microseconds field does not overflow
+
+---
+ lib/system.c |    6 ++++++
+ 1 files changed, 6 insertions(+), 0 deletions(-)
+
+diff --git a/lib/system.c b/lib/system.c
+index 1573bb3..679bb0a 100644
+--- a/lib/system.c
++++ b/lib/system.c
+@@ -130,6 +130,12 @@ int fd = GNUTLS_POINTER_TO_INT(ptr);
+   tv.tv_sec = 0;
+   tv.tv_usec = ms * 1000;
+   
++  while(tv.tv_usec >= 1000000)
++    {
++      tv.tv_usec -= 1000000;
++      tv.tv_sec++;
++    }
++  
+   ret = select(fd+1, &rfds, NULL, NULL, &tv);
+   if (ret <= 0)
+     return ret;
+-- 
+1.7.2.5
+

Added: packages/gnutls28/trunk/debian/patches/31_provide-accurate-value-to-select.patch
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/31_provide-accurate-value-to-select.patch?rev=1405&op=file
==============================================================================
--- packages/gnutls28/trunk/debian/patches/31_provide-accurate-value-to-select.patch (added)
+++ packages/gnutls28/trunk/debian/patches/31_provide-accurate-value-to-select.patch Sat Feb 25 14:19:54 2012
@@ -1,0 +1,31 @@
+From bd86118a9dec58bf720780291b93f12150841cea Mon Sep 17 00:00:00 2001
+From: Nikos Mavrogiannopoulos <nmav at gnutls.org>
+Date: Sat, 25 Feb 2012 13:04:38 +0100
+Subject: [PATCH 2/2] provide accurate value to select
+
+---
+ src/udp-serv.c |    8 +++++++-
+ 1 files changed, 7 insertions(+), 1 deletions(-)
+
+diff --git a/src/udp-serv.c b/src/udp-serv.c
+index 489a577..c4a376b 100644
+--- a/src/udp-serv.c
++++ b/src/udp-serv.c
+@@ -190,7 +190,13 @@ char c;
+   
+   tv.tv_sec = 0;
+   tv.tv_usec = ms * 1000;
+-  
++
++  while(tv.tv_usec >= 1000000)
++    {
++      tv.tv_usec -= 1000000;
++      tv.tv_sec++;
++    }
++
+   ret = select(priv->fd+1, &rfds, NULL, NULL, &tv);
+ 
+   if (ret <= 0)
+-- 
+1.7.2.5
+

Modified: packages/gnutls28/trunk/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnutls/packages/gnutls28/trunk/debian/patches/series?rev=1405&op=diff
==============================================================================
--- packages/gnutls28/trunk/debian/patches/series (original)
+++ packages/gnutls28/trunk/debian/patches/series Sat Feb 25 14:19:54 2012
@@ -1,2 +1,4 @@
 14_version_gettextcat.diff
 20_test-select.diff
+30_microseconds-does-not-overflow.patch
+31_provide-accurate-value-to-select.patch