[Pkg-utopia-commits] r1151 - in packages/unstable/dbus/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2006-11-19 22:22:01 +0100 (Sun, 19 Nov 2006)
New Revision: 1151

Added:
   packages/unstable/dbus/debian/patches/02_fix_thread_initialisation.patch
Modified:
   packages/unstable/dbus/debian/changelog
Log:
* New bugfix release
* Fixes bug where calling dbus_threads_init_default would assert
* debian/patches/02_fix_thread_initialisation.patch
  + Fixes an assertion failure when using pthreads (From upstream CVS)
* Urgency medium, fixes two assertion failures.

Modified: packages/unstable/dbus/debian/changelog
===================================================================
--- packages/unstable/dbus/debian/changelog	2006-11-19 13:24:55 UTC (rev 1150)
+++ packages/unstable/dbus/debian/changelog	2006-11-19 21:22:01 UTC (rev 1151)
@@ -1,3 +1,13 @@
+dbus (1.0.1-1) unstable; urgency=medium
+
+  * New bugfix release
+  * Fixes bug where calling dbus_threads_init_default would assert
+  * debian/patches/02_fix_thread_initialisation.patch
+    + Fixes an assertion failure when using pthreads (From upstream CVS)
+  * Urgency medium, fixes two assertion failures.
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Sun, 19 Nov 2006 22:02:16 +0100
+
 dbus (1.0.0-1) unstable; urgency=low
 
   [ Sebastian Dröge ]

Added: packages/unstable/dbus/debian/patches/02_fix_thread_initialisation.patch
===================================================================
--- packages/unstable/dbus/debian/patches/02_fix_thread_initialisation.patch	2006-11-19 13:24:55 UTC (rev 1150)
+++ packages/unstable/dbus/debian/patches/02_fix_thread_initialisation.patch	2006-11-19 21:22:01 UTC (rev 1151)
@@ -0,0 +1,37 @@
+Index: dbus/dbus-sysdeps-pthread.c
+===================================================================
+RCS file: /cvs/dbus/dbus/dbus/dbus-sysdeps-pthread.c,v
+retrieving revision 1.5
+retrieving revision 1.6
+diff -u -r1.5 -r1.6
+--- dbus/dbus-sysdeps-pthread.c	28 Oct 2006 01:41:37 -0000	1.5
++++ dbus/dbus-sysdeps-pthread.c	19 Nov 2006 18:23:27 -0000	1.6
+@@ -153,6 +153,7 @@
+         {
+           /* Wait for the lock */
+           PTHREAD_CHECK ("pthread_mutex_lock", pthread_mutex_lock (&pmutex->lock));
++	  pmutex->holder = self;
+           _dbus_assert (pmutex->count == 0);
+         }
+ 
+@@ -222,10 +223,11 @@
+   _dbus_assert (pthread_equal (pmutex->holder, pthread_self ()));
+ 
+   old_count = pmutex->count;
+-  pmutex->count = 0;
++  pmutex->count = 0;		/* allow other threads to lock */
+   PTHREAD_CHECK ("pthread_cond_wait", pthread_cond_wait (&pcond->cond, &pmutex->lock));
+   _dbus_assert (pmutex->count == 0);
+   pmutex->count = old_count;
++  pmutex->holder = pthread_self(); /* other threads may have locked the mutex in the meantime */
+ }
+ 
+ static dbus_bool_t
+@@ -264,6 +266,7 @@
+ 
+   _dbus_assert (pmutex->count == 0);
+   pmutex->count = old_count;
++  pmutex->holder = pthread_self(); /* other threads may have locked the mutex in the meantime */
+   
+   /* return true if we did not time out */
+   return result != ETIMEDOUT;