Bug#699618: unblock: empathy/3.4.2.3-2
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider:
unblock empathy/3.4.2.3-2
This avoids a TLS certificate warning when connecting to Windows Live
accounts as configured in GNOME Online Accounts, working around a
long-standing misconfiguration by Microsoft. The same change has been
in upstream stable releases, and in experimental, for several months.
I omitted the changelog entry for the -1+build1 pseudo-binNMU, as if it
had been a real binNMU - hopefully that's the right handling of such
uploads? Diffstat below.
Regards,
S
diffstat for empathy-3.4.2.3 empathy-3.4.2.3
changelog | 8 +-
patches/0001-GOA-set-param-extra-certificate-identities-for-Windo.patch | 33 ++++++++++
patches/series | 1
3 files changed, 39 insertions(+), 3 deletions(-)
diff -Nru empathy-3.4.2.3/debian/changelog empathy-3.4.2.3/debian/changelog
--- empathy-3.4.2.3/debian/changelog 2012-08-05 19:38:49.000000000 +0100
+++ empathy-3.4.2.3/debian/changelog 2013-02-02 12:50:58.000000000 +0000
@@ -1,8 +1,10 @@
-empathy (3.4.2.3-1+build1) unstable; urgency=low
+empathy (3.4.2.3-2) unstable; urgency=low
- * No source changes; rebuild with xz compression.
+ * 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)
- -- Michael Biebl <biebl@debian.org> Sun, 05 Aug 2012 20:38:11 +0200
+ -- Simon McVittie <smcv@debian.org> Sat, 02 Feb 2013 12:49:46 +0000
empathy (3.4.2.3-1) unstable; urgency=low
diff -Nru empathy-3.4.2.3/debian/patches/0001-GOA-set-param-extra-certificate-identities-for-Windo.patch empathy-3.4.2.3/debian/patches/0001-GOA-set-param-extra-certificate-identities-for-Windo.patch
--- empathy-3.4.2.3/debian/patches/0001-GOA-set-param-extra-certificate-identities-for-Windo.patch 1970-01-01 01:00:00.000000000 +0100
+++ empathy-3.4.2.3/debian/patches/0001-GOA-set-param-extra-certificate-identities-for-Windo.patch 2013-02-02 12:50:58.000000000 +0000
@@ -0,0 +1,33 @@
+From a046af1f644f0a05a0b8492f6ea47f5958b77428 Mon Sep 17 00:00:00 2001
+From: Guillaume Desmottes <guillaume.desmottes@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 -Nru empathy-3.4.2.3/debian/patches/series empathy-3.4.2.3/debian/patches/series
--- empathy-3.4.2.3/debian/patches/series 2012-06-27 13:05:47.000000000 +0100
+++ empathy-3.4.2.3/debian/patches/series 2013-02-02 12:50:58.000000000 +0000
@@ -0,0 +1 @@
+0001-GOA-set-param-extra-certificate-identities-for-Windo.patch
Reply to: