2 files changed, 0 insertions, 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 <vkrause@kde.org>
-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 <montel@kde.org>
-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
-