diff --git a/dbus-1-x11.changes b/dbus-1-x11.changes index 7601f96..5632c20 100644 --- a/dbus-1-x11.changes +++ b/dbus-1-x11.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 7 14:42:07 CEST 2008 - thoenig@suse.de + +- add patch dbus-fix-timer-leak-dmueller-01.patch (bnc#381621) + ------------------------------------------------------------------- Thu Apr 24 15:45:58 CEST 2008 - thoenig@suse.de diff --git a/dbus-1-x11.spec b/dbus-1-x11.spec index 0c4ddd7..78fc9b6 100644 --- a/dbus-1-x11.spec +++ b/dbus-1-x11.spec @@ -21,12 +21,13 @@ Summary: X11-requiring add-ons for D-Bus # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig Version: 1.2.1 -Release: 6 +Release: 10 AutoReqProv: on Source0: dbus-%{version}.tar.bz2 Source1: rc.boot.dbus Source2: dbus-1.desktop Patch0: dbus-do-not-abort-on-check-thoenig-01.patch +Patch1: dbus-fix-timer-leak-dmueller-01.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END # COMMON1-END @@ -60,6 +61,7 @@ Authors: %setup -n dbus-%{version} -q # Disable this until we hit RC phase #%patch0 +%patch1 %build autoreconf -fi @@ -107,6 +109,8 @@ rm -rf $tdir %{_mandir}/man1/dbus-launch.1* %changelog +* Wed May 07 2008 thoenig@suse.de +- add patch dbus-fix-timer-leak-dmueller-01.patch (bnc#381621) * Thu Apr 24 2008 thoenig@suse.de - %%post: don't use invalid macro - %%post: don't call %%run_ldconfig (deprecated) diff --git a/dbus-1.changes b/dbus-1.changes index 7601f96..5632c20 100644 --- a/dbus-1.changes +++ b/dbus-1.changes @@ -1,3 +1,8 @@ +------------------------------------------------------------------- +Wed May 7 14:42:07 CEST 2008 - thoenig@suse.de + +- add patch dbus-fix-timer-leak-dmueller-01.patch (bnc#381621) + ------------------------------------------------------------------- Thu Apr 24 15:45:58 CEST 2008 - thoenig@suse.de diff --git a/dbus-1.spec b/dbus-1.spec index 9f1bf9d..9c4cd93 100644 --- a/dbus-1.spec +++ b/dbus-1.spec @@ -19,12 +19,13 @@ Summary: D-Bus Message Bus System # COMMON1-BEGIN BuildRequires: doxygen libexpat-devel libzio pkgconfig Version: 1.2.1 -Release: 5 +Release: 8 AutoReqProv: on Source0: dbus-%{version}.tar.bz2 Source1: rc.boot.dbus Source2: dbus-1.desktop Patch0: dbus-do-not-abort-on-check-thoenig-01.patch +Patch1: dbus-fix-timer-leak-dmueller-01.patch BuildRoot: %{_tmppath}/%{name}-%{version}-build # COMMON1-END PreReq: permissions /usr/sbin/groupadd /usr/sbin/useradd /sbin/insserv /etc/init.d/boot.localfs @@ -129,6 +130,7 @@ Authors: %setup -n dbus-%{version} -q # Disable this until we hit RC phase #%patch0 +%patch1 %build autoreconf -fi @@ -252,6 +254,8 @@ mkdir -p %{_localstatedir}/lib/dbus %{_datadir}/susehelp %changelog +* Wed May 07 2008 thoenig@suse.de +- add patch dbus-fix-timer-leak-dmueller-01.patch (bnc#381621) * Thu Apr 24 2008 thoenig@suse.de - %%post: don't use invalid macro - %%post: don't call %%run_ldconfig (deprecated) diff --git a/dbus-fix-timer-leak-dmueller-01.patch b/dbus-fix-timer-leak-dmueller-01.patch new file mode 100644 index 0000000..a6912a0 --- /dev/null +++ b/dbus-fix-timer-leak-dmueller-01.patch @@ -0,0 +1,16 @@ +--- dbus/dbus-connection.c ++++ dbus/dbus-connection.c +@@ -965,6 +965,13 @@ _dbus_connection_detach_pending_call_and_unlock (DBusConnection *connection, + _dbus_pending_call_ref_unlocked (pending); + _dbus_hash_table_remove_int (connection->pending_replies, + _dbus_pending_call_get_reply_serial_unlocked (pending)); ++ ++ if (_dbus_pending_call_is_timeout_added_unlocked (pending)) ++ _dbus_connection_remove_timeout_unlocked (connection, ++ _dbus_pending_call_get_timeout_unlocked (pending)); ++ ++ _dbus_pending_call_set_timeout_added_unlocked (pending, FALSE); ++ + _dbus_pending_call_unref_and_unlock (pending); + } +