From 4ddf5c7f97980f53bd1c0a2b05927c74f38f08d5 Mon Sep 17 00:00:00 2001
From: Matthew Barnes <mbarnes@redhat.com>
Date: Wed, 17 Jul 2013 12:15:56 -0400
Subject: [PATCH] Work around a crash caught by -fstack-protector-strong.

---
 evolution-3.9.4-stack-protector-strong-crash.patch | 14 ++++++++++++++
 evolution.spec                                     |  9 ++++++++-
 2 files changed, 22 insertions(+), 1 deletion(-)
 create mode 100644 evolution-3.9.4-stack-protector-strong-crash.patch

diff --git a/evolution-3.9.4-stack-protector-strong-crash.patch b/evolution-3.9.4-stack-protector-strong-crash.patch
new file mode 100644
index 0000000..b510594
--- /dev/null
+++ b/evolution-3.9.4-stack-protector-strong-crash.patch
@@ -0,0 +1,14 @@
+diff -up evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c.stack-protector-strong-crash evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c
+--- evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c.stack-protector-strong-crash	2013-07-07 11:19:47.000000000 -0400
++++ evolution-3.9.4/modules/mail-config/e-mail-config-smtp-backend.c	2013-07-17 12:13:48.981736397 -0400
+@@ -238,8 +238,8 @@ mail_config_smtp_backend_insert_widgets
+ 	priv->user_entry = widget;  /* do not reference */
+ 	gtk_widget_show (widget);
+ 
+-	port = 0;
+-	g_object_get (G_OBJECT (settings), "port", &port, NULL);
++	port = camel_network_settings_get_port (
++		CAMEL_NETWORK_SETTINGS (settings));
+ 
+ 	g_object_bind_property (
+ 		settings, "host",
diff --git a/evolution.spec b/evolution.spec
index 6793bf9..5137253 100644
--- a/evolution.spec
+++ b/evolution.spec
@@ -31,7 +31,7 @@
 
 Name: evolution
 Version: 3.9.4
-Release: 2%{?dist}
+Release: 3%{?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
 
+# GNOME bug #703991
+Patch03: evolution-3.9.4-stack-protector-strong-crash.patch
+
 ## Dependencies ###
 
 Requires: gnome-icon-theme >= %{gnome_icon_theme_version}
@@ -193,6 +196,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 .stack-protector-strong-crash
 
 mkdir -p krb5-fakeprefix/include
 mkdir -p krb5-fakeprefix/lib
@@ -518,6 +522,9 @@ rm -rf $RPM_BUILD_ROOT
 %endif
 
 %changelog
+* Wed Jul 17 2013 Matthew Barnes <mbarnes@redhat.com> - 3.9.4-3
+- Work around a crash caught by -fstack-protector-strong.
+
 * Wed Jul 17 2013 Petr Pisar <ppisar@redhat.com> - 3.9.4-2
 - Perl 5.18 rebuild