From 5573942bbad6deef54beecdf80877664ee471fdb Mon Sep 17 00:00:00 2001 From: Milan Crha Date: Mon, 17 Sep 2012 15:37:04 +0200 Subject: [PATCH] Add patch for Red Hat bug #802310 (Crash under mail_mt_free_activity()) --- evolution-3.4.4-activity-free-crash.patch | 13 +++++++++++++ evolution.spec | 9 ++++++++- 2 files changed, 21 insertions(+), 1 deletion(-) create mode 100644 evolution-3.4.4-activity-free-crash.patch diff --git a/evolution-3.4.4-activity-free-crash.patch b/evolution-3.4.4-activity-free-crash.patch new file mode 100644 index 0000000..4acdafb --- /dev/null +++ b/evolution-3.4.4-activity-free-crash.patch @@ -0,0 +1,13 @@ +diff --git a/libemail-engine/mail-ops.c b/libemail-engine/mail-ops.c +index f0632a4..0f1ca47 100644 +--- a/libemail-engine/mail-ops.c ++++ b/libemail-engine/mail-ops.c +@@ -1051,7 +1051,7 @@ mail_send_queue (EMailSession *session, + m->queue = g_object_ref (queue); + m->transport = g_object_ref (transport); + if (G_IS_CANCELLABLE (cancellable)) +- m->base.cancellable = cancellable; ++ m->base.cancellable = g_object_ref (cancellable); + m->status = status; + m->status_data = status_data; + m->done = done; diff --git a/evolution.spec b/evolution.spec index f0b398f..d5957a5 100644 --- a/evolution.spec +++ b/evolution.spec @@ -27,7 +27,7 @@ Name: evolution Version: 3.4.4 -Release: 1%{?dist} +Release: 2%{?dist} Group: Applications/Productivity Summary: Mail and calendar client for GNOME License: GPLv2+ and GFDL @@ -46,6 +46,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch # RH bug #589555 Patch02: evolution-2.30.1-help-contents.patch +# RH bug #802310 +Patch03: evolution-3.4.4-activity-free-crash.patch + ## Dependencies ### Requires(pre): GConf2 @@ -202,6 +205,7 @@ This package contains the plugin to import Microsoft Personal Storage Table %setup -q -n evolution-%{version} %patch01 -p1 -b .ldaphack %patch02 -p1 -b .help-contents +%patch03 -p1 -b .activity-free-crash mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/lib @@ -572,6 +576,9 @@ rm -rf $RPM_BUILD_ROOT %endif %changelog +* Mon Sep 17 2012 Milan Crha - 3.4.4-2 +- Add patch for Red Hat bug #802310 (Crash under mail_mt_free_activity()) + * Mon Aug 13 2012 Milan Crha - 3.4.4-1 - Update to 3.4.4 - Remove patch for Red Hat bug #831128 (fixed upstream)