[evolution-data-server/f18] Add patch for Red Hat bug #883410 (file descriptor leak)
Milan Crha
mcrha at fedoraproject.org
Wed Dec 12 22:35:19 UTC 2012
commit 68c92249ef696bb0e6788a11a6b97b30cd042f07
Author: Milan Crha <mcrha at redhat.com>
Date: Wed Dec 12 23:35:00 2012 +0100
Add patch for Red Hat bug #883410 (file descriptor leak)
evolution-data-server-3.6.2-fd-leak.patch | 17 +++++++++++++++++
evolution-data-server.spec | 7 ++++++-
2 files changed, 23 insertions(+), 1 deletions(-)
---
diff --git a/evolution-data-server-3.6.2-fd-leak.patch b/evolution-data-server-3.6.2-fd-leak.patch
new file mode 100644
index 0000000..5ed38ac
--- /dev/null
+++ b/evolution-data-server-3.6.2-fd-leak.patch
@@ -0,0 +1,17 @@
+diff --git a/libedataserver/e-source-registry.c b/libedataserver/e-source-registry.c
+index 0d83d98..93ae50b 100644
+--- a/libedataserver/e-source-registry.c
++++ b/libedataserver/e-source-registry.c
+@@ -1729,6 +1729,12 @@ e_source_registry_authenticate_sync (ESourceRegistry *registry,
+
+ exit:
+ g_main_context_pop_thread_default (main_context);
++
++ /* Make sure the main_context doesn't have pending operations;
++ workarounds https://bugzilla.gnome.org/show_bug.cgi?id=690126 */
++ while (g_main_context_pending (main_context))
++ g_main_context_iteration (main_context, FALSE);
++
+ g_main_context_unref (main_context);
+
+ return success;
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 41689e6..6dbb66e 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -27,7 +27,7 @@
Name: evolution-data-server
Version: 3.6.2
-Release: 2%{?dist}
+Release: 3%{?dist}
Group: System Environment/Libraries
Summary: Backend data server for Evolution
License: LGPLv2+
@@ -44,6 +44,7 @@ Obsoletes: evolution-webcal < 2.24.0
Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
Patch02: evolution-data-server-3.6.2-restore.patch
+Patch03: evolution-data-server-3.6.2-fd-leak.patch
### Build Dependencies ###
@@ -126,6 +127,7 @@ This package contains developer documentation for %{name}.
%patch01 -p1 -b .fix-64bit-acinclude
%patch02 -p1 -b .restore
+%patch03 -p1 -b .fdleak
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -370,6 +372,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/gtk-doc/html/libedataserverui
%changelog
+* Wed Dec 12 2012 Milan Crha <mcrha at redhat.com> - 3.6.2-3
+- Add patch for Red Hat bug #883410 (file descriptor leak)
+
* Wed Nov 21 2012 Milan Crha <mcrha at redhat.com> - 3.6.2-2
- Add patch for Red Hat bug #877562 (restore doesn't work properly)
More information about the scm-commits
mailing list