Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at Tue May 17 13:16:56 CEST 2011.
-------- --- KDE/akonadi-runtime/akonadi-runtime.changes 2011-04-07 17:37:59.000000000 +0200 +++ /mounts/work_src_done/STABLE/akonadi-runtime/akonadi-runtime.changes 2011-05-07 11:40:44.000000000 +0200 @@ -1,0 +2,7 @@ +Sat May 7 09:38:23 UTC 2011 - [email protected] + +- Update to 1.5.3 + - Don't crash when copying a folder into itself. (BKO#271808) + + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- akonadi-1.5.2.tar.bz2 New: ---- akonadi-1.5.3.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.nCIBm0/_old 2011-05-17 13:11:48.000000000 +0200 +++ /var/tmp/diff_new_pack.nCIBm0/_new 2011-05-17 13:11:48.000000000 +0200 @@ -21,7 +21,7 @@ BuildRequires: cmake kde4-filesystem libmysqlclient-devel BuildRequires: automoc4 boost-devel libsoprano-devel libxslt mysql shared-mime-info BuildRequires: fdupes -Version: 1.5.2 +Version: 1.5.3 Release: 1 %define rversion %version License: LGPLv2.1+ ++++++ akonadi-1.5.2.tar.bz2 -> akonadi-1.5.3.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.2/CMakeLists.txt new/akonadi-1.5.3/CMakeLists.txt --- old/akonadi-1.5.2/CMakeLists.txt 2011-04-05 14:22:20.000000000 +0200 +++ new/akonadi-1.5.3/CMakeLists.txt 2011-05-07 11:22:49.000000000 +0200 @@ -55,7 +55,7 @@ set(AKONADI_VERSION_MAJOR "1") set(AKONADI_VERSION_MINOR "5") -set(AKONADI_VERSION_PATCH "2") +set(AKONADI_VERSION_PATCH "3") set(AKONADI_VERSION "${AKONADI_VERSION_MAJOR}.${AKONADI_VERSION_MINOR}.${AKONADI_VERSION_PATCH}") set(AKONADI_VERSION_STRING "${AKONADI_VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.2/Mainpage.dox new/akonadi-1.5.3/Mainpage.dox --- old/akonadi-1.5.2/Mainpage.dox 2011-04-05 14:22:20.000000000 +0200 +++ new/akonadi-1.5.3/Mainpage.dox 2011-05-07 11:22:49.000000000 +0200 @@ -315,6 +315,6 @@ // DOXYGEN_EXCLUDE = sqlplugin server/control server/akonadictl server/tests // DOXYGEN_PROJECTNAME=Akonadi -// DOXYGEN_PROJECTVERSION=1.5.2 +// DOXYGEN_PROJECTVERSION=1.5.3 // vim:ts=4:sw=4:expandtab:filetype=doxygen diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.2/NEWS new/akonadi-1.5.3/NEWS --- old/akonadi-1.5.2/NEWS 2011-04-05 14:22:20.000000000 +0200 +++ new/akonadi-1.5.3/NEWS 2011-05-07 11:22:49.000000000 +0200 @@ -1,3 +1,7 @@ +1.5.3 07-May-2011 +--------------------------------------------- +- Fix crash when copying collections into themselves. + 1.5.2 05-April-2011 --------------------------------------------- - Fix XdgBaseDirs reporting duplicated paths. diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/akonadi-1.5.2/server/src/handler/colcopy.cpp new/akonadi-1.5.3/server/src/handler/colcopy.cpp --- old/akonadi-1.5.2/server/src/handler/colcopy.cpp 2011-04-05 14:22:20.000000000 +0200 +++ new/akonadi-1.5.3/server/src/handler/colcopy.cpp 2011-05-07 11:22:49.000000000 +0200 @@ -24,12 +24,18 @@ #include "storage/datastore.h" #include "storage/transaction.h" #include "storage/itemretriever.h" +#include "storage/collectionqueryhelper.h" #include "imapstreamparser.h" using namespace Akonadi; bool ColCopy::copyCollection(const Collection & source, const Collection & target) { + if ( !CollectionQueryHelper::canBeMovedTo( source, target ) ) { + // We don't accept source==target, or source being an ancestor of target. + return false; + } + // copy the source collection Collection col = source; col.setParentId( target.id() ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
