Bug#688221: unblock: telepathy-mission-control-5/1:5.12.3-1
Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock
Please consider:
unblock telepathy-mission-control-5/1:5.12.3-1
for which the changelog is:
telepathy-mission-control-5 (1:5.12.3-1) unstable; urgency=low
* New upstream stable release
- remove all patches: all applied upstream
- if the user upgraded to Empathy 3 while running MC << 1:5.12.1-3
(most wheezy-as-testing users will fall into this category), complete
Empathy's password migration, avoiding inability to change the
account's password in future (Closes: #687933)
- fix a race condition in starting Mission Control from D-Bus
(Closes: #688215)
-- Simon McVittie <smcv@debian.org> Thu, 20 Sep 2012 13:42:01 +0100
As OK'd by Adam on #687635, this syncs up with the upstream stable branch,
rather than applying a bunch of patches to an older stable-branch release.
Because we were previously applying patches, the most representative diff
is between the patched tree arrived at by applying 1:5.12.1-3's patches,
and the (unpatched) source from 1:5.12.3-1.
I used a patched debdiff which applies 3.0 (quilt) patches before diffing
(wishlist bug filed), and filtered the diff to omit autotools-generated
files, gtk-doc documentation (which is rebuilt in Debian anyway), regression
tests (which are not run in Debian), and the patches themselves.
Regards,
S
diffstat for telepathy-mission-control-5-5.12.1 telepathy-mission-control-5-5.12.3
.pc/applied-patches | 7
ChangeLog | 270 ++++++++++++
NEWS | 38 +
configure.ac | 5
debian/changelog | 13
debian/patches/series | 7
mission-control-plugins/Makefile.am | 6
mission-control-plugins/account-storage.c | 2
mission-control-plugins/mcp-signals-marshal.h | 28 -
server/Makefile.am | 5
server/org.freedesktop.Telepathy.MissionControl5.service.in | 2
src/connectivity-monitor.c | 2
src/mcd-account-manager-default.c | 55 ++
tools/Makefile.am | 10
util/wait-for-name.c | 87 +++
15 files changed, 477 insertions(+), 60 deletions(-)
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/ChangeLog telepathy-mission-control-5-5.12.3/ChangeLog
--- telepathy-mission-control-5-5.12.1/ChangeLog 2012-07-11 11:56:17.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/ChangeLog 2012-09-20 13:22:00.000000000 +0100
@@ -1,3 +1,273 @@
+commit 010ab4ba86f557f89e1ec2045dc9fc5ae71513ad
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-09-20 13:21:47 +0100
+
+ Prepare version 5.12.3
+
+commit 17965ae51796f93771a6444e90f6846639b68a9b
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-09-20 13:21:31 +0100
+
+ Do not distribute mcp-signals-marshal.h, which is generated at build-time
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+commit eaefb264316f206186b2ac7f1f36e6a4692deb3d
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-09-20 12:28:59 +0100
+
+ Default accounts backend: finish password migrations that Empathy 3.0 started
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088
+ Bug-Debian: http://bugs.debian.org/687933
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+commit 5c89fe0b540eaeecd72379f1f2b9da07883425e9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-30 16:53:36 +0100
+
+ Make the gnome-keyring test work again, with modern gnome-keyring
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088
+ Cherry-picked-from: c21e2b09bf4cdda6fb05d64f9198f6db7b776c76
+
+commit dd0eb39c5da72f5f0fae9bfc28072b001044b7bd
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-09-06 18:05:24 +0100
+
+ tools/Makefile.am: be careful not to create empty files in the builddir
+
+ "make distcheck" in an already-out-of-tree build turns out not to
+ work because of this.
+
+ This corresponds to commit beb2d971 in telepathy-glib.
+
+commit 073c5898443755d64752d92b2ac0c1f94581f3e9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-09-06 18:00:05 +0100
+
+ post-release version bump
+
+commit e37277d17d9c7cbbb519e9e881d1582727b3acb2
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-09-06 16:59:40 +0100
+
+ Prepare release
+
+commit 5e1bbe8f891af4d86cb9dfd2f0b36fdfbbb7b2ef
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-09-06 16:40:37 +0100
+
+ Butterfly account migration: migrate the password too, if stored
+
+ Otherwise the upgrade from Debian 6 to 7 forgets MSN passwords, which
+ is not the end of the world, but seems less nice than it could be.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
+
+commit 3ae49c706e93d06131cabf5b4a0421869948ec62
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-09-06 16:43:19 +0100
+
+ Migrate from Butterfly to Haze even if Butterfly is no longer installed
+
+ Mission Control has a bug/design flaw/whatever in which it doesn't
+ know the types of parameters without looking at the corresponding
+ connection manager, which doesn't work if that connection manager has
+ been uninstalled. This turns out to be bad for the upgrade from
+ Debian 6 to Debian 7, which upgrades MC to a version that will
+ perform the migration from Butterfly to Haze, but also uninstalls
+ Butterfly...
+
+ Since we know what the type of 'account' is, with a bit of refactoring
+ we can tell McdAccount that we know it's a string, get its value
+ anyway, and get on with our lives.
+
+ Bug-Debian: http://bugs.debian.org/686835
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
+
+commit 1ce1e32bc7f83b5dfc3b75407e896c7bd7e6cbdb
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-30 18:50:41 +0100
+
+ Default account backend: when deleting passwords, delete the same thing we will look for
+
+ Deleting secrets with param="param-password" isn't a whole lot of use
+ when we save, and look up, param="password".
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088
+ Cherry-picked-from: 1d9e8f5cfb9e7b426a99ae6e16c35c1101d55a91
+
+commit bd56ee0e36a681ee50d3e02d4f158bbc5df462f1
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-30 18:12:06 +0100
+
+ Default account backend: when deleting from the keyring, remove from secrets
+
+ Otherwise we'd just delete it, then (because it's still in secrets)
+ re-commit it!
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088
+ Cherry-picked-from: 16e4507c5001f6f45158ef3d0b46998fa8c1ca2a
+
+commit efc15381535a2d94eeec2b19651302768f65d0ad
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-30 16:03:08 +0100
+
+ _keyring_commit: perform deletions for keys in removed, not in secrets
+
+ 'removed' is essentially a set of (account, key) tuples that should
+ be deleted. What we were doing was:
+
+ foreach account in removed
+ foreach key in secrets[account]
+ delete (account, key)
+
+ which makes little sense - if we have param-password and
+ param-proxy-password and we want to unset Parameters['password'],
+ the current implementation would delete both. This commit changes it to:
+
+ foreach account in removed
+ foreach key in removed[account]
+ delete (account, key)
+
+ which has the advantage of actually making sense.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088
+ Cherry-picked-from: d4ca35cffea9d0093e127e0be633501d22ded35f
+
+commit dbba880903def15bc7bb5fdb9d05ee310f1a5bfe
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-30 18:09:21 +0100
+
+ Default account backend: when deleting, always delete from both places
+
+ Our tracking of whether something is "secret" (in the gnome-keyring) is
+ pretty shaky, and in particular, we can forget that things are meant
+ to be "secret" sometimes (we lose that information when deleting
+ parameters).
+
+ Happily, when we're deleting things, it doesn't actually matter: the
+ right thing to do is clearly to delete from both locations, regardless
+ of where we think it ought to be.
+
+ Similarly, when we're setting a property to a new value, it's appropriate
+ to delete it from both locations, then put it in the right location
+ (only).
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=42088
+ Cherry-picked-from: 5b4954d2c959c4ba7f6c67b7d8e16eaa5ab272dd
+
+commit a5fb89bad8b6fc7498cb7056faea1fdaa44de986
+Author: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+Date: 2012-09-04 13:51:20 +0200
+
+ mcd_connectivity_monitor_is_online: check if we are awake as well
+
+ To be considered as online, we have to be connected to the network *and* not
+ in the proccess of sleeping.
+
+ Fix a race where an account we just disconnected because we are going to sleep
+ is put back online because the monitor was considering us online again.
+
+commit 47f3cb54fcda485e3fbfc9b297dd556a504273b7
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-27 11:49:45 +0100
+
+ NEWS
+
+commit 249a3a81704d7af6426cc58732097056ca482c19
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-27 11:48:04 +0100
+
+ Revert "stop using deprecated tp-glib functions"
+
+ This wasn't really an appropriate change for a stable branch: it
+ introduced code churn without actually fixing a bug. We should
+ ignore deprecation warnings instead.
+
+ This reverts commit 88642511bb9c6f66d2fe4aae1550893eb0d781b2.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Acked-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+
+commit df7276a652ac3f69e330f1fb8d126c229041ace0
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-27 10:50:08 +0100
+
+ Don't warn on deprecated declarations, this is a stable branch.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+
+commit 131248f8e1aec7b47e47e96d33122f4bfbcb66f2
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-14 16:41:45 +0100
+
+ Disable the connectivity GSetting on Android
+
+ There's no immediately obvious way to install GSettings schemas there.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53497
+
+commit 09c0b67148873c65d36afd322712a8a6db7eb7a5
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-08 10:32:58 +0100
+
+ NEWS
+
+commit ad4b94ecd7768bd952cdcba51fd7039f564e6765
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2012-08-07 19:48:09 +0100
+
+ Avoid race between Mission Control's two names by having one wait for the other
+
+ If you do:
+
+ dbus-send --dest=org.freedesktop.Telepathy.MissionControl5 \
+ --type=method_call --print-reply / org.freedesktop.DBus.Peer.Ping & \
+ dbus-send --dest=org.freedesktop.Telepathy.AccountManager \
+ --type=method_call --print-reply / org.freedesktop.DBus.Peer.Ping
+
+ then one or both of the calls will fail because the executable claims
+ one of its bus names, but can't get the other, and exits 1.
+
+ By making one wait for the other, we get the desired behaviour.
+ I've made activating MissionControl5 wait for AccountManager because
+ in MC's current implementation AccountManager is taken last.
+
+ Reviewed-by: Jonny Lamb <jonny.lamb@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=53220
+
+commit fd24dd6521bf9a9bebfcbf0241b3b8129bc90e61
+Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
+Date: 2012-07-19 10:38:20 +0200
+
+ McdAccountStorage: fix altered-one signal
+
+ https://bugs.freedesktop.org/show_bug.cgi?id=52231
+
+commit 329c70f9f63eb25dadeb145225a83d25cecb7eec
+Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
+Date: 2012-07-11 13:03:05 +0200
+
+ start working on version 5.12.2
+
commit e824493e533f7c4ea9ae9066fb29b3298d9a8aa8
Author: Xavier Claessens <xavier.claessens@collabora.co.uk>
Date: 2012-07-11 12:49:04 +0200
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/configure.ac telepathy-mission-control-5-5.12.3/configure.ac
--- telepathy-mission-control-5-5.12.1/configure.ac 2012-07-11 11:55:01.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/configure.ac 2012-09-20 13:21:01.000000000 +0100
@@ -1,7 +1,7 @@
dnl Set the version number to e.g. 5.x.y immediately before a release.
dnl Set the version number to e.g. 5.x.y+ immediately after (this will
dnl enable -Werror).
-AC_INIT([telepathy-mission-control], [5.12.1])
+AC_INIT([telepathy-mission-control], [5.12.3])
AC_CONFIG_MACRO_DIR([m4])
AC_CONFIG_SRCDIR(Makefile.am)
@@ -46,7 +46,7 @@
# else if library source has changed since last release
# increment revision
MCP_LT_CURRENT=3
-MCP_LT_REVISION=1
+MCP_LT_REVISION=3
MCP_LT_AGE=3
AC_SUBST([MCP_LT_CURRENT])
AC_SUBST([MCP_LT_REVISION])
@@ -73,6 +73,7 @@
init-self \
],
[missing-field-initializers \
+ deprecated-declarations \
unused-parameter])
AC_SUBST([ERROR_CFLAGS])
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/debian/changelog telepathy-mission-control-5-5.12.3/debian/changelog
--- telepathy-mission-control-5-5.12.1/debian/changelog 2012-09-06 17:06:48.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/debian/changelog 2012-09-20 13:47:19.000000000 +0100
@@ -1,3 +1,16 @@
+telepathy-mission-control-5 (1:5.12.3-1) unstable; urgency=low
+
+ * New upstream stable release
+ - remove all patches: all applied upstream
+ - if the user upgraded to Empathy 3 while running MC << 1:5.12.1-3
+ (most wheezy-as-testing users will fall into this category), complete
+ Empathy's password migration, avoiding inability to change the
+ account's password in future (Closes: #687933)
+ - fix a race condition in starting Mission Control from D-Bus
+ (Closes: #688215)
+
+ -- Simon McVittie <smcv@debian.org> Thu, 20 Sep 2012 13:42:01 +0100
+
telepathy-mission-control-5 (1:5.12.1-3) unstable; urgency=low
* Add patches from upstream stable release 5.12.2 to fix deletion of
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/debian/patches/series telepathy-mission-control-5-5.12.3/debian/patches/series
--- telepathy-mission-control-5-5.12.1/debian/patches/series 2012-09-06 17:06:48.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/debian/patches/series 2012-09-20 13:47:19.000000000 +0100
@@ -1,7 +0,0 @@
-0001-Revert-stop-using-deprecated-tp-glib-functions.patch
-0010-Default-account-backend-when-deleting-always-delete-.patch
-0011-_keyring_commit-perform-deletions-for-keys-in-remove.patch
-0012-Default-account-backend-when-deleting-from-the-keyri.patch
-0013-Default-account-backend-when-deleting-passwords-dele.patch
-0014-Migrate-from-Butterfly-to-Haze-even-if-Butterfly-is-.patch
-0015-Butterfly-account-migration-migrate-the-password-too.patch
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/mission-control-plugins/account-storage.c telepathy-mission-control-5-5.12.3/mission-control-plugins/account-storage.c
--- telepathy-mission-control-5-5.12.1/mission-control-plugins/account-storage.c 2012-07-11 11:16:54.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/mission-control-plugins/account-storage.c 2012-08-07 18:53:54.000000000 +0100
@@ -158,7 +158,7 @@
*
* Should not be fired until mcp_account_storage_ready() has been called
**/
- signals[ALTERED] = g_signal_new ("altered-one",
+ signals[ALTERED_ONE] = g_signal_new ("altered-one",
type, G_SIGNAL_RUN_LAST, 0, NULL, NULL,
_mcp_marshal_VOID__STRING_STRING, G_TYPE_NONE,
2, G_TYPE_STRING, G_TYPE_STRING);
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/mission-control-plugins/Makefile.am telepathy-mission-control-5-5.12.3/mission-control-plugins/Makefile.am
--- telepathy-mission-control-5-5.12.1/mission-control-plugins/Makefile.am 2012-07-11 11:16:54.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/mission-control-plugins/Makefile.am 2012-09-20 13:17:32.000000000 +0100
@@ -29,7 +29,11 @@
loader.h \
request.h \
request-policy.h \
- mcp-signals-marshal.h
+ $(NULL)
+
+nodist_plugins_include_HEADERS = \
+ mcp-signals-marshal.h \
+ $(NULL)
libmission_control_plugins_la_LDFLAGS = \
-export-symbols-regex "^(mcp_)" \
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/mission-control-plugins/mcp-signals-marshal.h telepathy-mission-control-5-5.12.3/mission-control-plugins/mcp-signals-marshal.h
--- telepathy-mission-control-5-5.12.1/mission-control-plugins/mcp-signals-marshal.h 2012-07-11 11:56:05.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/mission-control-plugins/mcp-signals-marshal.h 1970-01-01 01:00:00.000000000 +0100
@@ -1,28 +0,0 @@
-
-#ifndef ___mcp_marshal_MARSHAL_H__
-#define ___mcp_marshal_MARSHAL_H__
-
-#include <glib-object.h>
-
-G_BEGIN_DECLS
-
-/* VOID:STRING,BOOLEAN (mcp-signals-marshal.list:1) */
-extern void _mcp_marshal_VOID__STRING_BOOLEAN (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-/* VOID:STRING,STRING (mcp-signals-marshal.list:2) */
-extern void _mcp_marshal_VOID__STRING_STRING (GClosure *closure,
- GValue *return_value,
- guint n_param_values,
- const GValue *param_values,
- gpointer invocation_hint,
- gpointer marshal_data);
-
-G_END_DECLS
-
-#endif /* ___mcp_marshal_MARSHAL_H__ */
-
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/NEWS telepathy-mission-control-5-5.12.3/NEWS
--- telepathy-mission-control-5-5.12.1/NEWS 2012-07-11 11:55:01.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/NEWS 2012-09-20 13:20:55.000000000 +0100
@@ -1,3 +1,41 @@
+telepathy-mission-control 5.12.3 (2012-09-20)
+=============================================
+
+The "put it with the other Kryptonite" release.
+
+Fixes:
+
+• Recover from incomplete password migrations caused by upgrading to
+ Empathy 3 while running MC 5.12.1 or older, by deleting the old (MC) copy
+ of the password if Empathy has already copied it (fd.o #42088, Simon)
+• Omit generated file mcp-signals-marshal.h from tarballs (Simon)
+• Fix distcheck in out-of-tree builds (Simon)
+• Backport a patch from 5.13.1 to make the gnome-keyring regression test
+ work with modern gnome-keyring (Simon)
+
+telepathy-mission-control 5.12.2 (2012-09-06)
+=============================================
+
+The "Parasaurolophus" release.
+
+Fixes:
+
+• Passwords are now deleted from gnome-keyring correctly (fd.o #42088, Simon)
+• When migrating Butterfly accounts to Haze, do the migration even if Butterfly
+ isn't installed, and copy the password as well as the username
+ (Debian #686835, Simon)
+• If compiled with UPower support, do not attempt to connect while going
+ to sleep (Guillaume)
+• Set up the altered-one signal for account storage backends correctly
+ (fd.o #52231, Xavier)
+• If service-activated under both names o.fd.Telepathy.MissionControl5
+ and o.fd.Telepathy.AccountManager simultaneously, avoid one or both
+ failing to activate due to a race condition (fd.o #53220, Simon)
+• When built for Android, don't use GSettings (fd.o #53497, Simon)
+• Revert the change from 5.12.1 that stopped using deprecated symbols,
+ which wasn't really necessary for a stable branch; ignore deprecation
+ warnings instead. (Simon)
+
telepathy-mission-control 5.12.1 (2012-07-11)
=============================================
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/.pc/applied-patches telepathy-mission-control-5-5.12.3/.pc/applied-patches
--- telepathy-mission-control-5-5.12.1/.pc/applied-patches 2012-09-20 14:13:46.404522374 +0100
+++ telepathy-mission-control-5-5.12.3/.pc/applied-patches 2012-09-20 14:13:46.576523233 +0100
@@ -1,7 +0,0 @@
-0001-Revert-stop-using-deprecated-tp-glib-functions.patch
-0010-Default-account-backend-when-deleting-always-delete-.patch
-0011-_keyring_commit-perform-deletions-for-keys-in-remove.patch
-0012-Default-account-backend-when-deleting-from-the-keyri.patch
-0013-Default-account-backend-when-deleting-passwords-dele.patch
-0014-Migrate-from-Butterfly-to-Haze-even-if-Butterfly-is-.patch
-0015-Butterfly-account-migration-migrate-the-password-too.patch
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/server/Makefile.am telepathy-mission-control-5-5.12.3/server/Makefile.am
--- telepathy-mission-control-5-5.12.1/server/Makefile.am 2012-07-11 11:16:54.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/server/Makefile.am 2012-09-06 09:09:31.000000000 +0100
@@ -24,7 +24,10 @@
org.freedesktop.Telepathy.AccountManager.service
%.service: %.service.in Makefile
- $(AM_V_GEN)sed -e 's![@]libexecdir[@]!$(libexecdir)!' $< > $@
+ $(AM_V_GEN)sed \
+ -e 's![@]libexecdir[@]!$(libexecdir)!' \
+ -e 's![@]bindir[@]!$(bindir)!' \
+ $< > $@
man8_MANS = mission-control-5.8
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/server/org.freedesktop.Telepathy.MissionControl5.service.in telepathy-mission-control-5-5.12.3/server/org.freedesktop.Telepathy.MissionControl5.service.in
--- telepathy-mission-control-5-5.12.1/server/org.freedesktop.Telepathy.MissionControl5.service.in 2011-01-21 14:27:13.000000000 +0000
+++ telepathy-mission-control-5-5.12.3/server/org.freedesktop.Telepathy.MissionControl5.service.in 2012-09-06 09:09:31.000000000 +0100
@@ -1,3 +1,3 @@
[D-BUS Service]
Name=org.freedesktop.Telepathy.MissionControl5
-Exec=@libexecdir@/mission-control-5
+Exec=@bindir@/mc-wait-for-name --activate org.freedesktop.Telepathy.AccountManager org.freedesktop.Telepathy.MissionControl5
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/src/connectivity-monitor.c telepathy-mission-control-5-5.12.3/src/connectivity-monitor.c
--- telepathy-mission-control-5-5.12.1/src/connectivity-monitor.c 2012-07-11 11:16:54.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/src/connectivity-monitor.c 2012-09-06 10:30:56.000000000 +0100
@@ -465,7 +465,7 @@
{
McdConnectivityMonitorPrivate *priv = connectivity_monitor->priv;
- return priv->connected;
+ return priv->connected && priv->awake;
}
gboolean
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/src/mcd-account-manager-default.c telepathy-mission-control-5-5.12.3/src/mcd-account-manager-default.c
--- telepathy-mission-control-5-5.12.1/src/mcd-account-manager-default.c 2012-09-20 14:13:46.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/src/mcd-account-manager-default.c 2012-09-20 12:29:13.000000000 +0100
@@ -20,7 +20,11 @@
*/
#include "config.h"
+
#include <string.h>
+
+#include <telepathy-glib/telepathy-glib.h>
+
#include "mcd-account-manager-default.h"
#include "mcd-debug.h"
@@ -286,6 +290,57 @@
g_warning ("Unsupported value type for %s.%s", account, name);
}
+ if (!tp_strdiff (param, "password"))
+ {
+ /* Empathy 3.0 was meant to migrate passwords from MC to
+ * itself, but it couldn't complete the migration by
+ * deleting the password from MC, because MC had several
+ * bugs that meant deleting passwords didn't work. To atone
+ * for our past sins, detect an incomplete migration and
+ * complete it. */
+ GnomeKeyringResult empathy_ok =
+ GNOME_KEYRING_RESULT_NO_KEYRING_DAEMON;
+ GnomeKeyringAttributeList *empathy_match =
+ gnome_keyring_attribute_list_new ();
+ GList *empathy_items = NULL;
+
+ gnome_keyring_attribute_list_append_string (empathy_match,
+ "account-id", account);
+ gnome_keyring_attribute_list_append_string (empathy_match,
+ "param-name", "password");
+
+ empathy_ok = gnome_keyring_find_items_sync (
+ GNOME_KEYRING_ITEM_GENERIC_SECRET, empathy_match,
+ &empathy_items);
+
+ if (empathy_ok == GNOME_KEYRING_RESULT_OK &&
+ empathy_items != NULL)
+ {
+ KeyringSetData *ksd = g_slice_new0 (KeyringSetData);
+
+ DEBUG ("An Empathy 3.0 password migration wasn't finished "
+ "due to fd.o #42088. Finishing it now by deleting the "
+ "password for %s", account);
+
+ ksd->account = g_strdup (account);
+ ksd->name = g_strdup ("password");
+ ksd->set = FALSE;
+
+ gnome_keyring_delete_password (&keyring_schema,
+ _keyring_set_cb, ksd, NULL,
+ "account", account,
+ "param", "password",
+ NULL);
+ }
+
+ gnome_keyring_found_list_free (empathy_items);
+
+ /* behave as if it had already been deleted, i.e. we never
+ * actually found it... */
+ param = NULL;
+ value = NULL;
+ }
+
if (param != NULL && value != NULL)
{
gchar *key = g_strdup_printf ("param-%s", param);
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/tools/Makefile.am telepathy-mission-control-5-5.12.3/tools/Makefile.am
--- telepathy-mission-control-5-5.12.1/tools/Makefile.am 2011-01-21 14:27:13.000000000 +0000
+++ telepathy-mission-control-5-5.12.3/tools/Makefile.am 2012-09-06 17:58:01.000000000 +0100
@@ -23,15 +23,15 @@
all: $(EXTRA_DIST)
libglibcodegen.py: libtpcodegen.py
- touch $@
+ $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
glib-client-marshaller-gen.py: libglibcodegen.py
- touch $@
+ $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
glib-ginterface-gen.py: libglibcodegen.py
- touch $@
+ $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
glib-gtypes-generator.py: libglibcodegen.py
- touch $@
+ $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
glib-signals-marshal-gen.py: libglibcodegen.py
- touch $@
+ $(AM_V_GEN)test -e ${srcdir}/$@ && touch ${srcdir}/$@
TELEPATHY_GLIB_SRCDIR = $(top_srcdir)/../telepathy-glib
maintainer-update-from-telepathy-glib:
diff -Nru --exclude aclocal.m4 --exclude config.sub --exclude config.guess --exclude configure --exclude depcomp --exclude ltmain.sh --exclude libtool.m4 --exclude tests --exclude doc --exclude Makefile.in --exclude '*.patch' telepathy-mission-control-5-5.12.1/util/wait-for-name.c telepathy-mission-control-5-5.12.3/util/wait-for-name.c
--- telepathy-mission-control-5-5.12.1/util/wait-for-name.c 2012-07-11 11:16:54.000000000 +0100
+++ telepathy-mission-control-5-5.12.3/util/wait-for-name.c 2012-08-07 19:48:02.000000000 +0100
@@ -4,14 +4,22 @@
* automatically (after a while) by the desktop session.
*
* Usage, in
- * $XDG_DATA_DIRS/dbus-1/services/org.freedesktop.Client.Something.service:
+ * $XDG_DATA_DIRS/dbus-1/services/....Client.Something.service:
*
* [D-BUS Service]
- * Name=org.freedesktop.Telepathy.Client.Something
- * Exec=/usr/lib/mission-control/mc-wait-for-name org.freedesktop.Telepathy.Client.Something
+ * Name=....Client.Something
+ * Exec=/usr/lib/telepathy/mc-wait-for-name ....Client.Something
+ *
+ * Alternatively, it can be used to activate something via an alternative
+ * name, e.g. in
+ * $XDG_DATA_DIRS/dbus-1/services/....AccountManager.service:
+ *
+ * [D-BUS Service]
+ * Name=....AccountManager
+ * Exec=/usr/lib/telepathy/mc-wait-for-name --activate ....MissionControl5 ....AccountManager
*
* Copyright (C) 2009 Nokia Corporation
- * Copyright (C) 2009 Collabora Ltd.
+ * Copyright (C) 2009, 2012 Collabora Ltd.
*
* This library is free software; you can redistribute it and/or
* modify it under the terms of the GNU Lesser General Public
@@ -41,7 +49,7 @@
#include <glib.h>
-#include <telepathy-glib/dbus.h>
+#include <telepathy-glib/telepathy-glib.h>
static int exit_status = EX_SOFTWARE;
static guint timeout_id = 0;
@@ -86,8 +94,48 @@
}
}
+static void
+start_service_cb (TpDBusDaemon *bus_daemon,
+ guint ret,
+ const GError *error,
+ gpointer user_data,
+ GObject *weak_object)
+{
+ GMainLoop *loop = user_data;
+
+ if (error != NULL)
+ {
+ g_message ("%s", error->message);
+ g_main_loop_quit (loop);
+ exit_status = EX_TEMPFAIL;
+ }
+ else
+ {
+ switch (ret)
+ {
+ case 1: /* DBUS_START_REPLY_SUCCESS */
+ g_debug ("activated name successfully started");
+ break;
+
+ case 2: /* DBUS_START_REPLY_ALREADY_RUNNING */
+ g_debug ("activated name already running");
+ break;
+
+ default:
+ g_message ("ignoring unknown result from StartServiceByName: %u", ret);
+ break;
+ }
+ }
+}
+
#define WFN_TIMEOUT (5 * 60) /* 5 minutes */
+static gchar *activate = NULL;
+static GOptionEntry entries[] = {
+ { "activate", 0, 0, G_OPTION_ARG_STRING, &activate, "Activate NAME before waiting for the other name", "NAME" },
+ { NULL }
+};
+
int
main (int argc,
char **argv)
@@ -95,14 +143,33 @@
TpDBusDaemon *bus_daemon;
GMainLoop *loop;
GError *error = NULL;
+ GOptionContext *context;
g_set_prgname ("mc-wait-for-name");
+ context = g_option_context_new ("- wait for a bus name");
+ g_option_context_add_main_entries (context, entries, NULL);
+
+ if (!g_option_context_parse (context, &argc, &argv, &error))
+ {
+ g_message ("%s", error->message);
+ g_error_free (error);
+ return EX_USAGE;
+ }
+
+ if (activate != NULL &&
+ !tp_dbus_check_valid_bus_name (activate, TP_DBUS_NAME_TYPE_WELL_KNOWN,
+ NULL))
+ {
+ g_message ("Not a valid bus name: %s", activate);
+ return EX_USAGE;
+ }
+
if (argc != 2 ||
!tp_dbus_check_valid_bus_name (argv[1], TP_DBUS_NAME_TYPE_WELL_KNOWN,
NULL))
{
- g_message ("Usage: mc-wait-for-name com.example.SomeBusName");
+ g_message ("Usage: mc-wait-for-name [OPTIONS] com.example.SomeBusName");
return EX_USAGE;
}
@@ -117,6 +184,14 @@
}
loop = g_main_loop_new (NULL, FALSE);
+
+ if (activate != NULL)
+ {
+ tp_cli_dbus_daemon_call_start_service_by_name (bus_daemon, -1,
+ activate, 0 /* no flags */, start_service_cb, g_main_loop_ref (loop),
+ (GDestroyNotify) g_main_loop_unref, NULL);
+ }
+
tp_dbus_daemon_watch_name_owner (bus_daemon, argv[1],
noc_cb, g_main_loop_ref (loop), (GDestroyNotify) g_main_loop_unref);
Reply to: