From c6618ff36f2081421b0c62ddcd7311e145442ba0 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Dec 12 2014 13:26:54 +0000
Subject: Add patch for GNOME bug #741434 (Use-after-free after error in GPG signature verification)


---

diff --git a/evolution-data-server-3.12.9-gpg-check-crash-on-error.patch b/evolution-data-server-3.12.9-gpg-check-crash-on-error.patch
new file mode 100644
index 0000000..67ff15a
--- /dev/null
+++ b/evolution-data-server-3.12.9-gpg-check-crash-on-error.patch
@@ -0,0 +1,18 @@
+commit 234791233b71ae24d020ec5379069f5dd8c1f15d
+Author: Milan Crha <mcrha@redhat.com>
+Date:   Fri Dec 12 14:11:04 2014 +0100
+
+    Bug 741434 - Use-after-free after error in GPG signature verification
+
+diff --git a/camel/camel-gpg-context.c b/camel/camel-gpg-context.c
+index 8c3104b..ea2cb84 100644
+--- a/camel/camel-gpg-context.c
++++ b/camel/camel-gpg-context.c
+@@ -1889,6 +1889,7 @@ gpg_verify_sync (CamelCipherContext *context,
+ 
+ 	g_object_unref (filter);
+ 	g_object_unref (istream);
++	istream = NULL;
+ 
+ 	g_seekable_seek (G_SEEKABLE (canon_stream), 0, G_SEEK_SET, NULL, NULL);
+ 
diff --git a/evolution-data-server.spec b/evolution-data-server.spec
index 87bca49..6481f58 100644
--- a/evolution-data-server.spec
+++ b/evolution-data-server.spec
@@ -32,7 +32,7 @@
 
 Name: evolution-data-server
 Version: 3.12.9
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: System Environment/Libraries
 Summary: Backend data server for Evolution
 License: LGPLv2+
@@ -53,6 +53,9 @@ Obsoletes: compat-evolution-data-server310-libcamel < 3.12
 # RH bug #243296
 Patch01: evolution-data-server-1.11.5-fix-64bit-acinclude.patch
 
+# GN bug #741434
+Patch02: evolution-data-server-3.12.9-gpg-check-crash-on-error.patch
+
 ### Dependencies ###
 
 Requires: dconf
@@ -140,6 +143,7 @@ This package contains developer documentation for %{name}.
 %setup -q
 
 %patch01 -p1 -b .fix-64bit-acinclude
+%patch02 -p1 -b .gpg-check-crash-on-error
 
 %build
 %if %{ldap_support}
@@ -382,6 +386,9 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &>/dev/null || :
 %endif
 
 %changelog
+* Fri Dec 12 2014 Milan Crha <mcrha@redhat.com> - 3.12.9-2
+- Add patch for GNOME bug #741434 (Use-after-free after error in GPG signature verification)
+
 * Mon Dec 08 2014 Milan Crha <mcrha@redhat.com> - 3.12.9-1
 - Update to 3.12.9