Update to 0.9.2.

Thanks for help for building wocky to joerg!

telepathy-gabble 0.9.2 (2009-10-27)
===================================

The ``The photo device is down'' release.

Highlights:

* Add support for using OpenSSL instead of GNUTLS for SSL support

Fixes:

* Honour errors that tell us to wait and try again when fetching vCards. This
  was erroneously claimed to be in 0.9.1. (Alban)

* Don't re-fetch our own avatar in a loop when connecting to Google
  Talk. This should fix #23684 once and for all. (Alban)

* Don't trust other people's <message/> IDs to be globally unique: in
  particular, Google Talk uses simple incrementing integers (wjt)

* Use the correct marshaller for the pre-presence signal, fixing a cr
  64-bit platforms (wjt)

* Make sure the Connection object disappears from the bus when disconnected
  (Vivek)


telepathy-gabble 0.9.1 (2009-09-25)
===================================

The “even children are made of atoms” release.

Highlights:

* Jingle call interoperability with Pidgin and Gajim.

Fixes:

* When receiving a file, Gabble now closes the local socket once all the data
  has been written. (Guillaume)

* fd.o #24043: Doesn't parse candidates in a Jingle session-accept stanza
  This fix lets us interoperate with Pidgin's Jingle implementation. (Sjoerd,
  David)

* fd.o #24023: Accepting initial streams for a call is racy. (Sjoerd, Daf)

* fd.o #20629: DBus events in tests should contain full path. (Daf)

* fd.o #22795: jingle/google-relay.py is secretly made of cheese. (Daf)

* fd.o #23903: Gabble crashes in File Transfer. (Guillaume)

* fd.o #23685: build Gibber with fno-strict-aliasing so asyncns.c builds with
  new GCC. (Guillaume)

* fd.o #20565: Contacts should be initially offline and not unknown. (Daf)

* When members are removed from a call due to a stream error, always indicate
  so. (Daf)

* Fix corner cases in SetLocation()'s language handling. (Daf)

* fd.o #24195: Doesn't think clients without google p2p tranport are media
  capable. This fix lets us interoperate with Gajim's Jingle implementation.
  (Sjoerd, Daf)

* Make stun-server.py not fail if the default STUN server hostname can't be
  resolved. (David)

* fd.o #23684: Gabble advertizes an avatar's sha1 in its presence stanza
  without following XEP-0153. (Alban)

* Honour errors that tell us to wait and try again when fetching vCards.
  (Alban)

telepathy-gabble 0.9.0 (2009-09-16)
===================================

The "Use STAPLE REMOVER on TREMENDOUS DANGEROUS-LOOKING YAK" release.

This is the first release in the 0.9 development branch.
Most users should continue to use the 0.8.x stable branch for now.
This release introduces some regressions: proxies and keep-alive aren't
supported any more. These features will be back in future releases.

Dependencies:

* Gabble doesn't depend on loudmouth anymore. Instead, it ships a
  copy of Wocky, a new XMPP library based on gio. As a side effect of this,
  gio >= 2.21 and gnutls >= 2.8.2 are now needed to build Gabble.

* telepathy-glib >= 0.7.37 is now required

Enhancements:

* Add the ability to send a message when terminating a VoIP call (wjt)

* Add ContactSearch channels using spec draft 2 (wjt, cassidy)

* Implement the final ContactCapabilities spec, and refactor Capabilities code
  to represent capabilities as sets of XML namespaces, rather than
  bitfields (wjt, smcv)

* fd.o#19952: Support requesting channels with InitialAudio/InitialVideo
  through the final API from telepathy-spec 0.17.28 (smcv)

* Gabble now loads certificates from ~/.config/telepathy/certs/ as well as
  from the system-wide location (/etc/ssl/certs/ca-certificates.crt).

Fixes:

* Improve pubsub.c test coverage (cassidy)

* fd.o #22968: don't try to pass credentials through Unix sockets on non-Linux,
  since the way we currently do it is known to be non-portable. Patches to
  implement Credentials on more OSs would be welcomed. (smcv)

telepathy-gabble 0.8.5 (2009-10-02)
===================================

The “a page out of Remembrance of Things Past and a blowtorch with which
to set it on fire” release.

Fixes:

