Bug#708114: pu: package empathy/3.4.2.3-2+deb7u1
Package: release.debian.org
Severity: normal
Tags: wheezy
User: release.debian.org@packages.debian.org
Usertags: pu
Empathy currently crashes when a Google Talk user tries to edit their
account details, due to poor handling of new fields provided by the server.
The bug is http://bugs.debian.org/706900, reported as grave (which might
be a bit excessive, but it's at least important).
I would like to upload this stable update. It is identical to unstable's
3.4.2.3-3, except for the changelog and the change to gbp.conf (which has
no effect on the binary packages, and makes building from git a bit easier).
I have confirmed that it fixes the bug on a wheezy virtual machine with
task-gnome-desktop, for both of the ways you can add a Google account
(gnome-online-accounts, or directly in Empathy).
Thanks,
S
diffstat for empathy-3.4.2.3 empathy-3.4.2.3
changelog | 9 ++
gbp.conf | 4 -
patches/0002-Fix-crash-when-displaying-google-account-vcard.patch | 33 ++++++++++
patches/series | 1
4 files changed, 45 insertions(+), 2 deletions(-)
diff -Nru empathy-3.4.2.3/debian/changelog empathy-3.4.2.3/debian/changelog
--- empathy-3.4.2.3/debian/changelog 2013-02-02 12:50:58.000000000 +0000
+++ empathy-3.4.2.3/debian/changelog 2013-05-13 09:26:22.000000000 +0100
@@ -1,3 +1,12 @@
+empathy (3.4.2.3-2+deb7u1) stable; urgency=low
+
+ * gbp.conf: set branch to debian-wheezy
+ * Backport patch from upstream 3.8 branch to avoid a crash now that
+ Google Talk vCards can contain a (read-only) <URL> field, which is
+ not flagged as supported in telepathy-gabble. (Closes: #706900)
+
+ -- Simon McVittie <smcv@debian.org> Mon, 13 May 2013 09:25:02 +0100
+
empathy (3.4.2.3-2) unstable; urgency=low
* Apply patch from upstream 3.5.5 to accept Windows Live's TLS certificate,
diff -Nru empathy-3.4.2.3/debian/gbp.conf empathy-3.4.2.3/debian/gbp.conf
--- empathy-3.4.2.3/debian/gbp.conf 2013-02-02 12:50:58.000000000 +0000
+++ empathy-3.4.2.3/debian/gbp.conf 2013-05-13 09:26:22.000000000 +0100
@@ -1,6 +1,6 @@
[DEFAULT]
-debian-branch = debian
-upstream-branch = upstream
+debian-branch = debian-wheezy
+upstream-branch = upstream-wheezy
pristine-tar = True
compression = xz
diff -Nru empathy-3.4.2.3/debian/patches/0002-Fix-crash-when-displaying-google-account-vcard.patch empathy-3.4.2.3/debian/patches/0002-Fix-crash-when-displaying-google-account-vcard.patch
--- empathy-3.4.2.3/debian/patches/0002-Fix-crash-when-displaying-google-account-vcard.patch 1970-01-01 01:00:00.000000000 +0100
+++ empathy-3.4.2.3/debian/patches/0002-Fix-crash-when-displaying-google-account-vcard.patch 2013-05-13 09:26:22.000000000 +0100
@@ -0,0 +1,33 @@
+From: Xavier Claessens <xavier.claessens@collabora.co.uk>
+Date: Tue, 7 May 2013 15:14:48 +0200
+Subject: Fix crash when displaying google account vcard
+
+Origin: backport, commit:add79d54e, 3.8.2
+Backported-by: Simon McVittie <smcv@debian.org>
+Bug-Debian: http://bugs.debian.org/706900
+---
+ libempathy-gtk/empathy-contact-widget.c | 11 +++++++++++
+ 1 file changed, 11 insertions(+)
+
+diff --git a/libempathy-gtk/empathy-contact-widget.c b/libempathy-gtk/empathy-contact-widget.c
+index 5691891..8b37b7d 100644
+--- a/libempathy-gtk/empathy-contact-widget.c
++++ b/libempathy-gtk/empathy-contact-widget.c
+@@ -342,6 +342,17 @@ contact_widget_details_update_edit (EmpathyContactWidget *information)
+ {
+ TpContactInfoField *field = l->data;
+
++ /* For some reason it can happen that the vCard contains fields the CM
++ * claims to be not supported. This is a workaround for gabble bug
++ * https://bugs.freedesktop.org/show_bug.cgi?id=64319. But we shouldn't
++ * crash on buggy CM anyway. */
++ if (get_spec_from_list (specs, field->field_name) == NULL)
++ {
++ DEBUG ("Buggy CM: self's vCard contains %s field but it is not in "
++ "Connection' supported fields", field->field_name);
++ continue;
++ }
++
+ /* make a copy for the details_to_set list */
+ field = tp_contact_info_field_copy (field);
+ DEBUG ("Field %s is in our vCard", field->field_name);
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 2013-02-02 12:50:58.000000000 +0000
+++ empathy-3.4.2.3/debian/patches/series 2013-05-13 09:26:22.000000000 +0100
@@ -1 +1,2 @@
0001-GOA-set-param-extra-certificate-identities-for-Windo.patch
+0002-Fix-crash-when-displaying-google-account-vcard.patch
Reply to: