From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 4C3DB15808E for ; Mon, 25 Apr 2022 21:48:58 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 70BEEE07F9; Mon, 25 Apr 2022 21:48:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 25916E07EF for ; Mon, 25 Apr 2022 21:48:51 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id BC51A3418E5 for ; Mon, 25 Apr 2022 21:48:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id EF935435 for ; Mon, 25 Apr 2022 21:48:46 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1650923175.81bb63c3ee3da471884b73827bd7ae3a1ba5be27.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kmailtransport/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch X-VCS-Directories: kde-apps/kmailtransport/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 81bb63c3ee3da471884b73827bd7ae3a1ba5be27 X-VCS-Branch: master Date: Mon, 25 Apr 2022 21:48:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: de988629-cbda-48ae-842d-6bebacb53edc X-Archives-Hash: 14eb0d17d734d3ef73dbb37bcd341356 commit: 81bb63c3ee3da471884b73827bd7ae3a1ba5be27 Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Apr 23 16:05:45 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Mon Apr 25 21:46:15 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=81bb63c3 kde-apps/kmailtransport: remove unused patch(es) Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../kmailtransport-21.08.3-CVE-2021-38373.patch | 63 ---------------------- ...ort-21.08.3-fix-crash-when-response-empty.patch | 25 --------- 2 files changed, 88 deletions(-) diff --git a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch deleted file mode 100644 index e83449e4e32a..000000000000 --- a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch +++ /dev/null @@ -1,63 +0,0 @@ -From cc4907eba8e16c319fb837b5ec85393b118c4ab6 Mon Sep 17 00:00:00 2001 -From: Volker Krause -Date: Thu, 16 Sep 2021 17:07:08 +0200 -Subject: [PATCH] Adapt to KSmtp moving encryption settings from LoginJob to - Session - -See https://invent.kde.org/pim/ksmtp/-/merge_requests/5. - -(cherry picked from commit b49ee72009620f152aaab1f592704e56e3be01f5) ---- - src/kmailtransport/plugins/smtp/smtpjob.cpp | 29 ++++++++++----------- - 1 file changed, 14 insertions(+), 15 deletions(-) - -diff --git a/src/kmailtransport/plugins/smtp/smtpjob.cpp b/src/kmailtransport/plugins/smtp/smtpjob.cpp -index 7ad0124..5a08dfd 100644 ---- a/src/kmailtransport/plugins/smtp/smtpjob.cpp -+++ b/src/kmailtransport/plugins/smtp/smtpjob.cpp -@@ -134,6 +134,20 @@ void SmtpJob::startSmtpJob() - d->session = new KSmtp::Session(transport()->host(), transport()->port()); - d->session->setUseNetworkProxy(transport()->useProxy()); - d->session->setUiProxy(d->uiProxy); -+ switch (transport()->encryption()) { -+ case Transport::EnumEncryption::None: -+ d->session->setEncryptionMode(KSmtp::Session::Unencrypted); -+ break; -+ case Transport::EnumEncryption::TLS: -+ d->session->setEncryptionMode(KSmtp::Session::STARTTLS); -+ break; -+ case Transport::EnumEncryption::SSL: -+ d->session->setEncryptionMode(KSmtp::Session::TLS); -+ break; -+ default: -+ qCWarning(MAILTRANSPORT_SMTP_LOG) << "Unknown encryption mode" << transport()->encryption(); -+ break; -+ } - if (transport()->specifyHostname()) { - d->session->setCustomHostname(transport()->localHostname()); - } -@@ -298,21 +312,6 @@ void SmtpJobPrivate::doLogin() - break; - } - -- switch (q->transport()->encryption()) { -- case Transport::EnumEncryption::None: -- login->setEncryptionMode(KSmtp::LoginJob::Unencrypted); -- break; -- case Transport::EnumEncryption::TLS: -- login->setEncryptionMode(KSmtp::LoginJob::STARTTLS); -- break; -- case Transport::EnumEncryption::SSL: -- login->setEncryptionMode(KSmtp::LoginJob::SSLorTLS); -- break; -- default: -- qCWarning(MAILTRANSPORT_SMTP_LOG) << "Unknown encryption mode" << q->transport()->encryption(); -- break; -- } -- - q->connect(login, &KJob::result, q, &SmtpJob::slotResult); - q->addSubjob(login); - login->start(); --- -2.34.0 - diff --git a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch deleted file mode 100644 index 84589d4908a3..000000000000 --- a/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch +++ /dev/null @@ -1,25 +0,0 @@ -From fb2ce5f1115ede2c782cc0e1095584eb07cf032b Mon Sep 17 00:00:00 2001 -From: Laurent Montel -Date: Mon, 1 Nov 2021 09:15:31 +0100 -Subject: [PATCH] Fix crash when response is empty - ---- - src/kmailtransport/servertest.cpp | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/src/kmailtransport/servertest.cpp b/src/kmailtransport/servertest.cpp -index 6e8d711..35079e1 100644 ---- a/src/kmailtransport/servertest.cpp -+++ b/src/kmailtransport/servertest.cpp -@@ -236,7 +236,7 @@ bool ServerTestPrivate::handlePopConversation(MailTransport::Socket *socket, int - // Initial Greeting - if (stage == 0) { - // Regexp taken from POP3 ioslave -- const QString responseWithoutCRLF = response.chopped(2); -+ const QString responseWithoutCRLF = response.isEmpty() ? response : response.chopped(2); - const QRegularExpression re(QStringLiteral("<[A-Za-z0-9\\.\\-_]+@[A-Za-z0-9\\.\\-_]+>$"), QRegularExpression::CaseInsensitiveOption); - if (responseWithoutCRLF.indexOf(re) != -1) { - authenticationResults[type] << Transport::EnumAuthenticationType::APOP; --- -GitLab -