gentoo resync : 05.12.2021

3 files changed, 118 insertions, 6 deletions

diff --git a/kde-apps/kdepim-runtime/Manifest b/kde-apps/kdepim-runtime/Manifest
index 088281312cbd..2c78a55d4b7d 100644
--- a/kde-apps/kdepim-runtime/Manifest
+++ b/kde-apps/kdepim-runtime/Manifest
@@ -1,5 +1,5 @@
-DIST kdepim-runtime-21.04.3.tar.xz 1822120 BLAKE2B 6eb8ec1d5feb136b31c8122db28e586cca6fee2ae29aa89ee9d7050fdb8088178b262935b80e2f213f6f96594a3a83d48df4670700e0acb20306845fad33cd36 SHA512 1830cde921bf6f0e7a772c60a8bf30db1333f9172596843b89c5333ee7a289aec0670849b88adfce4a451ac46c4f5e43dac715d4e42e4df36cb1b5ca711b0afd
+AUX kdepim-runtime-21.08.3-CVE-2020-15954.patch 3482 BLAKE2B 055f2b568348ba9443f84c6d24a0da8ead918e7b1f67f73d6645e887b003353cdc297d25d5a2e42d00dff7e80133451e81417337fca7c6023b1747a12eef0a5e SHA512 a86881edd2aaa9a1cb8a1ef23eb2c549b0b8b9e2d7dbdd2d992bab7b6f2b947244746c781108914c27ee5863912f8a1717a23bf153b2a4fdff3846f70f16fd70
 DIST kdepim-runtime-21.08.3.tar.xz 1824164 BLAKE2B c1c367b45e306891e581b493b550061dd7f765299246baf170119f35e3aa5baf37bf595fb184e0ca74c72e6640829f6b6739c44bcd3ddbfe60d04a2d9194002b SHA512 d13bb98663372aafeaa34dab785ed1f09d9a3974cdb680c123978bbbc22ee721b5ff26332aedbddf638c0cb5847b94e9d60d24599210e1cadfde514b7a7c6454
-EBUILD kdepim-runtime-21.04.3.ebuild 2500 BLAKE2B ab20431cfee7ee21c9738f628fb336221b4eee89f4f226bd7104a58fddc9ea6daf91ad58e0068eea878a930a2ab9e45f79549c4d6dfd0082d82e3042f7a42eed SHA512 21abba19191c96ecea3293d79f3c1af2470e79e7349ecc13bdb83c8bd91eca2a97736843b51e6d5f44483d194ae6bec2b18c4b7cfc0b905a166c9e04eedc893c
+EBUILD kdepim-runtime-21.08.3-r1.ebuild 2559 BLAKE2B 5f33099e32f243f5b4eaf07eae5303ea891cc734ae3672b4fae014591848ddcad72939d1fe239c7af086d2155a07551f528febd522e9ddc817c59e9029fca519 SHA512 32ff7d171a0da855cf48938b5e05d92a920ff36212737c868921146e7bf506de2445bec4a8a9942a9ed6fbcf84506754aab05fe50698c1c19a5365e0b9cef278
 EBUILD kdepim-runtime-21.08.3.ebuild 2496 BLAKE2B 9a7c5ec7a6e2dc0035ab80aa45e642743e85c93b5ef32218b53042ecf5ccbd6ae8f5adbd242f76a6b2ceeafa48ee83ee1967ab27b56dd7c1187e2fd77055effd SHA512 e7cdd3853a5ab226ff425d9642d9c9f84c91ce4a2f01e3a54cac73f014186cc5b4edaa7006cda6cfa8b96387c6239ada05dea230604fe1ab4d7e73d6e3188b98
 MISC metadata.xml 318 BLAKE2B 922a5e32e706b2976c5f359a14194d268d3f499398576c80ce5fad8c0fcea0fbf048de4480a80a6a1889c88b8b6c14147654a3ab4d5ffbcc258c2290da63f6d1 SHA512 614cb8dda7ad2088e5d6ef39b449bb4be0ac72cd0231c320188d76d1816dce6490c5114bb4798112c4b11d99d30a9e82ff8fcf08ffa8c049589682a5e38208f6
