Hello community, here is the log from the commit of package kdepim-runtime for openSUSE:Factory checked in at 2016-04-03 23:06:34 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/kdepim-runtime (Old) and /work/SRC/openSUSE:Factory/.kdepim-runtime.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "kdepim-runtime" Changes: -------- --- /work/SRC/openSUSE:Factory/kdepim-runtime/kdepim-runtime.changes 2016-03-26 15:15:02.000000000 +0100 +++ /work/SRC/openSUSE:Factory/.kdepim-runtime.new/kdepim-runtime.changes 2016-04-03 23:06:35.000000000 +0200 @@ -1,0 +2,6 @@ +Wed Mar 30 08:42:37 UTC 2016 - tittiatc...@gmail.com + +- Add upstream patch bko354056.diff to resolve issues with + Courier IMAP servers (bko#354056) + +------------------------------------------------------------------- New: ---- bko354056.diff ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ kdepim-runtime.spec ++++++ --- /var/tmp/diff_new_pack.YMUpTQ/_old 2016-04-03 23:06:36.000000000 +0200 +++ /var/tmp/diff_new_pack.YMUpTQ/_new 2016-04-03 23:06:36.000000000 +0200 @@ -26,6 +26,8 @@ Group: System/GUI/KDE Url: http://www.kde.org Source: kdepim-runtime-%{version}.tar.xz +# PATCH-FIX-UPSTREAM bko354056.diff -- dvra...@kde.org handle deprecated Delete rights when checking ACL before expunge +Patch1: bko354056.diff BuildRequires: akonadi-calendar-devel >= %{kf5_pimlibs_version} BuildRequires: akonadi-contact-devel >= %{kf5_pimlibs_version} BuildRequires: akonadi-devel >= %{kf5_pimlibs_version} @@ -89,6 +91,7 @@ %prep %setup -q -n kdepim-runtime-%{version} +%patch1 -p1 %build %cmake_kf5 -d build -- -DBUILD_TESTING=ON -DKF5_INCLUDE_INSTALL_DIR=%{_kf5_includedir} ++++++ bko354056.diff ++++++ From: Daniel Vrátil <dvra...@kde.org> Date: Mon, 21 Mar 2016 22:27:09 +0000 Subject: IMAP: handle deprecated Delete right when checking ACL before expunge X-Git-Tag: v16.03.80 X-Git-Url: http://quickgit.kde.org/?p=kdepim-runtime.git&a=commitdiff&h=6f2026f657ba7b68b4022ca969b3b6ff052609d1 --- IMAP: handle deprecated Delete right when checking ACL before expunge Due to ambiguity in RFC 2086 the new RFC 4314 introduced two virtual rights, one of them being "d" (delete). When "d" right is present, presence of "e", "t" and "x" rights must be assumed by the clients. Courier IMAP server uses this virtual rights but does not explicitly list the "e" (expunge) right like most other servers, which caused RetrieveItemsTask to not trigger EXPUNGE before syncing the mailbox. BUG: 354056 FIXED-IN: 16.04.0 --- --- a/resources/imap/retrieveitemstask.cpp +++ b/resources/imap/retrieveitemstask.cpp @@ -161,8 +161,9 @@ m_time.start(); // Now is the right time to expunge the messages marked \\Deleted from this mailbox. - // We assume that we can only expunge if we can delete items (correct would be to check for "e" ACL right). - if (isAutomaticExpungeEnabled() && (!serverCapabilities().contains(QStringLiteral("ACL")) || (myRights(collection()) & KIMAP::Acl::Expunge))) { + const bool hasACL = serverCapabilities().contains(QStringLiteral("ACL")); + const KIMAP::Acl::Rights rights = myRights(collection()); + if (isAutomaticExpungeEnabled() && (!hasACL || (rights & KIMAP::Acl::Expunge) || (rights & KIMAP::Acl::Delete))) { if (m_session->selectedMailBox() != mailBox) { triggerPreExpungeSelect(mailBox); } else {
