Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-websockets for openSUSE:Factory checked in at 2024-12-05 17:05:58 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-websockets (Old) and /work/SRC/openSUSE:Factory/.qt6-websockets.new.28523 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-websockets" Thu Dec 5 17:05:58 2024 rev:26 rq:1228218 version:6.8.1 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-websockets/qt6-websockets.changes 2024-10-17 18:38:29.108119312 +0200 +++ /work/SRC/openSUSE:Factory/.qt6-websockets.new.28523/qt6-websockets.changes 2024-12-05 17:07:19.202274777 +0100 @@ -1,0 +2,6 @@ +Mon Dec 2 13:02:17 UTC 2024 - Christophe Marin <christo...@krop.fr> + +- Update to 6.8.1: + * https://www.qt.io/blog/qt-6.8.1-released + +------------------------------------------------------------------- Old: ---- qtwebsockets-everywhere-src-6.8.0.tar.xz New: ---- qtwebsockets-everywhere-src-6.8.1.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-websockets.spec ++++++ --- /var/tmp/diff_new_pack.QbNWuH/_old 2024-12-05 17:07:20.010308614 +0100 +++ /var/tmp/diff_new_pack.QbNWuH/_new 2024-12-05 17:07:20.014308782 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.8.0 +%define real_version 6.8.1 %define short_version 6.8 %define tar_name qtwebsockets-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-websockets%{?pkg_suffix} -Version: 6.8.0 +Version: 6.8.1 Release: 0 Summary: Qt 6 WebSockets library License: LGPL-3.0-only OR (GPL-2.0-only OR GPL-3.0-or-later) @@ -96,7 +96,8 @@ %autosetup -p1 -n %{tar_name}-%{real_version}%{tar_suffix} %build -%cmake_qt6 +%cmake_qt6 \ + -DQT_GENERATE_SBOM:BOOL=FALSE %{qt6_build} ++++++ qtwebsockets-everywhere-src-6.8.0.tar.xz -> qtwebsockets-everywhere-src-6.8.1.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.8.0/.cmake.conf new/qtwebsockets-everywhere-src-6.8.1/.cmake.conf --- old/qtwebsockets-everywhere-src-6.8.0/.cmake.conf 2024-10-02 16:25:56.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.8.1/.cmake.conf 2024-11-21 04:34:08.000000000 +0100 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.8.0") +set(QT_REPO_MODULE_VERSION "6.8.1") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_AS_CONST=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.8.0/.tag new/qtwebsockets-everywhere-src-6.8.1/.tag --- old/qtwebsockets-everywhere-src-6.8.0/.tag 2024-10-02 16:25:56.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.8.1/.tag 2024-11-21 04:34:08.000000000 +0100 @@ -1 +1 @@ -6f1afa8a1e9487813e06fb55ee14baa5dc76b8bb +0ec0f302905b2154f8ccec4a761fdccf07692c66 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.8.0/LICENSES/Qt-GPL-exception-1.0.txt new/qtwebsockets-everywhere-src-6.8.1/LICENSES/Qt-GPL-exception-1.0.txt --- old/qtwebsockets-everywhere-src-6.8.0/LICENSES/Qt-GPL-exception-1.0.txt 2024-10-02 16:25:56.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.8.1/LICENSES/Qt-GPL-exception-1.0.txt 1970-01-01 01:00:00.000000000 +0100 @@ -1,22 +0,0 @@ -The Qt Company GPL Exception 1.0 - -Exception 1: - -As a special exception you may create a larger work which contains the -output of this application and distribute that work under terms of your -choice, so long as the work is not otherwise derived from or based on -this application and so long as the work does not in itself generate -output that contains the output from this application in its original -or modified form. - -Exception 2: - -As a special exception, you have permission to combine this application -with Plugins licensed under the terms of your choice, to produce an -executable, and to copy and distribute the resulting executable under -the terms of your choice. However, the executable must be accompanied -by a prominent notice offering all users of the executable the entire -source code to this application, excluding the source code of the -independent modules, but including any changes you have made to this -application, under the terms of this license. - diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.8.0/REUSE.toml new/qtwebsockets-everywhere-src-6.8.1/REUSE.toml --- old/qtwebsockets-everywhere-src-6.8.0/REUSE.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.8.1/REUSE.toml 2024-11-21 04:34:08.000000000 +0100 @@ -0,0 +1,58 @@ +version = 1 + +[[annotations]] +path = ["src/imports/qmlwebsockets/plugins.qmltypes", + "src/websockets/doc/images/websockets-pictorial-representation.jpg"] +precedence = "closest" +comment = "source and plugins" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR LGPL-3.0-only OR GPL-2.0-only OR GPL-3.0-only" + +[[annotations]] +path = ["tests/**.txt", "tests/**.cert", "tests/**.key"] +precedence = "closest" +comment = "test" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GPL-3.0-only" + +[[annotations]] +path = ["**.pro", ".cmake.conf", "**.yaml", "**.json", "**.cfg", "**BLACKLIST"] +precedence = "closest" +comment = "build system" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = [".tag", "**/.gitattributes", "**.gitignore"] +precedence = "closest" +comment = "version control system. Licensed as build system" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "BSD-3-Clause" + +[[annotations]] +path = ["examples/**"] +comment = "this must be after the build system table because example and snippets take precedence over build system" +precedence = "closest" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR BSD-3-Clause" + +[[annotations]] +path = ["**/README*", "**.qdocconf"] +comment = "documentation" +precedence = "closest" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" + +[[annotations]] +path = ["**.toml", "licenseRule.json"] +precedence = "override" +comment = "documentation" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" + +[[annotations]] +path = ["**/qt_attribution.json"] +precedence = "override" +comment = "documentation" +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.8.0/dependencies.yaml new/qtwebsockets-everywhere-src-6.8.1/dependencies.yaml --- old/qtwebsockets-everywhere-src-6.8.0/dependencies.yaml 2024-10-02 16:25:56.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.8.1/dependencies.yaml 2024-11-21 04:34:08.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: b839e9b36db3a4e50dfb34521d8ef8de1fd01969 + ref: 0db4321f2f13c6870283f3fcc0f1a462fd7cf663 required: true ../qtdeclarative: - ref: 2884c601242f030307a5acdca984b3aa0d34e064 + ref: b34fca34941ecdbf99819bbf58b45332ac9e6fa7 required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.8.0/dist/REUSE.toml new/qtwebsockets-everywhere-src-6.8.1/dist/REUSE.toml --- old/qtwebsockets-everywhere-src-6.8.0/dist/REUSE.toml 1970-01-01 01:00:00.000000000 +0100 +++ new/qtwebsockets-everywhere-src-6.8.1/dist/REUSE.toml 2024-11-21 04:34:08.000000000 +0100 @@ -0,0 +1,8 @@ +version = 1 + +[[annotations]] +path = ["*"] +precedence = "override" +comment = "Licensed as documentation." +SPDX-FileCopyrightText = "Copyright (C) 2024 The Qt Company Ltd." +SPDX-License-Identifier = "LicenseRef-Qt-Commercial OR GFDL-1.3-no-invariants-only" diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.8.0/src/imports/qmlwebsockets/qqmlwebsocket.cpp new/qtwebsockets-everywhere-src-6.8.1/src/imports/qmlwebsockets/qqmlwebsocket.cpp --- old/qtwebsockets-everywhere-src-6.8.0/src/imports/qmlwebsockets/qqmlwebsocket.cpp 2024-10-02 16:25:56.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.8.1/src/imports/qmlwebsockets/qqmlwebsocket.cpp 2024-11-21 04:34:08.000000000 +0100 @@ -124,6 +124,8 @@ QQmlWebSocket::~QQmlWebSocket() { + if (m_webSocket) + m_webSocket->disconnect(); } qint64 QQmlWebSocket::sendTextMessage(const QString &message) diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qtwebsockets-everywhere-src-6.8.0/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp new/qtwebsockets-everywhere-src-6.8.1/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp --- old/qtwebsockets-everywhere-src-6.8.0/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp 2024-10-02 16:25:56.000000000 +0200 +++ new/qtwebsockets-everywhere-src-6.8.1/tests/auto/websockets/qwebsocket/tst_qwebsocket.cpp 2024-11-21 04:34:08.000000000 +0100 @@ -9,6 +9,9 @@ #include <QtWebSockets/QWebSocketServer> #include <QtWebSockets/qwebsocketprotocol.h> +#include <QtCore/qoperatingsystemversion.h> +#include <QtCore/qsystemdetection.h> + #include <QtNetwork/qtcpserver.h> #include <QtNetwork/qauthenticator.h> #include <QtNetwork/qtcpsocket.h> @@ -17,6 +20,7 @@ #include <QtNetwork/qsslserver.h> #include <QtNetwork/qsslcertificate.h> #include <QtNetwork/qsslkey.h> +#include <QtNetwork/qsslsocket.h> #endif #include <utility> @@ -25,6 +29,31 @@ Q_DECLARE_METATYPE(QWebSocketProtocol::Version) + +#if QT_CONFIG(ssl) +// Check if it's a macOS-build-with-SDK14 running on macOS 15: +bool sslServerIsBlockingKeychain() +{ +#ifdef Q_OS_MACOS + if (QSslSocket::activeBackend() != QLatin1String("securetransport")) + return false; +#if QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE(150000, 180000) + // Starting from macOS 15 our temporary keychain is ignored. + // We have to use kSecImportToMemoryOnly/kCFBooleanTrue key/value + // instead. This way we don't have to use QT_SSL_USE_TEMPORARY_KEYCHAIN anymore. + return false; +#else + if (QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSequoia) { + // Built with SDK < 15, with file-based keychains that no longer work on macOS >= 15. + return true; + } +#endif +#endif // Q_OS_MACOS + return false; +} +#endif // QT_CONFIG(ssl) + + using namespace Qt::StringLiterals; class EchoServer : public QObject @@ -1132,6 +1161,11 @@ qDebug("Skipping the SslServer part of this test because proper TLS is not supported."); return; } + if (sslServerIsBlockingKeychain()) { + qDebug("SecureTransport is blocking in keychain access."); + return; + } + // And double that, but now with TLS for (auto &server : serverScenarios) { server.withEncryption = true;
