- Add patch for GNOME bug #524310

This commit is contained in:
Daniel Williams 2008-03-25 15:26:56 +00:00
parent 8a8ab3e558
commit a396545246
2 changed files with 23 additions and 1 deletions

View File

@ -0,0 +1,15 @@
diff -up evolution-2.10.3/mail/mail-session.c.server-message-double-free evolution-2.10.3/mail/mail-session.c
--- evolution-2.10.3/mail/mail-session.c.server-message-double-free 2008-03-25 10:01:13.000000000 -0400
+++ evolution-2.10.3/mail/mail-session.c 2008-03-25 10:01:25.000000000 -0400
@@ -389,10 +389,8 @@ alert_user(CamelSession *session, CamelS
mail_msg_unref (m);
}
- if (m->ismain) {
- user_message_free (m);
+ if (m->ismain)
mail_msg_unref (m);
- }
return result;
}

View File

@ -46,7 +46,7 @@
Name: evolution Name: evolution
Version: 2.22.0 Version: 2.22.0
Release: 3%{?dist} Release: 4%{?dist}
License: GPLv2 and GFDL+ License: GPLv2 and GFDL+
Group: Applications/Productivity Group: Applications/Productivity
Summary: GNOME's next-generation groupware suite Summary: GNOME's next-generation groupware suite
@ -84,6 +84,9 @@ Patch15: evolution-2.9.1-im-context-reset.patch
# RH bug #437208 / GNOME bug #518103 # RH bug #437208 / GNOME bug #518103
Patch16: evolution-2.22.0-line-status.patch Patch16: evolution-2.22.0-line-status.patch
# GNOME bug #524310
Patch17: evolution-2.10.3-server-message-double-free.patch
## Dependencies ### ## Dependencies ###
Requires(post): GConf2 Requires(post): GConf2
@ -230,6 +233,7 @@ This package contains the plugin to filter junk mail using SpamAssassin.
%patch14 -p1 -b .no-gnome-common %patch14 -p1 -b .no-gnome-common
%patch15 -p1 -b .im-context-reset %patch15 -p1 -b .im-context-reset
%patch16 -p1 -b .line-status %patch16 -p1 -b .line-status
%patch17 -p1 -b .server-message-double-free
mkdir -p krb5-fakeprefix/include mkdir -p krb5-fakeprefix/include
mkdir -p krb5-fakeprefix/lib mkdir -p krb5-fakeprefix/lib
@ -657,6 +661,9 @@ rm -rf $RPM_BUILD_ROOT
%{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
%changelog %changelog
* Tue Mar 25 2008 Dan Williams <dcbw@redhat.com> - 2.22.0-4.fc9
- Add patch for GNOME bug #524310
* Fri Mar 14 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-3.fc9 * Fri Mar 14 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.0-3.fc9
- Explicit require evolution-data-server since its shared object names - Explicit require evolution-data-server since its shared object names
still can't be trusted (RH bug #426511). still can't be trusted (RH bug #426511).