gentoo resync : 05.12.2021

5 files changed, 98 insertions, 54 deletions

diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index d71b21d74ec1..6bf7586e1ade 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,5 +1,5 @@
-DIST kmailtransport-21.04.3.tar.xz 174100 BLAKE2B e356305570376df2c147e7c2e768f427237c05b56f2325d89774a067620c9d5162dfddeb7d50f7c5cb84b7270d338016967541c2fc67a52d06716cbc990a1228 SHA512 aa4afb187969faee3b6fc5567595232ac5aa74aebfa2e407e0ad10245f4bb26da4fb8beae17b2a2a3d3d8b676198e1eedc694f4ba669927b3a6eb50be6703c30
+AUX kmailtransport-21.08.3-CVE-2021-38373.patch 2459 BLAKE2B f2bf0a072134e50d963ac180eb56cc39b3ce87cc1656b2fed50c949f17c8cf28fcfa7defdd22f8811a79142cde08b4c67583a340d58dca1d434b269bce678720 SHA512 e6c13c7ae6ee92d73aa010398642b932b840b0c95036c18a19bd22083ae28a632208b181d6b6465bfa986e3a784831420b5473abd46ac0eaba9d0dffbca7decc
+AUX kmailtransport-21.08.3-fix-crash-when-response-empty.patch 1134 BLAKE2B 12d52676a6cc6b7b92ac08c593e82887195ae1ee237a0de73e250399cb74f129d7f307b959f1f62220787f6d8d660dff8cd6a66fc32ad2c7029ab4bb5d61af7c SHA512 34ffc2c911ef339b437dc79a31396eb5b58782d3548ee74479b3bf2a44bf92956e5ca86f96ec4ece0560d1cac4bd09a28655540e9cf316be5d57c9328f98b241
 DIST kmailtransport-21.08.3.tar.xz 172708 BLAKE2B 4c6faf8a4ba6d94af0f67a1785410dd5ae761514249d9a6fe4ac192de48ea38ba20427e33dfc0b7b626e2e896df6e042f7aa6521f3ca8d85670311db8ef3f9bd SHA512 ae00304aeb391603ddd30db93548f0e14f35e364c32a44ada1663bd38cf921d095fb2804f337cba9b47f7e0daa4d462caffe41c0bd18d8cffddfb75f51854b1c
-EBUILD kmailtransport-21.04.3.ebuild 1154 BLAKE2B 13b3b1d69fc40dd7a805b5c0bafb45c7d6921276ed5692b32ac8b57e640a6688ccff6eb769cfbc3fd3e393d59f34e0db2a003c4eb70a0bd901d8a54518148cd5 SHA512 87d2cc08aa3d69ce8082e10b1051f983b418f0dd20cf06f60f9be2f0145762de4444dc2b978085b670228724d00d5a8b7a54af0b522adf9c72a606a221d29033
-EBUILD kmailtransport-21.08.3.ebuild 1059 BLAKE2B e50926aa80f850a3c4355d49e1b2cd7168e3e1e7f7130040ab4575eba829b8a46e057eb6ef034aa5e372e75feaf0af32225bb1565ae8511d35538daae202e244 SHA512 6ab34857a07b3bd0b382853136203e5dbd31d4dbc7b91e4f5eaea24489ab57f1d807b02f30f4a57bd7296a6cf20113343d4d7296a0eb5645e243819062f19b20
+EBUILD kmailtransport-21.08.3-r2.ebuild 1175 BLAKE2B f2bf4a7d0fea201e823e724d4f80fbfc13675359010fc0c59880ffa9d3a4d4c74f55583dc59c04f1ba17fbd8a976988bc16bf6f0795627dc2f366591203bfbec SHA512 f3dce79effaf81f31d336ed66d6e91b2664ce896d6736c769fef6fb35f3000df32dc895b19861c17cfde7bf82890eefe7fe3d36634f0692886e7d90d28317c7d
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
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
new file mode 100644
index 000000000000..e83449e4e32a
--- /dev/null
+++ b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch
@@ -0,0 +1,63 @@
+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
new file mode 100644
index 000000000000..84589d4908a3
--- /dev/null
+++ b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-fix-crash-when-response-empty.patch
@@ -0,0 +1,25 @@
+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
+
diff --git a/kde-apps/kmailtransport/kmailtransport-21.04.3.ebuild b/kde-apps/kmailtransport/kmailtransport-21.04.3.ebuild
deleted file mode 100644
index 3aa1c505795c..000000000000
--- a/kde-apps/kmailtransport/kmailtransport-21.04.3.ebuild
+++ /dev/null
@@ -1,49 +0,0 @@
-# Copyright 1999-2021 Gentoo Authors
-# Distributed under the terms of the GNU General Public License v2
-
-EAPI=7
-
-ECM_TEST="true"
-PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
-QTMIN=5.15.2
-inherit ecm kde.org
-
-DESCRIPTION="Mail transport service"
-
-LICENSE="LGPL-2.1+"
-SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 x86"
-IUSE=""
-
-RESTRICT+=" test"
-
-RDEPEND="
-	dev-libs/qtkeychain:=
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/ksmtp-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-frameworks/kcmutils-${KFMIN}:5
-	>=kde-frameworks/kcompletion-${KFMIN}:5
-	>=kde-frameworks/kconfig-${KFMIN}:5
-	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
-	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/ki18n-${KFMIN}:5
-	>=kde-frameworks/kio-${KFMIN}:5
-	>=kde-frameworks/kwallet-${KFMIN}:5
-	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
-"
-DEPEND="${RDEPEND}
-	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
-"
-
-src_prepare() {
-	ecm_src_prepare
-	ecm_punt_bogus_dep KF5 Service # fixed in 21.08/git master
-}
diff --git a/kde-apps/kmailtransport/kmailtransport-21.08.3.ebuild b/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild
index c63c9a180094..8b14d213dc76 100644
--- a/kde-apps/kmailtransport/kmailtransport-21.08.3.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild
@@ -13,7 +13,7 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test"
@@ -27,7 +27,7 @@ RDEPEND="
 	>=kde-apps/akonadi-${PVCUT}:5
 	>=kde-apps/akonadi-mime-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/ksmtp-${PVCUT}:5
+	>=kde-apps/ksmtp-21.08.3-r1:5
 	>=kde-apps/libkgapi-${PVCUT}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -42,3 +42,8 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
 "
+
+PATCHES=(
+	"${FILESDIR}/${P}-fix-crash-when-response-empty.patch"
+	"${FILESDIR}/${P}-CVE-2021-38373.patch"
+)