diff options
Diffstat (limited to 'user/qt5-qtwebsockets')
| -rw-r--r-- | user/qt5-qtwebsockets/APKBUILD | 6 | ||||
| -rw-r--r-- | user/qt5-qtwebsockets/kde-lts.patch | 100 |
2 files changed, 32 insertions, 74 deletions
diff --git a/user/qt5-qtwebsockets/APKBUILD b/user/qt5-qtwebsockets/APKBUILD index f9fce48d9..201845791 100644 --- a/user/qt5-qtwebsockets/APKBUILD +++ b/user/qt5-qtwebsockets/APKBUILD @@ -2,7 +2,7 @@ # Maintainer: A. Wilcox <awilfox@adelielinux.org> pkgname=qt5-qtwebsockets _pkgname=qtwebsockets-everywhere -pkgver=5.15.4 +pkgver=5.15.17 pkgrel=0 pkgdesc="Qt implementation of WebSockets" url="https://www.qt.io/" @@ -26,5 +26,5 @@ package() { make install INSTALL_ROOT="$pkgdir" } -sha512sums="01714b9927c3a234fac9386a596aa3dc3833d9cfe8cc152892fec969e51b428bed00f501c16b8e4f810452739ff8491e5c64f9b936aa10e1a839c09c8f2832ce qtwebsockets-everywhere-opensource-src-5.15.4.tar.xz -cbffbd9de347d4c58a38ddb3c50427a96ae08019de90a0035672fe49ce061015873fdb70f491c84ac09dc28871ced851782bae2195b26ce123a135b44a3f1a0b kde-lts.patch" +sha512sums="59afb4a8992b3fd1ca50f26a5ae13b0ffd79ac321475963cfdc7e64ef7a1a070b8eee1052d1cff26fa0c3bda1d8bbb2849e8e84b4c15f1b4ba936cb54a6f4014 qtwebsockets-everywhere-opensource-src-5.15.17.tar.xz +c32d811bb44a777be69f67657a2a38ffd5498e57826e3167b3a68dae7b5aa35980de306cd166b3531c3a76ee0ca296b269b791fe3479e2d197a8fbd6cdd157cd kde-lts.patch" diff --git a/user/qt5-qtwebsockets/kde-lts.patch b/user/qt5-qtwebsockets/kde-lts.patch index aeaabdb14..10c952151 100644 --- a/user/qt5-qtwebsockets/kde-lts.patch +++ b/user/qt5-qtwebsockets/kde-lts.patch @@ -1,7 +1,7 @@ -From c905caaecf33c1820eebae34e7b5ef1e71642af0 Mon Sep 17 00:00:00 2001 +From c91acbedf93a3526e8c58197b1ae8d6676a54078 Mon Sep 17 00:00:00 2001 From: Allan Sandfeld Jensen <allan.jensen@qt.io> Date: Mon, 25 Jan 2021 15:34:22 +0100 -Subject: [PATCH 1/3] Clear frame on reconnect +Subject: [PATCH 1/2] Clear frame on reconnect MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit @@ -22,10 +22,10 @@ Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> 1 file changed, 1 insertion(+) diff --git a/src/websockets/qwebsocketdataprocessor.cpp b/src/websockets/qwebsocketdataprocessor.cpp -index e2cc291..69c4fa8 100644 +index 2affdd5..95f1194 100644 --- a/src/websockets/qwebsocketdataprocessor.cpp +++ b/src/websockets/qwebsocketdataprocessor.cpp -@@ -269,6 +269,7 @@ void QWebSocketDataProcessor::clear() +@@ -273,6 +273,7 @@ void QWebSocketDataProcessor::clear() if (!m_pConverterState) m_pConverterState = new QTextCodec::ConverterState(QTextCodec::ConvertInvalidToNull | QTextCodec::IgnoreHeader); @@ -34,82 +34,40 @@ index e2cc291..69c4fa8 100644 /*! -- -2.36.0 +2.49.0 -From 6b318a2f39942b248574438925e23b46235009b2 Mon Sep 17 00:00:00 2001 -From: Jens Trillmann <jens.trillmann@governikus.de> -Date: Fri, 26 Feb 2021 13:06:49 +0100 -Subject: [PATCH 2/3] Pass ignoreSslErrors to unterlying QSslSocket +From db9cb84499229143506a9692fc65d3cb223b3978 Mon Sep 17 00:00:00 2001 +From: =?UTF-8?q?M=C3=A5rten=20Nordheim?= <marten.nordheim@qt.io> +Date: Tue, 13 Dec 2022 17:07:48 +0100 +Subject: [PATCH 2/2] Disconnect when handshake fails -When setting ignoreSslErrors(List<QSslError>) during the sslErrors -signal handling the call got ignored. Only the internal config for -creating a QSslSocket would be updated but not the current QSslSocket. -The request of the caller to ignore specific QSslErrors would be -ignored. +It is unexpected that websocket does not disconnect once +it knows the handshake has failed. -Pick-to: 5.12 5.15 6.2 -Change-Id: I6aaea2111fe1d26e07e6eaaa7532ae1b14a187a8 -Reviewed-by: Allan Sandfeld Jensen <allan.jensen@qt.io> -(cherry picked from commit b13f23d232cfdd372ef812d427872d52eed2337e) +Pick-to: 6.5 6.4 6.2 5.15 +Change-Id: I11e64745ffdb01c11ac79739cf7f384ad6cc4590 +Reviewed-by: Timur Pocheptsov <timur.pocheptsov@qt.io> +(cherry picked from commit 7efdec16d9f6116fc6c13bc3ae7c9b9e229e5a49) + +* asturmlechner 2023-01-06: Resolve conflict with dev branch commit + 55cef3a13c8377c55b2fe050751c8a05eb7f9fce --- - src/websockets/qwebsocket_p.cpp | 5 +++++ - 1 file changed, 5 insertions(+) + src/websockets/qwebsocket_p.cpp | 2 ++ + 1 file changed, 2 insertions(+) diff --git a/src/websockets/qwebsocket_p.cpp b/src/websockets/qwebsocket_p.cpp -index aedc3c6..824184a 100644 +index cf3087f..0dd0fa6 100644 --- a/src/websockets/qwebsocket_p.cpp +++ b/src/websockets/qwebsocket_p.cpp -@@ -270,6 +270,11 @@ QSslConfiguration QWebSocketPrivate::sslConfiguration() const - void QWebSocketPrivate::ignoreSslErrors(const QList<QSslError> &errors) - { - m_configuration.m_ignoredSslErrors = errors; -+ if (Q_LIKELY(m_pSocket)) { -+ QSslSocket *pSslSocket = qobject_cast<QSslSocket *>(m_pSocket); -+ if (Q_LIKELY(pSslSocket)) -+ pSslSocket->ignoreSslErrors(errors); -+ } +@@ -1100,6 +1100,8 @@ void QWebSocketPrivate::processHandshake(QTcpSocket *pSocket) + m_handshakeState = AllDoneState; + setErrorString(errorDescription); + Q_EMIT q->error(QAbstractSocket::ConnectionRefusedError); ++ if (m_pSocket->state() != QAbstractSocket::UnconnectedState) ++ m_pSocket->disconnectFromHost(); + } } - /*! --- -2.36.0 - -From 6a4991250793cd38efa5e8db858cd49c82439130 Mon Sep 17 00:00:00 2001 -From: Marc Mutz <marc.mutz@qt.io> -Date: Fri, 17 Dec 2021 09:08:45 +0100 -Subject: [PATCH 3/3] QWebSocketProtocol: fix potential UB (signed overflow) in - masking operation -MIME-Version: 1.0 -Content-Type: text/plain; charset=UTF-8 -Content-Transfer-Encoding: 8bit - -The size of the payload is a 64-bit integer, which the loop counts -down. If the size is > INT_MAX, then we'll overflow the int i used to -track the current position in the mask. - -Fix by using an unsigned integer type instead. - -Pick-to: 6.3 6.2 5.15 -Change-Id: Ia3b8d42ae906eb03c1c7399cb1137a08121fcde3 -Reviewed-by: Mårten Nordheim <marten.nordheim@qt.io> -(cherry picked from commit 38218494a65049b5f9da7a8aab012a969c7dac86) ---- - src/websockets/qwebsocketprotocol.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/websockets/qwebsocketprotocol.cpp b/src/websockets/qwebsocketprotocol.cpp -index df87a93..d0465f1 100644 ---- a/src/websockets/qwebsocketprotocol.cpp -+++ b/src/websockets/qwebsocketprotocol.cpp -@@ -210,7 +210,7 @@ void QWebSocketProtocol::mask(char *payload, quint64 size, quint32 maskingKey) - quint8((maskingKey & 0x0000FF00u) >> 8), - quint8((maskingKey & 0x000000FFu)) - }; -- int i = 0; -+ quint64 i = 0; - while (size-- > 0) - *payload++ ^= mask[i++ % 4]; - } -- -2.36.0 +2.49.0 |