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)diff -r1.9 -r1.10 pkgsrc/chat/gloox/Makefile
(wiz)
@@ -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 | |||
3 | DISTNAME= gloox-1.0 | 3 | DISTNAME= gloox-1.0.10 | |
4 | PKGREVISION= 5 | |||
5 | CATEGORIES= chat | 4 | CATEGORIES= chat | |
6 | MASTER_SITES= http://camaya.net/download/ | 5 | MASTER_SITES= http://camaya.net/download/ | |
7 | EXTRACT_SUFX= .tar.bz2 | 6 | EXTRACT_SUFX= .tar.bz2 | |
8 | 7 | |||
9 | MAINTAINER= schnoebe@cirr.com | 8 | MAINTAINER= schnoebe@cirr.com | |
10 | HOMEPAGE= http://camaya.net/gloox/ | 9 | HOMEPAGE= http://camaya.net/gloox/ | |
11 | COMMENT= Jabber/XMPP client library | 10 | COMMENT= Jabber/XMPP client library | |
12 | LICENSE= gnu-gpl-v2 | 11 | LICENSE= gnu-gpl-v2 | |
13 | 12 | |||
14 | GNU_CONFIGURE= yes | 13 | GNU_CONFIGURE= yes | |
15 | 14 | |||
16 | USE_LANGUAGES+= c++ c | 15 | USE_LANGUAGES+= c++ c | |
17 | USE_TOOLS+= autoconf automake pkg-config | 16 | USE_TOOLS+= autoconf automake pkg-config |
@@ -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 $ | |
2 | bin/gloox-config | 2 | bin/gloox-config | |
3 | include/gloox/adhoc.h | 3 | include/gloox/adhoc.h | |
4 | include/gloox/adhoccommandprovider.h | 4 | include/gloox/adhoccommandprovider.h | |
5 | include/gloox/adhochandler.h | 5 | include/gloox/adhochandler.h | |
6 | include/gloox/amp.h | 6 | include/gloox/amp.h | |
7 | include/gloox/annotations.h | 7 | include/gloox/annotations.h | |
8 | include/gloox/annotationshandler.h | 8 | include/gloox/annotationshandler.h | |
9 | include/gloox/atomicrefcount.h | |||
9 | include/gloox/attention.h | 10 | include/gloox/attention.h | |
10 | include/gloox/base64.h | 11 | include/gloox/base64.h | |
11 | include/gloox/bookmarkhandler.h | 12 | include/gloox/bookmarkhandler.h | |
12 | include/gloox/bookmarkstorage.h | 13 | include/gloox/bookmarkstorage.h | |
13 | include/gloox/bytestream.h | 14 | include/gloox/bytestream.h | |
14 | include/gloox/bytestreamdatahandler.h | 15 | include/gloox/bytestreamdatahandler.h | |
15 | include/gloox/bytestreamhandler.h | 16 | include/gloox/bytestreamhandler.h | |
16 | include/gloox/capabilities.h | 17 | include/gloox/capabilities.h | |
18 | include/gloox/carbons.h | |||
17 | include/gloox/chatstate.h | 19 | include/gloox/chatstate.h | |
18 | include/gloox/chatstatefilter.h | 20 | include/gloox/chatstatefilter.h | |
19 | include/gloox/chatstatehandler.h | 21 | include/gloox/chatstatehandler.h | |
20 | include/gloox/client.h | 22 | include/gloox/client.h | |
21 | include/gloox/clientbase.h | 23 | include/gloox/clientbase.h | |
22 | include/gloox/component.h | 24 | include/gloox/component.h | |
23 | include/gloox/compressionbase.h | 25 | include/gloox/compressionbase.h | |
24 | include/gloox/compressiondatahandler.h | 26 | include/gloox/compressiondatahandler.h | |
25 | include/gloox/compressiondefault.h | 27 | include/gloox/compressiondefault.h | |
26 | include/gloox/connectionbase.h | 28 | include/gloox/connectionbase.h | |
27 | include/gloox/connectionbosh.h | 29 | include/gloox/connectionbosh.h | |
28 | include/gloox/connectiondatahandler.h | 30 | include/gloox/connectiondatahandler.h | |
29 | include/gloox/connectionhandler.h | 31 | include/gloox/connectionhandler.h | |
@@ -41,37 +43,50 @@ include/gloox/dataformfieldcontainer.h | @@ -41,37 +43,50 @@ include/gloox/dataformfieldcontainer.h | |||
41 | include/gloox/dataformitem.h | 43 | include/gloox/dataformitem.h | |
42 | include/gloox/dataformreported.h | 44 | include/gloox/dataformreported.h | |
43 | include/gloox/delayeddelivery.h | 45 | include/gloox/delayeddelivery.h | |
44 | include/gloox/disco.h | 46 | include/gloox/disco.h | |
45 | include/gloox/discohandler.h | 47 | include/gloox/discohandler.h | |
46 | include/gloox/disconodehandler.h | 48 | include/gloox/disconodehandler.h | |
47 | include/gloox/error.h | 49 | include/gloox/error.h | |
48 | include/gloox/event.h | 50 | include/gloox/event.h | |
49 | include/gloox/eventdispatcher.h | 51 | include/gloox/eventdispatcher.h | |
50 | include/gloox/eventhandler.h | 52 | include/gloox/eventhandler.h | |
51 | include/gloox/featureneg.h | 53 | include/gloox/featureneg.h | |
52 | include/gloox/flexoff.h | 54 | include/gloox/flexoff.h | |
53 | include/gloox/flexoffhandler.h | 55 | include/gloox/flexoffhandler.h | |
56 | include/gloox/forward.h | |||
54 | include/gloox/gloox.h | 57 | include/gloox/gloox.h | |
55 | include/gloox/glooxversion.h | 58 | include/gloox/glooxversion.h | |
56 | include/gloox/gpgencrypted.h | 59 | include/gloox/gpgencrypted.h | |
57 | include/gloox/gpgsigned.h | 60 | include/gloox/gpgsigned.h | |
58 | include/gloox/inbandbytestream.h | 61 | include/gloox/inbandbytestream.h | |
59 | include/gloox/instantmucroom.h | 62 | include/gloox/instantmucroom.h | |
60 | include/gloox/iq.h | 63 | include/gloox/iq.h | |
61 | include/gloox/iqhandler.h | 64 | include/gloox/iqhandler.h | |
62 | include/gloox/jid.h | 65 | include/gloox/jid.h | |
66 | include/gloox/jinglecontent.h | |||
67 | include/gloox/jinglefiletransfer.h | |||
68 | include/gloox/jingleiceudp.h | |||
69 | include/gloox/jingleplugin.h | |||
70 | include/gloox/jinglepluginfactory.h | |||
71 | include/gloox/jinglesession.h | |||
72 | include/gloox/jinglesessionhandler.h | |||
73 | include/gloox/jinglesessionmanager.h | |||
63 | include/gloox/lastactivity.h | 74 | include/gloox/lastactivity.h | |
64 | include/gloox/lastactivityhandler.h | 75 | include/gloox/lastactivityhandler.h | |
76 | include/gloox/linklocal.h | |||
77 | include/gloox/linklocalclient.h | |||
78 | include/gloox/linklocalhandler.h | |||
79 | include/gloox/linklocalmanager.h | |||
65 | include/gloox/loghandler.h | 80 | include/gloox/loghandler.h | |
66 | include/gloox/logsink.h | 81 | include/gloox/logsink.h | |
67 | include/gloox/macros.h | 82 | include/gloox/macros.h | |
68 | include/gloox/md5.h | 83 | include/gloox/md5.h | |
69 | include/gloox/message.h | 84 | include/gloox/message.h | |
70 | include/gloox/messageevent.h | 85 | include/gloox/messageevent.h | |
71 | include/gloox/messageeventfilter.h | 86 | include/gloox/messageeventfilter.h | |
72 | include/gloox/messageeventhandler.h | 87 | include/gloox/messageeventhandler.h | |
73 | include/gloox/messagefilter.h | 88 | include/gloox/messagefilter.h | |
74 | include/gloox/messagehandler.h | 89 | include/gloox/messagehandler.h | |
75 | include/gloox/messagesession.h | 90 | include/gloox/messagesession.h | |
76 | include/gloox/messagesessionhandler.h | 91 | include/gloox/messagesessionhandler.h | |
77 | include/gloox/mucinvitationhandler.h | 92 | include/gloox/mucinvitationhandler.h |
@@ -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 | |||
3 | PKG_OPTIONS_VAR= PKG_OPTIONS.gloox | 3 | PKG_OPTIONS_VAR= PKG_OPTIONS.gloox | |
4 | PKG_OPTIONS_REQUIRED_GROUPS= tls | 4 | PKG_OPTIONS_REQUIRED_GROUPS= tls | |
5 | # TLS selections | 5 | # TLS selections | |
6 | PKG_OPTIONS_GROUP.tls= gnutls openssl | 6 | PKG_OPTIONS_GROUP.tls= gnutls openssl | |
7 | # debugging | 7 | # debugging | |
8 | PKG_SUPPORTED_OPTIONS+= debug | 8 | PKG_SUPPORTED_OPTIONS+= debug | |
9 | PKG_SUGGESTED_OPTIONS= gnutls | 9 | PKG_SUGGESTED_OPTIONS= gnutls | |
10 | 10 | |||
11 | .include "../../mk/bsd.options.mk" | 11 | .include "../../mk/bsd.options.mk" | |
12 | 12 | |||
13 | PLIST_VARS+= gnutls openssl | 13 | PLIST_VARS+= gnutls openssl | |
14 | 14 | |||
15 | .if !empty(PKG_OPTIONS:Mgnutls) | 15 | .if !empty(PKG_OPTIONS:Mgnutls) | |
16 | PLIST.gnutls= yes | 16 | PLIST.gnutls= yes | |
17 | CONFIGURE_ARGS+= --with-gnutls=${BUILDLINK_PREFIX.gnutls} | 17 | CONFIGURE_ARGS+= --with-gnutls=${BUILDLINK_PREFIX.gnutls} | |
18 | . include "../../security/gnutls/buildlink3.mk" | 18 | . include "../../security/gnutls/buildlink3.mk" | |
19 | . include "../../security/libgcrypt/buildlink3.mk" | |||
20 | USE_TOOLS+= pkg-config | |||
19 | .else | 21 | .else | |
20 | CONFIGURE_ARGS+= --without-gnutls | 22 | CONFIGURE_ARGS+= --without-gnutls | |
21 | .endif | 23 | .endif | |
22 | 24 | |||
23 | .if !empty(PKG_OPTIONS:Mopenssl) | 25 | .if !empty(PKG_OPTIONS:Mopenssl) | |
24 | PLIST.openssl= yes | 26 | PLIST.openssl= yes | |
25 | CONFIGURE_ARGS+= --with-openssl=${BUILDLINK_PREFIX.openssl} | 27 | CONFIGURE_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) | |
30 | CONFIGURE_ARGS+= --enable-debug | 32 | CONFIGURE_ARGS+= --enable-debug | |
31 | .endif | 33 | .endif |
@@ -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 | |||
3 | SHA1 (gloox-1.0.tar.bz2) = 8c788738f72b05fae7c05c744a67859419ffa09c | 3 | SHA1 (gloox-1.0.10.tar.bz2) = a55b663df28bbac62442ad6cdc5156213933427f | |
4 | RMD160 (gloox-1.0.tar.bz2) = 92089462ed778fb41bf97d882fc1785b8e82233f | 4 | RMD160 (gloox-1.0.10.tar.bz2) = ec10ee4463593760b86ab09bf6534cb3fdd9e982 | |
5 | Size (gloox-1.0.tar.bz2) = 603434 bytes | 5 | Size (gloox-1.0.10.tar.bz2) = 670288 bytes | |
6 | SHA1 (patch-src_connectiontcpbase.cpp) = 41cda3692468a86f4b819f66d887667065a6cbe4 | 6 | SHA1 (patch-configure) = b14cc132665cbcb722589007c36767c0ddfab25f | |
7 | SHA1 (patch-src_connectiontcpbase.cpp) = de9f367b91de7b4efd9ac7a3da463d3d32e5bdf0 | |||
7 | SHA1 (patch-src_connectiontcpserver.cpp) = 720129dfcdff5a7ebb70bbf378c9ca3e5dfaabae | 8 | SHA1 (patch-src_connectiontcpserver.cpp) = 720129dfcdff5a7ebb70bbf378c9ca3e5dfaabae | |
8 | SHA1 (patch-src_dns.cpp) = dfc538e9a059b06b6222c3dffe879105701d504c | 9 | SHA1 (patch-src_dns.cpp) = dfc538e9a059b06b6222c3dffe879105701d504c | |
9 | SHA1 (patch-src_examples_e2ee__client.cpp) = 3a28030733fca789769c9361fe21b586aebe1370 | 10 | SHA1 (patch-src_examples_e2ee__client.cpp) = 3a28030733fca789769c9361fe21b586aebe1370 | |
10 | SHA1 (patch-src_examples_e2ee__server.cpp) = eb8c22427def85387b9bf88b665feb1315df878f | 11 | SHA1 (patch-src_examples_e2ee__server.cpp) = eb8c22427def85387b9bf88b665feb1315df878f | |
11 | SHA1 (patch-src_examples_ft__recv.cpp) = 3a4431f24b9ad933e7829af23ea99bcd4a488abd | 12 | SHA1 (patch-src_examples_ft__recv.cpp) = 3a4431f24b9ad933e7829af23ea99bcd4a488abd | |
12 | SHA1 (patch-src_sha.cpp) = b9f51307b97c68575aff4a029653584fcc6aeec6 | |||
13 | SHA1 (patch-src_util.h) = 225609b219c76fdf1171a326cf40a9c26fde0a80 | 13 | SHA1 (patch-src_util.h) = 225609b219c76fdf1171a326cf40a9c26fde0a80 |
$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
@@ -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 |