[evolution-data-server/f18] Add patch for Red Hat bug #901798 (workaround IMAPx assert crash)
Milan Crha
mcrha at fedoraproject.org
Tue May 14 16:26:12 UTC 2013
commit 5860e8d64b03925944837d558538dc48930de1e7
Author: Milan Crha <mcrha at redhat.com>
Date: Tue May 14 18:26:00 2013 +0200
Add patch for Red Hat bug #901798 (workaround IMAPx assert crash)
evolution-data-server-3.6.4-imapx-assert.patch | 13 +++++++++++++
evolution-data-server.spec | 9 ++++++++-
2 files changed, 21 insertions(+), 1 deletions(-)
---
diff --git a/evolution-data-server-3.6.4-imapx-assert.patch b/evolution-data-server-3.6.4-imapx-assert.patch
new file mode 100644
index 0000000..a5b0411
--- /dev/null
+++ b/evolution-data-server-3.6.4-imapx-assert.patch
@@ -0,0 +1,13 @@
+diff -up evolution-data-server-3.6.4/camel/camel-imapx-server.c.imapx-assert evolution-data-server-3.6.4/camel/camel-imapx-server.c
+--- evolution-data-server-3.6.4/camel/camel-imapx-server.c.imapx-assert 2013-02-26 15:58:36.000000000 +0100
++++ evolution-data-server-3.6.4/camel/camel-imapx-server.c 2013-05-14 18:24:54.035852867 +0200
+@@ -1778,8 +1778,7 @@ imapx_untagged_fetch (CamelIMAPXServer *
+
+ } while (!found && min <= max);
+
+- if (!found)
+- g_assert_not_reached ();
++ g_return_val_if_fail (found, FALSE);
+
+ server_flags = r->server_flags;
+ server_user_flags = r->server_user_flags;
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index aa4bc02..4df12ce 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -27,7 +27,7 @@
Name: evolution-data-server
Version: 3.6.4
-Release: 3%{?dist}
+Release: 4%{?dist}
Group: System Environment/Libraries
Summary: Backend data server for Evolution
License: LGPLv2+
@@ -49,6 +49,9 @@ Patch02: evolution-data-server-3.6.4-signature-migration.patch
# GNOME bug #696757
Patch03: evolution-data-server-3.6.4-client-op-ids.patch
+# RH bug #901798
+Patch04: evolution-data-server-3.6.4-imapx-assert.patch
+
### Build Dependencies ###
BuildRequires: bison
@@ -131,6 +134,7 @@ This package contains developer documentation for %{name}.
%patch01 -p1 -b .fix-64bit-acinclude
%patch02 -p1 -b .signature-migration
%patch03 -p1 -b .client-op-ids
+%patch04 -p1 -b .imapx-assert
mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib
@@ -375,6 +379,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
%{_datadir}/gtk-doc/html/libedataserverui
%changelog
+* Tue May 14 2013 Milan Crha <mcrha at redhat.com> - 3.6.4-4
+- Add patch for Red Hat bug #901798 (workaround IMAPx assert crash)
+
* Fri Apr 12 2013 Milan Crha <mcrha at redhat.com> - 3.6.4-3
- Add patch for GNOME bug #696757 (dynamic keys in g_object_set_data())
More information about the scm-commits
mailing list