* Don't re-fetch our own avatar in a loop when connecting to Google
  Talk. This should fix #23684 once and for all. (Alban)

* Fix a crash introduced by the vCard-related fixes in 0.8.4. (Alban)

telepathy-gabble 0.8.4 (2009-09-25)
===================================

The “bourgeois traditional omelette form” release.

Highlights:

* Jingle call interoperability with Pidgin and Gajim.

Fixes:

* When receiving a file, Gabble now closes the local socket once all the data
  has been written. (Guillaume)

* fd.o #24043: Doesn't parse candidates in a Jingle session-accept stanza
  This fix lets us interoperate with Pidgin's Jingle implementation. (Sjoerd,
  David)

* fd.o #24023: Accepting initial streams for a call is racy. (Sjoerd, Daf)

* fd.o #20629: DBus events in tests should contain full path. (Daf)

* fd.o #22795: jingle/google-relay.py is secretly made of cheese. (Daf)

* fd.o #23903: Gabble crashes in File Transfer. (Guillaume)

* fd.o #23685: build Gibber with fno-strict-aliasing so asyncns.c builds with
  new GCC. (Guillaume)

* fd.o #20565: Contacts should be initially offline and not unknown. (Daf)

* When members are removed from a call due to a stream error, always indicate
  so. (Daf)

* Fix corner cases in SetLocation()'s language handling. (Daf)

* fd.o #24195: Doesn't think clients without google p2p tranport are media
  capable. This fix lets us interoperate with Gajim's Jingle implementation.
  (Sjoerd, Daf)

* Make stun-server.py not fail if the default STUN server hostname can't be
  resolved. (David)

* fd.o #23684: Gabble advertizes an avatar's sha1 in its presence stanza
  without following XEP-0153. (Alban)

* Honour errors that tell us to wait and try again when fetching vCards.
  (Alban)

telepathy-gabble 0.8.3 (2009-09-10)
===================================

The “one cigarette, some coffee, and four tiny stones” release.

Enhancements:

* fd.o #23681: Allow setting presence on a connection before it goes online.
  This avoids e.g. going from Available -> Busy immediately when signing on.
  (daf)

Fixes:

* fd.o #23684: fix handling of avatar conflict with several resources, and
  a possible infinite ping-pong of presence stanzas from the server (albanc)

* Time out disco requests after 20, not 20,000, seconds! (grundleborg)

* Correctly respond to disco requests for video-v1 bundle, avoiding a loop
  when iChat blindly retries failed disco requests (smcv)

* Fix Requested and State properties of muc D-Bus tubes that we previously
  created and are still present when we re-join the muc. These tubes are now
  listed in Tubes.ListTubes(). fd.o #23678. (cassidy)

* Don't send the same disco request to the same (full) JID more than once. fd.o
  #23841. (wjt)

* Update the Jingle raw-udp and ice-udp namespaces we claim to support to the
  current version. (wjt)

* fd.o #23348, #23349: fix compilation on NetBSD by including more headers
  (Thomas Klausner)

* fd.o #21327: force ISO date format in ChangeLog (wjt)

* Reduce the size of the ChangeLog by truncating at version 0.6.0 and not
  including diffstats (previously, the changelog.gz in our Debian packages
  was larger than Gabble itself!) (smcv)

telepathy-gabble 0.8.2 (2009-09-03)
===================================

The “tape two fried eggs over your eyes and walk the streets of Paris for an
hour” release.

Enhancements:

* Improve jid validation, so that obviously-invalid jids are rejected.
  (daf)

Fixes:

* Don't crash when a vCard set fails, and there are edits pending. This
  can happen if you're trying to set your avatar and then disconnect.
  (daf)

* fd.o#23013: ContactCapabilities.SetSelfCapabilities can crash gabble
  with wrong parms (sjoerd)

* Fix parsing of incoming session accept from Google Video Chat. This
  should make outgoing calls to Google Video Chat users work, as well as
  incoming calls. Hooray! (wjt, with help from sjoerd and Olivier Crête)

telepathy-gabble 0.8.1 (2009-08-20)
===================================

The “five pounds of cherries and a live beaver” release.

Fixes:

* fd.o#22535: Gabble no longer crashes if you disconnect while it's
  trying to start a Google relay session for a call. This should have
  been fixed in 0.7.31, but it's really fixed now. :-) (wjt)

* Fix an occasional crash when PEP requests time out, or are cancelled
  when you disconnect. (daf)

* Correct an assertion about vCard edits not to fire incorrectly. (daf)

* Clarify some correct-but-confusing behaviour in libjingle 0.3 mode,
  which fixes a Coverity false-positive. (smcv)

telepathy-gabble 0.8.0 (2009-08-18)
===================================

The “place a chair facing the oven and sit in it forever” release. This is the
first release in the 0.8 stable series.

Dependencies:

* telepathy-glib >= 0.7.34 is now required as Gabble implements the
  Location API.

Enhancements:

* Location and Debug are now implemented as stable interfaces.

* Timeouts are synchronised to the second where possible, leading to fewer
  wakeups.

Fixes:

* Fix race condition introduced by fix for fd.o #22023.

* Make vCard request less likely to time out.

* Fix a bug where a vCard request failure could cause SetAvatar or SetAliases
  not to return.

4 files changed, 40 insertions, 39 deletions

diff --git a/chat/telepathy-gabble/Makefile b/chat/telepathy-gabble/Makefile
index 4ffd3c36293..d98bb95c175 100644
--- a/chat/telepathy-gabble/Makefile
+++ b/chat/telepathy-gabble/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/09/09 11:16:56 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/12/03 23:58:59 wiz Exp $
 #
 
-DISTNAME=	telepathy-gabble-0.7.21
+DISTNAME=	telepathy-gabble-0.9.2
 CATEGORIES=	chat
 MASTER_SITES=	http://telepathy.freedesktop.org/releases/telepathy-gabble/
 
@@ -19,18 +19,23 @@ USE_TOOLS+=	gmake pkg-config
 .if ${PYPKGPREFIX} == "py24"
 BUILD_DEPENDS+=		${PYPKGPREFIX}-expat-[0-9]*:../../textproc/py-expat
 .endif
-CONFIGURE_ENV+=		ac_cv_prog_PYTHON=${PYTHONBIN}
 
-BUILDLINK_API_DEPENDS.telepathy-glib+=	telepathy-glib>=0.7.23
+pre-configure: wocky-pkg-config-hack
+wocky-pkg-config-hack:
+	${LN} -s ${WRKSRC}/lib/ext/wocky/wocky/wocky-uninstalled.pc \
+		${BUILDLINK_DIR}/lib/pkgconfig
+
+BUILDLINK_API_DEPENDS.telepathy-glib+=	telepathy-glib>=0.7.37
 .include "../../chat/telepathy-glib/buildlink3.mk"
-BUILDLINK_API_DEPENDS.loudmouth+=	loudmouth>=1.3.2
-.include "../../chat/loudmouth/buildlink3.mk"
-BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.16.0
+BUILDLINK_API_DEPENDS.glib2+=		glib2>=2.21.0
 .include "../../devel/glib2/buildlink3.mk"
 .include "../../lang/python/application.mk"
+.include "../../net/libsoup24/buildlink3.mk"
 BUILDLINK_API_DEPENDS.dbus-glib+=	dbus-glib>=0.78
 .include "../../sysutils/dbus-glib/buildlink3.mk"
 BUILDLINK_API_DEPENDS.dbus+=		dbus>=1.1
 .include "../../sysutils/dbus/buildlink3.mk"
 .include "../../textproc/libxslt/buildlink3.mk"
+.include "../../security/cyrus-sasl/buildlink3.mk"
+.include "../../security/openssl/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/chat/telepathy-gabble/distinfo b/chat/telepathy-gabble/distinfo
index ad68c7e0afe..92d4ae61226 100644
--- a/chat/telepathy-gabble/distinfo
+++ b/chat/telepathy-gabble/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.7 2009/09/20 12:36:03 sno Exp $
+$NetBSD: distinfo,v 1.8 2009/12/03 23:58:59 wiz Exp $
 
-SHA1 (telepathy-gabble-0.7.21.tar.gz) = b6c19456ace1812e98c69b52648b324fdf6f1faa
-RMD160 (telepathy-gabble-0.7.21.tar.gz) = 3f2ba18a09bab5bc9fb1f58ce3dd5922f8a3fcbc
-Size (telepathy-gabble-0.7.21.tar.gz) = 1597740 bytes
+SHA1 (telepathy-gabble-0.9.2.tar.gz) = 615821d1f80aecd4cdefaf578b8755e8adbae6d6
+RMD160 (telepathy-gabble-0.9.2.tar.gz) = 2767db9ac8173649e302189440fd1f18446b00ad
+Size (telepathy-gabble-0.9.2.tar.gz) = 2274608 bytes
 SHA1 (patch-aa) = c6f579acd92f43bd327136b4ebabce8d3a54976c
-SHA1 (patch-ab) = 15bf26b3b3be950db46b63b8904e98f52d5e2547
-SHA1 (patch-ac) = afe4969ae0845dc1ac07881beaa90713c0d65490
+SHA1 (patch-ab) = b231ff2d99da0d4246134956a5cb0931358b28fd
+SHA1 (patch-ac) = 2d3c4fcb5490acbca969c11f168a1f80fe133d11
 SHA1 (patch-ad) = 9eab302f5b2a754b55bd9d0f4d6262fd04e1c444
diff --git a/chat/telepathy-gabble/patches/patch-ab b/chat/telepathy-gabble/patches/patch-ab
index 8a06b01cee2..1b337630258 100644
--- a/chat/telepathy-gabble/patches/patch-ab
+++ b/chat/telepathy-gabble/patches/patch-ab
@@ -1,14 +1,13 @@
-$NetBSD: patch-ab,v 1.2 2009/08/16 18:46:27 wiz Exp $
+$NetBSD: patch-ab,v 1.3 2009/12/03 23:58:59 wiz Exp $
 
-http://bugs.freedesktop.org/show_bug.cgi?id=23348
-
---- lib/gibber/gibber-fd-transport.h.orig	2008-12-18 17:41:05.000000000 +0100
-+++ lib/gibber/gibber-fd-transport.h
-@@ -25,6 +25,7 @@
- 
- #include <sys/socket.h>
- #include <netdb.h>
-+#include <netinet/in.h>
- 
- #include "gibber-transport.h"
+--- configure.orig	2009-10-27 17:12:34.000000000 +0000
++++ configure
+@@ -12537,7 +12537,7 @@ if test "${am_cv_pathless_PYTHON+set}" =
+   $as_echo_n "(cached) " >&6
+ else
  
+-	for am_cv_pathless_PYTHON in python python2 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
++	for am_cv_pathless_PYTHON in python python2 python2.6 python2.5 python2.4 python2.3 python2.2 python2.1 python2.0 python1.6 python1.5 none; do
+ 	  test "$am_cv_pathless_PYTHON" = none && break
+ 	  prog="import sys, string
+ # split strings by '.' and convert to numeric.  Append some zeros
diff --git a/chat/telepathy-gabble/patches/patch-ac b/chat/telepathy-gabble/patches/patch-ac
index 480b75e0c48..d1acaf26e14 100644
--- a/chat/telepathy-gabble/patches/patch-ac
+++ b/chat/telepathy-gabble/patches/patch-ac
@@ -1,15 +1,12 @@
-$NetBSD: patch-ac,v 1.3 2009/08/16 18:46:27 wiz Exp $
+$NetBSD: patch-ac,v 1.4 2009/12/03 23:58:59 wiz Exp $
 
-http://bugs.freedesktop.org/show_bug.cgi?id=23349
-
---- lib/gibber/gibber-util.h.orig	2009-02-19 19:25:00 +0200
-+++ lib/gibber/gibber-util.h	2009-03-14 18:58:53 +0200
-@@ -21,6 +21,8 @@
- #define __GIBBER_UTIL_H__
- 
- #include <netdb.h>
-+#include <netinet/in.h>
-+#include <sys/socket.h>
- 
- #include <glib.h>
- 
+--- lib/gibber/asyncns.c.orig	2009-02-27 13:05:19.000000000 +0000
++++ lib/gibber/asyncns.c
+@@ -35,6 +35,7 @@
+ #include <errno.h>
+ #include <sys/wait.h>
+ #include <sys/types.h>
++#include <sys/resource.h>
+ #include <pwd.h>
+ #include <netinet/in.h>
+ #include <arpa/nameser.h>