commit: b890132492bdf7f2a8de0156c370574a4ab5f13a Author: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> AuthorDate: Sat Aug 1 15:46:33 2020 +0000 Commit: Andreas Sturmlechner <asturm <AT> gentoo <DOT> org> CommitDate: Sat Aug 1 22:57:17 2020 +0000 URL: https://gitweb.gentoo.org/repo/gentoo.git/commit/?id=b8901324
kde-apps/kdepim-runtime: Fix CVE-2020-15954 Bug: https://bugs.gentoo.org/734126 Package-Manager: Portage-3.0.1, Repoman-2.3.23 Signed-off-by: Andreas Sturmlechner <asturm <AT> gentoo.org> .../kdepim-runtime-20.04.3-CVE-2020-15954.patch | 28 +++++++ .../kdepim-runtime-20.04.3-r1.ebuild | 91 ++++++++++++++++++++++ 2 files changed, 119 insertions(+) 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 00000000000..92fec0bbcfc --- /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 <[email protected]> +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-20.04.3-r1.ebuild b/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild new file mode 100644 index 00000000000..5284241615d --- /dev/null +++ b/kde-apps/kdepim-runtime/kdepim-runtime-20.04.3-r1.ebuild @@ -0,0 +1,91 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI=7 + +ECM_HANDBOOK="forceoptional" +ECM_TEST="forceoptional" +PVCUT=$(ver_cut 1-3) +KFMIN=5.70.0 +QTMIN=5.14.2 +VIRTUALX_REQUIRED="test" +inherit ecm kde.org + +DESCRIPTION="Runtime plugin collection to extend the functionality of KDE PIM" +HOMEPAGE="https://kde.org/applications/office/org.kde.kontact"; + +LICENSE="GPL-2+ LGPL-2.1+" +SLOT="5" +KEYWORDS="~amd64 ~arm64 ~x86" +IUSE="" + +# TODO kolab +BDEPEND=" + dev-libs/libxslt +" +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 + >=kde-frameworks/kconfig-${KFMIN}:5 + >=kde-frameworks/kconfigwidgets-${KFMIN}:5 + >=kde-frameworks/kcontacts-${KFMIN}:5 + >=kde-frameworks/kcoreaddons-${KFMIN}:5 + >=kde-frameworks/kholidays-${KFMIN}:5 + >=kde-frameworks/ki18n-${KFMIN}:5 + >=kde-frameworks/kio-${KFMIN}:5 + >=kde-frameworks/kitemmodels-${KFMIN}:5 + >=kde-frameworks/kjobwidgets-${KFMIN}:5 + >=kde-frameworks/knotifications-${KFMIN}:5 + >=kde-frameworks/knotifyconfig-${KFMIN}:5 + >=kde-frameworks/kservice-${KFMIN}:5 + >=kde-frameworks/ktextwidgets-${KFMIN}:5 + >=kde-frameworks/kwallet-${KFMIN}:5 + >=kde-frameworks/kwidgetsaddons-${KFMIN}:5 + >=kde-frameworks/kwindowsystem-${KFMIN}:5 + >=kde-frameworks/kxmlgui-${KFMIN}:5 +" +DEPEND="${RDEPEND} + >=dev-qt/qtxmlpatterns-${QTMIN}:5 + test? ( >=kde-apps/kimap-${PVCUT}:5[test] ) +" + +RESTRICT+=" test" + +PATCHES=( "${FILESDIR}/${P}-CVE-2020-15954.patch" ) + +src_configure() { + local mycmakeargs=( + -DCMAKE_DISABLE_FIND_PACKAGE_Libkolabxml=ON + ) + ecm_src_configure +}
