|
|
Author: rstrode
Update of /cvs/dist/rpms/dbus/FC-6
In directory cvs.devel.redhat.com:/tmp/cvs-serv16469
Modified Files:
.cvsignore dbus.spec sources
Added Files:
dbus-1.0.1-pthread-holder-fix.patch
Removed Files:
dbus-1.0.0-thread.patch
Log Message:
- Update to 1.0.1
- Add patch from Thiago Macieira <thiago@xxxxxxx> to fix
assertion failure
dbus-1.0.1-pthread-holder-fix.patch:
dbus-sysdeps-pthread.c | 5 ++++-
1 files changed, 4 insertions(+), 1 deletion(-)
--- NEW FILE dbus-1.0.1-pthread-holder-fix.patch ---
--- dbus-1.0.1/dbus/dbus-sysdeps-pthread.c 28 Oct 2006 01:41:37 -0000
1.5
+++ dbus-1.0.1/dbus/dbus-sysdeps-pthread.c 19 Nov 2006 12:40:47 -0000
@@ -153,6 +153,7 @@ _dbus_pthread_mutex_lock (DBusMutex *mut
{
/* 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_pthread_condvar_wait (DBusCondVar
_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_pthread_condvar_wait_timeout (DBus
_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;
Index: .cvsignore
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/.cvsignore,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- .cvsignore 13 Nov 2006 19:53:28 -0000 1.23
+++ .cvsignore 20 Nov 2006 19:06:43 -0000 1.24
@@ -1,18 +1 @@
-dbus-0.22.tar.gz
-dbus-0.23.tar.gz
-dbus-0.31.tar.gz
-dbus-0.32.tar.gz
-dbus-0.33.tar.gz
-dbus-0.34.tar.gz
-dbus-0.35.2.tar.gz
-dbus-0.36.tar.gz
-dbus-0.36.1.tar.gz
-dbus-0.36.2.tar.gz
-dbus-0.50.tar.gz
-dbus-0.60.tar.gz
-dbus-0.61.tar.gz
-dbus-0.62.tar.gz
-dbus-0.90.tar.gz
-dbus-0.92.tar.gz
-dbus-0.93.tar.gz
-dbus-1.0.0.tar.gz
+dbus-1.0.1.tar.gz
Index: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/dbus.spec,v
retrieving revision 1.103
retrieving revision 1.104
diff -u -r1.103 -r1.104
--- dbus.spec 14 Nov 2006 19:27:12 -0000 1.103
+++ dbus.spec 20 Nov 2006 19:06:43 -0000 1.104
@@ -7,8 +7,8 @@
Summary: D-BUS message bus
Name: dbus
-Version: 1.0.0
-Release: 2%{?dist}
+Version: 1.0.1
+Release: 1%{?dist}
URL: http://www.freedesktop.org/software/dbus/
Source0: %{name}-%{version}.tar.gz
License: AFL/GPL
@@ -33,7 +33,7 @@
Patch3: dbus-0.60-start-early.patch
Patch4: dbus-0.92-audit-system.patch
Patch6: dbus-1.0.0-no_fatal_checks.patch
-Patch7: dbus-1.0.0-thread.patch
+Patch7: dbus-1.0.1-pthread-holder-fix.patch
%description
@@ -68,7 +68,7 @@
%patch3 -p1 -b .start-early
%patch4 -p1 -b .audit_system
%patch6 -p1 -b .no_fatal_checks
-%patch7 -p0 -b .thread
+%patch7 -p1 -b .pthread-holder-fix
autoreconf -f -i
@@ -172,6 +172,11 @@
%{_includedir}/*
%changelog
+* Mon Nov 20 2006 Ray Strode <rstrode@xxxxxxxxxx> - 1.0.1-1
+- Update to 1.0.1
+- Add patch from Thiago Macieira <thiago@xxxxxxx> to fix
+ assertion failure
+
* Tue Nov 14 2006 John (J5) Palmieri <johnp@xxxxxxxxxx> - 1.0.0-2
- add patch to fix dbus_threads_init_default
Index: sources
===================================================================
RCS file: /cvs/dist/rpms/dbus/FC-6/sources,v
retrieving revision 1.23
retrieving revision 1.24
diff -u -r1.23 -r1.24
--- sources 13 Nov 2006 19:53:28 -0000 1.23
+++ sources 20 Nov 2006 19:06:43 -0000 1.24
@@ -1 +1 @@
-8261b2abac8281007fd3176930017302 dbus-1.0.0.tar.gz
+52c70d18fe0b398f5de3b8a18a589960 dbus-1.0.1.tar.gz
--- dbus-1.0.0-thread.patch DELETED ---
--
fedora-cvs-commits mailing list
fedora-cvs-commits@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/fedora-cvs-commits
|
|