Hello community,
here is the log from the commit of package telepathy-haze for openSUSE:Factory
checked in at Fri Sep 4 00:30:41 CEST 2009.
--------
--- GNOME/telepathy-haze/telepathy-haze.changes 2009-07-20 09:41:10.000000000 +0200
+++ telepathy-haze/telepathy-haze.changes 2009-08-26 10:30:11.000000000 +0200
@@ -1,0 +2,21 @@
+Wed Aug 26 10:27:52 CEST 2009 - vuntz@novell.com
+
+- Update to version 0.3.2:
+ + Fixes:
+ - Yahoo! Japan-specific parameters are no longer listed for the
+ 'yahoo' protocol in haze.manager. This fixes bgo#591381. If
+ you're using libpurple 2.6.0 or later, 'yahoojp' will be
+ available as a separate protocol.
+ - The "busy" status is exposed as Busy rather than as Away.
+ This fixes fdo#23441.
+ - Haze now fails gracefully rather than asserting if you try to
+ connect to MSN and your libpurple was built without SSL
+ support. Fixes fdo#22800.
+ + Enhancements:
+ - The Facebook protocol plugin is now special-cased to have a
+ sensible name in the Telepathy API. It seems to work with
+ Empathy 2.27.91 if you delete haze.manager (which will no
+ longer be shipped in a future release when stable releases of
+ clients support it being absent).
+
+-------------------------------------------------------------------
calling whatdependson for head-i586
Old:
----
telepathy-haze-0.3.1.tar.bz2
New:
----
telepathy-haze-0.3.2.tar.bz2
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ telepathy-haze.spec ++++++
--- /var/tmp/diff_new_pack.qhj1Go/_old 2009-09-04 00:29:37.000000000 +0200
+++ /var/tmp/diff_new_pack.qhj1Go/_new 2009-09-04 00:29:37.000000000 +0200
@@ -1,5 +1,5 @@
#
-# spec file for package telepathy-haze (Version 0.3.1)
+# spec file for package telepathy-haze (Version 0.3.2)
#
# Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany.
#
@@ -15,31 +15,24 @@
# Please submit bugfixes or comments via http://bugs.opensuse.org/
#
-# norootforbuild
Url: http://telepathy.freedesktop.org/wiki/
Name: telepathy-haze
-Version: 0.3.1
-Release: 2
+Version: 0.3.2
+Release: 1
License: GPL v2 or later
-BuildRoot: %{_tmppath}/%{name}-%{version}-build
-BuildRequires: telepathy-glib-devel
-BuildRequires: libpurple-devel
-Group: Productivity/Networking/Instant Messenger
Summary: A libpurple connection manager for Telepathy
+Group: Productivity/Networking/Instant Messenger
Source: %{name}-%{version}.tar.bz2
+BuildRequires: libpurple-devel
+BuildRequires: telepathy-glib-devel
+BuildRoot: %{_tmppath}/%{name}-%{version}-build
%description
A connection manager for Telepathy that provide support for AIM, ICQ,
MSN, Yahoo! and Groupwise using Pidgin's libpurple.
-
-
-Authors:
---------
- Will Thompson
-
%prep
%setup -q
@@ -55,7 +48,7 @@
%postun -p /sbin/ldconfig
%clean
-%{__rm} -rf "$RPM_BUILD_ROOT"
+%{__rm} -rf %{buildroot}
%files
%defattr(-,root,root)
++++++ telepathy-haze-0.3.1.tar.bz2 -> telepathy-haze-0.3.2.tar.bz2 ++++++
++++ 13299 lines of diff (skipped)
++++ retrying with extended exclude list
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/INSTALL new/telepathy-haze-0.3.2/INSTALL
--- old/telepathy-haze-0.3.1/INSTALL 2009-06-05 01:00:40.000000000 +0200
+++ new/telepathy-haze-0.3.2/INSTALL 2009-08-25 18:52:26.000000000 +0200
@@ -1,19 +1,16 @@
Installation Instructions
*************************
-Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005,
-2006, 2007, 2008 Free Software Foundation, Inc.
+Copyright (C) 1994, 1995, 1996, 1999, 2000, 2001, 2002, 2004, 2005 Free
+Software Foundation, Inc.
- This file is free documentation; the Free Software Foundation gives
+This file is free documentation; the Free Software Foundation gives
unlimited permission to copy, distribute and modify it.
Basic Installation
==================
- Briefly, the shell commands `./configure; make; make install' should
-configure, build, and install this package. The following
-more-detailed instructions are generic; see the `README' file for
-instructions specific to this package.
+These are generic installation instructions.
The `configure' shell script attempts to guess correct values for
various system-dependent variables used during compilation. It uses
@@ -26,9 +23,9 @@
It can also use an optional file (typically called `config.cache'
and enabled with `--cache-file=config.cache' or simply `-C') that saves
-the results of its tests to speed up reconfiguring. Caching is
+the results of its tests to speed up reconfiguring. (Caching is
disabled by default to prevent problems with accidental use of stale
-cache files.
+cache files.)
If you need to do unusual things to compile the package, please try
to figure out how `configure' could check whether to do them, and mail
@@ -38,17 +35,20 @@
may remove or edit it.
The file `configure.ac' (or `configure.in') is used to create
-`configure' by a program called `autoconf'. You need `configure.ac' if
-you want to change it or regenerate `configure' using a newer version
-of `autoconf'.
+`configure' by a program called `autoconf'. You only need
+`configure.ac' if you want to change it or regenerate `configure' using
+a newer version of `autoconf'.
The simplest way to compile this package is:
1. `cd' to the directory containing the package's source code and type
- `./configure' to configure the package for your system.
+ `./configure' to configure the package for your system. If you're
+ using `csh' on an old version of System V, you might need to type
+ `sh ./configure' instead to prevent `csh' from trying to execute
+ `configure' itself.
- Running `configure' might take a while. While running, it prints
- some messages telling which features it is checking for.
+ Running `configure' takes awhile. While running, it prints some
+ messages telling which features it is checking for.
2. Type `make' to compile the package.
@@ -67,57 +67,42 @@
all sorts of other programs in order to regenerate files that came
with the distribution.
- 6. Often, you can also type `make uninstall' to remove the installed
- files again.
-
Compilers and Options
=====================
- Some systems require unusual options for compilation or linking that
-the `configure' script does not know about. Run `./configure --help'
-for details on some of the pertinent environment variables.
+Some systems require unusual options for compilation or linking that the
+`configure' script does not know about. Run `./configure --help' for
+details on some of the pertinent environment variables.
You can give `configure' initial values for configuration parameters
by setting variables in the command line or in the environment. Here
is an example:
- ./configure CC=c99 CFLAGS=-g LIBS=-lposix
+ ./configure CC=c89 CFLAGS=-O2 LIBS=-lposix
*Note Defining Variables::, for more details.
Compiling For Multiple Architectures
====================================
- You can compile the package for more than one kind of computer at the
+You can compile the package for more than one kind of computer at the
same time, by placing the object files for each architecture in their
-own directory. To do this, you can use GNU `make'. `cd' to the
+own directory. To do this, you must use a version of `make' that
+supports the `VPATH' variable, such as GNU `make'. `cd' to the
directory where you want the object files and executables to go and run
the `configure' script. `configure' automatically checks for the
source code in the directory that `configure' is in and in `..'.
- With a non-GNU `make', it is safer to compile the package for one
-architecture at a time in the source code directory. After you have
-installed the package for one architecture, use `make distclean' before
-reconfiguring for another architecture.
-
- On MacOS X 10.5 and later systems, you can create libraries and
-executables that work on multiple system types--known as "fat" or
-"universal" binaries--by specifying multiple `-arch' options to the
-compiler but only a single `-arch' option to the preprocessor. Like
-this:
-
- ./configure CC="gcc -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CXX="g++ -arch i386 -arch x86_64 -arch ppc -arch ppc64" \
- CPP="gcc -E" CXXCPP="g++ -E"
-
- This is not guaranteed to produce working output in all cases, you
-may have to build one architecture at a time and combine the results
-using the `lipo' tool if you have problems.
+ If you have to use a `make' that does not support the `VPATH'
+variable, you have to compile the package for one architecture at a
+time in the source code directory. After you have installed the
+package for one architecture, use `make distclean' before reconfiguring
+for another architecture.
Installation Names
==================
- By default, `make install' installs the package's commands under
+By default, `make install' installs the package's commands under
`/usr/local/bin', include files under `/usr/local/include', etc. You
can specify an installation prefix other than `/usr/local' by giving
`configure' the option `--prefix=PREFIX'.
@@ -140,7 +125,7 @@
Optional Features
=================
- Some packages pay attention to `--enable-FEATURE' options to
+Some packages pay attention to `--enable-FEATURE' options to
`configure', where FEATURE indicates an optional part of the package.
They may also pay attention to `--with-PACKAGE' options, where PACKAGE
is something like `gnu-as' or `x' (for the X Window System). The
@@ -152,36 +137,14 @@
you can use the `configure' options `--x-includes=DIR' and
`--x-libraries=DIR' to specify their locations.
-Particular systems
-==================
-
- On HP-UX, the default C compiler is not ANSI C compatible. If GNU
-CC is not installed, it is recommended to use the following options in
-order to use an ANSI C compiler:
-
- ./configure CC="cc -Ae"
-
-and if that doesn't work, install pre-built binaries of GCC for HP-UX.
-
- On OSF/1 a.k.a. Tru64, some versions of the default C compiler cannot
-parse its `' header file. The option `-nodtk' can be used as
-a workaround. If GNU CC is not installed, it is therefore recommended
-to try
-
- ./configure CC="cc"
-
-and if that doesn't work, try
-
- ./configure CC="cc -nodtk"
-
Specifying the System Type
==========================
- There may be some features `configure' cannot figure out
-automatically, but needs to determine by the type of machine the package
-will run on. Usually, assuming the package is built to be run on the
-_same_ architectures, `configure' can figure that out, but if it prints
-a message saying it cannot guess the machine type, give it the
+There may be some features `configure' cannot figure out automatically,
+but needs to determine by the type of machine the package will run on.
+Usually, assuming the package is built to be run on the _same_
+architectures, `configure' can figure that out, but if it prints a
+message saying it cannot guess the machine type, give it the
`--build=TYPE' option. TYPE can either be a short name for the system
type, such as `sun4', or a canonical name which has the form:
@@ -207,9 +170,9 @@
Sharing Defaults
================
- If you want to set default values for `configure' scripts to share,
-you can create a site shell script called `config.site' that gives
-default values for variables like `CC', `cache_file', and `prefix'.
+If you want to set default values for `configure' scripts to share, you
+can create a site shell script called `config.site' that gives default
+values for variables like `CC', `cache_file', and `prefix'.
`configure' looks for `PREFIX/share/config.site' if it exists, then
`PREFIX/etc/config.site' if it exists. Or, you can set the
`CONFIG_SITE' environment variable to the location of the site script.
@@ -218,7 +181,7 @@
Defining Variables
==================
- Variables not defined in a site shell script can be set in the
+Variables not defined in a site shell script can be set in the
environment passed to `configure'. However, some packages may run
configure again during the build, and the customized values of these
variables may be lost. In order to avoid this problem, you should set
@@ -227,29 +190,21 @@
./configure CC=/usr/local2/bin/gcc
causes the specified `gcc' to be used as the C compiler (unless it is
-overridden in the site shell script).
+overridden in the site shell script). Here is a another example:
-Unfortunately, this technique does not work for `CONFIG_SHELL' due to
-an Autoconf bug. Until the bug is fixed you can use this workaround:
+ /bin/bash ./configure CONFIG_SHELL=/bin/bash
- CONFIG_SHELL=/bin/bash /bin/bash ./configure CONFIG_SHELL=/bin/bash
+Here the `CONFIG_SHELL=/bin/bash' operand causes subsequent
+configuration-related scripts to be executed by `/bin/bash'.
`configure' Invocation
======================
- `configure' recognizes the following options to control how it
-operates.
+`configure' recognizes the following options to control how it operates.
`--help'
`-h'
- Print a summary of all of the options to `configure', and exit.
-
-`--help=short'
-`--help=recursive'
- Print a summary of the options unique to this package's
- `configure', and exit. The `short' variant lists options used
- only in the top level, while the `recursive' variant lists options
- also present in any nested packages.
+ Print a summary of the options to `configure', and exit.
`--version'
`-V'
@@ -276,16 +231,6 @@
Look for the package's source code in directory DIR. Usually
`configure' can determine that directory automatically.
-`--prefix=DIR'
- Use DIR as the installation prefix. *Note Installation Names::
- for more details, including other options available for fine-tuning
- the installation locations.
-
-`--no-create'
-`-n'
- Run the configure checks, but stop before creating any output
- files.
-
`configure' also accepts some other, not widely useful, options. Run
`configure --help' for more details.
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/NEWS new/telepathy-haze-0.3.2/NEWS
--- old/telepathy-haze-0.3.1/NEWS 2009-06-05 01:09:59.000000000 +0200
+++ new/telepathy-haze-0.3.2/NEWS 2009-08-25 19:09:21.000000000 +0200
@@ -1,3 +1,30 @@
+telepathy-haze 0.3.2 (2009-08-25)
+=================================
+
+The “Isaac” release.
+
+Fixes:
+
+ * Yahoo! Japan-specific parameters are no longer listed for the 'yahoo'
+ protocol in haze.manager. This fixes Gnome bug #591381. If you're
+ using libpurple 2.6.0 or later, 'yahoojp' will be available as a
+ separate protocol.
+
+ * The "busy" status is exposed as Busy rather than as Away. This fixes
+ fd.o#23441.
+
+ * Haze now fails gracefully rather than asserting if you try to connect
+ to MSN and your libpurple was built without SSL support. Fixes
+ fd.o#22800.
+
+Enhancements:
+
+ * The Facebook protocol plugin is now special-cased to have a
+ sensible name in the Telepathy API. It seems to work with Empathy
+ 2.27.91 if you delete haze.manager (which will no longer be shipped
+ in a future release when stable releases of clients support it being
+ absent).
+
telepathy-haze 0.3.1 (2009-06-05)
=================================
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/config.h.in new/telepathy-haze-0.3.2/config.h.in
--- old/telepathy-haze-0.3.1/config.h.in 2009-06-05 01:11:12.000000000 +0200
+++ new/telepathy-haze-0.3.2/config.h.in 2009-08-25 19:09:35.000000000 +0200
@@ -56,6 +56,9 @@
/* Define to the one symbol short name of this package. */
#undef PACKAGE_TARNAME
+/* Define to the home page for this package. */
+#undef PACKAGE_URL
+
/* Define to the version of this package. */
#undef PACKAGE_VERSION
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/configure.ac new/telepathy-haze-0.3.2/configure.ac
--- old/telepathy-haze-0.3.1/configure.ac 2009-06-05 01:09:59.000000000 +0200
+++ new/telepathy-haze-0.3.2/configure.ac 2009-08-25 19:09:21.000000000 +0200
@@ -8,7 +8,7 @@
m4_define([haze_major_version], [0])
m4_define([haze_minor_version], [3])
-m4_define([haze_micro_version], [1])
+m4_define([haze_micro_version], [2])
m4_define([haze_nano_version], [0])
m4_define([haze_base_version],
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/data/haze.manager new/telepathy-haze-0.3.2/data/haze.manager
--- old/telepathy-haze-0.3.1/data/haze.manager 2009-06-05 00:46:57.000000000 +0200
+++ new/telepathy-haze-0.3.2/data/haze.manager 2009-08-25 19:09:01.000000000 +0200
@@ -7,14 +7,14 @@
param-password=s required
param-server=s
param-port=i
-param-use_ssl=b
+param-use-ssl=b
param-always-use-rv-proxy=b
-param-allow_multiple_logins=b
+param-allow-multiple-logins=b
default-server=login.messaging.aol.com
default-port=5190
-default-use_ssl=false
+default-use-ssl=false
default-always-use-rv-proxy=false
-default-allow_multiple_logins=true
+default-allow-multiple-logins=true
[Protocol gadugadu]
param-account=s required
@@ -34,15 +34,15 @@
param-password=s required
param-server=s
param-port=i
-param-use_ssl=b
+param-use-ssl=b
param-always-use-rv-proxy=b
-param-allow_multiple_logins=b
+param-allow-multiple-logins=b
param-charset=s
default-server=login.messaging.aol.com
default-port=5190
-default-use_ssl=false
+default-use-ssl=false
default-always-use-rv-proxy=false
-default-allow_multiple_logins=true
+default-allow-multiple-logins=true
default-charset=UTF-8
[Protocol irc]
@@ -50,13 +50,13 @@
param-password=s
param-port=i
param-charset=s
-param-autodetect_utf8=b
+param-autodetect-utf8=b
param-username=s
param-realname=s
param-ssl=b
default-port=6667
default-charset=UTF-8
-default-autodetect_utf8=false
+default-autodetect-utf8=false
default-ssl=false
[Protocol jabber]
@@ -68,13 +68,13 @@
param-port=i
param-server=s
param-ft-proxies=s
-param-custom_smileys=b
-default-require-encryption=false
+param-custom-smileys=b
+default-require-encryption=true
default-old-ssl=false
default-auth-plain-in-clear=false
default-port=5222
-default-ft-proxies=proxy.jabber.org
-default-custom_smileys=true
+default-ft-proxies=proxy.eu.jabber.org
+default-custom-smileys=true
[Protocol local-xmpp]
param-account=s required
@@ -112,21 +112,21 @@
param-account=s required
param-password=s required
param-server=s
-param-client_version=s
+param-client-version=s
param-use-tcp=b
-param-show_notice=b
-param-show_news=b
-param-show_chat=b
-param-keep_alive_interval=i
-param-update_interval=i
+param-show-notice=b
+param-show-news=b
+param-show-chat=b
+param-keep-alive-interval=i
+param-update-interval=i
default-server=auto
-default-client_version=qq2005
+default-client-version=qq2005
default-use-tcp=true
-default-show_notice=true
-default-show_news=true
-default-show_chat=true
-default-keep_alive_interval=60
-default-update_interval=300
+default-show-notice=true
+default-show-news=true
+default-show-chat=true
+default-keep-alive-interval=60
+default-update-interval=300
[Protocol sametime]
param-account=s required
@@ -139,6 +139,32 @@
default-force-login=false
default-fake-client-id=false
+[Protocol silc]
+param-account=s required
+param-password=s
+param-server=s
+param-port=i
+param-public-key=s
+param-private-key=s
+param-cipher=s
+param-hmac=s
+param-pfs=b
+param-pubkey-auth=b
+param-block-ims=b
+param-block-wb=b
+param-open-wb=b
+param-sign-verify=b
+default-server=silc.silcnet.org
+default-port=706
+default-cipher=aes-256-ctr
+default-hmac=hmac-sha256-96
+default-pfs=false
+default-pubkey-auth=false
+default-block-ims=false
+default-block-wb=false
+default-open-wb=false
+default-sign-verify=false
+
[Protocol simple]
param-account=s required
param-password=s required
@@ -157,27 +183,39 @@
[Protocol yahoo]
param-account=s required
param-password=s required
-param-yahoojp=b
param-server=s
-param-serverjp=s
param-port=i
param-xfer-host=s
-param-xferjp-host=s
param-xfer-port=i
param-room-list-locale=s
param-ignore-invites=b
param-charset=s
-default-yahoojp=false
-default-server=scs.msg.yahoo.com
-default-serverjp=cs.yahoo.co.jp
+default-server=scsa.msg.yahoo.com
default-port=5050
default-xfer-host=filetransfer.msg.yahoo.com
-default-xferjp-host=filetransfer.msg.yahoo.co.jp
default-xfer-port=80
default-room-list-locale=us
default-ignore-invites=false
default-charset=UTF-8
+[Protocol yahoojp]
+param-account=s required
+param-password=s required
+param-server=s
+param-port=i
+param-xfer-host=s
+param-xfer-port=i
+param-room-list-locale=s
+param-ignore-invites=b
+param-charset=s
+default-server=cs.yahoo.co.jp
+default-port=5050
+default-xfer-host=filetransfer.msg.yahoo.co.jp
+default-xfer-port=80
+default-room-list-locale=ja
+default-ignore-invites=false
+default-charset=UTF-8
+
[Protocol zephyr]
param-account=s required
param-use-tzc=b
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/missing new/telepathy-haze-0.3.2/missing
--- old/telepathy-haze-0.3.1/missing 2009-06-05 01:00:40.000000000 +0200
+++ new/telepathy-haze-0.3.2/missing 2009-08-25 18:52:26.000000000 +0200
@@ -1,9 +1,9 @@
#! /bin/sh
# Common stub for a few missing GNU programs while installing.
-scriptversion=2006-05-10.23
+scriptversion=2005-06-08.21
-# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005, 2006
+# Copyright (C) 1996, 1997, 1999, 2000, 2002, 2003, 2004, 2005
# Free Software Foundation, Inc.
# Originally by Fran,cois Pinard , 1996.
@@ -33,8 +33,6 @@
fi
run=:
-sed_output='s/.* --output[ =]\([^ ]*\).*/\1/p'
-sed_minuso='s/.* -o \([^ ]*\).*/\1/p'
# In the cases where this matters, `missing' is being run in the
# srcdir already.
@@ -46,7 +44,7 @@
msg="missing on your system"
-case $1 in
+case "$1" in
--run)
# Try to run requested program, and just exit if it succeeds.
run=
@@ -79,7 +77,6 @@
aclocal touch file \`aclocal.m4'
autoconf touch file \`configure'
autoheader touch file \`config.h.in'
- autom4te touch the output file, or create a stub one
automake touch all \`Makefile.in' files
bison create \`y.tab.[ch]', if possible, from existing .[ch]
flex create \`lex.yy.c', if possible, from existing .c
@@ -109,7 +106,7 @@
# Now exit if we have it, but it failed. Also exit now if we
# don't have it and --version was passed (most likely to detect
# the program).
-case $1 in
+case "$1" in
lex|yacc)
# Not GNU programs, they don't have --version.
;;
@@ -138,7 +135,7 @@
# If it does not exist, or fails to run (possibly an outdated version),
# try to emulate it.
-case $1 in
+case "$1" in
aclocal*)
echo 1>&2 "\
WARNING: \`$1' is $msg. You should only need it if
@@ -167,7 +164,7 @@
test -z "$files" && files="config.h"
touch_files=
for f in $files; do
- case $f in
+ case "$f" in
*:*) touch_files="$touch_files "`echo "$f" |
sed -e 's/^[^:]*://' -e 's/:.*//'`;;
*) touch_files="$touch_files $f.in";;
@@ -195,8 +192,8 @@
You can get \`$1' as part of \`Autoconf' from any GNU
archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*--output[ =]*\([^ ]*\).*/\1/p'`
+ test -z "$file" && file=`echo "$*" | sed -n 's/.*-o[ ]*\([^ ]*\).*/\1/p'`
if test -f "$file"; then
touch $file
else
@@ -217,25 +214,25 @@
in order for those modifications to take effect. You can get
\`Bison' from any GNU archive site."
rm -f y.tab.c y.tab.h
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.y)
SRCFILE=`echo "$LASTARG" | sed 's/y$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.c
fi
SRCFILE=`echo "$LASTARG" | sed 's/y$/h/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" y.tab.h
fi
;;
esac
fi
- if test ! -f y.tab.h; then
+ if [ ! -f y.tab.h ]; then
echo >y.tab.h
fi
- if test ! -f y.tab.c; then
+ if [ ! -f y.tab.c ]; then
echo 'main() { return 0; }' >y.tab.c
fi
;;
@@ -247,18 +244,18 @@
in order for those modifications to take effect. You can get
\`Flex' from any GNU archive site."
rm -f lex.yy.c
- if test $# -ne 1; then
+ if [ $# -ne 1 ]; then
eval LASTARG="\${$#}"
- case $LASTARG in
+ case "$LASTARG" in
*.l)
SRCFILE=`echo "$LASTARG" | sed 's/l$/c/'`
- if test -f "$SRCFILE"; then
+ if [ -f "$SRCFILE" ]; then
cp "$SRCFILE" lex.yy.c
fi
;;
esac
fi
- if test ! -f lex.yy.c; then
+ if [ ! -f lex.yy.c ]; then
echo 'main() { return 0; }' >lex.yy.c
fi
;;
@@ -270,9 +267,11 @@
\`Help2man' package in order for those modifications to take
effect. You can get \`Help2man' from any GNU archive site."
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
- if test -f "$file"; then
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
+ if test -z "$file"; then
+ file=`echo "$*" | sed -n 's/.*--output=\([^ ]*\).*/\1/p'`
+ fi
+ if [ -f "$file" ]; then
touch $file
else
test -z "$file" || exec >$file
@@ -290,17 +289,11 @@
DU, IRIX). You might want to install the \`Texinfo' package or
the \`GNU make' package. Grab either from any GNU archive site."
# The file to touch is that specified with -o ...
- file=`echo "$*" | sed -n "$sed_output"`
- test -z "$file" && file=`echo "$*" | sed -n "$sed_minuso"`
+ file=`echo "$*" | sed -n 's/.*-o \([^ ]*\).*/\1/p'`
if test -z "$file"; then
# ... or it is the one specified with @setfilename ...
infile=`echo "$*" | sed 's/.* \([^ ]*\) *$/\1/'`
- file=`sed -n '
- /^@setfilename/{
- s/.* \([^ ]*\) *$/\1/
- p
- q
- }' $infile`
+ file=`sed -n '/^@setfilename/ { s/.* \([^ ]*\) *$/\1/; p; q; }' $infile`
# ... or it is derived from the source name (dir/f.texi becomes f.info)
test -z "$file" && file=`echo "$infile" | sed 's,.*/,,;s,.[^.]*$,,'`.info
fi
@@ -324,13 +317,13 @@
fi
firstarg="$1"
if shift; then
- case $firstarg in
+ case "$firstarg" in
*o*)
firstarg=`echo "$firstarg" | sed s/o//`
tar "$firstarg" "$@" && exit 0
;;
esac
- case $firstarg in
+ case "$firstarg" in
*h*)
firstarg=`echo "$firstarg" | sed s/h//`
tar "$firstarg" "$@" && exit 0
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/src/connection-manager.c new/telepathy-haze-0.3.2/src/connection-manager.c
--- old/telepathy-haze-0.3.1/src/connection-manager.c 2009-03-30 14:10:00.000000000 +0200
+++ new/telepathy-haze-0.3.2/src/connection-manager.c 2009-08-25 19:09:01.000000000 +0200
@@ -1,7 +1,7 @@
/*
* connection-manager.c - HazeConnectionManager source
* Copyright (C) 2007 Will Thompson
- * Copyright (C) 2007-2008 Collabora Ltd.
+ * Copyright (C) 2007-2009 Collabora Ltd.
*
* 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
@@ -40,33 +40,23 @@
* hyphens rather than underscores for consistency.
*/
static HazeProtocolInfo known_protocol_info[] = {
- { "aim", "prpl-aim", NULL,
- "always_use_rv_proxy:always-use-rv-proxy" },
+ { "aim", "prpl-aim", NULL, "" },
+ /* Seriously. */
+ { "facebook", "prpl-bigbrownchunx-facebookim", NULL, "" },
{ "gadugadu", "prpl-gg", NULL, "" },
{ "groupwise", "prpl-novell", NULL, "" },
{ "irc", "prpl-irc", NULL, "encoding:charset" },
- { "icq", "prpl-icq", NULL,
- "encoding:charset,always_use_rv_proxy:always-use-rv-proxy" },
+ { "icq", "prpl-icq", NULL, "encoding:charset" },
{ "jabber", "prpl-jabber", NULL,
- "connect_server:server,old_ssl:old-ssl,require_tls:require-encryption,"
- "auth_plain_in_clear:auth-plain-in-clear,ft_proxies:ft-proxies" },
+ "connect_server:server,require_tls:require-encryption" },
{ "local-xmpp", "prpl-bonjour", NULL,
"first:first-name,last:last-name" },
- { "msn", "prpl-msn", NULL,
- "http_method:http-method,http_method_server:http-method-server,"
- "custom_smileys:custom-smileys" },
- { "qq", "prpl-qq", NULL, "use_tcp:use-tcp" },
- { "sametime", "prpl-meanwhile", NULL,
- "force_login:force-login,fake_client_id:fake-client-id" },
- { "yahoo", "prpl-yahoo", NULL,
- "local_charset:charset,xfer_host:xfer-host,xferjp_host:xferjp-host,"
- "xfer_port:xfer-port,room_list_locale:room-list-locale,"
- "ignore_invites:ignore-invites" },
- { "zephyr", "prpl-zephyr", NULL,
- "encoding:charset,use_tzc:use-tzc,tzc_command:tzc-command,"
- "write_anyone:write-anyone,write_zsubs:write-zsubs,"
- "read_anyone:read-anyone,read_zsubs:read-zsubs,"
- "exposure_level:exposure-level" },
+ { "msn", "prpl-msn", NULL, "" },
+ { "qq", "prpl-qq", NULL, "" },
+ { "sametime", "prpl-meanwhile", NULL, "" },
+ { "yahoo", "prpl-yahoo", NULL, "local_charset:charset" },
+ { "yahoojp", "prpl-yahoojp", NULL, "local_charset:charset" },
+ { "zephyr", "prpl-zephyr", NULL, "encoding:charset" },
{ NULL, NULL, NULL, "" }
};
@@ -167,10 +157,23 @@
{
const char *pref_name = purple_account_option_get_setting (option);
PurplePrefType pref_type = purple_account_option_get_type (option);
- gchar *name = g_hash_table_lookup (parameter_map, pref_name);
+ gchar *name = g_strdup (g_hash_table_lookup (parameter_map, pref_name));
+
/* These strings are never free'd, but need to last until exit anyway.
*/
- paramspec->name = g_strdup (name ? name : pref_name);
+ if (name == NULL)
+ name = g_strdup (pref_name);
+
+ if (g_str_has_prefix (name, "facebook_"))
+ {
+ gchar *tmp = g_strdup (name + strlen ("facebook_"));
+ g_free (name);
+ name = tmp;
+ }
+
+ g_strdelimit (name, "_", '-');
+ paramspec->name = name;
+
paramspec->setter_data = option->pref_name;
/* TODO: does libpurple ever require a parameter besides the username
* and possibly password?
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/src/connection-presence.c new/telepathy-haze-0.3.2/src/connection-presence.c
--- old/telepathy-haze-0.3.1/src/connection-presence.c 2009-03-30 14:10:00.000000000 +0200
+++ new/telepathy-haze-0.3.2/src/connection-presence.c 2009-08-23 17:23:03.000000000 +0200
@@ -43,7 +43,7 @@
static const TpPresenceStatusSpec statuses[] = {
{ "available", TP_CONNECTION_PRESENCE_TYPE_AVAILABLE, TRUE,
arg_specs, NULL, NULL },
- { "busy", TP_CONNECTION_PRESENCE_TYPE_AWAY, TRUE,
+ { "busy", TP_CONNECTION_PRESENCE_TYPE_BUSY, TRUE,
arg_specs, NULL, NULL },
{ "away", TP_CONNECTION_PRESENCE_TYPE_AWAY, TRUE,
arg_specs, NULL, NULL },
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/src/connection.c new/telepathy-haze-0.3.2/src/connection.c
--- old/telepathy-haze-0.3.1/src/connection.c 2009-06-05 00:46:57.000000000 +0200
+++ new/telepathy-haze-0.3.2/src/connection.c 2009-08-25 19:09:01.000000000 +0200
@@ -1,7 +1,7 @@
/*
* connection.c - HazeConnection source
* Copyright (C) 2007 Will Thompson
- * Copyright (C) 2007-2008 Collabora Ltd.
+ * Copyright (C) 2007-2009 Collabora Ltd.
*
* 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
@@ -345,12 +345,12 @@
if (!base->self_handle)
return FALSE;
- purple_account_set_enabled(self->account, UI_ID, TRUE);
- purple_account_connect(self->account);
-
tp_base_connection_change_status(base, TP_CONNECTION_STATUS_CONNECTING,
TP_CONNECTION_STATUS_REASON_REQUESTED);
+ purple_account_set_enabled(self->account, UI_ID, TRUE);
+ purple_account_connect(self->account);
+
return TRUE;
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/tests/twisted/hazetest.py new/telepathy-haze-0.3.2/tests/twisted/hazetest.py
--- old/telepathy-haze-0.3.1/tests/twisted/hazetest.py 2009-06-05 00:21:04.000000000 +0200
+++ new/telepathy-haze-0.3.2/tests/twisted/hazetest.py 2009-08-25 19:09:01.000000000 +0200
@@ -240,6 +240,9 @@
self.addObserver(
"/iq/query[@xmlns='http://jabber.org/protocol/disco#info']",
self._cb_disco_iq)
+ self.addObserver(
+ "/iq/query[@xmlns='jabber:iq:roster']",
+ self._cb_roster_get)
self.event_func(servicetest.Event('stream-authenticated'))
def _cb_disco_iq(self, iq):
@@ -256,6 +259,12 @@
iq['type'] = 'result'
self.send(iq)
+ def _cb_roster_get(self, iq):
+ # Just send back an empty roster. prpl-jabber waits for the roster
+ # before saying it's online.
+ if iq.getAttribute('type') == 'get':
+ self.send(make_result_iq(self, iq))
+
class JabberXmlStream(BaseXmlStream):
version = (0, 9)
@@ -270,6 +279,7 @@
'server': 'localhost',
# FIXME: the spec says this is a UInt32 and Gabble agrees
'port': dbus.Int32(4242),
+ 'require-encryption': False,
}
if params:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/tests/twisted/presence/presence.py new/telepathy-haze-0.3.2/tests/twisted/presence/presence.py
--- old/telepathy-haze-0.3.1/tests/twisted/presence/presence.py 2009-03-24 13:20:34.000000000 +0100
+++ new/telepathy-haze-0.3.2/tests/twisted/presence/presence.py 2009-08-25 19:09:01.000000000 +0200
@@ -7,6 +7,7 @@
import dbus
from twisted.words.xish import domish, xpath
+from twisted.words.protocols.jabber.client import IQ
from hazetest import exec_test
@@ -16,14 +17,15 @@
amy_handle = conn.RequestHandles(1, ['amy@foo.com'])[0]
- event = q.expect('stream-iq', query_ns='jabber:iq:roster')
- event.stanza['type'] = 'result'
-
- item = event.query.addElement('item')
+ # Divergence from Gabble: hazetest responds to all roster gets with an
+ # empty roster, so we need to push the roster.
+ iq = IQ(stream, 'set')
+ query = iq.addElement(('jabber:iq:roster', 'query'))
+ item = query.addElement('item')
item['jid'] = 'amy@foo.com'
item['subscription'] = 'both'
- stream.send(event.stanza)
+ stream.send(iq)
presence = domish.Element((None, 'presence'))
presence['from'] = 'amy@foo.com'
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' --exclude Makefile.in --exclude configure --exclude config.guess --exclude '*.pot' --exclude mkinstalldirs --exclude aclocal.m4 --exclude config.sub --exclude depcomp --exclude install-sh --exclude ltmain.sh old/telepathy-haze-0.3.1/tests/twisted/text/destroy.py new/telepathy-haze-0.3.2/tests/twisted/text/destroy.py
--- old/telepathy-haze-0.3.1/tests/twisted/text/destroy.py 2009-06-05 00:21:04.000000000 +0200
+++ new/telepathy-haze-0.3.2/tests/twisted/text/destroy.py 2009-08-25 19:09:01.000000000 +0200
@@ -83,9 +83,14 @@
elem = event.stanza
assert elem.name == 'message'
assert elem['type'] == 'chat'
- body = list(event.stanza.elements())[0]
- assert body.name == 'body'
- assert body.children[0] == u'hey'
+
+ found = False
+ for e in elem.elements():
+ if e.name == 'body':
+ found = True
+ e.children[0] == u'hey'
+ break
+ assert found, elem.toXml()
# <message type="chat"><body>hello