gentoo resync : 25.08.2020

4 files changed, 93 insertions, 9 deletions

diff --git a/kde-apps/kmail-account-wizard/Manifest b/kde-apps/kmail-account-wizard/Manifest
index 2b7deffc1273..51b84c062b31 100644
--- a/kde-apps/kmail-account-wizard/Manifest
+++ b/kde-apps/kmail-account-wizard/Manifest
@@ -1,5 +1,6 @@
-DIST kmail-account-wizard-19.12.3.tar.xz 158392 BLAKE2B 0d7bbe070ecf50665915c3e353eb7c0bda7208989f5702a8ac11d1419e471568db62491bf335f468798665d8fff99166f5cb716527caf35adce2089f28f0f02b SHA512 07bbf4f935c411cf1a7b25654af2b2123d763b0136880a814a310e689ad7ea508f6b943743980ce3bff339c56f9157c35368ff77401ca7b6b50ce1409286b216
-DIST kmail-account-wizard-20.04.2.tar.xz 158268 BLAKE2B 3fb06a6fa649e62026cbae16572b33f8b6c107b587a7e3c6854fb05421e9612d000c726fabf83bb27b20c458156d7dae72347a1195719bee7a0aa0daa057f053 SHA512 bffe8d51766c305d3884020c602f0708c800686f994c7a1a4d6dd3433865d51772ec0ee78043864f8db97763ac22b26339f4623c65dd82bb2ce18867c7a3e5b0
-EBUILD kmail-account-wizard-19.12.3.ebuild 1579 BLAKE2B 49f0af1d780f5f92820bfb4b0f1b76c17d0db2b49eea4c15b27240077f0a32a83114381022bb4b4f133800dc6da9a46c3a9103238fd63465286b08f41de7e2d5 SHA512 c04db238555bc0579f51d01f59d93967f60a31ae9df570a6a414b18c4673bb3effa7b9f879116b5c6d3a61f8352349f16ba9d55224a49c6f0de4a2c20d73385e
-EBUILD kmail-account-wizard-20.04.2.ebuild 1582 BLAKE2B 4276c85c224fd81d4733a64cd1cd6a081d8ee1873d745602fea3444da714f10cf2960623d64ef30b4eb71f211acbd355d227280529040bd95583231706c77e12 SHA512 ce49214469462ae91b39ac927ab854d5b773a6b22552e95d3a049a416fdd7e07dc6bd604a70c9634edce2fd1a89655d600e3948c142e1123beb8bd3d6f118aa2
+AUX kmail-account-wizard-20.04.3-CVE-2020-15954.patch 2790 BLAKE2B be3a02e7d3c12d121196a0230c42094a2f9cf6ad562adcd3de2693a7702c1fa1df6c4ceb3f7e20547b83627350db0d8566688ef9f9c62d18691ef2ae46aae3d7 SHA512 d680fdd9cc506cadbf3f62e639acbf152a958230fb0b5b014a99af9fa0a25f54aaf95cb005b213dbdb005f3f41012319154594b79e68162ea4b5dcd436df4a2c
+DIST kmail-account-wizard-20.04.3.tar.xz 158132 BLAKE2B 237e1d9535c1dde19ad21ceed08177da0d98cc773a96785afaa14a8e780573f30ad4ab9ba946314ce440093923acc3dbc91406c598f02b017556a74d9fe8df52 SHA512 71a305dcf51fe20d700c181f0a13981bae243e2a3d9080e58cc4ec24a1adc625f500936656b732fd419cfbfef9258af1ace45789c7756687a22788fc5d9da296
+DIST kmail-account-wizard-20.08.0.tar.xz 160252 BLAKE2B c216488da27179b4606aade1bef7e5e4f56ac3ffeabd4d0037e31cc41ba0cb26395be527b013357f71ba7b09327b7532c337850b105229deebe91ac533ce9331 SHA512 fe7ab4019d4f0c7809362351a22a5b9e5b1813258130a40f20fd50deefa435fdfb4024e0800305b127e452a4f2c947b456ee42499f312e561eda2a3408f0df5f
+EBUILD kmail-account-wizard-20.04.3-r1.ebuild 1632 BLAKE2B db3fe8cef0f2c010ccd9b1dcbf8984ec79ce5f7901984c993326c823eaf33cb616817378e2d0a915eb7bef4f41931cbcadb47a2687a6d3401348f78d27a041b4 SHA512 e9b0d0426be1b930ac49a336e8d028ca38099e1692cf7d8f4b2210aafe9ac8e7cc856f8cda088a33370f78b53d4671a28868bdb04a1d9e6650a0a030ea0e2fbc
+EBUILD kmail-account-wizard-20.08.0.ebuild 1582 BLAKE2B 301c1a58e408a9567cd88a7947b9eeb0a7a32e463f8aa14a7692399e12889210f41975aae3c2ae440916c54d71b0ef62fd56af1d73d3ada3fcda4635a989fd92 SHA512 b374197fb6b084ec5efde7cf603a3c049b6b6c8ce6d3c155d4620a58dc795c63bfa0ec85cd5df2303e12806ebf7241be4eff528293bee44596e2737b59de5e33
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kmail-account-wizard/files/kmail-account-wizard-20.04.3-CVE-2020-15954.patch b/kde-apps/kmail-account-wizard/files/kmail-account-wizard-20.04.3-CVE-2020-15954.patch
new file mode 100644
index 000000000000..a1c63e3a3a1d
--- /dev/null
+++ b/kde-apps/kmail-account-wizard/files/kmail-account-wizard-20.04.3-CVE-2020-15954.patch
@@ -0,0 +1,81 @@
+From a64d80e523edce7d3d59c26834973418fae042f6 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 28 Jul 2020 13:52:19 +0200
+Subject: [PATCH] Show info about encryption/authentication settings
+
+CCBUG: 423426
+---
+ src/transport.cpp | 18 +++++++++++++++---
+ src/transport.h   |  2 ++
+ 2 files changed, 17 insertions(+), 3 deletions(-)
+
+diff --git a/src/transport.cpp b/src/transport.cpp
+index 567df31..26344ef 100644
+--- a/src/transport.cpp
++++ b/src/transport.cpp
+@@ -53,14 +53,16 @@ static const StringValueTable<MailTransport::Transport::EnumAuthenticationType>
+ static const int authenticationTypeEnumSize = sizeof(authenticationTypeEnum) / sizeof(*authenticationTypeEnum);
+ 
+ template<typename T>
+-static typename T::value_type stringToValue(const T *table, const int tableSize, const QString &string)
++static typename T::value_type stringToValue(const T *table, const int tableSize, const QString &string, bool &valid)
+ {
+     const QString ref = string.toLower();
+     for (int i = 0; i < tableSize; ++i) {
+         if (ref == QLatin1String(table[i].name)) {
++            valid = true;
+             return table[i].value;
+         }
+     }
++    valid = false;
+     return table[0].value; // TODO: error handling
+ }
+ 
+@@ -98,6 +100,7 @@ void Transport::create()
+     mt->setAuthenticationType(m_auth);
+     m_transportId = mt->id();
+     mt->save();
++    Q_EMIT info(i18n("Mail transport uses '%1' encryption and '%2' authentication.", m_encrStr, m_authStr));
+     MailTransport::TransportManager::self()->addTransport(mt);
+     MailTransport::TransportManager::self()->setDefaultTransport(mt->id());
+     if (m_editMode) {
+@@ -154,12 +157,21 @@ void Transport::setPassword(const QString &password)
+ 
+ void Transport::setEncryption(const QString &encryption)
+ {
+-    m_encr = stringToValue(encryptionEnum, encryptionEnumSize, encryption);
++    bool valid;
++    m_encr = stringToValue(encryptionEnum, encryptionEnumSize, encryption, valid);
++    if (valid) {
++        m_encrStr = encryption;
++    }
+ }
+ 
+ void Transport::setAuthenticationType(const QString &authType)
+ {
+-    m_auth = stringToValue(authenticationTypeEnum, authenticationTypeEnumSize, authType);
++    bool valid;
++    m_auth = stringToValue(authenticationTypeEnum, authenticationTypeEnumSize, authType, valid);
++    if (valid) {
++        m_authStr = authType;
++    }
++
+ }
+ 
+ int Transport::transportId() const
+diff --git a/src/transport.h b/src/transport.h
+index 3773b04..6415bf9 100644
+--- a/src/transport.h
++++ b/src/transport.h
+@@ -53,6 +53,8 @@ private:
+     QString m_password;
+     MailTransport::Transport::EnumEncryption::type m_encr;
+     MailTransport::Transport::EnumAuthenticationType::type m_auth;
++    QString m_encrStr;
++    QString m_authStr;
+ 
+     bool m_editMode;
+ };
+-- 
+GitLab
+
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.3.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3-r1.ebuild
index cb7499c495f7..3ba6a85d5258 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-19.12.3.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.3-r1.ebuild
@@ -6,13 +6,13 @@ EAPI=7
 ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.63.0
-QTMIN=5.12.3
+KFMIN=5.70.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
 
 DESCRIPTION="Assistant for KMail accounts configuration"
-HOMEPAGE+=" https://userbase.kde.org/Kmail/Account_Wizard"
+HOMEPAGE+=" https://userbase.kde.org/KMail/Account_Wizard"
 
 LICENSE="GPL-2+ handbook? ( FDL-1.2+ )"
 SLOT="5"
@@ -51,3 +51,5 @@ DEPEND="
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
 "
 RDEPEND="${DEPEND}"
+
+PATCHES=( "${FILESDIR}/${P}-CVE-2020-15954.patch" )
diff --git a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.2.ebuild b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.0.ebuild
index c14f1a4beda7..e975d950f12e 100644
--- a/kde-apps/kmail-account-wizard/kmail-account-wizard-20.04.2.ebuild
+++ b/kde-apps/kmail-account-wizard/kmail-account-wizard-20.08.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional" # FIXME: Check back for doc in release
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.70.0
-QTMIN=5.14.1
+KFMIN=5.72.0
+QTMIN=5.14.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org