rpms/dbus/devel dbus-1.0.1-pthread-holder-fix.patch, NONE, 1.1 dbus.spec, 1.111, 1.112 dbus-1.0.0-thread.patch, 1.1, NONE
fedora-cvs-commits at redhat.com
fedora-cvs-commits at redhat.com
Mon Nov 20 19:03:09 UTC 2006
- Previous message (by thread): rpms/libXrandr/devel .cvsignore, 1.8, 1.9 libXrandr.spec, 1.15, 1.16 sources, 1.8, 1.9
- Next message (by thread): rpms/dbus/devel .cvsignore,1.24,1.25 sources,1.25,1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
Author: rstrode
Update of /cvs/dist/rpms/dbus/devel
In directory cvs.devel.redhat.com:/tmp/cvs-serv16247
Modified Files:
dbus.spec
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
- Apply patch from Thiago Macieira <thiago at kde.org> to
fix failed assertion in threading implementation
- Drop some crazy looking build time speed optimization
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: dbus.spec
===================================================================
RCS file: /cvs/dist/rpms/dbus/devel/dbus.spec,v
retrieving revision 1.111
retrieving revision 1.112
diff -u -r1.111 -r1.112
--- dbus.spec 14 Nov 2006 19:34:37 -0000 1.111
+++ dbus.spec 20 Nov 2006 19:03:07 -0000 1.112
@@ -7,10 +7,10 @@
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
+Source0: http://dbus.freedesktop.org/releases/dbus/%{name}-%{version}.tar.gz
License: AFL/GPL
Group: System Environment/Libraries
BuildRoot: %{_tmppath}/%{name}-root
@@ -29,10 +29,10 @@
Conflicts: cups < 1:1.1.20-4
-Patch2: dbus-0.61-selinux-avc-audit.patch
-Patch3: dbus-0.60-start-early.patch
-Patch4: dbus-0.92-audit-system.patch
-Patch5: dbus-1.0.0-thread.patch
+Patch0: dbus-0.61-selinux-avc-audit.patch
+Patch1: dbus-0.60-start-early.patch
+Patch2: dbus-0.92-audit-system.patch
+Patch3: dbus-1.0.1-pthread-holder-fix.patch
%description
@@ -63,29 +63,18 @@
%prep
%setup -q
-%patch2 -p1 -b .selinux-avc-audit
-%patch3 -p1 -b .start-early
-%patch4 -p1 -b .audit_system
-%patch5 -p0 -b .thread
+%patch0 -p1 -b .selinux-avc-audit
+%patch1 -p1 -b .start-early
+%patch2 -p1 -b .audit_system
+%patch3 -p1 -b .pthread-holder-fix
autoreconf -f -i
%build
COMMON_ARGS="--enable-libaudit --enable-selinux=yes --with-init-scripts=redhat --with-system-pid-file=%{_localstatedir}/run/messagebus.pid --with-dbus-user=%{dbus_user_uid} --libdir=/%{_lib} --bindir=/bin --sysconfdir=/etc --exec-prefix=/"
-### this is some crack because bits of dbus can be
-### smp-compiled but others don't feel like working
-function make_fast() {
- ### try to burn through it with SMP a couple times
- make %{?_smp_mflags} || true
- make %{?_smp_mflags} || true
-
- ### then do a real make and don't ignore failure
- DBUS_VERBOSE=1 make
-}
-
#### Build once with tests to make check
%configure $COMMON_ARGS --enable-tests=yes --enable-verbose-mode=yes --enable-asserts=yes
-make_fast
+DBUS_VERBOSE=1 make
#### Clean up and build again
make clean
@@ -173,6 +162,12 @@
%{_includedir}/*
%changelog
+* Mon Nov 20 2006 Ray Strode <rstrode at redhat.com> - 1.0.1-1
+- Update to 1.0.1
+- Apply patch from Thiago Macieira <thiago at kde.org> to
+ fix failed assertion in threading implementation
+- Drop some crazy looking build time speed optimization
+
* Tue Nov 14 2006 John (J5) Palmieri <johnp at redhat.com> - 1.0.0-2
- add patch to fix dbus_threads_init_default
--- dbus-1.0.0-thread.patch DELETED ---
- Previous message (by thread): rpms/libXrandr/devel .cvsignore, 1.8, 1.9 libXrandr.spec, 1.15, 1.16 sources, 1.8, 1.9
- Next message (by thread): rpms/dbus/devel .cvsignore,1.24,1.25 sources,1.25,1.26
- Messages sorted by:
[ date ]
[ thread ]
[ subject ]
[ author ]
More information about the fedora-cvs-commits
mailing list