From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 7655C15808E for ; Mon, 25 Apr 2022 21:48:56 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 0D551E07D8; Mon, 25 Apr 2022 21:48:51 +0000 (UTC) Received: from smtp.gentoo.org (woodpecker.gentoo.org [140.211.166.183]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id CCF67E07D8 for ; Mon, 25 Apr 2022 21:48:50 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id AF9BE34185F for ; Mon, 25 Apr 2022 21:48:49 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id C8957430 for ; Mon, 25 Apr 2022 21:48:46 +0000 (UTC) From: "Conrad Kostecki" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Conrad Kostecki" Message-ID: <1650923174.118716e5af13e0bd3997eafd988e654f4b3fe81d.conikost@gentoo> Subject: [gentoo-commits] repo/gentoo:master commit in: kde-apps/kdepim-runtime/files/ X-VCS-Repository: repo/gentoo X-VCS-Files: kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch X-VCS-Directories: kde-apps/kdepim-runtime/files/ X-VCS-Committer: conikost X-VCS-Committer-Name: Conrad Kostecki X-VCS-Revision: 118716e5af13e0bd3997eafd988e654f4b3fe81d X-VCS-Branch: master Date: Mon, 25 Apr 2022 21:48:46 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: 4e5620d7-8afd-4c23-9e3a-424f2c7133b4 X-Archives-Hash: 936a6662bfb41645a021ee56f3ecc828 commit: 118716e5af13e0bd3997eafd988e654f4b3fe81d Author: Michael Mair-Keimberger levelnine at> AuthorDate: Sat Apr 23 16:05:01 2022 +0000 Commit: Conrad Kostecki gentoo org> CommitDate: Mon Apr 25 21:46:14 2022 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=118716e5 kde-apps/kdepim-runtime: remove unused patch(es) Package-Manager: Portage-3.0.30, Repoman-3.0.3 Signed-off-by: Michael Mair-Keimberger levelnine.at> Signed-off-by: Conrad Kostecki gentoo.org> .../kdepim-runtime-21.08.3-CVE-2020-15954.patch | 110 --------------------- ...time-21.08.3-disable-google-sync-contacts.patch | 27 ----- 2 files changed, 137 deletions(-) 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 deleted file mode 100644 index 14ba90537025..000000000000 --- a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-CVE-2020-15954.patch +++ /dev/null @@ -1,110 +0,0 @@ -From 35447bd04e8c12afac524e1c4556ef3db088e014 Mon Sep 17 00:00:00 2001 -From: Laurent Montel -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 -+ SPDX-FileCopyrightText: 2009-2021 Montel Laurent - - 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/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch b/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch deleted file mode 100644 index 7270d6e42aaf..000000000000 --- a/kde-apps/kdepim-runtime/files/kdepim-runtime-21.08.3-disable-google-sync-contacts.patch +++ /dev/null @@ -1,27 +0,0 @@ -From 624ef213e50ae4712bfe2a254c5f444caaacfa22 Mon Sep 17 00:00:00 2001 -From: Laurent Montel -Date: Mon, 7 Feb 2022 06:58:43 +0100 -Subject: [PATCH] Apply patch for disable sync contact as it don't ported yet. - -BUG:449024 ---- - resources/google-groupware/googleresource.cpp | 2 ++ - 1 file changed, 2 insertions(+) - -diff --git a/resources/google-groupware/googleresource.cpp b/resources/google-groupware/googleresource.cpp -index 62b08fab0..a0d74e738 100644 ---- a/resources/google-groupware/googleresource.cpp -+++ b/resources/google-groupware/googleresource.cpp -@@ -104,7 +104,9 @@ GoogleResource::GoogleResource(const QString &id) - m_freeBusyHandler = std::make_unique(m_iface, m_settings); - m_handlers.clear(); - m_handlers.push_back(GenericHandler::Ptr(new CalendarHandler(m_iface, m_settings))); -+#ifdef DISABLE_UNTIL_LIBKGAPI_PORTED - m_handlers.push_back(GenericHandler::Ptr(new ContactHandler(m_iface, m_settings))); -+#endif - m_handlers.push_back(GenericHandler::Ptr(new TaskHandler(m_iface, m_settings))); - - new SettingsAdaptor(m_settings); --- -GitLab -