From 6d32baac4042548b6cab05d27fed1194f375515f Mon Sep 17 00:00:00 2001 From: Rex Dieter Date: Tue, 19 Dec 2017 09:20:15 -0600 Subject: [PATCH] backport upstream fix: forwardsocket errors (D9249) --- ...rd-socket-error-string-to-KTcpSocket.patch | 35 +++++++++++++++++++ kf5-kio.spec | 6 +++- 2 files changed, 40 insertions(+), 1 deletion(-) create mode 100644 0012-forward-socket-error-string-to-KTcpSocket.patch diff --git a/0012-forward-socket-error-string-to-KTcpSocket.patch b/0012-forward-socket-error-string-to-KTcpSocket.patch new file mode 100644 index 0000000..ed7b872 --- /dev/null +++ b/0012-forward-socket-error-string-to-KTcpSocket.patch @@ -0,0 +1,35 @@ +From 84f290a2659d4e8704282d186cfa3a1093bcd133 Mon Sep 17 00:00:00 2001 +From: Martin Koller +Date: Fri, 8 Dec 2017 14:37:41 +0100 +Subject: [PATCH 12/25] forward socket error string to KTcpSocket + +KTcpSocket is a QIODevice, internally using a Qt socket - however it did +not set the error string of itself when the internal socket +signals some error condition. Now it does. + +Differential Revision: https://phabricator.kde.org/D9249 +--- + src/core/ktcpsocket.cpp | 2 ++ + 1 file changed, 2 insertions(+) + +diff --git a/src/core/ktcpsocket.cpp b/src/core/ktcpsocket.cpp +index a3e70c4b..439e9022 100644 +--- a/src/core/ktcpsocket.cpp ++++ b/src/core/ktcpsocket.cpp +@@ -349,11 +349,13 @@ public: + //private slots + void reemitSocketError(QAbstractSocket::SocketError e) + { ++ q->setErrorString(sock.errorString()); + emit q->error(errorFromAbsSocket(e)); + } + + void reemitSslErrors(const QList &errors) + { ++ q->setErrorString(sock.errorString()); + q->showSslErrors(); //H4X + QList kErrors; + foreach (const QSslError &e, errors) { +-- +2.14.3 + diff --git a/kf5-kio.spec b/kf5-kio.spec index 8969f3c..cee618c 100644 --- a/kf5-kio.spec +++ b/kf5-kio.spec @@ -2,7 +2,7 @@ Name: kf5-%{framework} Version: 5.41.0 -Release: 2%{?dist} +Release: 3%{?dist} Summary: KDE Frameworks 5 Tier 3 solution for filesystem abstraction License: GPLv2+ and MIT and BSD @@ -18,6 +18,7 @@ URL: https://cgit.kde.org/%{framework}.git Source0: http://download.kde.org/%{stable}/frameworks/%{majmin}/%{framework}-%{version}.tar.xz ## upstream patches +Patch12: 0012-forward-socket-error-string-to-KTcpSocket.patch ## upstreamable patches # revert part of https://cgit.kde.org/kio.git/commit/src/core/slave.cpp?id=e2a4517f099d809bd53c6a10769ebfddc0f28a8b @@ -275,6 +276,9 @@ fi %changelog +* Tue Dec 19 2017 Rex Dieter - 5.41.0-3 +- backport upstream fix: forwardsocket errors (D9249) + * Thu Dec 07 2017 Rex Dieter - 5.41.0-2 - cleanup