Script 'mail_helper' called by obssrc Hello community, here is the log from the commit of package qt6-httpserver for openSUSE:Factory checked in at 2025-02-03 21:43:02 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/qt6-httpserver (Old) and /work/SRC/openSUSE:Factory/.qt6-httpserver.new.2316 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "qt6-httpserver" Mon Feb 3 21:43:02 2025 rev:20 rq:1242048 version:6.8.2 Changes: -------- --- /work/SRC/openSUSE:Factory/qt6-httpserver/qt6-httpserver.changes 2024-12-05 17:07:40.391162096 +0100 +++ /work/SRC/openSUSE:Factory/.qt6-httpserver.new.2316/qt6-httpserver.changes 2025-02-03 21:43:05.717446155 +0100 @@ -1,0 +2,6 @@ +Fri Jan 31 10:22:54 UTC 2025 - Christophe Marin <[email protected]> + +- Update to 6.8.2 + https://www.qt.io/blog/qt-6.8.2-released + +------------------------------------------------------------------- Old: ---- qthttpserver-everywhere-src-6.8.1.tar.xz New: ---- qthttpserver-everywhere-src-6.8.2.tar.xz ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ qt6-httpserver.spec ++++++ --- /var/tmp/diff_new_pack.mJ4Pyx/_old 2025-02-03 21:43:06.253468280 +0100 +++ /var/tmp/diff_new_pack.mJ4Pyx/_new 2025-02-03 21:43:06.253468280 +0100 @@ -16,7 +16,7 @@ # -%define real_version 6.8.1 +%define real_version 6.8.2 %define short_version 6.8 %define tar_name qthttpserver-everywhere-src %define tar_suffix %{nil} @@ -27,7 +27,7 @@ %endif # Name: qt6-httpserver%{?pkg_suffix} -Version: 6.8.1 +Version: 6.8.2 Release: 0 Summary: Qt HTTP Server License: GPL-3.0-only ++++++ qthttpserver-everywhere-src-6.8.1.tar.xz -> qthttpserver-everywhere-src-6.8.2.tar.xz ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.8.1/.cmake.conf new/qthttpserver-everywhere-src-6.8.2/.cmake.conf --- old/qthttpserver-everywhere-src-6.8.1/.cmake.conf 2024-11-21 05:00:02.000000000 +0100 +++ new/qthttpserver-everywhere-src-6.8.2/.cmake.conf 2025-01-24 10:54:55.000000000 +0100 @@ -1,4 +1,4 @@ -set(QT_REPO_MODULE_VERSION "6.8.1") +set(QT_REPO_MODULE_VERSION "6.8.2") set(QT_REPO_MODULE_PRERELEASE_VERSION_SEGMENT "alpha1") set(QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_FOREACH=1") list(APPEND QT_EXTRA_INTERNAL_TARGET_DEFINES "QT_NO_CONTEXTLESS_CONNECT=1") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.8.1/.tag new/qthttpserver-everywhere-src-6.8.2/.tag --- old/qthttpserver-everywhere-src-6.8.1/.tag 2024-11-21 05:00:02.000000000 +0100 +++ new/qthttpserver-everywhere-src-6.8.2/.tag 2025-01-24 10:54:55.000000000 +0100 @@ -1 +1 @@ -5aaeb8606959bad655a07ce80c9cec824c0678b8 +d5f7f65b169783d82516dcc395c27648a0c68812 diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.8.1/dependencies.yaml new/qthttpserver-everywhere-src-6.8.2/dependencies.yaml --- old/qthttpserver-everywhere-src-6.8.1/dependencies.yaml 2024-11-21 05:00:02.000000000 +0100 +++ new/qthttpserver-everywhere-src-6.8.2/dependencies.yaml 2025-01-24 10:54:55.000000000 +0100 @@ -1,7 +1,7 @@ dependencies: ../qtbase: - ref: 0db4321f2f13c6870283f3fcc0f1a462fd7cf663 + ref: f1136de66638060b8a1ab9bc0cdf1a91dcb5ec01 required: true ../qtwebsockets: - ref: 0ec0f302905b2154f8ccec4a761fdccf07692c66 + ref: f98fdcb40cc9a13cad3a3e2ec6fac915057771ec required: false diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.8.1/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp new/qthttpserver-everywhere-src-6.8.2/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp --- old/qthttpserver-everywhere-src-6.8.1/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp 2024-11-21 05:00:02.000000000 +0100 +++ new/qthttpserver-everywhere-src-6.8.2/tests/auto/qabstracthttpserver/tst_qabstracthttpserver.cpp 2025-01-24 10:54:55.000000000 +0100 @@ -12,6 +12,8 @@ #include <QtTest/qtesteventloop.h> #include <QtCore/qregularexpression.h> +#include <QtCore/qoperatingsystemversion.h> +#include <QtCore/qsystemdetection.h> #include <QtCore/qurl.h> #include <QtHttpServer/qhttpserverrequest.h> #include <QtHttpServer/qhttpserverresponder.h> @@ -415,6 +417,19 @@ tcpServer.listen(); server.bind(&tcpServer); #if QT_CONFIG(ssl) +#ifdef Q_OS_MACOS +#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. + if (QSslSocket::activeBackend() == QLatin1String("securetransport") + && QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSequoia) { + // We were built with SDK below 15, but a file-based keychains are not working anymore on macOS 15... + QSKIP("This test will block in keychain access"); + } +#endif // QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE +#endif // Q_OS_MACOS + QSslServer sslServer; QSslConfiguration sslConfiguration = QSslConfiguration::defaultConfiguration(); sslConfiguration.setLocalCertificate(QSslCertificate(QByteArray(g_certificate))); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/qthttpserver-everywhere-src-6.8.1/tests/auto/qhttpservermultithreaded/tst_qhttpservermultithreaded.cpp new/qthttpserver-everywhere-src-6.8.2/tests/auto/qhttpservermultithreaded/tst_qhttpservermultithreaded.cpp --- old/qthttpserver-everywhere-src-6.8.1/tests/auto/qhttpservermultithreaded/tst_qhttpservermultithreaded.cpp 2024-11-21 05:00:02.000000000 +0100 +++ new/qthttpserver-everywhere-src-6.8.2/tests/auto/qhttpservermultithreaded/tst_qhttpservermultithreaded.cpp 2025-01-24 10:54:55.000000000 +0100 @@ -7,6 +7,8 @@ #include <QtTest/qtest.h> #include <QtConcurrent/qtconcurrentrun.h> +#include <QtCore/qoperatingsystemversion.h> +#include <QtCore/qsystemdetection.h> #include <QtCore/qbytearray.h> #include <QtCore/qlist.h> #include <QtCore/qurl.h> @@ -426,11 +428,33 @@ void tst_QHttpServerMultithreaded::initTestCase_data() { + // Check if it's a macOS-build-with-SDK14 running on macOS 15: + auto sslServerIsBlockingKeychain = [] + { + #ifdef Q_OS_MACOS + #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 (QSslSocket::activeBackend() == QLatin1String("securetransport") + && QOperatingSystemVersion::current() >= QOperatingSystemVersion::MacOSSequoia) { + // We were built with SDK below 15, but a file-based keychains are not working anymore on macOS 15... + return true; + } + #endif // QT_MACOS_IOS_PLATFORM_SDK_EQUAL_OR_ABOVE + #endif // Q_OS_MACOS + return false; + }; + QTest::addColumn<ServerType>("serverType"); QTest::addRow("TCP") << ServerType::TCP; #if QT_CONFIG(ssl) - if (QSslSocket::supportsSsl()) + if (QSslSocket::supportsSsl() && !sslServerIsBlockingKeychain()) QTest::addRow("SSL") << ServerType::SSL; + else if (QSslSocket::supportsSsl()) + qInfo("Not testing TLS, keychain access will block the test"); #endif #if QT_CONFIG(localserver) QTest::addRow("LOCAL") << ServerType::LOCAL;
