gentoo resync : 25.08.2020

4 files changed, 74 insertions, 40 deletions

diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 9b9fe5156538..bb2dc5b627a1 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,6 @@
-DIST kdepim-runtime-19.12.3.tar.xz 1736984 BLAKE2B fdb6e010a6944738ea3618183e709ed8ff93e199be18c5a7a3695f8ec83d23e1a92e181d73decefb6266e24ec1f149933620aae236c24769f26d4db1e656c154 SHA512 0a851ac588ac8b78f31344712badcf8770e5d1effe488aaa70baf695034bfa75fd08d6a2b30fa43856b800f9d016551213960495ba1ef4687ae38f88fad08b3b
-DIST kdepim-runtime-20.04.2.tar.xz 1740368 BLAKE2B eec5bf64ab66462c87f5890c902e30e8b3d182a932bc6137f6eb68f785cc0c0c351e3674d55c4c3c889f46b9c42934290629936b4913e7c385a93a43f0b47d51 SHA512 03d1b846ba7fbe5fd61b592bf94500973f3843776c7f8b7b51c0e6843aaad6fa97a8be1e76622d3b93a615518ffb49eb8fc09ecd3d344ca334082125ec0b7e34
-EBUILD kdepim-runtime-19.12.3.ebuild 2468 BLAKE2B 357b9416270ec12a6677ebbdeaa0250ed9febba599057ee88b28a45a73a0eb463425de2f6e394cb9562bf16c13f8e7f6460babf273e905fdb5d7882d69edd14c SHA512 c0ccb25d1ea0493bb86497e6f0bf740c9471b61c3f85df8c10b2a0987cfe7c7031df8a97622c01d4e01c2becbd29cafa7c39bbb3112d1d40e39b3ac443c6b5fa
-EBUILD kdepim-runtime-20.04.2.ebuild 2392 BLAKE2B 4220d75522c86370f0910661a179aa3e31a00c55a2f536d3305e86058c017f6d2a5d48d89173ab0d6ac4e6c380c1987fe1a34cb2d32d5f9c3ab2f1bed9b183e5 SHA512 d2a3c446912381d0a754d490cc5338c7eab5e7c349b8543e12b9f3a1fedbfe5181ba8960402f8c6e2a39779bd6f131e4959a3904d2a8c0cfab47a13579940b9e
+AUX kdepim-runtime-20.04.3-CVE-2020-15954.patch 891 BLAKE2B 842b8bdf564a18b70fba9f5135e56e1ea351bb4e4f3afd22f49be32b9eae89cee18272ab20b2c34d4b6c23405f33978bfdf5fa460477dd41c8c430ea796147bf SHA512 3c30ec3e482683b78384704f3c67d41beeb5b59bc8d2815998bc5b197d3fb3c94c14aabc27db35e681a7bd39b071da7a4a150143dddf7629c1440e71e74689a6
+DIST kdepim-runtime-20.04.3.tar.xz 1739888 BLAKE2B 514bd4167e961a079397df11331abcf7a308071306f53be18386106eb14cca99c5c984f9bc69d1f361cb7f93d2b41a1568175f889df48f513b4d89d94f906afe SHA512 2b6e88a61606a833fc7376e9f28f347261c8a7000baf91cb2f0ff2a7df465c8a642c64aabf0e1d064859cab2daf0ef84116f47c043d3cdcea0bfbbe102c12d19
+DIST kdepim-runtime-20.08.0.tar.xz 1753792 BLAKE2B ddb7d6632c8eefd0f3468e1ebccd667a4701ff2ccaf403865838afed10612acd3a9c101ba1987a2b65259cbc55c5feac4a0d52e30042d0e709c2e5b93217cd30 SHA512 726ac94e52d34f1938a6c7a9fa0c73070cbb5bc06df6f9c1c9090fcca48e344b2898c7744ae787d1fa8b24eda4a21da6873ae9cc7274c32c8093a29abc56ba59
+EBUILD kdepim-runtime-20.04.3-r1.ebuild 2487 BLAKE2B 32a190fa8205041ea0cda1482f2bb1bb4f34e0b5b1c08b2f0440d4a6a0e0dc72e89d822f2608fdba717fedf91112a9d76d80f1e2828e3b8ec186e663f8cfc689 SHA512 43551419111d8f6e274f4c9c11a49e521ba80d06618306a55a76e25344e620956ea6450f95d4a74444f359aef5122b71cded0aaeeb6ca010a807f26eeb7edbc9
+EBUILD kdepim-runtime-20.08.0.ebuild 2498 BLAKE2B e189f8c7c23504968a4afbb92cf2e787ecff8682e9abeeaf9eec8ebb0dd58c33e1ed83f8bdfa4af6de1323c646b5ffbfa18104bf1e65f2d35b261704753951d8 SHA512 1231b4c2881b5099f7f50a1dca0d2a0d8abce74575f6f4b0b52dd86f21888ab6b76bfc339aa2b96c12cfa99f64f9277ca5d4bea6993155b933f7f9e13994e55f
 MISC metadata.xml 249 BLAKE2B ad415db89e5dee1627aa77f44ded9d4e1e5b8217d06c7ca25bbaa3fe92ce67c2b1090957c45a821b407d7927e5af798498aa6a5b903895ee1af8ee20a446c7f7 SHA512 76a5a340b13f0053ca3c5e94ed24380ea8d29b45ac8655419e22eaadb1e4a827c04d2e7e36b65145c4964e6526f656618fc6ac144e277ef53cb7373e6239e3c3
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch
new file mode 100644
index 000000000000..92fec0bbcfcb
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-20.04.3-CVE-2020-15954.patch
@@ -0,0 +1,28 @@
+From bd64ab29116aa7318fdee7f95878ff97580162f2 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Tue, 28 Jul 2020 13:35:24 +0200
+Subject: [PATCH] Fix Bug 423426 - POP3 setup wizard defaults to unencrypted
+ connections
+
+Make sure to use TLS when we create it
+CCBUG: 423426
+---
+ resources/pop3/wizard/pop3wizard.es | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/resources/pop3/wizard/pop3wizard.es b/resources/pop3/wizard/pop3wizard.es
+index 81d511d0a..aa83d0abf 100644
+--- a/resources/pop3/wizard/pop3wizard.es
++++ b/resources/pop3/wizard/pop3wizard.es
+@@ -53,7 +53,7 @@ function setup()
+   var smtp = SetupManager.createTransport( "smtp" );
+   smtp.setName( SetupManager.name() );
+   smtp.setHost( page.widget().outgoingAddress.text.trim() );
+-  smtp.setEncryption( "NONE" );
++  smtp.setEncryption( "SSL" );
+ 
+   SetupManager.execute();
+ }
+-- 
+GitLab
+
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild
index 9abeaab33b26..ef1bad9bfc43 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-19.12.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 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
 
@@ -23,7 +23,36 @@ IUSE=""
 BDEPEND="
 	dev-libs/libxslt
 "
-COMMON_DEPEND="
+RDEPEND="
+	>=app-crypt/qca-2.3.0:2
+	dev-libs/cyrus-sasl:2
+	dev-libs/libical:=
+	>=dev-qt/qtdbus-${QTMIN}:5
+	>=dev-qt/qtgui-${QTMIN}:5
+	>=dev-qt/qtnetwork-${QTMIN}:5
+	>=dev-qt/qtnetworkauth-${QTMIN}:5
+	>=dev-qt/qtspeech-${QTMIN}:5
+	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
+	>=dev-qt/qtwidgets-${QTMIN}:5
+	>=dev-qt/qtxml-${QTMIN}:5
+	>=kde-apps/akonadi-${PVCUT}:5
+	>=kde-apps/akonadi-calendar-${PVCUT}:5
+	>=kde-apps/akonadi-contacts-${PVCUT}:5
+	>=kde-apps/akonadi-mime-${PVCUT}:5
+	>=kde-apps/akonadi-notes-${PVCUT}:5
+	>=kde-apps/kalarmcal-${PVCUT}:5
+	>=kde-apps/kcalutils-${PVCUT}:5
+	|| (
+		>=kde-frameworks/kdav-${KFMIN}:5
+		>=kde-apps/kdav-${PVCUT}:5
+	)
+	>=kde-apps/kidentitymanagement-${PVCUT}:5
+	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kmailtransport-${PVCUT}:5
+	>=kde-apps/kmbox-${PVCUT}:5
+	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkgapi-${PVCUT}:5
+	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
@@ -31,7 +60,6 @@ COMMON_DEPEND="
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
-	>=kde-frameworks/kdbusaddons-${KFMIN}:5
 	>=kde-frameworks/kholidays-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5
