commit: 53429306a3674746da4c8c8c556548b7d5d32fca Author: Michael Mair-Keimberger <mmk <AT> levelnine <DOT> at> AuthorDate: Sat Apr 23 16:05:24 2022 +0000 Commit: Conrad Kostecki <conikost <AT> gentoo <DOT> org> CommitDate: Mon Apr 25 21:46:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=53429306
kde-apps/kimap: remove unused patch(es) Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger <mmk <AT> levelnine.at> Signed-off-by: Conrad Kostecki <conikost <AT> gentoo.org> .../kimap/files/kimap-21.08.3-CVE-2021-38373.patch | 51 ---------------------- 1 file changed, 51 deletions(-) diff --git a/kde-apps/kimap/files/kimap-21.08.3-CVE-2021-38373.patch b/kde-apps/kimap/files/kimap-21.08.3-CVE-2021-38373.patch deleted file mode 100644 index 90d216b0b846..000000000000 --- a/kde-apps/kimap/files/kimap-21.08.3-CVE-2021-38373.patch +++ /dev/null @@ -1,51 +0,0 @@ -From 5aed4138567934c3be20cddb60fe6d7d4a10da0f Mon Sep 17 00:00:00 2001 -From: Volker Krause <[email protected]> -Date: Mon, 15 Nov 2021 18:18:28 +0100 -Subject: [PATCH] Treat SSL handshake errors as fatal also when using STARTTLS - -This fixes the infinite SSL error dialog loop also when using -STARTTLS, the previous fix was only effective for direct TLS -connections. - -CCBUG: 423424 -(cherry picked from commit cbd3a03bc1d2cec48bb97570633940bbf94c34fa) ---- - src/loginjob.cpp | 22 +++++++++------------- - 1 file changed, 9 insertions(+), 13 deletions(-) - -diff --git a/src/loginjob.cpp b/src/loginjob.cpp -index 7d53187..b5fbede 100644 ---- a/src/loginjob.cpp -+++ b/src/loginjob.cpp -@@ -552,19 +552,15 @@ void LoginJob::connectionLost() - { - Q_D(LoginJob); - -- // don't emit the result if the connection was lost before getting the tls result, as it can mean -- // the TLS handshake failed and the socket was reconnected in normal mode -- if (d->authState != LoginJobPrivate::StartTls) { -- qCWarning(KIMAP_LOG) << "Connection to server lost " << d->m_socketError; -- if (d->m_socketError == QAbstractSocket::SslHandshakeFailedError) { -- setError(KJob::UserDefinedError); -- setErrorText(i18n("SSL handshake failed.")); -- emitResult(); -- } else { -- setError(ERR_COULD_NOT_CONNECT); -- setErrorText(i18n("Connection to server lost.")); -- emitResult(); -- } -+ qCWarning(KIMAP_LOG) << "Connection to server lost " << d->m_socketError; -+ if (d->m_socketError == QAbstractSocket::SslHandshakeFailedError) { -+ setError(KJob::UserDefinedError); -+ setErrorText(i18n("SSL handshake failed.")); -+ emitResult(); -+ } else { -+ setError(ERR_COULD_NOT_CONNECT); -+ setErrorText(i18n("Connection to server lost.")); -+ emitResult(); - } - } - --- -2.34.0 -
