diff --git a/0001-fix-CVE-2024-36048.patch b/0001-fix-CVE-2024-36048.patch deleted file mode 100644 index 43609867d673a6c8e838683ab29612d376d5e761..0000000000000000000000000000000000000000 --- a/0001-fix-CVE-2024-36048.patch +++ /dev/null @@ -1,62 +0,0 @@ -From d185b65e0ab20089199ec9d30f8cbc2df4a73e18 Mon Sep 17 00:00:00 2001 -From: Marc Mutz -Date: Wed, 8 May 2024 16:11:36 +0200 -Subject: [PATCH] fix CVE-2024-36048 - -Signed-off-by: lichenguang ---- - src/oauth/qabstractoauth.cpp | 14 ++++++++------ - 1 file changed, 8 insertions(+), 6 deletions(-) - -diff --git a/src/oauth/qabstractoauth.cpp b/src/oauth/qabstractoauth.cpp -index 46985d6..a8b9ec5 100644 ---- a/src/oauth/qabstractoauth.cpp -+++ b/src/oauth/qabstractoauth.cpp -@@ -37,7 +37,6 @@ - #include - #include - #include --#include - #include - #include - #include -@@ -46,7 +45,9 @@ - #include - #include - --#include -+#include -+#include -+ - - Q_DECLARE_METATYPE(QAbstractOAuth::Error) - -@@ -292,13 +293,13 @@ void QAbstractOAuthPrivate::setStatus(QAbstractOAuth::Status newStatus) - - QByteArray QAbstractOAuthPrivate::generateRandomString(quint8 length) - { -- const char characters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; -- static std::mt19937 randomEngine(QDateTime::currentDateTime().toMSecsSinceEpoch()); -- std::uniform_int_distribution distribution(0, sizeof(characters) - 2); -+ constexpr char characters[] = "ABCDEFGHIJKLMNOPQRSTUVWXYZabcdefghijklmnopqrstuvwxyz0123456789"; -+ const int len = strlen(characters); - QByteArray data; - data.reserve(length); -+ QRandomGenerator *prng = QRandomGenerator::system(); - for (quint8 i = 0; i < length; ++i) -- data.append(characters[distribution(randomEngine)]); -+ data.append(characters[prng->bounded(len)]); - return data; - } - -@@ -614,6 +615,7 @@ void QAbstractOAuth::resourceOwnerAuthorization(const QUrl &url, const QVariantM - } - - /*! -+ \threadsafe - Generates a random string which could be used as state or nonce. - The parameter \a length determines the size of the generated - string. --- -2.50.1 - diff --git a/qt5-qtnetworkauth.spec b/qt5-qtnetworkauth.spec index fa912207c1e24dea59614f7697de605ef162273c..a12cde22cfc1395c861d4245d79c0eed80306a8b 100644 --- a/qt5-qtnetworkauth.spec +++ b/qt5-qtnetworkauth.spec @@ -2,15 +2,13 @@ Summary: Qt5 - NetworkAuth component Name: qt5-%{qt_module} -Version: 5.15.16 -Release: 2 +Version: 5.15.18 +Release: 1 # See LGPL_EXCEPTIONS.txt, LICENSE.GPL3, respectively, for exception details License: LGPL-3.0-only OR GPL-3.0-only WITH Qt-GPL-exception-1.0 -Url: http://www.qt.io -%global majmin %(echo %{version} | cut -d. -f1-2) -Source0: https://download.qt.io/official_releases/qt/%{majmin}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz -Patch0: 0001-fix-CVE-2024-36048.patch +Url: https://www.qt.io +Source0: https://download.qt.io/archive/qt/%{version_major_minor}/%{version}/submodules/%{qt_module}-everywhere-opensource-src-%{version}.tar.xz # filter plugin/qml provides %global __provides_exclude_from ^(%{_qt5_archdatadir}/qml/.*\\.so|%{_qt5_plugindir}/.*\\.so)$ @@ -19,6 +17,7 @@ BuildRequires: make BuildRequires: qt5-qtbase-devel >= %{version} BuildRequires: qt5-qtbase-private-devel %{?_qt5:Requires: %{_qt5}%{?_isa} = %{_qt5_version}} +BuildRequires: qt5-doctools %description %{summary} @@ -36,15 +35,24 @@ Requires: %{name}%{?_isa} = %{version}-%{release} %description examples %{summary}. +%package doc +Summary: Documentation for %{name} +Buildarch: noarch + +%description doc +%{summary}. + %prep %autosetup -p1 -n %{qt_module}-everywhere-src-%{version} %build %qmake_qt5 %qmake_qt5_build +%qmake_qt5_build docs %install %qmake_qt5_install +%qmake_qt5_install install_docs pushd %{buildroot}%{_qt5_libdir} for prl_file in libQt5*.prl ; do @@ -71,7 +79,14 @@ popd %files examples %{_qt5_examplesdir}/ +%files doc +%license LICENSE.FDL +%{_qt5_docdir}/* + %changelog +* Thu Nov 06 2025 Funda Wang - 5.15.18-1 +- update to version 5.15.18 + * Thu Oct 30 2025 lichenguang - 5.15.16-2 - Update the CVE-2024-36048 patch diff --git a/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz b/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz deleted file mode 100644 index a495e88253fdbaccef3acd5a5cb76b1efe39d3a6..0000000000000000000000000000000000000000 Binary files a/qtnetworkauth-everywhere-opensource-src-5.15.16.tar.xz and /dev/null differ diff --git a/qtnetworkauth-everywhere-opensource-src-5.15.18.tar.xz b/qtnetworkauth-everywhere-opensource-src-5.15.18.tar.xz new file mode 100644 index 0000000000000000000000000000000000000000..423f1371adb33a770bd9a068038b389fc8b8399a Binary files /dev/null and b/qtnetworkauth-everywhere-opensource-src-5.15.18.tar.xz differ