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


---

diff --git a/evolution-data-server-2.22.1-double-free.patch b/evolution-data-server-2.22.1-double-free.patch
new file mode 100644
index 0000000..7528eb6
--- /dev/null
+++ b/evolution-data-server-2.22.1-double-free.patch
@@ -0,0 +1,11 @@
+diff -up evolution-data-server-2.22.1/calendar/backends/contacts/e-cal-backend-contacts.c.double-free evolution-data-server-2.22.1/calendar/backends/contacts/e-cal-backend-contacts.c
+--- evolution-data-server-2.22.1/calendar/backends/contacts/e-cal-backend-contacts.c.double-free	2008-04-04 05:02:31.000000000 -0400
++++ evolution-data-server-2.22.1/calendar/backends/contacts/e-cal-backend-contacts.c	2008-04-29 08:41:58.000000000 -0400
+@@ -102,7 +102,6 @@ book_record_new (ECalBackendContacts *cb
+         query = e_book_query_any_field_contains ("");
+ 
+         if (!e_book_get_book_view (book, query, fields, -1, &book_view, NULL)) {
+-		g_list_free (fields);
+                 e_book_query_unref (query);
+                 g_object_unref (book);
+                 g_list_free (fields);
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 44e6c61..85d978a 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -28,7 +28,7 @@
 
 Name: evolution-data-server
 Version: 2.22.1
-Release: 1%{?dist}
+Release: 2%{?dist}
 License: LGPL
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
@@ -55,6 +55,9 @@ Patch14: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
 Patch15: evolution-data-server-2.22.0-implicit-function-declaration.patch
 
+# GNOME bug #530323
+Patch16: evolution-data-server-2.22.1-double-free.patch
+
 ### Build Dependencies ###
 
 BuildRequires: GConf2-devel
@@ -134,6 +137,7 @@ This package contains developer documentation for %{name}.
 %patch13 -p1 -b .camel-folder-summary-crash
 %patch14 -p1 -b .fix-64bit-acinclude
 %patch15 -p1 -b .implicit-function-declaration
+%patch16 -p1 -b .double-free
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -376,7 +380,10 @@ rm -rf $RPM_BUILD_ROOT
 %{_datadir}/gtk-doc/html/libedataserverui
 
 %changelog
-* Mon Apr 07 2008 Matthew Barnes <mbarnes@redhat.com. - 2.22.1-1.fc9
+* Tue Apr 29 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.1-2.fc9
+- Add patch for GNOME bug #530323 (double free).
+
+* Mon Apr 07 2008 Matthew Barnes <mbarnes@redhat.com> - 2.22.1-1.fc9
 - Update to 2.22.1
 - Remove patch for RH bug #296671 (fixed upstream).
 - Remove patch for GNOME bug #523023 (fixed upstream).