[empathy/f15] Backport a patch to force encryption for Facebook and GTalk accounts. Backport a patch to set the se

[Brian Pepple]

commit 31f3a2f7052e44aeb06f465a0d92f0e76226d09f
Author: Brian Pepple <bpepple at fedoraproject.org>
Date:   Tue Jul 12 20:09:35 2011 -0400

    Backport a patch to force encryption for Facebook and GTalk accounts.
    Backport a patch to set the server parameter for GTalk.

 empathy.spec                            |   10 ++++++++-
 require-encryption-facebook-gtalk.patch |   33 ++++++++++++++++++++++++++++++
 set-server-parameter-gtalk.patch        |   34 +++++++++++++++++++++++++++++++
 3 files changed, 76 insertions(+), 1 deletions(-)
---
diff --git a/empathy.spec b/empathy.spec
index 6969963..e36d2b1 100644
--- a/empathy.spec
+++ b/empathy.spec
@@ -13,7 +13,7 @@
 
 Name:		empathy
 Version:	3.0.2
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	Instant Messaging Client for GNOME
 
 Group:		Applications/Communications
@@ -23,6 +23,8 @@ URL:		http://live.gnome.org/Empathy
 Source0:	http://download.gnome.org/sources/%{name}/3.0/%{name}-%{version}.tar.bz2
 Source1:	%{name}-README.ConnectionManagers
 Patch0:		%{name}-connect-on-passwd-retrieval.patch
+Patch1:		require-encryption-facebook-gtalk.patch
+Patch2:		set-server-parameter-gtalk.patch
 
 BuildRequires:	enchant-devel >= %{enchant_version}
 BuildRequires:	iso-codes-devel
@@ -81,6 +83,8 @@ It is built on top of the Telepathy framework.
 %prep
 %setup -q
 %patch0 -p1 -b .passwd
+%patch1 -p1 -b .encryption
+%patch2 -p1 -b .gtalk
 # force this to be regenerated
 rm data/empathy.desktop
 
@@ -158,6 +162,10 @@ glib-compile-schemas %{_datadir}/glib-2.0/schemas &> /dev/null || :
 
 
 %changelog
+* Tue Jul 12 2011 Brian Pepple <bpepple at fedoraproject.org> - 3.0.2-3
+- Backport a patch to force encryption for Facebook and GTalk accounts.
+- Backport a patch to set the server parameter for GTalk.
+
 * Wed Jun  8 2011 Brian Pepple <bpepple at fedoraproject.org> - 3.0.2-2
 - Backport patch to fix crash in empathy-accounts. (#698148)
 
diff --git a/require-encryption-facebook-gtalk.patch b/require-encryption-facebook-gtalk.patch
new file mode 100644
index 0000000..8fff076
--- /dev/null
+++ b/require-encryption-facebook-gtalk.patch
@@ -0,0 +1,33 @@
+From 11272824cebc8dfccb045934bf613f3564db5b2c Mon Sep 17 00:00:00 2001
+From: Will Thompson <will.thompson at collabora.co.uk>
+Date: Mon, 27 Jun 2011 16:14:09 +0000
+Subject: Set require-encryption for Facebook and Google Talk
+
+Future versions of Gabble will do this too, but Empathy can make sure
+it's set too.
+---
+diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
+index 6a97de6..46188d4 100644
+--- a/libempathy-gtk/empathy-protocol-chooser.c
++++ b/libempathy-gtk/empathy-protocol-chooser.c
+@@ -602,6 +602,8 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
+           NULL, NULL);
+       empathy_account_settings_set_string (settings, "server",
+           extra_certificate_identities[0]);
++      empathy_account_settings_set_boolean (settings, "require-encryption",
++          TRUE);
+       empathy_account_settings_set_strv (settings, "fallback-servers",
+           fallback_servers);
+ 
+@@ -616,7 +618,8 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
+     {
+       empathy_account_settings_set_icon_name_async (settings, "im-facebook",
+           NULL, NULL);
+-
++      empathy_account_settings_set_boolean (settings, "require-encryption",
++          TRUE);
+       empathy_account_settings_set_string (settings, "server",
+           "chat.facebook.com");
+     }
+--
+cgit v0.9
diff --git a/set-server-parameter-gtalk.patch b/set-server-parameter-gtalk.patch
new file mode 100644
index 0000000..7a0a3a6
--- /dev/null
+++ b/set-server-parameter-gtalk.patch
@@ -0,0 +1,34 @@
+From b1c88e335291d4c29ca385b9bb1dedbc921b797c Mon Sep 17 00:00:00 2001
+From: Will Thompson <will.thompson at collabora.co.uk>
+Date: Mon, 27 Jun 2011 16:03:50 +0000
+Subject: Set 'server' parameter on GTalk accounts.
+
+This stops us depending on properly-configured SRV records.
+'fallback-servers' is not good enough in this situation:
+
+ • foo.com's XMPP stuff is served by Google Apps;
+ • your router breaks SRV requests;
+ • foo.com resolves to 1.2.3.4 which has a (different) XMPP server
+   listening on port 5222.
+
+This may seem far-fetched, but this happened to two completely different
+people, both hosted with Dreamhost.
+
+https://bugzilla.gnome.org/show_bug.cgi?id=653510
+---
+diff --git a/libempathy-gtk/empathy-protocol-chooser.c b/libempathy-gtk/empathy-protocol-chooser.c
+index b2e4314..6a97de6 100644
+--- a/libempathy-gtk/empathy-protocol-chooser.c
++++ b/libempathy-gtk/empathy-protocol-chooser.c
+@@ -600,7 +600,8 @@ empathy_protocol_chooser_create_account_settings (EmpathyProtocolChooser *self)
+ 
+       empathy_account_settings_set_icon_name_async (settings, "im-google-talk",
+           NULL, NULL);
+-
++      empathy_account_settings_set_string (settings, "server",
++          extra_certificate_identities[0]);
+       empathy_account_settings_set_strv (settings, "fallback-servers",
+           fallback_servers);
+ 
+--
+cgit v0.9