r40711 - in /desktop/experimental/glib2.0/debian: changelog patches/0001-asyncqueue-fix-timeout-math-on-32bit-systems.patch patches/series

[pochu at users.alioth.debian.org]

Author: pochu
Date: Sun Feb 23 15:24:43 2014
New Revision: 40711

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=40711
Log:
* d/p/0001-asyncqueue-fix-timeout-math-on-32bit-systems.patch:
  + Patch from git, fix an overflow in g_async_queue_timed_pop_unlocked
    on 32 bits systems.

Added:
    desktop/experimental/glib2.0/debian/patches/0001-asyncqueue-fix-timeout-math-on-32bit-systems.patch
Modified:
    desktop/experimental/glib2.0/debian/changelog
    desktop/experimental/glib2.0/debian/patches/series

Modified: desktop/experimental/glib2.0/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/changelog?rev=40711&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/changelog	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/changelog	[utf-8] Sun Feb 23 15:24:43 2014
@@ -4,6 +4,9 @@
     + Bump gtk-doc-tools build-dependency per configure.ac.
   * debian/patches/Don-t-use-a-parallel-build-for-the-documentation.patch:
     + Removed, no longer needed with gtk-doc 1.20.
+  * d/p/0001-asyncqueue-fix-timeout-math-on-32bit-systems.patch:
+    + Patch from git, fix an overflow in g_async_queue_timed_pop_unlocked
+      on 32 bits systems.
 
  -- Emilio Pozuelo Monfort <pochu at debian.org>  Wed, 19 Feb 2014 11:09:59 +0100
 

Added: desktop/experimental/glib2.0/debian/patches/0001-asyncqueue-fix-timeout-math-on-32bit-systems.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/0001-asyncqueue-fix-timeout-math-on-32bit-systems.patch?rev=40711&op=file
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/0001-asyncqueue-fix-timeout-math-on-32bit-systems.patch	(added)
+++ desktop/experimental/glib2.0/debian/patches/0001-asyncqueue-fix-timeout-math-on-32bit-systems.patch	[utf-8] Sun Feb 23 15:24:43 2014
@@ -0,0 +1,44 @@
+From 356fe2cec65ad5b531ff08c78e5c24f37017bb83 Mon Sep 17 00:00:00 2001
+From: Ryan Lortie <desrt at desrt.ca>
+Date: Sun, 23 Feb 2014 01:11:50 -0500
+Subject: [PATCH] asyncqueue: fix timeout math on 32bit systems
+
+88182d375e13ae6519a288d5295220c83ca27e73 caught this issue in
+g_async_queue_timed_pop() but failed to fix the same bug in the _unlocked()
+variant.
+
+This is only a problem on 32bit systems.  On 64bit systems, the tv_sec
+in a timeval is already 64 bits, so no overflow occurs.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=722604
+---
+ glib/gasyncqueue.c | 6 ++----
+ 1 file changed, 2 insertions(+), 4 deletions(-)
+
+diff --git a/glib/gasyncqueue.c b/glib/gasyncqueue.c
+index 08bf126..8ed66ab 100644
+--- a/glib/gasyncqueue.c
++++ b/glib/gasyncqueue.c
+@@ -600,8 +600,7 @@ g_async_queue_timed_pop (GAsyncQueue *queue,
+   if (end_time != NULL)
+     {
+       m_end_time = g_get_monotonic_time () +
+-	((gint64)end_time->tv_sec * G_USEC_PER_SEC + end_time->tv_usec -
+-	 g_get_real_time ());
++        ((gint64) end_time->tv_sec * G_USEC_PER_SEC + end_time->tv_usec - g_get_real_time ());
+     }
+   else
+     m_end_time = -1;
+@@ -644,8 +643,7 @@ g_async_queue_timed_pop_unlocked (GAsyncQueue *queue,
+   if (end_time != NULL)
+     {
+       m_end_time = g_get_monotonic_time () +
+-	(end_time->tv_sec * G_USEC_PER_SEC + end_time->tv_usec -
+-	 g_get_real_time ());
++        ((gint64) end_time->tv_sec * G_USEC_PER_SEC + end_time->tv_usec - g_get_real_time ());
+     }
+   else
+     m_end_time = -1;
+-- 
+1.9.0
+

Modified: desktop/experimental/glib2.0/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/experimental/glib2.0/debian/patches/series?rev=40711&op=diff
==============================================================================
--- desktop/experimental/glib2.0/debian/patches/series	[utf-8] (original)
+++ desktop/experimental/glib2.0/debian/patches/series	[utf-8] Sun Feb 23 15:24:43 2014
@@ -15,3 +15,4 @@
 gdbus-Let-the-pending-read-finish-before-closing-the.patch
 gdbus-tests-wait-up-to-60s-for-gdbus-testserver-to-t.patch
 gdbus-connection-wait-up-to-10s-to-actually-send-a-m.patch
+0001-asyncqueue-fix-timeout-math-on-32bit-systems.patch