From 62beff29d7d570ccc87b4f3decf54fbfafd8cd4f Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@fedoraproject.org>
Date: Apr 29 2008 12:48:38 +0000
Subject: - Add patch for GNOME bug #524121 (double free).


---

diff --git a/evolution-2.22.1-double-free.patch b/evolution-2.22.1-double-free.patch
new file mode 100644
index 0000000..b21fa1d
--- /dev/null
+++ b/evolution-2.22.1-double-free.patch
@@ -0,0 +1,13 @@
+diff -U0 evolution-2.22.1/calendar/ChangeLog.double-free evolution-2.22.1/calendar/ChangeLog
+diff -up evolution-2.22.1/calendar/gui/e-calendar-table.c.double-free evolution-2.22.1/calendar/gui/e-calendar-table.c
+--- evolution-2.22.1/calendar/gui/e-calendar-table.c.double-free	2008-04-04 05:18:00.000000000 -0400
++++ evolution-2.22.1/calendar/gui/e-calendar-table.c	2008-04-29 08:46:17.000000000 -0400
+@@ -881,7 +881,7 @@ copy_row_cb (int model_row, gpointer dat
+ 					     icalcomponent_new_clone (child));
+ 		icalcomponent_free (child);
+ 	}
+-	g_free (child);
++	g_free (comp_str);
+ }
+ 
+ /**
diff --git a/evolution.spec b/evolution.spec
index dcd0efe..3d01b38 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -46,7 +46,7 @@
 
 Name: evolution
 Version: 2.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: GPLv2 and GFDL+
 Group: Applications/Productivity
 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
 Patch16: evolution-2.22.0-line-status.patch
 
+# GNOME bug #524121
+Patch17: evolution-2.22.1-double-free.patch
+
 ## Dependencies ###
 
 Requires(post): GConf2
@@ -230,6 +233,7 @@ This package contains the plugin to filter junk mail using SpamAssassin.
 %patch14 -p1 -b .no-gnome-common
 %patch15 -p1 -b .im-context-reset
 %patch16 -p1 -b .line-status
+%patch17 -p1 -b .double-free
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -657,6 +661,9 @@ rm -rf $RPM_BUILD_ROOT
 %{evo_plugin_dir}/liborg-gnome-sa-junk-plugin.so
 
 %changelog
+* Tue Apr 29 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.1-2.fc9
+- Add patch for GNOME bug #524121 (double free).
+
 * Mon Apr 07 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.1-1.fc9
 - Update to 2.22.1
 - Remove patch for GNOME bug #524310 (fixed upstream).