Hello community, here is the log from the commit of package kdepim-runtime for openSUSE:Factory checked in at 2019-11-23 23:16:54 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim-runtime.new.26869 (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-runtime" Sat Nov 23 23:16:54 2019 rev:60 rq:749309 version:19.08.3 Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-runtime/kdepim-runtime.changes 2019-11-12 11:36:36.750168953 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim-runtime.new.26869/kdepim-runtime.changes 2019-11-23 23:16:55.746772188 +0100 @@ -1,0 +2,6 @@ +Mon Nov 18 11:43:51 UTC 2019 - Christophe Giboudeaux <christo...@krop.fr> + +- Add 0001-Sanity-check-collection-path-before-performing-recur.patch to fix a potential data loss issue (kde#414178) + + +------------------------------------------------------------------- New: ---- 0001-Sanity-check-collection-path-before-performing-recur.patch ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-runtime.spec ++++++ --- /var/tmp/diff_new_pack.8oRdAk/_old 2019-11-23 23:16:56.378772256 +0100 +++ /var/tmp/diff_new_pack.8oRdAk/_new 2019-11-23 23:16:56.386772256 +0100 @@ -1,7 +1,7 @@ # # spec file for package kdepim-runtime # -# Copyright (c) 2019 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2019 SUSE LLC. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -32,6 +32,8 @@ Source1: https://download.kde.org/stable/applications/%{version}/src/%{name}-%{version}.tar.xz.sig Source2: applications.keyring %endif +# PATCH-FIX-UPSTREAM +Patch0: 0001-Sanity-check-collection-path-before-performing-recur.patch BuildRequires: cyrus-sasl-devel BuildRequires: extra-cmake-modules BuildRequires: kf5-filesystem @@ -97,7 +99,7 @@ %lang_package %prep -%setup -q -n kdepim-runtime-%{version} +%autosetup -p1 -n kdepim-runtime-%{version} %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} ++++++ 0001-Sanity-check-collection-path-before-performing-recur.patch ++++++ >From e3e0ee0ddc82bf6a34ebe93ed6c5c881f412ddc2 Mon Sep 17 00:00:00 2001 From: Volker Krause <vkra...@kde.org> Date: Sat, 16 Nov 2019 22:44:13 +0100 Subject: [PATCH] Sanity-check collection path before performing recursive deletion Summary: There is a error paths in directoryForCollection() which might give us an empty string here, which is then interpreted as the current working directory. CCBUG: 414178 Reviewers: mlaurent Reviewed By: mlaurent Subscribers: kde-pim Tags: #kde_pim Differential Revision: https://phabricator.kde.org/D25346 --- resources/contacts/contactsresource.cpp | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/resources/contacts/contactsresource.cpp b/resources/contacts/contactsresource.cpp index e718f235b..cd8deac97 100644 --- a/resources/contacts/contactsresource.cpp +++ b/resources/contacts/contactsresource.cpp @@ -399,8 +399,12 @@ void ContactsResource::collectionRemoved(const Akonadi::Collection &collection) return; } - QDir collectionDir = directoryForCollection(collection); - if (!collectionDir.removeRecursively()) { + const QString collectionDir = directoryForCollection(collection); + if (collectionDir.isEmpty()) { + cancelTask(i18n("Unknown folder to delete.")); + return; + } + if (!QDir(collectionDir).removeRecursively()) { cancelTask(i18n("Unable to delete folder '%1'.", collection.name())); return; } -- 2.24.0