diff --git a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch
new file mode 100644
index 000000000000..14ba90537025
--- /dev/null
+++ b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch
@@ -0,0 +1,110 @@
+From 35447bd04e8c12afac524e1c4556ef3db088e014 Mon Sep 17 00:00:00 2001
+From: Laurent Montel <montel@kde.org>
+Date: Fri, 12 Nov 2021 13:09:22 +0100
+Subject: [PATCH] Fix POP3 setup wizard defaults to unencrypted connections.
+
+Now I check encrypt support when I create resource.
+So if resource support starttls it will set option for it.
+
+BUG: 423426
+FIXED-IN: 5.19.0
+---
+ resources/pop3/wizard/pop3wizard.es | 73 ++++++++++++++++++++++++-----
+ 1 file changed, 61 insertions(+), 12 deletions(-)
+
+diff --git a/resources/pop3/wizard/pop3wizard.es b/resources/pop3/wizard/pop3wizard.es
+index 5864db5d2..6bcf9a1dd 100644
+--- a/resources/pop3/wizard/pop3wizard.es
++++ b/resources/pop3/wizard/pop3wizard.es
+@@ -1,5 +1,5 @@
+ /*
+-    SPDX-FileCopyrightText: 2009 Montel Laurent <montel@kde.org>
++    SPDX-FileCopyrightText: 2009-2021 Montel Laurent <montel@kde.org>
+ 
+     SPDX-License-Identifier: LGPL-2.0-or-later
+ */
+@@ -30,21 +30,70 @@ function validateInput()
+   }
+ }
+ 
++var stage = 1;
++
+ function setup()
+ {
+-  var pop3Res = SetupManager.createResource( "akonadi_pop3_resource" );
+-  pop3Res.setOption( "Host", page.widget().incommingAddress.text.trim() );
+-  pop3Res.setOption( "Login", page.widget().userName.text.trim() );
+-  pop3Res.setOption( "Password", SetupManager.password() );
++  if ( stage == 1 ) {
++    ServerTest.test( page.widget().incommingAddress.text.trim(), "pop" );
++  } else {
++    ServerTest.test( page.widget().outgoingAddress.text.trim(), "smtp" );
++  }
++}
++
++function testResultFail()
++{
++  testOk( -1 );
++}
+ 
+-  var smtp = SetupManager.createTransport( "smtp" );
+-  smtp.setName( SetupManager.name() );
+-  smtp.setHost( page.widget().outgoingAddress.text.trim() );
+-  smtp.setEncryption( "SSL" );
++function testOk( arg )
++{
++  if (stage == 1) {
++    SetupManager.openWallet();
++    var pop3Res = SetupManager.createResource( "akonadi_pop3_resource" );
++    var server = page.widget().incommingAddress.text.trim();
++    pop3Res.setOption( "Host", server );
++    pop3Res.setOption( "Login", page.widget().userName.text.trim() );
++    pop3Res.setOption( "Password", SetupManager.password() );
++
++    if ( arg == "ssl" ) {
++      pop3Res.setOption( "Port", 995 );
++      pop3Res.setOption( "UseTLS", true );
++    } else if ( arg == "tls" ) { // tls is really STARTTLS
++      pop3Res.setOption( "Port", 110 );
++      pop3Res.setOption( "UseTLS", true );
++    } else if ( arg == "none" ) {
++      pop3Res.setOption( "Port", 110 );
++    } else {
++      pop3Res.setOption( "Port", 110 );
++    }
++
++    stage = 2;
++    setup();
++  } else {
++    var smtp = SetupManager.createTransport( "smtp" );
++    smtp.setName( page.widget().outgoingAddress.text.trim() );
++    smtp.setHost( page.widget().outgoingAddress.text.trim() );
++    if ( arg == "ssl" ) {
++      smtp.setEncryption( "SSL" );
++    } else if ( arg == "tls" ) {
++      smtp.setEncryption( "TLS" );
++    } else {
++      smtp.setEncryption( "None" );
++    }
++    smtp.setUsername( page.widget().userName.text );
++    smtp.setPassword( SetupManager.password() );
++    SetupManager.execute();
++  }
++}
+ 
+-  SetupManager.execute();
++try {
++  ServerTest.testFail.connect( testResultFail );
++  ServerTest.testResult.connect( testOk );
++  page.widget().incommingAddress.textChanged.connect( validateInput );
++  page.pageLeftNext.connect( setup );
++} catch ( e ) {
++  print( e );
+ }
+ 
+-page.widget().incommingAddress.textChanged.connect( serverChanged );
+-page.pageLeftNext.connect( setup );
+ validateInput();
+-- 
+GitLab
+
diff --git a/kde-apps/kdepim-runtime/kdepim-runtime-21.04.3.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r1.ebuild
index 269dc680bd4e..6fb5200ce177 100644
--- a/kde-apps/kdepim-runtime/kdepim-runtime-21.04.3.ebuild
+++ b/kde-apps/kdepim-runtime/kdepim-runtime-21.08.3-r1.ebuild
@@ -1,12 +1,12 @@
 # Copyright 1999-2021 Gentoo Authors
 # Distributed under the terms of the GNU General Public License v2
 
-EAPI=7
+EAPI=8
 
-ECM_HANDBOOK="forceoptional"
+ECM_HANDBOOK="optional"
 ECM_TEST="forceoptional"
 PVCUT=$(ver_cut 1-3)
-KFMIN=5.80.0
+KFMIN=5.84.0
 QTMIN=5.15.2
 VIRTUALX_REQUIRED="test"
 inherit ecm kde.org
@@ -19,7 +19,7 @@ SLOT="5"
 KEYWORDS="amd64 arm64 ~ppc64 x86"
 IUSE=""
 
-RESTRICT+=" test"
+RESTRICT="test"
 
 # TODO kolab
 RDEPEND="
@@ -80,6 +80,8 @@ DEPEND="${RDEPEND}
 "
 BDEPEND="dev-libs/libxslt"
 
+PATCHES=( "${FILESDIR}"/${P}-CVE-2020-15954.patch ) # bug 734126
+
 src_configure() {
 	local mycmakeargs=(
 		-DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON