[Pkg-telepathy-commits] [SCM] Empathy packaging branch, debian, updated. debian/3.4.2.3-1-1-g14d736a

[Simon McVittie]

The following commit has been merged in the debian branch:
commit 14d736ac2dfd54cd04f6d53506d661b972f2bdde
Author: Simon McVittie <smcv at debian.org>
Date:   Sat Feb 2 12:49:37 2013 +0000

    Apply patch from upstream 3.5.5 to accept Windows Live's TLS certificate, which is in the name of *.gateway.messenger.live.com rather than the correct messenger.live.com (Closes: #699233)

diff --git a/debian/changelog b/debian/changelog
index e5dc085..52fc677 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+empathy (3.4.2.3-2) UNRELEASED; urgency=low
+
+  * Apply patch from upstream 3.5.5 to accept Windows Live's TLS certificate,
+    which is in the name of *.gateway.messenger.live.com rather than
+    the correct messenger.live.com (Closes: #699233)
+
+ -- Simon McVittie <smcv at debian.org>  Wed, 30 Jan 2013 07:55:01 +0000
+
 empathy (3.4.2.3-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/patches/0001-GOA-set-param-extra-certificate-identities-for-Windo.patch b/debian/patches/0001-GOA-set-param-extra-certificate-identities-for-Windo.patch
new file mode 100644
index 0000000..1e82149
--- /dev/null
+++ b/debian/patches/0001-GOA-set-param-extra-certificate-identities-for-Windo.patch
@@ -0,0 +1,33 @@
+From a046af1f644f0a05a0b8492f6ea47f5958b77428 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes at collabora.co.uk>
+Date: Fri, 3 Aug 2012 10:58:36 +0200
+Subject: [PATCH] GOA: set param-extra-certificate-identities for Windows live
+ accounts
+
+Windows live provides a cert for '*.gateway.messenger.live.com'
+instead of 'messenger.live.com'. It's not great from them but best to accept
+it than confuse users.
+
+Bug: https://bugzilla.gnome.org/show_bug.cgi?id=681079
+Bug-Debian: http://bugs.debian.org/699233
+Origin: upstream, 3.5.5
+---
+ goa-mc-plugin/mcp-account-manager-goa.c |    2 ++
+ 1 file changed, 2 insertions(+)
+
+diff --git a/goa-mc-plugin/mcp-account-manager-goa.c b/goa-mc-plugin/mcp-account-manager-goa.c
+index aa7f7fe..e45059a 100644
+--- a/goa-mc-plugin/mcp-account-manager-goa.c
++++ b/goa-mc-plugin/mcp-account-manager-goa.c
+@@ -150,6 +150,8 @@ get_tp_parameters (GoaAccount *account)
+       PARAM ("param-account", "messenger.live.com");
+       PARAM ("param-require-encryption", "true");
+       PARAM ("param-fallback-servers", "xmpp.messenger.live.com");
++      PARAM ("param-extra-certificate-identities",
++          "*.gateway.messenger.live.com");
+     }
+   else
+     {
+-- 
+1.7.10.4
+
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..21b15ed 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-GOA-set-param-extra-certificate-identities-for-Windo.patch

-- 
Empathy packaging