[telepathy-logger] Backport patch from upstream git for a change that wasn't included with original tarball. Refer to h

Brian Pepple bpepple at fedoraproject.org
Wed Mar 30 23:05:00 UTC 2011


commit e148036df9d265179b16e8df38a7df7ee90ed6c8
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Wed Mar 30 19:03:15 2011 -0400

    Backport patch from upstream git for a change that wasn't included with original
    tarball. Refer to http://lists.freedesktop.org/archives/telepathy/2011-March/005381.html

 ...finit-loop-in-pending-message-cache-logic.patch |   25 ++++++++++++++++++++
 telepathy-logger.spec                              |    8 +++++-
 2 files changed, 32 insertions(+), 1 deletions(-)
---
diff --git a/0001-Fix-infinit-loop-in-pending-message-cache-logic.patch b/0001-Fix-infinit-loop-in-pending-message-cache-logic.patch
new file mode 100644
index 0000000..fbb4260
--- /dev/null
+++ b/0001-Fix-infinit-loop-in-pending-message-cache-logic.patch
@@ -0,0 +1,25 @@
+From 884c52dad5d5fb30a450b013b83aed306ed49164 Mon Sep 17 00:00:00 2001
+From: Nicolas Dufresne <nicolas.dufresne at collabora.co.uk>
+Date: Wed, 30 Mar 2011 12:08:35 -0400
+Subject: [PATCH] Fix infinit loop in pending message cache logic
+
+---
+ telepathy-logger/text-channel.c |    2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/telepathy-logger/text-channel.c b/telepathy-logger/text-channel.c
+index 919c8f6..c721358 100644
+--- a/telepathy-logger/text-channel.c
++++ b/telepathy-logger/text-channel.c
+@@ -632,7 +632,7 @@ pendingproc_store_pending_messages (TplActionChain *ctx,
+           to_remove = g_list_prepend (to_remove, GUINT_TO_POINTER (cached->id));
+           cached_it = g_list_next (cached_it);
+         }
+-      else if (cached->id < pending_id)
++      else
+         {
+           /* The pending message has not been logged */
+           to_log = g_list_prepend (to_log, pending);
+-- 
+1.7.4.1
+
diff --git a/telepathy-logger.spec b/telepathy-logger.spec
index 45bd915..9592a71 100644
--- a/telepathy-logger.spec
+++ b/telepathy-logger.spec
@@ -1,12 +1,13 @@
 Name:           telepathy-logger
 Version:        0.2.7
-Release:        1%{?dist}
+Release:        2%{?dist}
 Summary:        Telepathy framework logging daemon
 
 Group:          Applications/Communications
 License:        LGPLv2+ 
 URL:            http://telepathy.freedesktop.org/wiki/Logger
 Source0:        http://telepathy.freedesktop.org/releases/%{name}/%{name}-%{version}.tar.bz2
+Patch0:         0001-Fix-infinit-loop-in-pending-message-cache-logic.patch
 
 BuildRequires:  dbus-devel >= 1.1.0
 BuildRequires:  dbus-glib-devel >= 0.82
@@ -43,6 +44,7 @@ developing applications that use %{name}.
 
 %prep
 %setup -q
+%patch0 -p1 -b .infinite
 
 
 #%check
@@ -96,6 +98,10 @@ glib-compile-schemas --allow-any-name %{_datadir}/glib-2.0/schemas ||:
 
 
 %changelog
+* Mon Mar 30 2011 Brian Pepple <bpepple at fedoraproject.org> - 0.2.7-2
+- Backport patch from upstream git for a change that wasn't included with original
+  tarball. Refer to http://lists.freedesktop.org/archives/telepathy/2011-March/005381.html
+
 * Fri Mar 25 2011 Brian Pepple <bpepple at fedoraproject.org> - 0.2.7-1
 - Update to 0.2.7.
 


More information about the scm-commits mailing list