Hello community, here is the log from the commit of package libqxmpp for openSUSE:Factory checked in at 2015-03-18 13:06:17 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/libqxmpp (Old) and /work/SRC/openSUSE:Factory/.libqxmpp.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "libqxmpp" Changes: -------- --- /work/SRC/openSUSE:Factory/libqxmpp/libqxmpp-qt5.changes 2015-01-20 12:28:13.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.libqxmpp.new/libqxmpp-qt5.changes 2015-03-18 13:06:18.000000000 +0100 @@ -1,0 +2,11 @@ +Sat Mar 14 12:40:23 UTC 2015 - [email protected] + +- update to 0.8.3 + * Add a QXmppClient::sslErrors signal to report SSL errors. + * Handle broken servers which send "bad-auth" + instead of "not-authorized". + * Fix a compilation issue with Qt 5.5 due to a missing include. + * Do not install test cases. + * Remove trailing comma after last item in enums. + +------------------------------------------------------------------- libqxmpp.changes: same change Old: ---- v0.8.2.tar.gz New: ---- v0.8.3.tar.gz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ libqxmpp-qt5.spec ++++++ --- /var/tmp/diff_new_pack.H2qtT1/_old 2015-03-18 13:06:19.000000000 +0100 +++ /var/tmp/diff_new_pack.H2qtT1/_new 2015-03-18 13:06:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqxmpp-qt5 # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define build_qt5 1 Name: libqxmpp-qt5 -Version: 0.8.2 +Version: 0.8.3 Release: 0 Summary: Qt XMPP Library License: LGPL-2.0+ ++++++ libqxmpp.spec ++++++ --- /var/tmp/diff_new_pack.H2qtT1/_old 2015-03-18 13:06:19.000000000 +0100 +++ /var/tmp/diff_new_pack.H2qtT1/_new 2015-03-18 13:06:19.000000000 +0100 @@ -1,7 +1,7 @@ # # spec file for package libqxmpp # -# Copyright (c) 2015 SUSE LINUX Products GmbH, Nuernberg, Germany. +# Copyright (c) 2015 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,7 +20,7 @@ %define build_qt5 0 Name: libqxmpp -Version: 0.8.2 +Version: 0.8.3 Release: 0 Summary: Qt XMPP Library License: LGPL-2.0+ ++++++ v0.8.2.tar.gz -> v0.8.3.tar.gz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/CHANGELOG new/qxmpp-0.8.3/CHANGELOG --- old/qxmpp-0.8.2/CHANGELOG 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/CHANGELOG 2015-03-13 00:29:36.000000000 +0100 @@ -1,3 +1,12 @@ +QXmpp 0.8.3 (Mar 13, 2015) +-------------------------- + + - Add a QXmppClient::sslErrors signal to report SSL errors. + - Handle broken servers which send "bad-auth" instead of "not-authorized". + - Fix a compilation issue with Qt 5.5 due to a missing header include. + - Do not install test cases. + - Remove trailing comma after last item in enums. + QXmpp 0.8.2 (Jan 7, 2015) ------------------------- diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/qxmpp.pri new/qxmpp-0.8.3/qxmpp.pri --- old/qxmpp-0.8.2/qxmpp.pri 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/qxmpp.pri 2015-03-13 00:29:36.000000000 +0100 @@ -1,7 +1,7 @@ # Common definitions QT += network xml -QXMPP_VERSION = 0.8.2 +QXMPP_VERSION = 0.8.3 QXMPP_INCLUDEPATH = $$PWD/src/base $$PWD/src/client $$PWD/src/server # Determine library name diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppByteStreamIq.h new/qxmpp-0.8.3/src/base/QXmppByteStreamIq.h --- old/qxmpp-0.8.2/src/base/QXmppByteStreamIq.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppByteStreamIq.h 2015-03-13 00:29:36.000000000 +0100 @@ -34,7 +34,7 @@ enum Mode { None = 0, Tcp, - Udp, + Udp }; class QXMPP_EXPORT StreamHost diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppCodec.cpp new/qxmpp-0.8.3/src/base/QXmppCodec.cpp --- old/qxmpp-0.8.2/src/base/QXmppCodec.cpp 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppCodec.cpp 2015-03-13 00:29:36.000000000 +0100 @@ -72,7 +72,7 @@ NoFragment = 0, StartFragment, MiddleFragment, - EndFragment, + EndFragment }; static qint16 seg_aend[8] = {0x1F, 0x3F, 0x7F, 0xFF, diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppDataForm.h new/qxmpp-0.8.3/src/base/QXmppDataForm.h --- old/qxmpp-0.8.2/src/base/QXmppDataForm.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppDataForm.h 2015-03-13 00:29:36.000000000 +0100 @@ -87,7 +87,7 @@ ListSingleField, TextMultiField, TextPrivateField, - TextSingleField, + TextSingleField }; Field(QXmppDataForm::Field::Type type = QXmppDataForm::Field::TextSingleField); @@ -134,7 +134,7 @@ ///< form-processing entity. Cancel, ///< The form-submitting entity has cancelled submission ///< of data to the form-processing entity. - Result, ///< The form-processing entity is returning data + Result ///< The form-processing entity is returning data ///< (e.g., search results) to the form-submitting entity, ///< or the data is a generic data set. }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppDiscoveryIq.h new/qxmpp-0.8.3/src/base/QXmppDiscoveryIq.h --- old/qxmpp-0.8.2/src/base/QXmppDiscoveryIq.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppDiscoveryIq.h 2015-03-13 00:29:36.000000000 +0100 @@ -72,7 +72,7 @@ enum QueryType { InfoQuery, - ItemsQuery, + ItemsQuery }; QStringList features() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppGlobal.h new/qxmpp-0.8.3/src/base/QXmppGlobal.h --- old/qxmpp-0.8.2/src/base/QXmppGlobal.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppGlobal.h 2015-03-13 00:29:36.000000000 +0100 @@ -52,7 +52,7 @@ /// available. /// -#define QXMPP_VERSION 0x000802 +#define QXMPP_VERSION 0x000803 QXMPP_EXPORT QString QXmppVersion(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppJingleIq.h new/qxmpp-0.8.3/src/base/QXmppJingleIq.h --- old/qxmpp-0.8.2/src/base/QXmppJingleIq.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppJingleIq.h 2015-03-13 00:29:36.000000000 +0100 @@ -90,7 +90,7 @@ ///< the address/port as seen from the peer. ServerReflexiveType, ///< Server-reflexive candidate, ///< the address/port as seen by the STUN server - RelayedType, ///< Relayed candidate, a candidate from + RelayedType ///< Relayed candidate, a candidate from ///< a TURN relay. }; @@ -170,7 +170,7 @@ TransportAccept, TransportInfo, TransportReject, - TransportReplace, + TransportReplace }; /// \internal @@ -255,7 +255,7 @@ Success, Timeout, UnsupportedApplications, - UnsupportedTransports, + UnsupportedTransports }; Reason(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppLogger.h new/qxmpp-0.8.3/src/base/QXmppLogger.h --- old/qxmpp-0.8.2/src/base/QXmppLogger.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppLogger.h 2015-03-13 00:29:36.000000000 +0100 @@ -58,7 +58,7 @@ NoLogging = 0, ///< Log messages are discarded FileLogging = 1, ///< Log messages are written to a file StdoutLogging = 2, ///< Log messages are written to the standard output - SignalLogging = 4, ///< Log messages are emitted as a signal + SignalLogging = 4 ///< Log messages are emitted as a signal }; /// This enum describes a type of log message. @@ -70,7 +70,7 @@ WarningMessage = 4, ///< Warning message ReceivedMessage = 8, ///< Message received from server SentMessage = 16, ///< Message sent to server - AnyMessage = 31, ///< Any message type + AnyMessage = 31 ///< Any message type }; Q_DECLARE_FLAGS(MessageTypes, MessageType) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppMessage.cpp new/qxmpp-0.8.3/src/base/QXmppMessage.cpp --- old/qxmpp-0.8.2/src/base/QXmppMessage.cpp 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppMessage.cpp 2015-03-13 00:29:36.000000000 +0100 @@ -60,7 +60,7 @@ enum StampType { LegacyDelayedDelivery, // XEP-0091: Legacy Delayed Delivery - DelayedDelivery, // XEP-0203: Delayed Delivery + DelayedDelivery // XEP-0203: Delayed Delivery }; class QXmppMessagePrivate : public QSharedData diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppMessage.h new/qxmpp-0.8.3/src/base/QXmppMessage.h --- old/qxmpp-0.8.2/src/base/QXmppMessage.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppMessage.h 2015-03-13 00:29:36.000000000 +0100 @@ -57,7 +57,7 @@ Inactive, ///< User has not been actively participating in the chat session. Gone, ///< User has effectively ended their participation in the chat session. Composing, ///< User is composing a message. - Paused, ///< User had been composing but now has stopped. + Paused ///< User had been composing but now has stopped. }; /// This enum describes a chat marker as defined by diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppMucIq.h new/qxmpp-0.8.3/src/base/QXmppMucIq.h --- old/qxmpp-0.8.2/src/base/QXmppMucIq.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppMucIq.h 2015-03-13 00:29:36.000000000 +0100 @@ -43,7 +43,7 @@ NoAffiliation, MemberAffiliation, AdminAffiliation, - OwnerAffiliation, + OwnerAffiliation }; /// This enum is used to represent short-lived permissions in a room (roles). @@ -52,7 +52,7 @@ NoRole, VisitorRole, ParticipantRole, - ModeratorRole, + ModeratorRole }; QXmppMucItem(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppPubSubIq.h new/qxmpp-0.8.3/src/base/QXmppPubSubIq.h --- old/qxmpp-0.8.2/src/base/QXmppPubSubIq.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppPubSubIq.h 2015-03-13 00:29:36.000000000 +0100 @@ -68,7 +68,7 @@ SubscribeQuery, SubscriptionQuery, SubscriptionsQuery, - UnsubscribeQuery, + UnsubscribeQuery }; QXmppPubSubIq::QueryType queryType() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppRtpChannel.cpp new/qxmpp-0.8.3/src/base/QXmppRtpChannel.cpp --- old/qxmpp-0.8.2/src/base/QXmppRtpChannel.cpp 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppRtpChannel.cpp 2015-03-13 00:29:36.000000000 +0100 @@ -176,7 +176,7 @@ L16Stereo = 10, L16Mono = 11, G728 = 15, - G729 = 18, + G729 = 18 }; struct ToneInfo diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppRtpChannel.h new/qxmpp-0.8.3/src/base/QXmppRtpChannel.h --- old/qxmpp-0.8.2/src/base/QXmppRtpChannel.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppRtpChannel.h 2015-03-13 00:29:36.000000000 +0100 @@ -200,7 +200,7 @@ ///< sub-sampled (U-Y-V-Y), i.e. two horizontally adjacent ///< pixels are stored as a 32-bit macropixel which has a Y ///< value for each pixel and common U and V values. - Format_YUYV = 21, ///< The frame is stored using an 8-bit per component packed + Format_YUYV = 21 ///< The frame is stored using an 8-bit per component packed ///< YUV format with the U and V planes horizontally ///< sub-sampled (Y-U-Y-V), i.e. two horizontally adjacent ///< pixels are stored as a 32-bit macropixel which has a Y diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppSocks.cpp new/qxmpp-0.8.3/src/base/QXmppSocks.cpp --- old/qxmpp-0.8.2/src/base/QXmppSocks.cpp 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppSocks.cpp 2015-03-13 00:29:36.000000000 +0100 @@ -33,19 +33,19 @@ enum AuthenticationMethod { NoAuthentication = 0, GSSAPI = 1, - UsernamePassword = 2, + UsernamePassword = 2 }; enum Command { ConnectCommand = 1, BindCommand = 2, - AssociateCommand = 3, + AssociateCommand = 3 }; enum AddressType { IPv4Address = 1, DomainName = 3, - IPv6Address = 4, + IPv6Address = 4 }; enum ReplyType { @@ -57,13 +57,13 @@ ConnectionRefused = 5, TtlExpired = 6, CommandNotSupported = 7, - AddressTypeNotSupported = 8, + AddressTypeNotSupported = 8 }; enum State { ConnectState = 0, CommandState = 1, - ReadyState = 2, + ReadyState = 2 }; static QByteArray encodeHostAndPort(quint8 type, const QByteArray &host, quint16 port) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppStreamInitiationIq_p.h new/qxmpp-0.8.3/src/base/QXmppStreamInitiationIq_p.h --- old/qxmpp-0.8.2/src/base/QXmppStreamInitiationIq_p.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppStreamInitiationIq_p.h 2015-03-13 00:29:36.000000000 +0100 @@ -48,7 +48,7 @@ public: enum Profile { None = 0, - FileTransfer, + FileTransfer }; QXmppDataForm featureForm() const; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppStun.cpp new/qxmpp-0.8.3/src/base/QXmppStun.cpp --- old/qxmpp-0.8.2/src/base/QXmppStun.cpp 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppStun.cpp 2015-03-13 00:29:36.000000000 +0100 @@ -24,6 +24,7 @@ #define QXMPP_DEBUG_STUN #include <QCryptographicHash> +#include <QDataStream> #include <QHostInfo> #include <QNetworkInterface> #include <QUdpSocket> @@ -66,7 +67,7 @@ Fingerprint = 0x8028, // RFC5389 IceControlled = 0x8029, // RFC5245 IceControlling = 0x802a, // RFC5245 - OtherAddress = 0x802c, // RFC5780 + OtherAddress = 0x802c // RFC5780 }; // FIXME : we need to set local preference to discriminate between diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/base/QXmppStun.h new/qxmpp-0.8.3/src/base/QXmppStun.h --- old/qxmpp-0.8.2/src/base/QXmppStun.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/base/QXmppStun.h 2015-03-13 00:29:36.000000000 +0100 @@ -49,14 +49,14 @@ Send = 0x6, Data = 0x7, CreatePermission = 0x8, - ChannelBind = 0x9, + ChannelBind = 0x9 }; enum ClassType { Request = 0x000, Indication = 0x010, Response = 0x100, - Error = 0x110, + Error = 0x110 }; QXmppStunMessage(); @@ -201,7 +201,7 @@ UnconnectedState, ConnectingState, ConnectedState, - ClosingState, + ClosingState }; QXmppTurnAllocation(QObject *parent = 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/client/QXmppCallManager.h new/qxmpp-0.8.3/src/client/QXmppCallManager.h --- old/qxmpp-0.8.2/src/client/QXmppCallManager.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/client/QXmppCallManager.h 2015-03-13 00:29:36.000000000 +0100 @@ -66,7 +66,7 @@ enum Direction { IncomingDirection, ///< The call is incoming. - OutgoingDirection, ///< The call is outgoing. + OutgoingDirection ///< The call is outgoing. }; /// This enum is used to describe the state of a call. @@ -75,7 +75,7 @@ ConnectingState = 0, ///< The call is being connected. ActiveState = 1, ///< The call is active. DisconnectingState = 2, ///< The call is being disconnected. - FinishedState = 3, ///< The call is finished. + FinishedState = 3 ///< The call is finished. }; ~QXmppCall(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/client/QXmppClient.cpp new/qxmpp-0.8.3/src/client/QXmppClient.cpp --- old/qxmpp-0.8.2/src/client/QXmppClient.cpp 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/client/QXmppClient.cpp 2015-03-13 00:29:36.000000000 +0100 @@ -124,6 +124,10 @@ this, SIGNAL(iqReceived(QXmppIq))); Q_ASSERT(check); + check = connect(d->stream, SIGNAL(sslErrors(QList<QSslError>)), + this, SIGNAL(sslErrors(QList<QSslError>))); + Q_ASSERT(check); + check = connect(d->stream->socket(), SIGNAL(stateChanged(QAbstractSocket::SocketState)), this, SLOT(_q_socketStateChanged(QAbstractSocket::SocketState))); Q_ASSERT(check); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/client/QXmppClient.h new/qxmpp-0.8.3/src/client/QXmppClient.h --- old/qxmpp-0.8.2/src/client/QXmppClient.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/client/QXmppClient.h 2015-03-13 00:29:36.000000000 +0100 @@ -31,6 +31,8 @@ #include "QXmppLogger.h" #include "QXmppPresence.h" +class QSslError; + class QXmppClientExtension; class QXmppClientPrivate; class QXmppPresence; @@ -90,7 +92,7 @@ NoError, ///< No error. SocketError, ///< Error due to TCP socket. KeepAliveError, ///< Error due to no response to a keep alive. - XmppStreamError, ///< Error due to XML stream. + XmppStreamError ///< Error due to XML stream. }; /// This enumeration describes a client state. @@ -98,7 +100,7 @@ { DisconnectedState, ///< Disconnected from the server. ConnectingState, ///< Trying to connect to the server. - ConnectedState, ///< Connected to the server. + ConnectedState ///< Connected to the server. }; QXmppClient(QObject *parent = 0); @@ -212,6 +214,10 @@ /// management, setting-getting vCards etc is done using iq stanzas. void iqReceived(const QXmppIq &iq); + /// This signal is emitted to indicate that one or more SSL errors were + /// encountered while establishing the identity of the server. + void sslErrors(const QList<QSslError> &errors); + /// This signal is emitted when the client state changes. void stateChanged(QXmppClient::State state); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/client/QXmppMucManager.h new/qxmpp-0.8.3/src/client/QXmppMucManager.h --- old/qxmpp-0.8.2/src/client/QXmppMucManager.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/client/QXmppMucManager.h 2015-03-13 00:29:36.000000000 +0100 @@ -119,7 +119,7 @@ SubjectAction = 1, ///< change the room's subject ConfigurationAction = 2, ///< change the room's configuration PermissionsAction = 4, ///< change the room's permissions - KickAction = 8, ///< kick users from the room + KickAction = 8 ///< kick users from the room }; Q_DECLARE_FLAGS(Actions, Action) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/client/QXmppOutgoingClient.cpp new/qxmpp-0.8.3/src/client/QXmppOutgoingClient.cpp --- old/qxmpp-0.8.2/src/client/QXmppOutgoingClient.cpp 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/client/QXmppOutgoingClient.cpp 2015-03-13 00:29:36.000000000 +0100 @@ -269,12 +269,17 @@ } } -void QXmppOutgoingClient::socketSslErrors(const QList<QSslError> & error) +void QXmppOutgoingClient::socketSslErrors(const QList<QSslError> &errors) { + // log errors warning("SSL errors"); - for(int i = 0; i< error.count(); ++i) - warning(error.at(i).errorString()); + for(int i = 0; i< errors.count(); ++i) + warning(errors.at(i).errorString()); + // relay signal + emit sslErrors(errors); + + // if configured, ignore the errors if (configuration().ignoreSslErrors()) socket()->ignoreSslErrors(); } @@ -538,7 +543,10 @@ QXmppSaslFailure failure; failure.parse(nodeRecv); - if (failure.condition() == "not-authorized") + // RFC3920 defines the error condition as "not-authorized", but + // some broken servers use "bad-auth" instead. We tolerate this + // by remapping the error to "not-authorized". + if (failure.condition() == "not-authorized" || failure.condition() == "bad-auth") d->xmppStreamError = QXmppStanza::Error::NotAuthorized; else d->xmppStreamError = QXmppStanza::Error::UndefinedCondition; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/client/QXmppOutgoingClient.h new/qxmpp-0.8.3/src/client/QXmppOutgoingClient.h --- old/qxmpp-0.8.2/src/client/QXmppOutgoingClient.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/client/QXmppOutgoingClient.h 2015-03-13 00:29:36.000000000 +0100 @@ -77,6 +77,9 @@ /// This signal is emitted when an IQ is received. void iqReceived(const QXmppIq&); + /// This signal is emitted when SSL errors are encountered. + void sslErrors(const QList<QSslError> &errors); + protected: /// \cond // Overridable methods diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/client/QXmppTransferManager.h new/qxmpp-0.8.3/src/client/QXmppTransferManager.h --- old/qxmpp-0.8.2/src/client/QXmppTransferManager.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/client/QXmppTransferManager.h 2015-03-13 00:29:36.000000000 +0100 @@ -102,7 +102,7 @@ enum Direction { IncomingDirection, ///< The file is being received. - OutgoingDirection, ///< The file is being sent. + OutgoingDirection ///< The file is being sent. }; /// This enum is used to describe the type of error encountered by a transfer job. @@ -112,7 +112,7 @@ AbortError, ///< The file transfer was aborted. FileAccessError, ///< An error was encountered trying to access a local file. FileCorruptError, ///< The file is corrupt: the file size or hash do not match. - ProtocolError, ///< An error was encountered in the file transfer protocol. + ProtocolError ///< An error was encountered in the file transfer protocol. }; /// This enum is used to describe a transfer method. @@ -121,7 +121,7 @@ NoMethod = 0, ///< No transfer method. InBandMethod = 1, ///< XEP-0047: In-Band Bytestreams SocksMethod = 2, ///< XEP-0065: SOCKS5 Bytestreams - AnyMethod = 3, ///< Any supported transfer method. + AnyMethod = 3 ///< Any supported transfer method. }; Q_DECLARE_FLAGS(Methods, Method) @@ -131,7 +131,7 @@ OfferState = 0, ///< The transfer is being offered to the remote party. StartState = 1, ///< The transfer is being connected. TransferState = 2, ///< The transfer is ongoing. - FinishedState = 3, ///< The transfer is finished. + FinishedState = 3 ///< The transfer is finished. }; ~QXmppTransferJob(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/server/QXmppDialback.h new/qxmpp-0.8.3/src/server/QXmppDialback.h --- old/qxmpp-0.8.2/src/server/QXmppDialback.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/server/QXmppDialback.h 2015-03-13 00:29:36.000000000 +0100 @@ -38,7 +38,7 @@ enum Command { Result, ///< A dialback command between the originating server ///< and the receiving server. - Verify, ///< A dialback command between the receiving server + Verify ///< A dialback command between the receiving server ///< and the authoritative server. }; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/src/server/QXmppPasswordChecker.h new/qxmpp-0.8.3/src/server/QXmppPasswordChecker.h --- old/qxmpp-0.8.2/src/server/QXmppPasswordChecker.h 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/src/server/QXmppPasswordChecker.h 2015-03-13 00:29:36.000000000 +0100 @@ -35,7 +35,7 @@ public: /// This enum is used to describe request types. enum Type { - CheckPassword = 0, + CheckPassword = 0 }; QString domain() const; @@ -64,7 +64,7 @@ enum Error { NoError = 0, AuthorizationError, - TemporaryError, + TemporaryError }; QXmppPasswordReply(QObject *parent = 0); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/tests/qxmpputils/tst_qxmpputils.cpp new/qxmpp-0.8.3/tests/qxmpputils/tst_qxmpputils.cpp --- old/qxmpp-0.8.2/tests/qxmpputils/tst_qxmpputils.cpp 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/tests/qxmpputils/tst_qxmpputils.cpp 2015-03-13 00:29:36.000000000 +0100 @@ -50,13 +50,13 @@ void tst_QXmppUtils::testHmac() { - QByteArray hmac = QXmppUtils::generateHmacMd5(QByteArray(16, 0x0b), QByteArray("Hi There")); + QByteArray hmac = QXmppUtils::generateHmacMd5(QByteArray(16, '\x0b'), QByteArray("Hi There")); QCOMPARE(hmac, QByteArray::fromHex("9294727a3638bb1c13f48ef8158bfc9d")); hmac = QXmppUtils::generateHmacMd5(QByteArray("Jefe"), QByteArray("what do ya want for nothing?")); QCOMPARE(hmac, QByteArray::fromHex("750c783e6ab0b503eaa86e310a5db738")); - hmac = QXmppUtils::generateHmacMd5(QByteArray(16, 0xaa), QByteArray(50, 0xdd)); + hmac = QXmppUtils::generateHmacMd5(QByteArray(16, '\xaa'), QByteArray(50, '\xdd')); QCOMPARE(hmac, QByteArray::fromHex("56be34521d144c88dbb8c733f0e8b3f6")); } @@ -114,7 +114,7 @@ void tst_QXmppUtils::testLibVersion() { - QCOMPARE(QXmppVersion(), QString("0.8.2")); + QCOMPARE(QXmppVersion(), QString("0.8.3")); } void tst_QXmppUtils::testTimezoneOffset() diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qxmpp-0.8.2/tests/tests.pri new/qxmpp-0.8.3/tests/tests.pri --- old/qxmpp-0.8.2/tests/tests.pri 2015-01-07 12:34:06.000000000 +0100 +++ new/qxmpp-0.8.3/tests/tests.pri 2015-03-13 00:29:36.000000000 +0100 @@ -9,3 +9,6 @@ QMAKE_RPATHDIR += $$OUT_PWD/../../src INCLUDEPATH += $$PWD $$QXMPP_INCLUDEPATH LIBS += $$QXMPP_LIBS + +# do not install testcases +target.CONFIG += no_default_install -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