@@ -45,42 +73,16 @@ COMMON_DEPEND="
 	>=kde-frameworks/kwidgetsaddons-${KFMIN}:5
 	>=kde-frameworks/kwindowsystem-${KFMIN}:5
 	>=kde-frameworks/kxmlgui-${KFMIN}:5
-	>=kde-apps/akonadi-${PVCUT}:5
-	>=kde-apps/akonadi-calendar-${PVCUT}:5
-	>=kde-apps/akonadi-contacts-${PVCUT}:5
-	>=kde-apps/akonadi-mime-${PVCUT}:5
-	>=kde-apps/akonadi-notes-${PVCUT}:5
-	>=kde-apps/kalarmcal-${PVCUT}:5
-	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kdav-${PVCUT}:5
-	>=kde-apps/kidentitymanagement-${PVCUT}:5
-	>=kde-apps/kimap-${PVCUT}:5
-	>=kde-apps/kmailtransport-${PVCUT}:5
-	>=kde-apps/kmbox-${PVCUT}:5
-	>=kde-apps/kmime-${PVCUT}:5
-	>=kde-apps/libkgapi-${PVCUT}:5
-	>=kde-apps/pimcommon-${PVCUT}:5
-	>=dev-qt/qtdbus-${QTMIN}:5
-	>=dev-qt/qtgui-${QTMIN}:5
-	>=dev-qt/qtnetwork-${QTMIN}:5
-	>=dev-qt/qtnetworkauth-${QTMIN}:5
-	>=dev-qt/qtspeech-${QTMIN}:5
-	>=dev-qt/qtwebengine-${QTMIN}:5[widgets]
-	>=dev-qt/qtwidgets-${QTMIN}:5
-	>=dev-qt/qtxml-${QTMIN}:5
-	dev-libs/cyrus-sasl:2
-	dev-libs/libical:=
 "
-DEPEND="${COMMON_DEPEND}
+DEPEND="${RDEPEND}
 	>=dev-qt/qtxmlpatterns-${QTMIN}:5
 	test? ( >=kde-apps/kimap-${PVCUT}:5[test] )
 "
-RDEPEND="${COMMON_DEPEND}
-	!kde-misc/akonadi-ews
-"
 
 RESTRICT+=" test"
 
+PATCHES=( "${FILESDIR}/${P}-CVE-2020-15954.patch" )
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-20.04.2.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.08.0.ebuild
index e881a7393a55..e58043c57743 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-20.04.2.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-20.08.0.ebuild
@@ -6,8 +6,8 @@ EAPI=7
 ECM_HANDBOOK="forceoptional"
 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
 
@@ -42,21 +42,24 @@ RDEPEND="
 	>=kde-apps/akonadi-notes-${PVCUT}:5
 	>=kde-apps/kalarmcal-${PVCUT}:5
 	>=kde-apps/kcalutils-${PVCUT}:5
-	>=kde-apps/kdav-${PVCUT}:5
 	>=kde-apps/kidentitymanagement-${PVCUT}:5
 	>=kde-apps/kimap-${PVCUT}:5
+	>=kde-apps/kldap-${PVCUT}:5
 	>=kde-apps/kmailtransport-${PVCUT}:5
 	>=kde-apps/kmbox-${PVCUT}:5
 	>=kde-apps/kmime-${PVCUT}:5
+	>=kde-apps/libkdepim-${PVCUT}:5
 	>=kde-apps/libkgapi-${PVCUT}:5
 	>=kde-apps/pimcommon-${PVCUT}:5
 	>=kde-frameworks/kcalendarcore-${KFMIN}:5
+	>=kde-frameworks/kcmutils-${KFMIN}:5
 	>=kde-frameworks/kcodecs-${KFMIN}:5
 	>=kde-frameworks/kcompletion-${KFMIN}:5
 	>=kde-frameworks/kconfig-${KFMIN}:5
 	>=kde-frameworks/kconfigwidgets-${KFMIN}:5
 	>=kde-frameworks/kcontacts-${KFMIN}:5
 	>=kde-frameworks/kcoreaddons-${KFMIN}:5
+	>=kde-frameworks/kdav-${KFMIN}:5
 	>=kde-frameworks/kholidays-${KFMIN}:5
 	>=kde-frameworks/ki18n-${KFMIN}:5
 	>=kde-frameworks/kio-${KFMIN}:5