Bug#722250: pu: package telepathy-gabble/0.16.7-0+deb7u1
On Mon, 23 Sep 2013 at 04:40:59 +0200, Cyril Brulebois wrote:
> Simon McVittie <smcv@debian.org> (2013-09-09):
> > I'd like to update telepathy-gabble/wheezy to fix inability to connect
> > to Facebook XMPP chat, for which a fix is on its way to unstable
> > (<http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=721883>).
Proposed debdiff attached, slightly filtered (the Wocky gtk-doc
in the tarball contains random IDs which lead to noise in the diff).
OK to upload?
> FWIW the BTS wants to be told wheezy is affected as well.
Done.
> > The changes are small and targeted, and most of the diffstat is in the
> > regression tests (which we don't install or run in Debian).
>
> I'm not sure how comforting the last bit is. :/
To clarify: I do make sure the tests pass on a Debian system while making
upstream releases, but unfortunately they have a history of failing for
spurious reasons (race conditions in the test itself) even though
the code under test is actually OK, so we (upstream) don't recommend
running them on autobuilders or similar.
I used a wheezy chroot to prepare this particular upstream release, so
the tests were run there while I did that.
In jessie/sid we do install the tests in a new telepathy-gabble-tests
package, which will get DEP-8 metadata eventually.
> > If we're able to work around another Facebook server bug that
> > periodically blanks contacts' nicknames/avatars
> > <http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=722098> without
> > inflating the diff too much, we'll include that in the release too.
This hasn't happened upstream yet, so it can wait.
S
[Filtered to exclude lib/ext/wocky/Changelog and
lib/ext/wocky/docs/reference/html/*.]
ChangeLog | 192 ++++++++++
NEWS | 51 ++
configure | 32 -
configure.ac | 2
debian/changelog | 13
debian/gbp.conf | 4
debian/patches/0001-security-respect-tls-required-flag-on-legacy-Jabber-.patch | 31 -
debian/patches/series | 1
extensions/Makefile.am | 28 -
extensions/Makefile.in | 28 -
lib/ext/wocky/Makefile.in | 4
lib/ext/wocky/compile | 142 -------
lib/ext/wocky/configure | 12
lib/ext/wocky/ltmain.sh | 4
lib/ext/wocky/m4/libtool.m4 | 12
lib/ext/wocky/wocky/wocky-c2s-porter.c | 10
lib/ext/wocky/wocky/wocky-connector.c | 3
ltmain.sh | 4
m4/libtool.m4 | 12
src/gabble.c | 5
tests/twisted/Makefile.am | 2
tests/twisted/Makefile.in | 10
tests/twisted/connect/disco-facebook.py | 51 ++
tests/twisted/gabbletest.py | 2
tests/twisted/jingle-share/test-send-file-send-before-accept.py | 4
tests/twisted/roster/groups.py | 39 +-
tests/twisted/rostertest.py | 17
tests/twisted/tls/legacy-jabber.py | 36 +
tests/twisted/tools/with-session-bus.sh | 6
29 files changed, 484 insertions(+), 273 deletions(-)
diff -Nru telepathy-gabble-0.16.5/ChangeLog telepathy-gabble-0.16.7/ChangeLog
--- telepathy-gabble-0.16.5/ChangeLog 2013-03-01 12:27:05.000000000 +0000
+++ telepathy-gabble-0.16.7/ChangeLog 2013-09-24 10:58:33.000000000 +0100
@@ -1,3 +1,195 @@
+commit c245477666fceb4bc711295a2ac0763ba20bbb65
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-09-24 08:20:17 +0100
+
+ prepare 0.16.7
+
+commit b4c43657db63cbb88ac1c4ee394a636cd8537f84
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-09-09 13:00:30 +0100
+
+ Add a regression test for #68829
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=68829
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+commit 92275e248608d7278829459f34095b22d3cf7c6b
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-09-09 13:23:16 +0100
+
+ Update Wocky for fd.o #68829; update NEWS
+
+commit 42c0c8f2b03a8ac9b94f268d41f379f8773c885f
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-08-06 15:28:30 +0100
+
+ NEWS
+
+commit 08ac84725bdc135e199146f180be2ea474b452c9
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-08-06 15:28:24 +0100
+
+ roster/groups: don't rely on an implementation detail
+
+ Before telepathy-glib 0.20.3 and 0.21.1, we had this incorrect sequence
+ (pseudocode) for each group:
+
+ * NewChannels(the group)
+ * GroupsChanged([the group], added: [...], removed: [])
+ * NewChannels(the group)
+
+ In 0.20.3 and 0.20.1, we removed the second emission of NewChannels.
+ Unfortunately, that broke this test, which was specifically expecting
+ GroupsChanged followed by NewChannels.
+
+ Rather than reversing the assumption, I'm doing it properly, by
+ expecting the events in no particular order.
+
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=67828
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+commit 794a02b84472ddbbadd6f5f920e2c523f68b27fc
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-06-11 14:46:51 +0100
+
+ NEWS for recent changes
+
+commit fa48076ccef7e5c8c4a08a88c399d0dbbb3ac624
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-06-11 14:39:42 +0100
+
+ Avoid having two of the same set of commands run in parallel
+
+ A rule like this:
+
+ _gen/x.c _gen/x.h: prerequisites
+ $(AM_V_GEN)x-generator
+
+ doesn't consider x.c and x.h together. Instead, it expands to two rules,
+ one to generate x.c and one to generate x.h, which happen to run the
+ same commands.
+
+ This means that in the worst case, you can end up running x-generator
+ twice in parallel, and they'll race with each other and overwrite or
+ delete each other's output.
+
+ Based on commit 36c2a545c from telepathy-glib.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=64285
+ Signed-off-by: Simon McVittie <simon.mcvittie@collabora.co.uk>
+ Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
+ Conflicts:
+ extensions/Makefile.am
+
+commit 5a349b2323f8bfd8a5d18c1bc2d79ef14689c0fe
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-06-04 18:34:14 +0100
+
+ Disable unreliable test-case
+
+ It has a race condition or something.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=49595
+ Reviewed-by: Guillaume Desmottes <guillaume.desmottes@collabora.co.uk>
+
+commit 83bb468e0d4b386d88821ba2981f981214e9ebc6
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-06-04 12:40:45 +0100
+
+ Initialize libdbus for thread-safety
+
+ libdbus is not thread-safe by default. This is a long-standing design
+ flaw (<https://bugs.freedesktop.org/show_bug.cgi?id=54972>).
+
+ We call into GIO, which calls into glib-networking, which can
+ (at least in recent versions) invoke libproxy in a thread. libproxy
+ apparently has a Network-Manager plugin, which uses libdbus in that
+ thread; meanwhile, we use libdbus in the main thread and everything
+ goes badly for us.
+
+ (It's possible that this crash is only reproducible with broken
+ connectivity: I wrote this patch on a train, with intermittent
+ mobile broadband coverage.)
+
+ In libdbus < 1.7.4, libraries cannot safely initialize libdbus for
+ multi-threading, because that initialization is not itself
+ thread-safe (!); in particular, glib-networking cannot safely initialize
+ libdbus. So, we have to do it.
+
+ I have written patches to make libdbus thread-safe-by-default, but
+ they haven't all been reviewed and merged yet, and in any case they
+ won't be in a stable libdbus until 1.8. Until then, each application
+ has to discover and fix this bug individually.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65296
+ Reviewed-by: Xavier Claessens <xavier.claessens@collabora.co.uk>
+
+commit 9e7500178fa2395c8955680e5c17c40a4b981407
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-05-30 17:01:16 +0100
+
+ nano version
+
+commit 84a20687c54c84aa61c9f3a606c8eb3bd14a8544
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-05-29 17:31:47 +0100
+
+ Prepare version 0.16.6
+
+commit 1e99c77f8d8a686c4c1714a959c062bda6dc0c44
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-05-29 12:05:09 +0100
+
+ Add a regression test for fd.o #65036
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65036
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+
+commit c1d101558de76e3ebacd05fb032764a126d28468
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-05-28 12:04:44 +0100
+
+ tests: fix JabberAuthenticator when self.emit_events is False
+
+ We don't currently use JabberAuthenticator in this mode, so nobody
+ noticed that it didn't work. I'm about to add a test that does use it.
+
+commit e8623e79ec356d4e72286140aa31656dc87b0567
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-05-29 17:22:51 +0100
+
+ NEWS: update and describe configuration changes for fd.o #65036
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65036
+ Reviewed-by: Will Thompson <will.thompson@collabora.co.uk>
+ [added CVE ID now that we have one -smcv]
+
+commit f35fa75276d6e04ea9f99e2df05a75284be920e8
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-05-29 17:21:00 +0100
+
+ Update Wocky for fd.o #65036
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65036
+
+commit f53ea2d64807cf625ca49f6163b77a36a8282f0d
+Author: Simon McVittie <simon.mcvittie@collabora.co.uk>
+Date: 2013-04-04 16:21:33 +0100
+
+ Merge with-session-bus.sh changes from telepathy-glib
+
+ We also have local changes, which should go "upstream" to telepathy-glib
+ at some point.
+
+ Bug: https://bugs.freedesktop.org/show_bug.cgi?id=63119
+
+commit ff28128c7699b7fee5757a742f07b4cf9c98764c
+Author: Will Thompson <will.thompson@collabora.co.uk>
+Date: 2013-03-01 15:02:50 +0000
+
+ Bump nano-version to 0.16.5.1
+
commit ed05203947880a0f4c45a7f95316e4cc28b23442
Author: Will Thompson <will.thompson@collabora.co.uk>
Date: 2013-03-01 12:24:16 +0000
diff -Nru telepathy-gabble-0.16.5/configure telepathy-gabble-0.16.7/configure
--- telepathy-gabble-0.16.5/configure 2013-03-01 12:24:26.000000000 +0000
+++ telepathy-gabble-0.16.7/configure 2013-09-24 08:35:04.000000000 +0100
@@ -1,6 +1,6 @@
#! /bin/sh
# Guess values for system-dependent variables and create Makefiles.
-# Generated by GNU Autoconf 2.69 for Telepathy Gabble 0.16.5.
+# Generated by GNU Autoconf 2.69 for Telepathy Gabble 0.16.7.
#
# Report bugs to <https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=gabble>.
#
@@ -591,8 +591,8 @@
# Identity of this package.
PACKAGE_NAME='Telepathy Gabble'
PACKAGE_TARNAME='telepathy-gabble'
-PACKAGE_VERSION='0.16.5'
-PACKAGE_STRING='Telepathy Gabble 0.16.5'
+PACKAGE_VERSION='0.16.7'
+PACKAGE_STRING='Telepathy Gabble 0.16.7'
PACKAGE_BUGREPORT='https://bugs.freedesktop.org/enter_bug.cgi?product=Telepathy&component=gabble'
PACKAGE_URL=''
@@ -1413,7 +1413,7 @@
# Omit some internal or obsolete options to make the list less imposing.
# This message is too long to be a string in the A/UX 3.1 sh.
cat <<_ACEOF
-\`configure' configures Telepathy Gabble 0.16.5 to adapt to many kinds of systems.
+\`configure' configures Telepathy Gabble 0.16.7 to adapt to many kinds of systems.
Usage: $0 [OPTION]... [VAR=VALUE]...
@@ -1484,7 +1484,7 @@
if test -n "$ac_init_help"; then
case $ac_init_help in
- short | recursive ) echo "Configuration of Telepathy Gabble 0.16.5:";;
+ short | recursive ) echo "Configuration of Telepathy Gabble 0.16.7:";;
esac
cat <<\_ACEOF
@@ -1643,7 +1643,7 @@
test -n "$ac_init_help" && exit $ac_status
if $ac_init_version; then
cat <<\_ACEOF
-Telepathy Gabble configure 0.16.5
+Telepathy Gabble configure 0.16.7
generated by GNU Autoconf 2.69
Copyright (C) 2012 Free Software Foundation, Inc.
@@ -2012,7 +2012,7 @@
This file contains any messages produced by compilers while
running configure, to aid debugging if configure makes a mistake.
-It was created by Telepathy Gabble $as_me 0.16.5, which was
+It was created by Telepathy Gabble $as_me 0.16.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
$ $0 $@
@@ -2839,7 +2839,7 @@
# Define the identity of the package.
PACKAGE='telepathy-gabble'
- VERSION='0.16.5'
+ VERSION='0.16.7'
cat >>confdefs.h <<_ACEOF
@@ -6158,8 +6158,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -7695,14 +7694,7 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
+ LD="${LD-ld} -m elf_i386"
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -15278,7 +15270,7 @@
# report actual input values of CONFIG_FILES etc. instead of their
# values after options handling.
ac_log="
-This file was extended by Telepathy Gabble $as_me 0.16.5, which was
+This file was extended by Telepathy Gabble $as_me 0.16.7, which was
generated by GNU Autoconf 2.69. Invocation command line was
CONFIG_FILES = $CONFIG_FILES
@@ -15344,7 +15336,7 @@
cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1
ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`"
ac_cs_version="\\
-Telepathy Gabble config.status 0.16.5
+Telepathy Gabble config.status 0.16.7
configured by $0, generated by GNU Autoconf 2.69,
with options \\"\$ac_cs_config\\"
diff -Nru telepathy-gabble-0.16.5/configure.ac telepathy-gabble-0.16.7/configure.ac
--- telepathy-gabble-0.16.5/configure.ac 2013-03-01 12:24:05.000000000 +0000
+++ telepathy-gabble-0.16.7/configure.ac 2013-09-24 08:15:15.000000000 +0100
@@ -9,7 +9,7 @@
m4_define([gabble_major_version], [0])
m4_define([gabble_minor_version], [16])
-m4_define([gabble_micro_version], [5])
+m4_define([gabble_micro_version], [7])
m4_define([gabble_nano_version], [0])
# Some magic
diff -Nru telepathy-gabble-0.16.5/debian/changelog telepathy-gabble-0.16.7/debian/changelog
--- telepathy-gabble-0.16.5/debian/changelog 2013-05-29 17:40:52.000000000 +0100
+++ telepathy-gabble-0.16.7/debian/changelog 2013-09-24 11:20:27.000000000 +0100
@@ -1,3 +1,16 @@
+telepathy-gabble (0.16.7-0+deb7u1) wheezy; urgency=low
+
+ * debian/gbp.conf: switch to wheezy branch
+ * New upstream stable release
+ - drop patch for CVE-2013-1431, fixed upstream
+ - work around Facebook server behaviour change so we don't consider its
+ service discovery response to be spoofed (Closes: #721883)
+ - fix potential FTBFS in highly-parallel builds
+ - initialize libdbus for thread-safety, as a precaution against
+ plugins which might use it in a thread (e.g. libproxy GIO extension)
+
+ -- Simon McVittie <smcv@debian.org> Tue, 24 Sep 2013 11:20:13 +0100
+
telepathy-gabble (0.16.5-1+deb7u1) wheezy-security; urgency=high
* CVE-2013-1431: respect the require-encryption flag on legacy Jabber
diff -Nru telepathy-gabble-0.16.5/debian/gbp.conf telepathy-gabble-0.16.7/debian/gbp.conf
--- telepathy-gabble-0.16.5/debian/gbp.conf 2013-05-29 17:40:52.000000000 +0100
+++ telepathy-gabble-0.16.7/debian/gbp.conf 2013-09-24 11:20:27.000000000 +0100
@@ -1,6 +1,6 @@
[DEFAULT]
-debian-branch = debian
-upstream-branch = upstream
+debian-branch = debian-wheezy
+upstream-branch = upstream-wheezy
pristine-tar = True
[git-buildpackage]
diff -Nru telepathy-gabble-0.16.5/debian/patches/0001-security-respect-tls-required-flag-on-legacy-Jabber-.patch telepathy-gabble-0.16.7/debian/patches/0001-security-respect-tls-required-flag-on-legacy-Jabber-.patch
--- telepathy-gabble-0.16.5/debian/patches/0001-security-respect-tls-required-flag-on-legacy-Jabber-.patch 2013-05-29 17:40:52.000000000 +0100
+++ telepathy-gabble-0.16.7/debian/patches/0001-security-respect-tls-required-flag-on-legacy-Jabber-.patch 1970-01-01 01:00:00.000000000 +0100
@@ -1,31 +0,0 @@
-From: Simon McVittie <simon.mcvittie@collabora.co.uk>
-Date: Mon, 27 May 2013 13:16:22 +0100
-Subject: CVE-2013-1431: respect tls-required flag on legacy Jabber servers
-
-It's checked elsewhere for XMPP 1.0 servers, which can either
-use "old SSL" or perform STARTTLS. Legacy Jabber can only use
-"old SSL", which is similar to https - connect to a separate port,
-typically 5223, and start speaking SSL - so if the connection was
-ever going to be encrypted, by this point it already would be.
-
-Bug: https://bugs.freedesktop.org/show_bug.cgi?id=65036
-Reviewed-by: Sjoerd Simons <sjoerd.simons@collabora.co.uk>
-Origin: upstream, 0.16.6
----
- wocky/wocky-connector.c | 3 +++
- 1 file changed, 3 insertions(+)
-
-diff --git a/lib/ext/wocky/wocky/wocky-connector.c b/lib/ext/wocky/wocky/wocky-connector.c
-index 133b9fd..3287285 100644
---- a/lib/ext/wocky/wocky/wocky-connector.c
-+++ b/lib/ext/wocky/wocky/wocky-connector.c
-@@ -1135,6 +1135,9 @@ xmpp_init_recv_cb (GObject *source,
- if (!priv->legacy_support)
- abort_connect_code (self, WOCKY_CONNECTOR_ERROR_NON_XMPP_V1_SERVER,
- "Server not XMPP 1.0 Compliant");
-+ else if (priv->tls_required && !priv->encrypted)
-+ abort_connect_code (data, WOCKY_CONNECTOR_ERROR_TLS_UNAVAILABLE,
-+ "TLS requested but server is not XMPP 1.0 compliant (try using \"old SSL\")");
- else
- jabber_request_auth (self);
- }
diff -Nru telepathy-gabble-0.16.5/debian/patches/series telepathy-gabble-0.16.7/debian/patches/series
--- telepathy-gabble-0.16.5/debian/patches/series 2013-05-29 17:40:52.000000000 +0100
+++ telepathy-gabble-0.16.7/debian/patches/series 2013-09-24 11:20:27.000000000 +0100
@@ -1 +0,0 @@
-0001-security-respect-tls-required-flag-on-legacy-Jabber-.patch
diff -Nru telepathy-gabble-0.16.5/extensions/Makefile.am telepathy-gabble-0.16.7/extensions/Makefile.am
--- telepathy-gabble-0.16.5/extensions/Makefile.am 2013-03-01 12:11:58.000000000 +0000
+++ telepathy-gabble-0.16.7/extensions/Makefile.am 2013-06-11 14:39:15.000000000 +0100
@@ -62,8 +62,11 @@
$(tools_dir)/doc-generator.xsl \
$< > $@
-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py \
- Makefile.am
+_gen/svc.h: _gen/svc.c
+ @: # do nothing, output as a side-effect
+_gen/svc-gtk-doc.h: _gen/svc.c
+ @: # do nothing, output as a side-effect
+_gen/svc.c: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
--filename=_gen/svc --signal-marshal-prefix=_gabble_ext \
--include='<telepathy-glib/dbus.h>' \
@@ -84,18 +87,25 @@
$(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \
$(GLIB_GENMARSHAL) --body --prefix=_gabble_ext_marshal $< ; } > $@
-_gen/enums.h _gen/enums-gtk-doc.h: _gen/all.xml $(tools_dir)/c-constants-gen.py \
- Makefile.am
+_gen/enums-gtk-doc.h: _gen/enums.h
+ @: # do nothing, output as a side-effect
+_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-gen.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py Gabble $< _gen/enums
-_gen/interfaces.h _gen/interfaces-body.h _gen/interfaces-gtk-doc.h: _gen/all.xml \
- $(tools_dir)/glib-interfaces-gen.py \
- Makefile.am
+_gen/interfaces-body.h: _gen/interfaces.h
+ @: # do nothing, output as a side-effect
+_gen/interfaces-gtk-doc.h: _gen/interfaces.h
+ @: # do nothing, output as a side-effect
+_gen/interfaces.h: _gen/all.xml $(tools_dir)/glib-interfaces-gen.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
Gabble _gen/interfaces-body.h _gen/interfaces.h $<
-_gen/gtypes.h _gen/gtypes-body.h _gen/gtypes-gtk-doc.h: _gen/all.xml \
- $(tools_dir)/glib-gtypes-generator.py Makefile.am
+_gen/gtypes.h: _gen/gtypes-body.h
+ @: # do nothing, output as a side-effect
+_gen/gtypes-gtk-doc.h: _gen/gtypes-body.h
+ @: # do nothing, output as a side-effect
+
+_gen/gtypes-body.h: _gen/all.xml $(tools_dir)/glib-gtypes-generator.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
$< _gen/gtypes Gabble
diff -Nru telepathy-gabble-0.16.5/extensions/Makefile.in telepathy-gabble-0.16.7/extensions/Makefile.in
--- telepathy-gabble-0.16.5/extensions/Makefile.in 2013-03-01 12:24:24.000000000 +0000
+++ telepathy-gabble-0.16.7/extensions/Makefile.in 2013-09-24 08:35:05.000000000 +0100
@@ -628,8 +628,11 @@
$(tools_dir)/doc-generator.xsl \
$< > $@
-_gen/svc.c _gen/svc.h _gen/svc-gtk-doc.h: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py \
- Makefile.am
+_gen/svc.h: _gen/svc.c
+ @: # do nothing, output as a side-effect
+_gen/svc-gtk-doc.h: _gen/svc.c
+ @: # do nothing, output as a side-effect
+_gen/svc.c: _gen/all.xml $(tools_dir)/glib-ginterface-gen.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-ginterface-gen.py \
--filename=_gen/svc --signal-marshal-prefix=_gabble_ext \
--include='<telepathy-glib/dbus.h>' \
@@ -650,18 +653,25 @@
$(AM_V_GEN){ echo '#include "_gen/signals-marshal.h"' && \
$(GLIB_GENMARSHAL) --body --prefix=_gabble_ext_marshal $< ; } > $@
-_gen/enums.h _gen/enums-gtk-doc.h: _gen/all.xml $(tools_dir)/c-constants-gen.py \
- Makefile.am
+_gen/enums-gtk-doc.h: _gen/enums.h
+ @: # do nothing, output as a side-effect
+_gen/enums.h: _gen/all.xml $(tools_dir)/c-constants-gen.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/c-constants-gen.py Gabble $< _gen/enums
-_gen/interfaces.h _gen/interfaces-body.h _gen/interfaces-gtk-doc.h: _gen/all.xml \
- $(tools_dir)/glib-interfaces-gen.py \
- Makefile.am
+_gen/interfaces-body.h: _gen/interfaces.h
+ @: # do nothing, output as a side-effect
+_gen/interfaces-gtk-doc.h: _gen/interfaces.h
+ @: # do nothing, output as a side-effect
+_gen/interfaces.h: _gen/all.xml $(tools_dir)/glib-interfaces-gen.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-interfaces-gen.py \
Gabble _gen/interfaces-body.h _gen/interfaces.h $<
-_gen/gtypes.h _gen/gtypes-body.h _gen/gtypes-gtk-doc.h: _gen/all.xml \
- $(tools_dir)/glib-gtypes-generator.py Makefile.am
+_gen/gtypes.h: _gen/gtypes-body.h
+ @: # do nothing, output as a side-effect
+_gen/gtypes-gtk-doc.h: _gen/gtypes-body.h
+ @: # do nothing, output as a side-effect
+
+_gen/gtypes-body.h: _gen/all.xml $(tools_dir)/glib-gtypes-generator.py Makefile.am
$(AM_V_GEN)$(PYTHON) $(tools_dir)/glib-gtypes-generator.py \
$< _gen/gtypes Gabble
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/ChangeLog telepathy-gabble-0.16.7/lib/ext/wocky/ChangeLog
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/compile telepathy-gabble-0.16.7/lib/ext/wocky/compile
--- telepathy-gabble-0.16.5/lib/ext/wocky/compile 2009-12-22 10:45:43.000000000 +0000
+++ telepathy-gabble-0.16.7/lib/ext/wocky/compile 1970-01-01 01:00:00.000000000 +0100
@@ -1,142 +0,0 @@
-#! /bin/sh
-# Wrapper for compilers which do not understand `-c -o'.
-
-scriptversion=2005-05-14.22
-
-# Copyright (C) 1999, 2000, 2003, 2004, 2005 Free Software Foundation, Inc.
-# Written by Tom Tromey <tromey@cygnus.com>.
-#
-# This program is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# This program is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with this program; if not, write to the Free Software
-# Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA.
-
-# As a special exception to the GNU General Public License, if you
-# distribute this file as part of a program that contains a
-# configuration script generated by Autoconf, you may include it under
-# the same distribution terms that you use for the rest of that program.
-
-# This file is maintained in Automake, please report
-# bugs to <bug-automake@gnu.org> or send patches to
-# <automake-patches@gnu.org>.
-
-case $1 in
- '')
- echo "$0: No command. Try \`$0 --help' for more information." 1>&2
- exit 1;
- ;;
- -h | --h*)
- cat <<\EOF
-Usage: compile [--help] [--version] PROGRAM [ARGS]
-
-Wrapper for compilers which do not understand `-c -o'.
-Remove `-o dest.o' from ARGS, run PROGRAM with the remaining
-arguments, and rename the output as expected.
-
-If you are trying to build a whole package this is not the
-right script to run: please start by reading the file `INSTALL'.
-
-Report bugs to <bug-automake@gnu.org>.
-EOF
- exit $?
- ;;
- -v | --v*)
- echo "compile $scriptversion"
- exit $?
- ;;
-esac
-
-ofile=
-cfile=
-eat=
-
-for arg
-do
- if test -n "$eat"; then
- eat=
- else
- case $1 in
- -o)
- # configure might choose to run compile as `compile cc -o foo foo.c'.
- # So we strip `-o arg' only if arg is an object.
- eat=1
- case $2 in
- *.o | *.obj)
- ofile=$2
- ;;
- *)
- set x "$@" -o "$2"
- shift
- ;;
- esac
- ;;
- *.c)
- cfile=$1
- set x "$@" "$1"
- shift
- ;;
- *)
- set x "$@" "$1"
- shift
- ;;
- esac
- fi
- shift
-done
-
-if test -z "$ofile" || test -z "$cfile"; then
- # If no `-o' option was seen then we might have been invoked from a
- # pattern rule where we don't need one. That is ok -- this is a
- # normal compilation that the losing compiler can handle. If no
- # `.c' file was seen then we are probably linking. That is also
- # ok.
- exec "$@"
-fi
-
-# Name of file we expect compiler to create.
-cofile=`echo "$cfile" | sed -e 's|^.*/||' -e 's/\.c$/.o/'`
-
-# Create the lock directory.
-# Note: use `[/.-]' here to ensure that we don't use the same name
-# that we are using for the .o file. Also, base the name on the expected
-# object file name, since that is what matters with a parallel build.
-lockdir=`echo "$cofile" | sed -e 's|[/.-]|_|g'`.d
-while true; do
- if mkdir "$lockdir" >/dev/null 2>&1; then
- break
- fi
- sleep 1
-done
-# FIXME: race condition here if user kills between mkdir and trap.
-trap "rmdir '$lockdir'; exit 1" 1 2 15
-
-# Run the compile.
-"$@"
-ret=$?
-
-if test -f "$cofile"; then
- mv "$cofile" "$ofile"
-elif test -f "${cofile}bj"; then
- mv "${cofile}bj" "$ofile"
-fi
-
-rmdir "$lockdir"
-exit $ret
-
-# Local Variables:
-# mode: shell-script
-# sh-indentation: 2
-# eval: (add-hook 'write-file-hooks 'time-stamp)
-# time-stamp-start: "scriptversion="
-# time-stamp-format: "%:y-%02m-%02d.%02H"
-# time-stamp-end: "$"
-# End:
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/configure telepathy-gabble-0.16.7/lib/ext/wocky/configure
--- telepathy-gabble-0.16.5/lib/ext/wocky/configure 2013-03-01 08:57:11.000000000 +0000
+++ telepathy-gabble-0.16.7/lib/ext/wocky/configure 2013-09-24 08:35:11.000000000 +0100
@@ -4798,8 +4798,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
@@ -6336,14 +6335,7 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
+ LD="${LD-ld} -m elf_i386"
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/api-index-full.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/api-index-full.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/ch01.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/ch01.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/index.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/index.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/object-tree.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/object-tree.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/WockyAuthRegistry.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/WockyBareContact.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/WockyBareContact.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/WockyCapsCache.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/WockyCapsCache.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/WockyContact.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/WockyContact.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky.devhelp2 telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky.devhelp2
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/WockyDiscoIdentity.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/WockyDiscoIdentity.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/WockyNodeTree.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/WockyNodeTree.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/WockyPubsubNode.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/WockyPubsubNode.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/WockyResourceContact.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/WockyResourceContact.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/WockySession.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/WockySession.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyAuthHandler.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-auth-registry-enumtypes.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyC2SPorter.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyCapsHash.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyCapsHash.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-connector-enumtypes.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyConnector.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyContactFactory.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyContactFactory.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-data-form-enumtypes.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyDataForm.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-debug.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-heartbeat-source.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-http-proxy.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-digest.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyJabberAuth.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-jabber-auth-password.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyMetaPorter.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-muc-enumtypes.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-muc-enumtypes.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyMuc.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-namespaces.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyNode.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-Wocky-OpenSSL-TLS.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-Wocky-OpenSSL-TLS.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyPepService.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyPepService.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyPing.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyPing.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyPorter.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-helpers.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-helpers.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-enumtypes.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-enumtypes.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-protected.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-node-protected.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-enumtypes.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-enumtypes.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyPubsubService.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyPubsubService.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-protected.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-pubsub-service-protected.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyRoster.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyRoster.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockySaslAuth.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockySaslAuth.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-digest-md5.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-digest-md5.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-plain.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-scram.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-sasl-utils.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyStanza.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyTLSConnector.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-tls-enumtypes.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyTLSHandler.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-utils.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyXmppConnection.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error-enumtypes.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-error.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-wocky-xmpp-reader-enumtypes.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyXmppReader.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyXmppReader.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/docs/reference/html/wocky-WockyXmppWriter.html telepathy-gabble-0.16.7/lib/ext/wocky/docs/reference/html/wocky-WockyXmppWriter.html
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/ltmain.sh telepathy-gabble-0.16.7/lib/ext/wocky/ltmain.sh
--- telepathy-gabble-0.16.5/lib/ext/wocky/ltmain.sh 2012-12-06 16:31:45.000000000 +0000
+++ telepathy-gabble-0.16.7/lib/ext/wocky/ltmain.sh 2013-09-24 08:35:09.000000000 +0100
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.2"
+VERSION="2.4.2 Debian-2.4.2-1.1"
TIMESTAMP=""
package_revision=1.3337
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/m4/libtool.m4 telepathy-gabble-0.16.7/lib/ext/wocky/m4/libtool.m4
--- telepathy-gabble-0.16.5/lib/ext/wocky/m4/libtool.m4 2012-12-06 16:31:45.000000000 +0000
+++ telepathy-gabble-0.16.7/lib/ext/wocky/m4/libtool.m4 2013-09-24 08:35:09.000000000 +0100
@@ -1324,14 +1324,7 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
+ LD="${LD-ld} -m elf_i386"
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -1695,8 +1688,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/Makefile.in telepathy-gabble-0.16.7/lib/ext/wocky/Makefile.in
--- telepathy-gabble-0.16.5/lib/ext/wocky/Makefile.in 2013-03-01 08:57:12.000000000 +0000
+++ telepathy-gabble-0.16.7/lib/ext/wocky/Makefile.in 2013-09-24 08:35:13.000000000 +0100
@@ -53,8 +53,8 @@
DIST_COMMON = README $(am__configure_deps) $(srcdir)/Makefile.am \
$(srcdir)/Makefile.in $(srcdir)/config.h.in \
$(top_srcdir)/configure $(top_srcdir)/rules/lcov.mak AUTHORS \
- COPYING ChangeLog INSTALL NEWS compile config.guess config.sub \
- depcomp install-sh ltmain.sh missing
+ COPYING ChangeLog INSTALL NEWS config.guess config.sub depcomp \
+ install-sh ltmain.sh missing
subdir = .
ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
am__aclocal_m4_deps = $(top_srcdir)/m4/as-compiler-flag.m4 \
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/wocky/wocky-c2s-porter.c telepathy-gabble-0.16.7/lib/ext/wocky/wocky/wocky-c2s-porter.c
--- telepathy-gabble-0.16.5/lib/ext/wocky/wocky/wocky-c2s-porter.c 2013-03-01 08:53:00.000000000 +0000
+++ telepathy-gabble-0.16.7/lib/ext/wocky/wocky/wocky-c2s-porter.c 2013-09-09 12:23:28.000000000 +0100
@@ -858,6 +858,16 @@
goto finally;
}
+ /* If we sent an IQ to the server itself, allow it to
+ * omit 'from' in its reply, which is normally used
+ * for messages from the server on behalf of our own
+ * account (as of 2013-09-02, the Facebook beta server
+ * does this). See fd.o #68829 */
+
+ if (from == NULL && !wocky_strdiff (should_be_from, self->priv->domain)) {
+ goto finally;
+ }
+
/* if we sent an IQ to our full or bare JID, allow our server to omit 'to'
* in the reply (Prosody 0.6.1 does this with the resulting error if we
* send disco#info to our own bare JID), or to use our full JID. */
diff -Nru telepathy-gabble-0.16.5/lib/ext/wocky/wocky/wocky-connector.c telepathy-gabble-0.16.7/lib/ext/wocky/wocky/wocky-connector.c
--- telepathy-gabble-0.16.5/lib/ext/wocky/wocky/wocky-connector.c 2013-03-01 08:53:00.000000000 +0000
+++ telepathy-gabble-0.16.7/lib/ext/wocky/wocky/wocky-connector.c 2013-05-27 13:16:15.000000000 +0100
@@ -1135,6 +1135,9 @@
if (!priv->legacy_support)
abort_connect_code (self, WOCKY_CONNECTOR_ERROR_NON_XMPP_V1_SERVER,
"Server not XMPP 1.0 Compliant");
+ else if (priv->tls_required && !priv->encrypted)
+ abort_connect_code (data, WOCKY_CONNECTOR_ERROR_TLS_UNAVAILABLE,
+ "TLS requested but server is not XMPP 1.0 compliant (try using \"old SSL\")");
else
jabber_request_auth (self);
}
diff -Nru telepathy-gabble-0.16.5/ltmain.sh telepathy-gabble-0.16.7/ltmain.sh
--- telepathy-gabble-0.16.5/ltmain.sh 2012-12-06 16:31:32.000000000 +0000
+++ telepathy-gabble-0.16.7/ltmain.sh 2013-09-24 08:35:01.000000000 +0100
@@ -70,7 +70,7 @@
# compiler: $LTCC
# compiler flags: $LTCFLAGS
# linker: $LD (gnu? $with_gnu_ld)
-# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.2
+# $progname: (GNU libtool) 2.4.2 Debian-2.4.2-1.1
# automake: $automake_version
# autoconf: $autoconf_version
#
@@ -80,7 +80,7 @@
PROGRAM=libtool
PACKAGE=libtool
-VERSION="2.4.2 Debian-2.4.2-1.2"
+VERSION="2.4.2 Debian-2.4.2-1.1"
TIMESTAMP=""
package_revision=1.3337
diff -Nru telepathy-gabble-0.16.5/m4/libtool.m4 telepathy-gabble-0.16.7/m4/libtool.m4
--- telepathy-gabble-0.16.5/m4/libtool.m4 2012-12-06 16:31:33.000000000 +0000
+++ telepathy-gabble-0.16.7/m4/libtool.m4 2013-09-24 08:35:01.000000000 +0100
@@ -1324,14 +1324,7 @@
LD="${LD-ld} -m elf_i386_fbsd"
;;
x86_64-*linux*)
- case `/usr/bin/file conftest.o` in
- *x86-64*)
- LD="${LD-ld} -m elf32_x86_64"
- ;;
- *)
- LD="${LD-ld} -m elf_i386"
- ;;
- esac
+ LD="${LD-ld} -m elf_i386"
;;
ppc64-*linux*|powerpc64-*linux*)
LD="${LD-ld} -m elf32ppclinux"
@@ -1695,8 +1688,7 @@
;;
*)
lt_cv_sys_max_cmd_len=`(getconf ARG_MAX) 2> /dev/null`
- if test -n "$lt_cv_sys_max_cmd_len" && \
- test undefined != "$lt_cv_sys_max_cmd_len"; then
+ if test -n "$lt_cv_sys_max_cmd_len"; then
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \/ 4`
lt_cv_sys_max_cmd_len=`expr $lt_cv_sys_max_cmd_len \* 3`
else
diff -Nru telepathy-gabble-0.16.5/NEWS telepathy-gabble-0.16.7/NEWS
--- telepathy-gabble-0.16.5/NEWS 2013-03-01 12:13:04.000000000 +0000
+++ telepathy-gabble-0.16.7/NEWS 2013-09-24 08:20:05.000000000 +0100
@@ -1,3 +1,54 @@
+telepathy-gabble 0.16.7 (2013-09-24)
+====================================
+
+The “chocolate fridge cake” release.
+
+Known incompatibilities:
+
+• The regression tests (make check/make distcheck) will not work if
+ the build system is refreshed with Automake 1.13 or later.
+ This is fixed in 0.18.x and newer branches. All tarball releases from this
+ branch should be made using Automake 1.12 or older.
+
+Fixes:
+
+• update Wocky:
+ · fd.o #68829: If we send an IQ to a server allow "from" to be empty
+ (David Edmundson)
+
+• fd.o #65296: initialize libdbus for thread-safety (Simon)
+
+• fd.o #49595: disable an unreliable test-case (Simon)
+
+• fd.o #64285: avoid running the same commands twice in parallel when doing a
+ highly parallel build (Simon)
+
+• fd.o #67828: fix a test failure with telepathy-glib 0.20.3/0.21.1 or later
+ (Simon)
+
+telepathy-gabble 0.16.6 (2013-05-30)
+====================================
+
+The “repeated gas boiler replacement” release.
+
+This release fixes a man-in-the-middle attack. You should upgrade.
+
+If you use an unencrypted connection to a "legacy Jabber" (pre-XMPP)
+server, this version of Gabble will not connect until you make
+one of these configuration changes:
+
+• upgrade the server software to something that supports XMPP 1.0; or
+• use an encrypted "old SSL" connection, typically on port 5223 (old-ssl); or
+• turn off "Encryption required (TLS/SSL)" (require-encryption)
+
+Fixes:
+
+• fd.o #65036 (CVE-2013-1431): update Wocky to respect the tls-required
+ flag on legacy Jabber servers (Simon)
+
+• fd.o #63119: improve regression tests' isolation from the session bus
+ (Simon)
+
telepathy-gabble 0.16.5 (2013-03-01)
====================================
diff -Nru telepathy-gabble-0.16.5/src/gabble.c telepathy-gabble-0.16.7/src/gabble.c
--- telepathy-gabble-0.16.5/src/gabble.c 2013-03-01 12:11:59.000000000 +0000
+++ telepathy-gabble-0.16.7/src/gabble.c 2013-06-11 14:41:15.000000000 +0100
@@ -25,6 +25,8 @@
# include <unistd.h>
#endif
+#include <dbus/dbus.h>
+
#include <glib/gstdio.h>
#include <telepathy-glib/debug.h>
@@ -116,6 +118,9 @@
g_thread_init (NULL);
#endif
+ if (!dbus_threads_init_default ())
+ g_error ("Unable to initialize libdbus thread-safety (out of memory?)");
+
g_type_init ();
wocky_init ();
}
diff -Nru telepathy-gabble-0.16.5/tests/twisted/connect/disco-facebook.py telepathy-gabble-0.16.7/tests/twisted/connect/disco-facebook.py
--- telepathy-gabble-0.16.5/tests/twisted/connect/disco-facebook.py 1970-01-01 01:00:00.000000000 +0100
+++ telepathy-gabble-0.16.7/tests/twisted/connect/disco-facebook.py 2013-09-09 13:23:36.000000000 +0100
@@ -0,0 +1,51 @@
+"""
+Test that Gabble is tolerant of non-RFC-compliance from Facebook.
+https://bugs.freedesktop.org/show_bug.cgi?id=68829
+"""
+
+from gabbletest import exec_test, XmppXmlStream
+import constants as cs
+import ns
+
+from twisted.words.xish import xpath
+
+def test(q, bus, conn, stream):
+ conn.Connect()
+
+ # everything is fine and actually very boring
+ q.expect('dbus-signal', signal='StatusChanged',
+ args=[cs.CONN_STATUS_CONNECTING, cs.CSR_REQUESTED]),
+ q.expect('dbus-signal', signal='StatusChanged',
+ args=[cs.CONN_STATUS_CONNECTED, cs.CSR_REQUESTED])
+
+class XmppXmlStreamFacebook201309(XmppXmlStream):
+ """As of 2013-09, a new version of Facebook's XMPP server (used
+ consistently for beta.chat.facebook.com, and gradually being rolled out
+ for chat.facebook.com users) omits the 'from' attribute in its disco
+ reply. The disco reply is otherwise correct.
+ """
+
+ def _cb_disco_iq(self, iq):
+ nodes = xpath.queryForNodes(
+ "/iq/query[@xmlns='" + ns.DISCO_INFO + "']", iq)
+ query = nodes[0]
+
+ for feature in self.disco_features:
+ query.addChild(elem('feature', var=feature))
+
+ iq['type'] = 'result'
+
+ # The Facebook server's IQ responses have neither 'from' nor 'to'
+ try:
+ del iq['from']
+ except KeyError:
+ pass
+ try:
+ del iq['to']
+ except KeyError:
+ pass
+
+ self.send(iq)
+
+if __name__ == '__main__':
+ exec_test(test, protocol=XmppXmlStreamFacebook201309, do_connect=False)
diff -Nru telepathy-gabble-0.16.5/tests/twisted/gabbletest.py telepathy-gabble-0.16.7/tests/twisted/gabbletest.py
--- telepathy-gabble-0.16.5/tests/twisted/gabbletest.py 2013-03-01 12:11:59.000000000 +0000
+++ telepathy-gabble-0.16.7/tests/twisted/gabbletest.py 2013-05-29 17:22:53.000000000 +0100
@@ -160,7 +160,7 @@
self._event_func(Event('auth-second-iq', authenticator=self,
iq=iq, id=iq["id"]))
else:
- self.respondToSecondIq(self, iq)
+ self.respondToSecondIq(iq)
def respondToSecondIq(self, iq):
username = xpath.queryForNodes('/iq/query/username', iq)
diff -Nru telepathy-gabble-0.16.5/tests/twisted/jingle-share/test-send-file-send-before-accept.py telepathy-gabble-0.16.7/tests/twisted/jingle-share/test-send-file-send-before-accept.py
--- telepathy-gabble-0.16.5/tests/twisted/jingle-share/test-send-file-send-before-accept.py 2013-03-01 12:11:59.000000000 +0000
+++ telepathy-gabble-0.16.7/tests/twisted/jingle-share/test-send-file-send-before-accept.py 2013-06-06 13:44:44.000000000 +0100
@@ -7,6 +7,10 @@
print "NOTE: built with --disable-file-transfer or --disable-voip"
raise SystemExit(77)
+print("FIXME: test is not stable enough.\n" +
+ " https://bugs.freedesktop.org/show_bug.cgi?id=49595";)
+raise SystemExit(77)
+
class SendFileBeforeAccept(SendFileTest):
def __init__(self, file, address_type,
access_control, acces_control_param):
diff -Nru telepathy-gabble-0.16.5/tests/twisted/Makefile.am telepathy-gabble-0.16.7/tests/twisted/Makefile.am
--- telepathy-gabble-0.16.5/tests/twisted/Makefile.am 2013-03-01 12:11:59.000000000 +0000
+++ telepathy-gabble-0.16.7/tests/twisted/Makefile.am 2013-09-09 13:23:36.000000000 +0100
@@ -21,6 +21,7 @@
client-types.py \
cm/protocol.py \
connect/disco-error-from-bare-jid.py \
+ connect/disco-facebook.py \
connect/disconnect-timeout.py \
connect/disco-no-reply.py \
connect/network-error.py \
@@ -120,6 +121,7 @@
text/test-text-delayed.py \
text/test-text-no-body.py \
text/test-text.py \
+ tls/legacy-jabber.py \
tls/server-tls-channel.py \
version.py \
$(NULL)
diff -Nru telepathy-gabble-0.16.5/tests/twisted/Makefile.in telepathy-gabble-0.16.7/tests/twisted/Makefile.in
--- telepathy-gabble-0.16.5/tests/twisted/Makefile.in 2013-03-01 12:24:25.000000000 +0000
+++ telepathy-gabble-0.16.7/tests/twisted/Makefile.in 2013-09-24 08:35:05.000000000 +0100
@@ -167,7 +167,7 @@
caps_helper.py caps/initial-caps.py caps/jingle-caps.py \
caps/offline.py caps/receive-jingle.py caps/trust-thyself.py \
caps/tube-caps.py client-types.py cm/protocol.py \
- connect/disco-error-from-bare-jid.py \
+ connect/disco-error-from-bare-jid.py connect/disco-facebook.py \
connect/disconnect-timeout.py connect/disco-no-reply.py \
connect/network-error.py connect/stream-closed.py \
connect/test-connection-params.py connect/test-fail.py \
@@ -213,7 +213,7 @@
text/send-error.py text/send-to-correct-resource.py \
text/test-chat-state.py text/test-text-delayed.py \
text/test-text-no-body.py text/test-text.py \
- tls/server-tls-channel.py version.py \
+ tls/legacy-jabber.py tls/server-tls-channel.py version.py \
file-transfer/test-caps-file-transfer.py \
file-transfer/test-ibb-too-early.py \
file-transfer/test-receive-file-and-close-socket-while-receiving.py \
@@ -467,7 +467,7 @@
caps/initial-caps.py caps/jingle-caps.py caps/offline.py \
caps/receive-jingle.py caps/trust-thyself.py caps/tube-caps.py \
client-types.py cm/protocol.py \
- connect/disco-error-from-bare-jid.py \
+ connect/disco-error-from-bare-jid.py connect/disco-facebook.py \
connect/disconnect-timeout.py connect/disco-no-reply.py \
connect/network-error.py connect/stream-closed.py \
connect/test-connection-params.py connect/test-fail.py \
@@ -513,8 +513,8 @@
text/send-error.py text/send-to-correct-resource.py \
text/test-chat-state.py text/test-text-delayed.py \
text/test-text-no-body.py text/test-text.py \
- tls/server-tls-channel.py version.py $(NULL) \
- $(TWISTED_FT_TESTS) $(TWISTED_TUBE_TESTS) \
+ tls/legacy-jabber.py tls/server-tls-channel.py version.py \
+ $(NULL) $(TWISTED_FT_TESTS) $(TWISTED_TUBE_TESTS) \
$(TWISTED_JINGLE_TESTS) $(TWISTED_VCARD_TESTS)
TWISTED_TUBE_TESTS = \
tubes/accept-muc-dbus-tube.py \
diff -Nru telepathy-gabble-0.16.5/tests/twisted/roster/groups.py telepathy-gabble-0.16.7/tests/twisted/roster/groups.py
--- telepathy-gabble-0.16.5/tests/twisted/roster/groups.py 2013-03-01 12:11:59.000000000 +0000
+++ telepathy-gabble-0.16.7/tests/twisted/roster/groups.py 2013-08-06 15:19:09.000000000 +0100
@@ -53,24 +53,35 @@
stream.send(event.stanza)
- # slight implementation detail: TpBaseContactList emits ContactsChanged
- # etc. before it announces its channels, and it emits one CGC per group.
- s1, s2 = q.expect_many(
- EventPattern('dbus-signal', signal='GroupsChanged',
- interface=cs.CONN_IFACE_CONTACT_GROUPS, path=conn.object_path,
- predicate=lambda e: 'women' in e.args[1]),
- EventPattern('dbus-signal', signal='GroupsChanged',
- interface=cs.CONN_IFACE_CONTACT_GROUPS, path=conn.object_path,
- predicate=lambda e: 'men' in e.args[1]),
- )
+ # Avoid relying on the implementation detail of exactly when
+ # TpBaseContactList emits ContactsChanged, relative to when it
+ # announces its channels. Prior to 0.20.3, 0.21.1 it would
+ # announce the channels, emit GroupsChanged, then announce the channels
+ # again... which was a bug, but it turned out this test relied on it.
+ #
+ # We do still rely on the implementation detail that we emit GroupsChanged
+ # once per group with all of its members, not once per contact with all
+ # of their groups. On a typical contact list, there are more contacts
+ # than groups, so that'll work out smaller.
+
+ pairs, groups_changed = expect_contact_list_signals(q, bus, conn, [],
+ ['men', 'women'],
+ [
+ EventPattern('dbus-signal', signal='GroupsChanged',
+ interface=cs.CONN_IFACE_CONTACT_GROUPS,
+ path=conn.object_path,
+ predicate=lambda e: 'women' in e.args[1]),
+ EventPattern('dbus-signal', signal='GroupsChanged',
+ interface=cs.CONN_IFACE_CONTACT_GROUPS,
+ path=conn.object_path,
+ predicate=lambda e: 'men' in e.args[1]),
+ ])
amy, bob, che = conn.RequestHandles(cs.HT_CONTACT,
['amy@foo.com', 'bob@foo.com', 'che@foo.com'])
- assertEquals([[amy], ['women'], []], s1.args)
- assertEquals([[bob, che], ['men'], []], s2.args)
-
- pairs = expect_contact_list_signals(q, bus, conn, [], ['men', 'women'])
+ assertEquals([[amy], ['women'], []], groups_changed[0].args)
+ assertEquals([[bob, che], ['men'], []], groups_changed[1].args)
q.expect('dbus-signal', signal='ContactListStateChanged',
args=[cs.CONTACT_LIST_STATE_SUCCESS])
diff -Nru telepathy-gabble-0.16.5/tests/twisted/rostertest.py telepathy-gabble-0.16.7/tests/twisted/rostertest.py
--- telepathy-gabble-0.16.5/tests/twisted/rostertest.py 2013-02-26 11:38:52.000000000 +0000
+++ telepathy-gabble-0.16.7/tests/twisted/rostertest.py 2013-08-06 15:19:09.000000000 +0100
@@ -68,10 +68,14 @@
predicate=new_channels_predicate)
)
-def expect_contact_list_signals(q, bus, conn, lists, groups=[]):
+def expect_contact_list_signals(q, bus, conn, lists, groups=[],
+ expect_more=None):
assert lists or groups
- eps = []
+ if expect_more is None:
+ eps = []
+ else:
+ eps = expect_more[:]
for name in lists:
eps.extend(get_contact_list_event_patterns(q, bus, conn,
@@ -83,6 +87,11 @@
events = q.expect_many(*eps)
ret = []
+ more = []
+
+ if expect_more is not None:
+ for ep in expect_more:
+ more.append(events.pop(0))
for name in lists:
old_signal = events.pop(0)
@@ -95,6 +104,10 @@
ret.append((old_signal, new_signal))
assert len(events) == 0
+
+ if expect_more is not None:
+ return ret, more
+
return ret
def check_contact_list_signals(q, bus, conn, signals,
diff -Nru telepathy-gabble-0.16.5/tests/twisted/tls/legacy-jabber.py telepathy-gabble-0.16.7/tests/twisted/tls/legacy-jabber.py
--- telepathy-gabble-0.16.5/tests/twisted/tls/legacy-jabber.py 1970-01-01 01:00:00.000000000 +0100
+++ telepathy-gabble-0.16.7/tests/twisted/tls/legacy-jabber.py 2013-05-29 17:22:53.000000000 +0100
@@ -0,0 +1,36 @@
+"""
+fd.o #65036: connecting to legacy Jabber servers should respect
+ require-encryption
+"""
+
+from servicetest import assertEquals
+from gabbletest import exec_test, JabberXmlStream, JabberAuthenticator
+import constants as cs
+
+JID = 'alice@example.com'
+PASSWORD = 's3kr1t'
+
+def test_require_encryption(q, bus, conn, stream):
+ conn.Connect()
+ q.expect('dbus-signal', signal='StatusChanged',
+ args=[cs.CONN_STATUS_CONNECTING, cs.CSR_REQUESTED])
+
+ # FIXME: arrange to get a better error
+ new = q.expect('dbus-signal', signal='ConnectionError')
+ assertEquals(cs.NETWORK_ERROR, new.args[0])
+
+ q.expect('dbus-signal', signal='StatusChanged',
+ args=[cs.CONN_STATUS_DISCONNECTED, cs.CSR_NETWORK_ERROR])
+
+if __name__ == '__main__':
+ exec_test(test_require_encryption,
+ {
+ 'password': PASSWORD,
+ 'account': JID,
+ 'require-encryption': True,
+ 'old-ssl': False,
+ 'resource': 'legacy-require-encryption',
+ },
+ protocol=JabberXmlStream,
+ authenticator=JabberAuthenticator(JID.split('@')[0], PASSWORD),
+ do_connect=False)
diff -Nru telepathy-gabble-0.16.5/tests/twisted/tools/with-session-bus.sh telepathy-gabble-0.16.7/tests/twisted/tools/with-session-bus.sh
--- telepathy-gabble-0.16.5/tests/twisted/tools/with-session-bus.sh 2013-03-01 12:11:59.000000000 +0000
+++ telepathy-gabble-0.16.7/tests/twisted/tools/with-session-bus.sh 2013-04-04 16:21:38.000000000 +0100
@@ -81,6 +81,12 @@
fi
e=0
+
+# These might be non-null when run from e.g. gnome-terminal 3.8, which uses
+# an activatable service for its windows; we don't want to inherit them either
+unset DBUS_STARTER_ADDRESS
+unset DBUS_STARTER_BUS_TYPE
+
DBUS_SESSION_BUS_ADDRESS="`cat $me-$$.address`"
export DBUS_SESSION_BUS_ADDRESS
Reply to: