Tue May 6 08:41:38 2014 UTC ()
Update to 1.0.10:

v1.0.10 -- 09 Apr 2014
---------------------
- TLSSChannel: use malloc/realloc/free instead of their legacy Local* variants (fixes #222)
- VCard: remove \r from vcard photos. Fixes a recent change Facebook made to their vcard pictures (patch by Fernando Sanchez)
- Jingle: fixed replying; distinguish between 'from' and 'initiator'; added Jingle::Session::setInitiator()
- Jingle: fixed ::ICEUDP to actually add candidates; added ::Session::initiator(), ::setHandler(), ::sessionAccept( PluginList ); fixed storing of new sessions in ::SessionManager (patches by Erich Keane)
- Jingle: removed Jingle::setInitiator() and ::setResponder() (now provided by ctor)
- AtomicRefCount: fixed compilation on iOS (patch by Erich Keane)
- Jingle::Plugin: added JinglePluginType, pluginType(), and findPlugin() to easily look for and retrieve specific plugins
- ConnectionBOSH: fixed return value for recv() (patch by Sudarshan Prasad)
- Parser: get rid of bogus isValid() (fixes #180, #224)

v1.0.9 -- 15 Oct 2013
---------------------
- changed colon to dash in uid generation to possibly fix #191
- added Channel Binding (needed for SASL SCRAM-SHA-1-PLUS) to SChannel on win32 (untested)
- fixed SCRAM-SHA-1-PLUS

v1.0.8 -- 15 Oct 2013
---------------------
- ConnectionTLS: make stacked TLS/SSL connections work again with HTTP proxies
- added SASL SCRAM-SHA-1/SCRAM-SHA-1-PLUS authentication mechanisms (GnuTLS & OpenSSL only) (#201)
- properly seed the RNG
- SHA::hex(): finalize() only once

v1.0.7.1 -- 11 Oct 2013
---------------------
- fixed/updated the win32 project files

v1.0.7 -- 11 Oct 2013
---------------------
- added Jingle (XEP-0166)
- added Jingle ICE-UDP Transport (XEP-0176)
- added Jingle File Transfer (XEP-0234)
- fixed compilation in iOS7 SDK (thanks to Kurt Vermeersch)
- fixed bug in stanza handling/counting related to Stream Management (patch by Norbert Riedlin)
- added protected ClientBase::stanzasSent() to return sent stanzas (if Stream Management enabled)

v1.0.6 -- 04 Sep 2013
---------------------
- ClientBase: removed check for empty message body --> messages of type chat with empty bodies will be passed on to listeners - required for Message Carbons
- MessageSession: removed check for empty message body --> messages of type chat with empty bodies will be passed on to listeners - required for Message Carbons
- don't send presence after stream resumption
- added ClientBase::sendQueue()
- documentation updates and fixes

v1.0.5 -- 02 Sep 2013
---------------------
- added support for Stanza Forwarding (XEP-0297)
- added support for Message Carbons (XEP-0280)

v1.0.4 -- 30 Aug 2013
---------------------
- added support for Stream Management (XEP-0198)
- Fix some iterator usage for portability related to erase (patch by Daniel Bowen)
- Ensure setting a connection does not leave a deleted value in the member variable for a time (patch by Daniel Bowen)
- Add operator< and relatives to JID so that it can be in a map (patch by Daniel Bowen)
- Sandboxing on Apple doesn't like getprotobyname (patch by Daniel Bowen)
- MessageSession::send(): removed default argument of 2nd parameter to remove ambiguity of MS::send( string ) (#206) (source incompatible!)
- VCard: renamed setPhoto( string ) to setPhotoUri( string ) (#166) (source and binary incompatible)

v1.0.3 -- 22 Jul 2013
---------------------
- Changed license to GPLv3
- removed space from VS project name (--> gloox-1.0)
- VCardUpdate: fixed handling of empty hash (#203)
- VCardUpdate: added hasPhoto() to inidicate whether there was a photo tag (#203)
- compilation fixed when using getaddrinfo (patch by Roy van Dam)
- Receipt: recognize id attribute (patch by D鱈dac P辿rez) (#208)
- MessageSession: added MS::send( string& ) to properly provide a base for MUCMS::send( string& ) (#206)
- really fixed memory leak in prep::idna()
- gloox.vcproj: removed not-yet-present tlsgnutlsserver.cpp/.h

v1.0.2 -- 05 Jul 2013
---------------------
- SOCKS5Bytestream: Don't wait for incoming data, notify about open stream immediately upon
connection (patch by Erik Horemans)
- fixed/updated Code::Blocks and VS project files (fixes #197, #198)
- fixed memory leak in ClientBase (fixes #204)
- fixed memory leak in prep::idna()

v1.0.1 -- 29 Jun 2013
---------------------
- Added support for Serverless Messaging (XEP-0174)
- TLSOpenSSLServer: compilation fix
- don't bail on DNS TCP queries
- fixed 袖s timeout value (now defaults to 1.000.000)
- omit port in initial greeting (usually -1 anyway)
- fixed SHA1 hashes of 55 byte strings (#164)
- fixed CFLAGS and LIBS in pkg-config file (#163)
- fixed SOCKS5Bytestream double close notification
- tell gcrypt that we're using pthreads (if available)
- ClientBase: send IQ error response for unsupported features
- ClientBase: fixed potential infinite loop on IQ error
- ClientBase: fixed NTLM auth
- ClientBase, SEF: mutex-protected SE handling
- PubSub: added 'subscribe & configure'
- PubSub: added optional subid
- SOCKS5BytestreamServer: expose local socket
- RosterManager: don't use string-comparison on JIDs; use JID class
- NonSASLAuth: fixed resource usage by deprecating ClientBase::m_selectedResource
- InBandBytestream: don't call handler in dtor
- util: fixed long2string()
- fixed a few leaks in GnutTLS client code (#181)
- VCard: made getters const (#186) (binary-incompatible change!)
- PubsubManager: fixed using wrong Tag (#190)
- Search: fixed search() (#193)
- DNS: fix socket leak if no network connection is available (#192)
- PubsubManager: unconditionally call handleItemPublication() (#194)
- configure: Added -lgcrypt (dependency of GNUTLS)


(wiz)
diff -r1.9 -r1.10 pkgsrc/chat/gloox/Makefile
diff -r1.1.1.1 -r1.2 pkgsrc/chat/gloox/PLIST
diff -r1.1.1.1 -r1.2 pkgsrc/chat/gloox/options.mk
diff -r1.5 -r1.6 pkgsrc/chat/gloox/distinfo
diff -r0 -r1.1 pkgsrc/chat/gloox/patches/patch-configure
diff -r1.1 -r1.2 pkgsrc/chat/gloox/patches/patch-src_connectiontcpbase.cpp
diff -r1.1.1.1 -r0 pkgsrc/chat/gloox/patches/patch-src_sha.cpp

cvs diff -r1.9 -r1.10 pkgsrc/chat/gloox/Makefile (expand / switch to unified diff)

--- pkgsrc/chat/gloox/Makefile 2014/02/12 23:17:36 1.9
+++ pkgsrc/chat/gloox/Makefile 2014/05/06 08:41:38 1.10
@@ -1,17 +1,16 @@ @@ -1,17 +1,16 @@
1# $NetBSD: Makefile,v 1.9 2014/02/12 23:17:36 tron Exp $ 1# $NetBSD: Makefile,v 1.10 2014/05/06 08:41:38 wiz Exp $
2 2
3DISTNAME= gloox-1.0 3DISTNAME= gloox-1.0.10
4PKGREVISION= 5 
5CATEGORIES= chat 4CATEGORIES= chat
6MASTER_SITES= http://camaya.net/download/ 5MASTER_SITES= http://camaya.net/download/
7EXTRACT_SUFX= .tar.bz2 6EXTRACT_SUFX= .tar.bz2
8 7
9MAINTAINER= schnoebe@cirr.com 8MAINTAINER= schnoebe@cirr.com
10HOMEPAGE= http://camaya.net/gloox/ 9HOMEPAGE= http://camaya.net/gloox/
11COMMENT= Jabber/XMPP client library 10COMMENT= Jabber/XMPP client library
12LICENSE= gnu-gpl-v2 11LICENSE= gnu-gpl-v2
13 12
14GNU_CONFIGURE= yes 13GNU_CONFIGURE= yes
15 14
16USE_LANGUAGES+= c++ c 15USE_LANGUAGES+= c++ c
17USE_TOOLS+= autoconf automake pkg-config 16USE_TOOLS+= autoconf automake pkg-config

cvs diff -r1.1.1.1 -r1.2 pkgsrc/chat/gloox/PLIST (expand / switch to unified diff)

--- pkgsrc/chat/gloox/PLIST 2011/02/06 19:46:48 1.1.1.1
+++ pkgsrc/chat/gloox/PLIST 2014/05/06 08:41:38 1.2
@@ -1,29 +1,31 @@ @@ -1,29 +1,31 @@
1@comment $NetBSD: PLIST,v 1.1.1.1 2011/02/06 19:46:48 schnoebe Exp $ 1@comment $NetBSD: PLIST,v 1.2 2014/05/06 08:41:38 wiz Exp $
2bin/gloox-config 2bin/gloox-config
3include/gloox/adhoc.h 3include/gloox/adhoc.h
4include/gloox/adhoccommandprovider.h 4include/gloox/adhoccommandprovider.h
5include/gloox/adhochandler.h 5include/gloox/adhochandler.h
6include/gloox/amp.h 6include/gloox/amp.h
7include/gloox/annotations.h 7include/gloox/annotations.h
8include/gloox/annotationshandler.h 8include/gloox/annotationshandler.h
 9include/gloox/atomicrefcount.h
9include/gloox/attention.h 10include/gloox/attention.h
10include/gloox/base64.h 11include/gloox/base64.h
11include/gloox/bookmarkhandler.h 12include/gloox/bookmarkhandler.h
12include/gloox/bookmarkstorage.h 13include/gloox/bookmarkstorage.h
13include/gloox/bytestream.h 14include/gloox/bytestream.h
14include/gloox/bytestreamdatahandler.h 15include/gloox/bytestreamdatahandler.h
15include/gloox/bytestreamhandler.h 16include/gloox/bytestreamhandler.h
16include/gloox/capabilities.h 17include/gloox/capabilities.h
 18include/gloox/carbons.h
17include/gloox/chatstate.h 19include/gloox/chatstate.h
18include/gloox/chatstatefilter.h 20include/gloox/chatstatefilter.h
19include/gloox/chatstatehandler.h 21include/gloox/chatstatehandler.h
20include/gloox/client.h 22include/gloox/client.h
21include/gloox/clientbase.h 23include/gloox/clientbase.h
22include/gloox/component.h 24include/gloox/component.h
23include/gloox/compressionbase.h 25include/gloox/compressionbase.h
24include/gloox/compressiondatahandler.h 26include/gloox/compressiondatahandler.h
25include/gloox/compressiondefault.h 27include/gloox/compressiondefault.h
26include/gloox/connectionbase.h 28include/gloox/connectionbase.h
27include/gloox/connectionbosh.h 29include/gloox/connectionbosh.h
28include/gloox/connectiondatahandler.h 30include/gloox/connectiondatahandler.h
29include/gloox/connectionhandler.h 31include/gloox/connectionhandler.h
@@ -41,37 +43,50 @@ include/gloox/dataformfieldcontainer.h @@ -41,37 +43,50 @@ include/gloox/dataformfieldcontainer.h
41include/gloox/dataformitem.h 43include/gloox/dataformitem.h
42include/gloox/dataformreported.h 44include/gloox/dataformreported.h
43include/gloox/delayeddelivery.h 45include/gloox/delayeddelivery.h
44include/gloox/disco.h 46include/gloox/disco.h
45include/gloox/discohandler.h 47include/gloox/discohandler.h
46include/gloox/disconodehandler.h 48include/gloox/disconodehandler.h
47include/gloox/error.h 49include/gloox/error.h
48include/gloox/event.h 50include/gloox/event.h
49include/gloox/eventdispatcher.h 51include/gloox/eventdispatcher.h
50include/gloox/eventhandler.h 52include/gloox/eventhandler.h
51include/gloox/featureneg.h 53include/gloox/featureneg.h
52include/gloox/flexoff.h 54include/gloox/flexoff.h
53include/gloox/flexoffhandler.h 55include/gloox/flexoffhandler.h
 56include/gloox/forward.h
54include/gloox/gloox.h 57include/gloox/gloox.h
55include/gloox/glooxversion.h 58include/gloox/glooxversion.h
56include/gloox/gpgencrypted.h 59include/gloox/gpgencrypted.h
57include/gloox/gpgsigned.h 60include/gloox/gpgsigned.h
58include/gloox/inbandbytestream.h 61include/gloox/inbandbytestream.h
59include/gloox/instantmucroom.h 62include/gloox/instantmucroom.h
60include/gloox/iq.h 63include/gloox/iq.h
61include/gloox/iqhandler.h 64include/gloox/iqhandler.h
62include/gloox/jid.h 65include/gloox/jid.h
 66include/gloox/jinglecontent.h
 67include/gloox/jinglefiletransfer.h
 68include/gloox/jingleiceudp.h
 69include/gloox/jingleplugin.h
 70include/gloox/jinglepluginfactory.h
 71include/gloox/jinglesession.h
 72include/gloox/jinglesessionhandler.h
 73include/gloox/jinglesessionmanager.h
63include/gloox/lastactivity.h 74include/gloox/lastactivity.h
64include/gloox/lastactivityhandler.h 75include/gloox/lastactivityhandler.h
 76include/gloox/linklocal.h
 77include/gloox/linklocalclient.h
 78include/gloox/linklocalhandler.h
 79include/gloox/linklocalmanager.h
65include/gloox/loghandler.h 80include/gloox/loghandler.h
66include/gloox/logsink.h 81include/gloox/logsink.h
67include/gloox/macros.h 82include/gloox/macros.h
68include/gloox/md5.h 83include/gloox/md5.h
69include/gloox/message.h 84include/gloox/message.h
70include/gloox/messageevent.h 85include/gloox/messageevent.h
71include/gloox/messageeventfilter.h 86include/gloox/messageeventfilter.h
72include/gloox/messageeventhandler.h 87include/gloox/messageeventhandler.h
73include/gloox/messagefilter.h 88include/gloox/messagefilter.h
74include/gloox/messagehandler.h 89include/gloox/messagehandler.h
75include/gloox/messagesession.h 90include/gloox/messagesession.h
76include/gloox/messagesessionhandler.h 91include/gloox/messagesessionhandler.h
77include/gloox/mucinvitationhandler.h 92include/gloox/mucinvitationhandler.h

cvs diff -r1.1.1.1 -r1.2 pkgsrc/chat/gloox/options.mk (expand / switch to unified diff)

--- pkgsrc/chat/gloox/options.mk 2011/02/06 19:46:48 1.1.1.1
+++ pkgsrc/chat/gloox/options.mk 2014/05/06 08:41:38 1.2
@@ -1,31 +1,33 @@ @@ -1,31 +1,33 @@
1# $NetBSD: options.mk,v 1.1.1.1 2011/02/06 19:46:48 schnoebe Exp $ 1# $NetBSD: options.mk,v 1.2 2014/05/06 08:41:38 wiz Exp $
2 2
3PKG_OPTIONS_VAR= PKG_OPTIONS.gloox 3PKG_OPTIONS_VAR= PKG_OPTIONS.gloox
4PKG_OPTIONS_REQUIRED_GROUPS= tls 4PKG_OPTIONS_REQUIRED_GROUPS= tls
5# TLS selections 5# TLS selections
6PKG_OPTIONS_GROUP.tls= gnutls openssl 6PKG_OPTIONS_GROUP.tls= gnutls openssl
7# debugging 7# debugging
8PKG_SUPPORTED_OPTIONS+= debug 8PKG_SUPPORTED_OPTIONS+= debug
9PKG_SUGGESTED_OPTIONS= gnutls 9PKG_SUGGESTED_OPTIONS= gnutls
10 10
11.include "../../mk/bsd.options.mk" 11.include "../../mk/bsd.options.mk"
12 12
13PLIST_VARS+= gnutls openssl 13PLIST_VARS+= gnutls openssl
14 14
15.if !empty(PKG_OPTIONS:Mgnutls) 15.if !empty(PKG_OPTIONS:Mgnutls)
16PLIST.gnutls= yes 16PLIST.gnutls= yes
17CONFIGURE_ARGS+= --with-gnutls=${BUILDLINK_PREFIX.gnutls} 17CONFIGURE_ARGS+= --with-gnutls=${BUILDLINK_PREFIX.gnutls}
18. include "../../security/gnutls/buildlink3.mk" 18. include "../../security/gnutls/buildlink3.mk"
 19. include "../../security/libgcrypt/buildlink3.mk"
 20USE_TOOLS+= pkg-config
19.else 21.else
20CONFIGURE_ARGS+= --without-gnutls 22CONFIGURE_ARGS+= --without-gnutls
21.endif 23.endif
22 24
23.if !empty(PKG_OPTIONS:Mopenssl) 25.if !empty(PKG_OPTIONS:Mopenssl)
24PLIST.openssl= yes 26PLIST.openssl= yes
25CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} 27CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl}
26. include "../../security/openssl/buildlink3.mk" 28. include "../../security/openssl/buildlink3.mk"
27.endif 29.endif
28 30
29.if !empty(PKG_OPTIONS:Mdebug) 31.if !empty(PKG_OPTIONS:Mdebug)
30CONFIGURE_ARGS+= --enable-debug 32CONFIGURE_ARGS+= --enable-debug
31.endif 33.endif

cvs diff -r1.5 -r1.6 pkgsrc/chat/gloox/distinfo (expand / switch to unified diff)

--- pkgsrc/chat/gloox/distinfo 2013/04/30 22:34:29 1.5
+++ pkgsrc/chat/gloox/distinfo 2014/05/06 08:41:38 1.6
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: distinfo,v 1.5 2013/04/30 22:34:29 joerg Exp $ 1$NetBSD: distinfo,v 1.6 2014/05/06 08:41:38 wiz Exp $
2 2
3SHA1 (gloox-1.0.tar.bz2) = 8c788738f72b05fae7c05c744a67859419ffa09c 3SHA1 (gloox-1.0.10.tar.bz2) = a55b663df28bbac62442ad6cdc5156213933427f
4RMD160 (gloox-1.0.tar.bz2) = 92089462ed778fb41bf97d882fc1785b8e82233f 4RMD160 (gloox-1.0.10.tar.bz2) = ec10ee4463593760b86ab09bf6534cb3fdd9e982
5Size (gloox-1.0.tar.bz2) = 603434 bytes 5Size (gloox-1.0.10.tar.bz2) = 670288 bytes
6SHA1 (patch-src_connectiontcpbase.cpp) = 41cda3692468a86f4b819f66d887667065a6cbe4 6SHA1 (patch-configure) = b14cc132665cbcb722589007c36767c0ddfab25f
 7SHA1 (patch-src_connectiontcpbase.cpp) = de9f367b91de7b4efd9ac7a3da463d3d32e5bdf0
7SHA1 (patch-src_connectiontcpserver.cpp) = 720129dfcdff5a7ebb70bbf378c9ca3e5dfaabae 8SHA1 (patch-src_connectiontcpserver.cpp) = 720129dfcdff5a7ebb70bbf378c9ca3e5dfaabae
8SHA1 (patch-src_dns.cpp) = dfc538e9a059b06b6222c3dffe879105701d504c 9SHA1 (patch-src_dns.cpp) = dfc538e9a059b06b6222c3dffe879105701d504c
9SHA1 (patch-src_examples_e2ee__client.cpp) = 3a28030733fca789769c9361fe21b586aebe1370 10SHA1 (patch-src_examples_e2ee__client.cpp) = 3a28030733fca789769c9361fe21b586aebe1370
10SHA1 (patch-src_examples_e2ee__server.cpp) = eb8c22427def85387b9bf88b665feb1315df878f 11SHA1 (patch-src_examples_e2ee__server.cpp) = eb8c22427def85387b9bf88b665feb1315df878f
11SHA1 (patch-src_examples_ft__recv.cpp) = 3a4431f24b9ad933e7829af23ea99bcd4a488abd 12SHA1 (patch-src_examples_ft__recv.cpp) = 3a4431f24b9ad933e7829af23ea99bcd4a488abd
12SHA1 (patch-src_sha.cpp) = b9f51307b97c68575aff4a029653584fcc6aeec6 
13SHA1 (patch-src_util.h) = 225609b219c76fdf1171a326cf40a9c26fde0a80 13SHA1 (patch-src_util.h) = 225609b219c76fdf1171a326cf40a9c26fde0a80

File Added: pkgsrc/chat/gloox/patches/patch-configure
$NetBSD: patch-configure,v 1.1 2014/05/06 08:41:38 wiz Exp $

Fix unportable test(1) construct.

--- configure.orig	2014-05-06 08:33:05.000000000 +0000
+++ configure
@@ -15153,7 +15153,7 @@ $as_echo "#define HAVE_GCC_ATOMIC_BUILTI
 
 	{ $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5
 $as_echo "yes" >&6; }
-	if test $cross_compiling == "yes"; then
+	if test $cross_compiling = "yes"; then
 		# Some platforms don't seem to be fully happy for libraries using GCC atomic builtins
 		#  unless -lgcc and -lgcc_s are explicitly included.
 		# (Errors like

cvs diff -r1.1 -r1.2 pkgsrc/chat/gloox/patches/Attic/patch-src_connectiontcpbase.cpp (expand / switch to unified diff)

--- pkgsrc/chat/gloox/patches/Attic/patch-src_connectiontcpbase.cpp 2012/02/16 13:57:16 1.1
+++ pkgsrc/chat/gloox/patches/Attic/patch-src_connectiontcpbase.cpp 2014/05/06 08:41:38 1.2
@@ -1,13 +1,13 @@ @@ -1,13 +1,13 @@
1$NetBSD: patch-src_connectiontcpbase.cpp,v 1.1 2012/02/16 13:57:16 hans Exp $ 1$NetBSD: patch-src_connectiontcpbase.cpp,v 1.2 2014/05/06 08:41:38 wiz Exp $
2 2
3--- src/connectiontcpbase.cpp.orig 2009-10-26 00:05:39.000000000 +0100 3--- src/connectiontcpbase.cpp.orig 2013-08-30 07:17:35.000000000 +0000
4+++ src/connectiontcpbase.cpp 2012-01-20 11:51:07.167505326 +0100 4+++ src/connectiontcpbase.cpp
5@@ -20,6 +20,8 @@ 5@@ -21,6 +21,8 @@
6 #include "prep.h" 
7 #include "mutexguard.h" 6 #include "mutexguard.h"
 7 #include "util.h"
8  8
9+#include <string.h> 9+#include <string.h>
10+ 10+
11 #ifdef __MINGW32__ 11 #ifdef __MINGW32__
12 # include <winsock.h> 12 # include <winsock.h>
13 #endif 13 #endif

File Deleted: pkgsrc/chat/gloox/patches/Attic/patch-src_sha.cpp