From 86e90070833e83859c8eaf00c2e7c0875cce5ab2 Mon Sep 17 00:00:00 2001
From: Milan Crha <mcrha@redhat.com>
Date: Mon, 12 Aug 2013 09:20:43 +0200
Subject: [PATCH] Add patch for RH bug #995516 (Crash in certificate viewer)

---
 evolution-3.8.5-cert-viewer-crash.patch | 12 ++++++++++++
 evolution.spec                          |  9 ++++++++-
 2 files changed, 20 insertions(+), 1 deletion(-)
 create mode 100644 evolution-3.8.5-cert-viewer-crash.patch

diff --git a/evolution-3.8.5-cert-viewer-crash.patch b/evolution-3.8.5-cert-viewer-crash.patch
new file mode 100644
index 0000000..9f0b3fa
--- /dev/null
+++ b/evolution-3.8.5-cert-viewer-crash.patch
@@ -0,0 +1,12 @@
+diff -up evolution-3.8.5/smime/gui/certificate-viewer.c.cert-viewer-crash evolution-3.8.5/smime/gui/certificate-viewer.c
+--- evolution-3.8.5/smime/gui/certificate-viewer.c.cert-viewer-crash	2013-07-23 14:52:23.000000000 +0200
++++ evolution-3.8.5/smime/gui/certificate-viewer.c	2013-08-12 09:19:29.826358628 +0200
+@@ -538,7 +538,7 @@ get_window_title (CERTCertificate *cert)
+ 		return title;
+ 	}
+ 
+-	return cert->subjectName;
++	return g_strdup (cert->subjectName);
+ }
+ 
+ GtkWidget *
diff --git a/evolution.spec b/evolution.spec
index 00a54a3..52b5e9e 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 
 Name: evolution
 Version: 3.8.5
-Release: 1%{?dist}
+Release: 2%{?dist}
 Group: Applications/Productivity
 Summary: Mail and calendar client for GNOME
 License: GPLv2+ and GFDL
@@ -51,6 +51,9 @@ Patch01: evolution-1.4.4-ldap-x86_64-hack.patch
 # RH bug #589555
 Patch02: evolution-2.30.1-help-contents.patch
 
+# RH bug #995516
+Patch03: evolution-3.8.5-cert-viewer-crash.patch
+
 ## Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -192,6 +195,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 .cert-viewer-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -517,6 +521,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Mon Aug 12 2013 Milan Crha <mcrha@redhat.com> - 3.8.5-2
+- Add patch for RH bug #995516 (Crash in certificate viewer)
+
 * Sun Aug 11 2013 Matthew Barnes <mbarnes@redhat.com> - 3.8.5-1
 - Update to 3.8.5
 - Remove patches from 3.8.4-2 update (both fixed upstream).