1 |
commit: 4754456d4c60b3dc562a7d32de2ff6bf66ab6679 |
2 |
Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
3 |
AuthorDate: Tue Nov 23 15:21:55 2021 +0000 |
4 |
Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> |
5 |
CommitDate: Tue Nov 23 20:04:51 2021 +0000 |
6 |
URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=4754456d |
7 |
|
8 |
kde-apps/kmailtransport: Adapt to kde-apps/ksmtp CVE-2021-38373 fix |
9 |
|
10 |
Upstream commit cc4907eba8e16c319fb837b5ec85393b118c4ab6 |
11 |
|
12 |
KDE-bug: https://bugs.kde.org/show_bug.cgi?id=423423 |
13 |
Bug: https://bugs.gentoo.org/807355 |
14 |
Package-Manager: Portage-3.0.28, Repoman-3.0.3 |
15 |
Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> |
16 |
|
17 |
.../kmailtransport-21.08.3-CVE-2021-38373.patch | 63 ++++++++++++++++++++++ |
18 |
.../kmailtransport-21.08.3-r2.ebuild | 49 +++++++++++++++++ |
19 |
2 files changed, 112 insertions(+) |
20 |
|
21 |
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 |
22 |
new file mode 100644 |
23 |
index 000000000000..e83449e4e32a |
24 |
--- /dev/null |
25 |
+++ b/kde-apps/kmailtransport/files/kmailtransport-21.08.3-CVE-2021-38373.patch |
26 |
@@ -0,0 +1,63 @@ |
27 |
+From cc4907eba8e16c319fb837b5ec85393b118c4ab6 Mon Sep 17 00:00:00 2001 |
28 |
+From: Volker Krause <vkrause@×××.org> |
29 |
+Date: Thu, 16 Sep 2021 17:07:08 +0200 |
30 |
+Subject: [PATCH] Adapt to KSmtp moving encryption settings from LoginJob to |
31 |
+ Session |
32 |
+ |
33 |
+See https://invent.kde.org/pim/ksmtp/-/merge_requests/5. |
34 |
+ |
35 |
+(cherry picked from commit b49ee72009620f152aaab1f592704e56e3be01f5) |
36 |
+--- |
37 |
+ src/kmailtransport/plugins/smtp/smtpjob.cpp | 29 ++++++++++----------- |
38 |
+ 1 file changed, 14 insertions(+), 15 deletions(-) |
39 |
+ |
40 |
+diff --git a/src/kmailtransport/plugins/smtp/smtpjob.cpp b/src/kmailtransport/plugins/smtp/smtpjob.cpp |
41 |
+index 7ad0124..5a08dfd 100644 |
42 |
+--- a/src/kmailtransport/plugins/smtp/smtpjob.cpp |
43 |
++++ b/src/kmailtransport/plugins/smtp/smtpjob.cpp |
44 |
+@@ -134,6 +134,20 @@ void SmtpJob::startSmtpJob() |
45 |
+ d->session = new KSmtp::Session(transport()->host(), transport()->port()); |
46 |
+ d->session->setUseNetworkProxy(transport()->useProxy()); |
47 |
+ d->session->setUiProxy(d->uiProxy); |
48 |
++ switch (transport()->encryption()) { |
49 |
++ case Transport::EnumEncryption::None: |
50 |
++ d->session->setEncryptionMode(KSmtp::Session::Unencrypted); |
51 |
++ break; |
52 |
++ case Transport::EnumEncryption::TLS: |
53 |
++ d->session->setEncryptionMode(KSmtp::Session::STARTTLS); |
54 |
++ break; |
55 |
++ case Transport::EnumEncryption::SSL: |
56 |
++ d->session->setEncryptionMode(KSmtp::Session::TLS); |
57 |
++ break; |
58 |
++ default: |
59 |
++ qCWarning(MAILTRANSPORT_SMTP_LOG) << "Unknown encryption mode" << transport()->encryption(); |
60 |
++ break; |
61 |
++ } |
62 |
+ if (transport()->specifyHostname()) { |
63 |
+ d->session->setCustomHostname(transport()->localHostname()); |
64 |
+ } |
65 |
+@@ -298,21 +312,6 @@ void SmtpJobPrivate::doLogin() |
66 |
+ break; |
67 |
+ } |
68 |
+ |
69 |
+- switch (q->transport()->encryption()) { |
70 |
+- case Transport::EnumEncryption::None: |
71 |
+- login->setEncryptionMode(KSmtp::LoginJob::Unencrypted); |
72 |
+- break; |
73 |
+- case Transport::EnumEncryption::TLS: |
74 |
+- login->setEncryptionMode(KSmtp::LoginJob::STARTTLS); |
75 |
+- break; |
76 |
+- case Transport::EnumEncryption::SSL: |
77 |
+- login->setEncryptionMode(KSmtp::LoginJob::SSLorTLS); |
78 |
+- break; |
79 |
+- default: |
80 |
+- qCWarning(MAILTRANSPORT_SMTP_LOG) << "Unknown encryption mode" << q->transport()->encryption(); |
81 |
+- break; |
82 |
+- } |
83 |
+- |
84 |
+ q->connect(login, &KJob::result, q, &SmtpJob::slotResult); |
85 |
+ q->addSubjob(login); |
86 |
+ login->start(); |
87 |
+-- |
88 |
+2.34.0 |
89 |
+ |
90 |
|
91 |
diff --git a/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild b/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild |
92 |
new file mode 100644 |
93 |
index 000000000000..c9317630cf43 |
94 |
--- /dev/null |
95 |
+++ b/kde-apps/kmailtransport/kmailtransport-21.08.3-r2.ebuild |
96 |
@@ -0,0 +1,49 @@ |
97 |
+# Copyright 1999-2021 Gentoo Authors |
98 |
+# Distributed under the terms of the GNU General Public License v2 |
99 |
+ |
100 |
+EAPI=8 |
101 |
+ |
102 |
+ECM_TEST="true" |
103 |
+PVCUT=$(ver_cut 1-3) |
104 |
+KFMIN=5.84.0 |
105 |
+QTMIN=5.15.2 |
106 |
+inherit ecm kde.org |
107 |
+ |
108 |
+DESCRIPTION="Mail transport service" |
109 |
+ |
110 |
+LICENSE="LGPL-2.1+" |
111 |
+SLOT="5" |
112 |
+KEYWORDS="~amd64 ~arm64 ~ppc64 ~x86" |
113 |
+IUSE="" |
114 |
+ |
115 |
+RESTRICT="test" |
116 |
+ |
117 |
+RDEPEND=" |
118 |
+ dev-libs/qtkeychain:= |
119 |
+ >=dev-qt/qtdbus-${QTMIN}:5 |
120 |
+ >=dev-qt/qtgui-${QTMIN}:5 |
121 |
+ >=dev-qt/qtnetwork-${QTMIN}:5 |
122 |
+ >=dev-qt/qtwidgets-${QTMIN}:5 |
123 |
+ >=kde-apps/akonadi-${PVCUT}:5 |
124 |
+ >=kde-apps/akonadi-mime-${PVCUT}:5 |
125 |
+ >=kde-apps/kmime-${PVCUT}:5 |
126 |
+ >=kde-apps/ksmtp-21.08.3-r1:5 |
127 |
+ >=kde-apps/libkgapi-${PVCUT}:5 |
128 |
+ >=kde-frameworks/kcmutils-${KFMIN}:5 |
129 |
+ >=kde-frameworks/kcompletion-${KFMIN}:5 |
130 |
+ >=kde-frameworks/kconfig-${KFMIN}:5 |
131 |
+ >=kde-frameworks/kconfigwidgets-${KFMIN}:5 |
132 |
+ >=kde-frameworks/kcoreaddons-${KFMIN}:5 |
133 |
+ >=kde-frameworks/ki18n-${KFMIN}:5 |
134 |
+ >=kde-frameworks/kio-${KFMIN}:5 |
135 |
+ >=kde-frameworks/kwallet-${KFMIN}:5 |
136 |
+ >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 |
137 |
+" |
138 |
+DEPEND="${RDEPEND} |
139 |
+ test? ( >=kde-frameworks/ktextwidgets-${KFMIN}:5 ) |
140 |
+" |
141 |
+ |
142 |
+PATCHES=( |
143 |
+ "${FILESDIR}/${P}-fix-crash-when-response-empty.patch" |
144 |
+ "${FILESDIR}/${P}-CVE-2021-38373.patch" |
145 |
+) |