Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-coap for openSUSE:Factory checked in at 2021-09-07 21:21:08 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-coap (Old) and /work/SRC/openSUSE:Factory/.qt6-coap.new.1899 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-coap" Tue Sep 7 21:21:08 2021 rev:7 rq:917022 version:6.1.3 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-coap/qt6-coap.changes 2021-07-05 22:23:42.589383085 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-coap.new.1899/qt6-coap.changes 2021-09-07 21:21:16.509292357 +0200 @@ -1,0 +2,6 @@ +Wed Sep 1 13:03:27 UTC 2021 - Christophe Giboudeaux <[email protected]> + +- Update to 6.1.3: + * https://www.qt.io/blog/qt-6.1.3-released + +------------------------------------------------------------------- Old: ---- qtcoap-6.1.2.tar.xz New: ---- qtcoap-6.1.3.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-coap.spec ++++++ --- /var/tmp/diff_new_pack.CCPYbB/_old 2021-09-07 21:21:17.125293102 +0200 +++ /var/tmp/diff_new_pack.CCPYbB/_new 2021-09-07 21:21:17.129293106 +0200 @@ -16,7 +16,7 @@ # -%define real_version 6.1.2 +%define real_version 6.1.3 %define short_version 6.1 %define tar_name qtcoap %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-coap%{?pkg_suffix} -Version: 6.1.2 +Version: 6.1.3 Release: 0 Summary: Qt 6 CoAP client module License: GPL-3.0-or-later ++++++ _service ++++++ --- /var/tmp/diff_new_pack.CCPYbB/_old 2021-09-07 21:21:17.165293150 +0200 +++ /var/tmp/diff_new_pack.CCPYbB/_new 2021-09-07 21:21:17.165293150 +0200 @@ -1,9 +1,9 @@ <services> <service name="tar_scm" mode="disabled"> <param name="changesgenerate">disable</param> - <param name="version">6.1.2</param> + <param name="version">6.1.3</param> <param name="url">git://code.qt.io/qt/qtcoap.git</param> - <param name="revision">v6.1.2</param> + <param name="revision">v6.1.3</param> <param name="scm">git</param> <param name="filename">qtcoap</param> </service> ++++++ qtcoap-6.1.2.tar.xz -> qtcoap-6.1.3.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.1.2/.cmake.conf new/qtcoap-6.1.3/.cmake.conf --- old/qtcoap-6.1.2/.cmake.conf 2021-06-18 17:17:55.000000000 +0200 +++ new/qtcoap-6.1.3/.cmake.conf 2021-08-27 13:41:26.000000000 +0200 @@ -1 +1 @@ -set(QT_REPO_MODULE_VERSION "6.1.2") +set(QT_REPO_MODULE_VERSION "6.1.3") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.1.2/.qmake.conf new/qtcoap-6.1.3/.qmake.conf --- old/qtcoap-6.1.2/.qmake.conf 2021-06-18 17:17:55.000000000 +0200 +++ new/qtcoap-6.1.3/.qmake.conf 2021-08-27 13:41:26.000000000 +0200 @@ -2,4 +2,4 @@ DEFINES += QT_NO_FOREACH QT_NO_JAVA_STYLE_ITERATORS -MODULE_VERSION = 6.1.2 +MODULE_VERSION = 6.1.3 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.1.2/conanfile.py new/qtcoap-6.1.3/conanfile.py --- old/qtcoap-6.1.2/conanfile.py 2021-06-18 17:17:55.000000000 +0200 +++ new/qtcoap-6.1.3/conanfile.py 2021-08-27 13:41:26.000000000 +0200 @@ -37,7 +37,7 @@ class QtCoAP(ConanFile): name = "qtcoap" - version = "6.1.2" + version = "6.1.3" license = "GPL-3.0+, Commercial Qt License Agreement" author = "The Qt Company <https://www.qt.io/contact-us>" url = "https://code.qt.io/cgit/qt/qtcoap.git/"; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.1.2/dependencies.yaml new/qtcoap-6.1.3/dependencies.yaml --- old/qtcoap-6.1.2/dependencies.yaml 2021-06-18 17:17:55.000000000 +0200 +++ new/qtcoap-6.1.3/dependencies.yaml 2021-08-27 13:41:26.000000000 +0200 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 4dcedb8ca4ae0c9c533997074098297abbfcf1c3 + ref: b496064efab47743fff4eb22f68e3acb3315fd9d required: true ../qttools: - ref: 9cfbb98844d63809ef446f7c2e2d16e258227b6a + ref: 60cae029c9f3fedd45cc39f9e72a33f765767289 required: true diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.1.2/src/coap/qcoapinternalrequest.cpp new/qtcoap-6.1.3/src/coap/qcoapinternalrequest.cpp --- old/qtcoap-6.1.2/src/coap/qcoapinternalrequest.cpp 2021-06-18 17:17:55.000000000 +0200 +++ new/qtcoap-6.1.3/src/coap/qcoapinternalrequest.cpp 2021-08-27 13:41:26.000000000 +0200 @@ -103,34 +103,18 @@ /*! \internal Initialize parameters to transform the QCoapInternalRequest into an - acknowledgment message with the message id \a messageId and the given - \a token. -*/ -void QCoapInternalRequest::initForAcknowledgment(quint16 messageId, const QByteArray &token) -{ - Q_D(QCoapInternalRequest); + empty message (RST or ACK) with the message id \a messageId. - setMethod(QtCoap::Method::Invalid); - d->message.setType(QCoapMessage::Type::Acknowledgment); - d->message.setMessageId(messageId); - d->message.setToken(token); - d->message.setPayload(QByteArray()); - d->message.clearOptions(); -} - -/*! - \internal - Initialize parameters to transform the QCoapInternalRequest into a - Reset message (RST) with the message id \a messageId. - - A Reset message should contain only the \a messageId. + An empty message should contain only the \a messageId. */ -void QCoapInternalRequest::initForReset(quint16 messageId) +void QCoapInternalRequest::initEmptyMessage(quint16 messageId, QCoapMessage::Type type) { Q_D(QCoapInternalRequest); + Q_ASSERT(type == QCoapMessage::Type::Acknowledgment || type == QCoapMessage::Type::Reset); + setMethod(QtCoap::Method::Invalid); - d->message.setType(QCoapMessage::Type::Reset); + d->message.setType(type); d->message.setMessageId(messageId); d->message.setToken(QByteArray()); d->message.setPayload(QByteArray()); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.1.2/src/coap/qcoapinternalrequest_p.h new/qtcoap-6.1.3/src/coap/qcoapinternalrequest_p.h --- old/qtcoap-6.1.2/src/coap/qcoapinternalrequest_p.h 2021-06-18 17:17:55.000000000 +0200 +++ new/qtcoap-6.1.3/src/coap/qcoapinternalrequest_p.h 2021-08-27 13:41:26.000000000 +0200 @@ -65,8 +65,7 @@ bool isValid() const override; - void initForAcknowledgment(quint16 messageId, const QByteArray &token); - void initForReset(quint16 messageId); + void initEmptyMessage(quint16 messageId, QCoapMessage::Type type); QByteArray toQByteArray() const; void setMessageId(quint16); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.1.2/src/coap/qcoapprotocol.cpp new/qtcoap-6.1.3/src/coap/qcoapprotocol.cpp --- old/qtcoap-6.1.2/src/coap/qcoapprotocol.cpp 2021-06-18 17:17:55.000000000 +0200 +++ new/qtcoap-6.1.3/src/coap/qcoapprotocol.cpp 2021-08-27 13:41:26.000000000 +0200 @@ -596,8 +596,8 @@ ackRequest.setTargetUri(request->targetUri()); auto internalReply = lastReplyForToken(request->token()); - ackRequest.initForAcknowledgment(internalReply->message()->messageId(), - internalReply->message()->token()); + ackRequest.initEmptyMessage(internalReply->message()->messageId(), + QCoapMessage::Type::Acknowledgment); ackRequest.setConnection(request->connection()); sendRequest(&ackRequest); } @@ -618,7 +618,7 @@ resetRequest.setTargetUri(request->targetUri()); auto lastReply = lastReplyForToken(request->token()); - resetRequest.initForReset(lastReply->message()->messageId()); + resetRequest.initEmptyMessage(lastReply->message()->messageId(), QCoapMessage::Type::Reset); resetRequest.setConnection(request->connection()); sendRequest(&resetRequest); } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtcoap-6.1.2/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp new/qtcoap-6.1.3/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp --- old/qtcoap-6.1.2/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp 2021-06-18 17:17:55.000000000 +0200 +++ new/qtcoap-6.1.3/tests/auto/qcoapinternalrequest/tst_qcoapinternalrequest.cpp 2021-08-27 13:41:26.000000000 +0200 @@ -54,6 +54,8 @@ void parseBlockOption(); void createBlockOption_data(); void createBlockOption(); + void initEmptyMessage_data(); + void initEmptyMessage(); }; void tst_QCoapInternalRequest::requestToFrame_data() @@ -451,6 +453,35 @@ QCOMPARE(option.opaqueValue(), expectedOption.opaqueValue()); } +void tst_QCoapInternalRequest::initEmptyMessage_data() +{ + QTest::addColumn<QCoapMessage::Type>("type"); + QTest::addColumn<QByteArray>("messageHeader"); + QTest::newRow("acknowledge") << QCoapMessage::Type::Acknowledgment << QByteArray("6000002a"); + QTest::newRow("reset") << QCoapMessage::Type::Reset << QByteArray("7000002a"); + +} + +void tst_QCoapInternalRequest::initEmptyMessage() +{ + QFETCH(QCoapMessage::Type, type); + QFETCH(QByteArray, messageHeader); + + // Populate the request with random data + QCoapRequest request = QCoapRequestPrivate::createRequest(QCoapRequest("coap://test"), + QtCoap::Method::Get); + request.setVersion(1); + request.setType(QCoapMessage::Type::Confirmable); + request.setMessageId(111); + request.setToken("token"); + request.addOption(QCoapOption::ProxyUri); + request.setPayload("payload"); + + QCoapInternalRequest emptyMessageRequest(request); + emptyMessageRequest.initEmptyMessage(42, type); + QCOMPARE(emptyMessageRequest.toQByteArray().toHex(), messageHeader); +} + QTEST_APPLESS_MAIN(tst_QCoapInternalRequest) #include "tst_qcoapinternalrequest.moc"
