gentoo resync : 12.05.2022

5 files changed, 9 insertions, 103 deletions

diff --git a/kde-apps/kmailtransport/Manifest b/kde-apps/kmailtransport/Manifest
index 1302f0daee5a..976231c8bf7c 100644
--- a/kde-apps/kmailtransport/Manifest
+++ b/kde-apps/kmailtransport/Manifest
@@ -1,7 +1,5 @@
-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
 DIST kmailtransport-21.12.3.tar.xz 173448 BLAKE2B abda233649e6b0b23a8fda146c1418a50f7c744138e178c8371808cbf25213bfbad9171552ca5f247e1a6891696ed845cdd2b962a4e99db789c9a17002466ef7 SHA512 0437dd2ba44b76a5855931581a2cec1c2a63f6dcf4c8ec1ca720f7630ed928041ee629a1df102bd7f33e687bf018b6f67f0645b02648249c13ba4434e03e8994
-EBUILD kmailtransport-21.08.3-r2.ebuild 1175 BLAKE2B f2bf4a7d0fea201e823e724d4f80fbfc13675359010fc0c59880ffa9d3a4d4c74f55583dc59c04f1ba17fbd8a976988bc16bf6f0795627dc2f366591203bfbec SHA512 f3dce79effaf81f31d336ed66d6e91b2664ce896d6736c769fef6fb35f3000df32dc895b19861c17cfde7bf82890eefe7fe3d36634f0692886e7d90d28317c7d
-EBUILD kmailtransport-21.12.3.ebuild 1082 BLAKE2B a57f371a64c3814e86a0656272fb4e158acc8ddd0d682db63efa441fd4994e8b0eebd5105db8dd3445af580a0f29056da7ff2fb0a4e1fac04c4ce92c3a285c03 SHA512 689b4916ca3879bcff1667f9563d880cd0fa9f663e5197f1f1c9c8583283725ab3f98ccce3599349c8030173029ce5e71e7fecc1939e5f8cb25dc995dbab49f3
+DIST kmailtransport-22.04.0.tar.xz 174136 BLAKE2B c3a3b2423a7e38abb6247c638ccb72621f6086de2ecd0b3a2196e5cf21a97ac73a404094e5776b35f4f05ad5913053ef5eace138c45823b251901547b59ffc26 SHA512 60eea713f8ae51e72c2e4252f09ae3f80a7d58dfc1daf06d5de52384fcaaac8321f8ec536ff2eb2427451e75c3d080b93f14005d440148d0ccf722a9557137ab
+EBUILD kmailtransport-21.12.3.ebuild 1081 BLAKE2B 4d97ecac03ca078de40090ecdb92792ba9bd94e0664cb287cca683d2600c80b40ac211385d52938b8538b40d98758dde58f35c3377f40e7540ddfa5fbcb8e26a SHA512 0e2546f9bfe0dfdc68978eae057ed2f96276b626e85515137905470cc8d01816284abc4900e9257ef8098d5a5d8e1fad9d8481f162379f6c2ba38d0cdd525b91
+EBUILD kmailtransport-22.04.0.ebuild 1084 BLAKE2B 75809a98cf3db3e1ed6d762ab5394023ec4bc9ea9bfc8e98ff34b0bbeeb864076166754ca118d077fca0697fa2bfbeca6ad887ad84c80b27e7489d3988fa0688 SHA512 844e48ea8454cefda2310db5e7a1f710a4ea738f08121a5844b2366738bb5de3e827ba5a912bf4a8e3eac16d70f5c5dbd5cef76bce07f8ba3f767d95afd203df
 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
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
-
diff --git a/kde-apps/kmailtransport/kmailtransport-21.12.3.ebuild b/kde-apps/kmailtransport/kmailtransport-21.12.3.ebuild
index 612e78611093..ca3031b45d33 100644
--- a/kde-apps/kmailtransport/kmailtransport-21.12.3.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-21.12.3.ebuild
@@ -14,7 +14,7 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 ~arm64 ~ppc64 ~riscv x86"
+KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
 IUSE=""
 
 RESTRICT="test"
diff --git a/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild b/kde-apps/kmailtransport/kmailtransport-22.04.0.ebuild
index 8b14d213dc76..0c1eaec75b04 100644
--- a/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild
+++ b/kde-apps/kmailtransport/kmailtransport-22.04.0.ebuild
@@ -1,11 +1,12 @@
-# Copyright 1999-2021 Gentoo Authors
+# Copyright 1999-2022 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
 EAPI=8
 
+ECM_QTHELP="true"
 ECM_TEST="true"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.84.0
+KFMIN=5.92.0
 QTMIN=5.15.2
 inherit ecm kde.org
 
@@ -13,7 +14,7 @@ DESCRIPTION="Mail transport service"
 
 LICENSE="LGPL-2.1+"
 SLOT="5"
-KEYWORDS="amd64 arm64 ~ppc64 ~riscv x86"
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~riscv ~x86"
 IUSE=""
 
 RESTRICT="test"
@@ -27,7 +28,7 @@ RDEPEND="
 	>=kde-apps/akonadi-${PVCUT}:5
 	>=kde-apps/akonadi-mime-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/ksmtp-21.08.3-r1:5
+	>=kde-apps/ksmtp-${PVCUT}:5
 	>=kde-apps/libkgapi-${PVCUT}:5
 	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -42,8 +43,3 @@ RDEPEND="
 DEPEND="${RDEPEND}
 	test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 )
 "
-
-PATCHES=(
-	"${FILESDIR}/${P}-fix-crash-when-response-empty.patch"
-	"${FILESDIR}/${P}-CVE-2021-38373.patch"
-)