Hello community, here is the log from the commit of package akonadi-runtime for openSUSE:Factory checked in at Wed May 6 18:30:51 CEST 2009. -------- --- KDE/akonadi-runtime/akonadi-runtime.changes 2009-01-22 02:04:48.000000000 +0100 +++ /mounts/work_src_done/STABLE/akonadi-runtime/akonadi-runtime.changes 2009-04-30 23:26:20.000000000 +0200 @@ -1,0 +2,6 @@ +Thu Apr 30 23:25:50 CEST 2009 - dmueller@suse.de + +- update to 1.1.2: + * fix dbus loop lockups + +------------------------------------------------------------------- calling whatdependson for head-i586 Old: ---- akonadi-1.1.1.tar.bz2 New: ---- akonadi-1.1.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ akonadi-runtime.spec ++++++ --- /var/tmp/diff_new_pack.z26751/_old 2009-05-06 18:29:13.000000000 +0200 +++ /var/tmp/diff_new_pack.z26751/_new 2009-05-06 18:29:13.000000000 +0200 @@ -1,5 +1,5 @@ # -# spec file for package akonadi-runtime (Version 1.1.1) +# spec file for package akonadi-runtime (Version 1.1.2) # # Copyright (c) 2009 SUSE LINUX Products GmbH, Nuernberg, Germany. # @@ -23,7 +23,7 @@ %if %suse_version > 1020 BuildRequires: fdupes %endif -Version: 1.1.1 +Version: 1.1.2 Release: 1 License: LGPL v2.1 or later BuildRoot: %{_tmppath}/%{name}-%{version}-build @@ -147,6 +147,9 @@ %_libdir/libakonadiprotocolinternals.so.1* %changelog +* Thu Apr 30 2009 dmueller@suse.de +- update to 1.1.2: + * fix dbus loop lockups * Thu Jan 22 2009 dmueller@suse.de - update to 1.1.1: - Fix code that was not executed in a release build. ++++++ akonadi-1.1.1.tar.bz2 -> akonadi-1.1.2.tar.bz2 ++++++ diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/akonadi-1.1.1/ChangeLog new/akonadi-1.1.2/ChangeLog --- old/akonadi-1.1.1/ChangeLog 2009-01-21 19:29:04.000000000 +0100 +++ new/akonadi-1.1.2/ChangeLog 2009-04-30 21:33:28.000000000 +0200 @@ -1,17 +1,41 @@ +2009-03-31 15:17 +0000 [r947472] Volker Krause vkrause@kde.org + + * branches/akonadi/1.1/server/control/agentinstance.cpp: Backport + SVN commit 947310 by amantia from trunk: Avoid DBUS lockups BUG: + 182198 + +2009-02-25 10:55 +0000 [r931467] Volker Krause vkrause@kde.org + + * branches/akonadi/1.1/server/src/akonadi.cpp: Backport SVN commit + 931461 by vkrause: Fix startup when the MySQL config files didn't + change. + +2009-02-24 18:33 +0000 [r931066] Rex Dieter rdieter@math.unl.edu + + * branches/akonadi/1.1/server/src/akonadi.cpp: backport from trunk: + update user mysql.conf only if global/local one's are newer, and + in doing so, clear mysql ib_logfile's + +2009-01-21 18:16 +0000 [r914764] Tom Albers toma@kde.org + + * branches/akonadi/1.1/ChangeLog, branches/akonadi/1.1/NEWS, + branches/akonadi/1.1/CMakeLists.txt, + branches/akonadi/1.1/makechangelog: Prep for 1.1.1 + 2009-01-16 09:46 +0000 [r911844] Volker Krause vkrause@kde.org * branches/akonadi/1.1/server/shared/akdebug.cpp: Backport SVN commit 908591 by vkrause from trunk: Don't put essential code into assert(), doesn't seem to be executed in release builds. -2009-01-09 21:34 +0000 [r908531] Tom Albers tomalbers@kde.nl +2009-01-09 21:34 +0000 [r908531] Tom Albers toma@kde.org * branches/akonadi/1.1/CMakeLists.txt, branches/akonadi/1.1/cmake/modules/FindBoost.cmake (removed): Backport: SVN commit 906112 by dfaure: Require cmake-2.6.0 and its much nicer FindBoost.cmake -2009-01-04 22:14 +0000 [r905716] Tom Albers tomalbers@kde.nl +2009-01-04 22:14 +0000 [r905716] Tom Albers toma@kde.org * branches/akonadi/1.1/cmake/modules/FindBoost.cmake: Backport SVN commit 905714 by sengels: add 1.37 release @@ -22,11 +46,11 @@ SVN commit 905553 by vkrause from trunk: Don't try to restart an agent that has been deleted. -2009-01-03 16:17 +0000 [r905029] Tom Albers tomalbers@kde.nl +2009-01-03 16:17 +0000 [r905029] Tom Albers toma@kde.org * branches/akonadi/1.1 (added): Branch off Akonadi 1.1 -2009-01-03 16:10 +0000 [r905016] Tom Albers tomalbers@kde.nl +2009-01-03 16:10 +0000 [r905016] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/ChangeLog, trunk/kdesupport/akonadi/NEWS, @@ -141,7 +165,7 @@ * trunk/kdesupport/akonadi/server/src/storage/dbconfig.cpp: add FreeBSD mysqld default path -2008-12-16 19:06 +0000 [r897748] Tom Albers tomalbers@kde.nl +2008-12-16 19:06 +0000 [r897748] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/ChangeLog, trunk/kdesupport/akonadi/NEWS, @@ -234,7 +258,7 @@ trunk/kdesupport/akonadi/server/src/storage/dbconfig.cpp: Try harder to find the mysqld executable during runtime. -2008-11-19 19:31 +0000 [r886652] Tom Albers tomalbers@kde.nl +2008-11-19 19:31 +0000 [r886652] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/ChangeLog, trunk/kdesupport/akonadi/NEWS: Prep for release. @@ -270,7 +294,7 @@ also removes the restriction that agents were not allowed to access the agent manager themselves to avoid deadlocks. -2008-11-04 21:16 +0000 [r880161] Tom Albers tomalbers@kde.nl +2008-11-04 21:16 +0000 [r880161] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/server/src/handler/akappend.cpp, trunk/kdesupport/akonadi/server/src/handler/append.cpp: Fix the @@ -281,7 +305,7 @@ * trunk/kdesupport/akonadi/server/src/storage/mysql-global.conf: Increase the limit to something more realistical. -2008-11-01 10:09 +0000 [r878448] Tom Albers tomalbers@kde.nl +2008-11-01 10:09 +0000 [r878448] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/server/src/handler/akappend.cpp, trunk/kdesupport/akonadi/server/src/handler/append.cpp: Don't @@ -291,7 +315,7 @@ messages are marked as recent, although they also contain the \Seen flag. -2008-11-01 09:26 +0000 [r878427] Tom Albers tomalbers@kde.nl +2008-11-01 09:26 +0000 [r878427] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/server/src/handler/append.h, trunk/kdesupport/akonadi/server/src/handler/store.cpp, @@ -310,7 +334,7 @@ * trunk/kdesupport/akonadi/server/src/storage/notificationcollector.h: build fix CCMAIL vkrause@kde.org -2008-10-04 23:05 +0000 [r867919] Tom Albers tomalbers@kde.nl +2008-10-04 23:05 +0000 [r867919] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/server/src/storage/mysql-global.conf: 1M is to restrictive, messages can and will be bigger. @@ -590,7 +614,7 @@ trunk/kdesupport/akonadi/server/src/handler/fetch.cpp: Return the modification time when an item is appended/stored/fetcehd. -2008-07-22 20:52 +0000 [r836720] Tom Albers tomalbers@kde.nl +2008-07-22 20:52 +0000 [r836720] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/CMakeLists.txt: Move version from 0.82.0 to 1.0.80. This is now akonadi unstable branch. Akonadi stable is @@ -641,7 +665,7 @@ CMAKE_INSTALL_PREFIX, since this is already part of PATH_SUFFIXES Alex -2008-06-18 16:00 +0000 [r821830] Tom Albers tomalbers@kde.nl +2008-06-18 16:00 +0000 [r821830] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/ChangeLog, trunk/kdesupport/akonadi/NEWS, @@ -719,12 +743,12 @@ trunk/kdesupport/akonadi/CMakeLists.txt: fix install_name RPATH stuff on OSX -2008-05-19 10:26 +0000 [r809711] Jaroslaw Staniek js@iidea.pl +2008-05-19 10:26 +0000 [r809711] Jarosław Staniek staniek@kde.org * trunk/kdesupport/akonadi/CMakeLists.txt: make libs install to bin on Windows, so far this fixes akonadiprivate.dll destination -2008-05-18 22:03 +0000 [r809435] Tom Albers tomalbers@kde.nl +2008-05-18 22:03 +0000 [r809435] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/ChangeLog (added), trunk/kdesupport/akonadi/NEWS (added), @@ -880,7 +904,7 @@ Extend requestItemDelivery() by mimeType to provide a sane API on ResourceBase side. -2008-04-29 23:04 +0000 [r802602] Tom Albers tomalbers@kde.nl +2008-04-29 23:04 +0000 [r802602] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/cmake/modules/COPYING-CMAKE-SCRIPTS (added): Referenced by some of the files in here. @@ -1138,7 +1162,7 @@ not available on msvc, do not use it - rather check with cmake for availability - msvc compiles now -2008-04-23 21:20 +0000 [r800304] Tom Albers tomalbers@kde.nl +2008-04-23 21:20 +0000 [r800304] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/lgpl-license (added), trunk/kdesupport/akonadi/server/CMakeLists.txt, @@ -1152,7 +1176,7 @@ * trunk/kdesupport/akonadi/cmake/automoc/CMakeLists.txt: Don't install our borrowed automoc. -2008-04-23 20:39 +0000 [r800285] Tom Albers tomalbers@kde.nl +2008-04-23 20:39 +0000 [r800285] Tom Albers toma@kde.org * trunk/kdesupport/akonadi/server/CMakeLists.txt, trunk/kdesupport/akonadi/libs/CMakeLists.txt: We can no longer diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/akonadi-1.1.1/CMakeLists.txt new/akonadi-1.1.2/CMakeLists.txt --- old/akonadi-1.1.1/CMakeLists.txt 2009-01-21 19:29:04.000000000 +0100 +++ new/akonadi-1.1.2/CMakeLists.txt 2009-04-30 21:33:28.000000000 +0200 @@ -52,7 +52,7 @@ set(AKONADI_LIB_MAJOR_VERSION "1") set(AKONADI_LIB_MINOR_VERSION "1") -set(AKONADI_LIB_PATCH_VERSION "1") +set(AKONADI_LIB_PATCH_VERSION "2") set(AKONADI_LIB_VERSION_STRING "${AKONADI_LIB_MAJOR_VERSION}.${AKONADI_LIB_MINOR_VERSION}.${AKONADI_LIB_PATCH_VERSION}") set( AKONADI_VERSION_STRING "${AKONADI_LIB_VERSION_STRING}" ) diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/akonadi-1.1.1/NEWS new/akonadi-1.1.2/NEWS --- old/akonadi-1.1.1/NEWS 2009-01-21 19:29:04.000000000 +0100 +++ new/akonadi-1.1.2/NEWS 2009-04-30 21:33:28.000000000 +0200 @@ -1,3 +1,8 @@ +1.1.2 30-Apr-2009 +--------------------------------------------- +- Avoid DBUS lockups, reported at: https://bugs.kde.org/182198 +- Update user mysql.conf only if global/local one's are newer + 1.1.1 21-Jan-2009 --------------------------------------------- - Fix code that was not executed in a release build. diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/akonadi-1.1.1/server/control/agentinstance.cpp new/akonadi-1.1.2/server/control/agentinstance.cpp --- old/akonadi-1.1.1/server/control/agentinstance.cpp 2009-01-21 19:29:03.000000000 +0100 +++ new/akonadi-1.1.2/server/control/agentinstance.cpp 2009-04-30 21:33:22.000000000 +0200 @@ -218,10 +218,8 @@ void AgentInstance::errorHandler(const QDBusError & error) { - mManager->tracer()->error( QLatin1String( "AgentInstance::errorHandler" ), - QString( "D-Bus communication error '%1': '%2'" ) - .arg( error.name(), error.message() ) ); - + //avoid using the server tracer, can result in D-BUS lockups + qDebug() << QString( "D-Bus communication error '%1': '%2'" ).arg( error.name(), error.message() ) ; // TODO try again after some time, esp. on timeout errors } diff -urN --exclude=CVS --exclude=.cvsignore --exclude=.svn --exclude=.svnignore old/akonadi-1.1.1/server/src/akonadi.cpp new/akonadi-1.1.2/server/src/akonadi.cpp --- old/akonadi-1.1.1/server/src/akonadi.cpp 2009-01-21 19:29:03.000000000 +0100 +++ new/akonadi-1.1.2/server/src/akonadi.cpp 2009-04-30 21:33:28.000000000 +0200 @@ -225,23 +225,30 @@ const QString actualConfig = XdgBaseDirs::saveDir( "data", QLatin1String( "akonadi" ) ) + QLatin1String("/mysql.conf"); if ( globalConfig.isEmpty() ) akFatal() << "Did not find MySQL server default configuration (mysql-global.conf)"; - QFile globalFile( globalConfig ); - QFile actualFile( actualConfig ); - if ( globalFile.open( QFile::ReadOnly ) && actualFile.open( QFile::WriteOnly ) ) { - actualFile.write( globalFile.readAll() ); - if ( !localConfig.isEmpty() ) { - QFile localFile( localConfig ); - if ( localFile.open( QFile::ReadOnly ) ) { - actualFile.write( localFile.readAll() ); - localFile.close(); + bool confUpdate = false; + QFile actualFile ( actualConfig ); + // update conf only if either global (or local) is newer than actual + if ( (QFileInfo( globalConfig ).lastModified() > QFileInfo( actualFile ).lastModified()) || + (QFileInfo( localConfig ).lastModified() > QFileInfo( actualFile ).lastModified()) ) + { + QFile globalFile( globalConfig ); + QFile localFile ( localConfig ); + if ( globalFile.open( QFile::ReadOnly ) && actualFile.open( QFile::WriteOnly ) ) { + actualFile.write( globalFile.readAll() ); + if ( !localConfig.isEmpty() ) { + if ( localFile.open( QFile::ReadOnly ) ) { + actualFile.write( localFile.readAll() ); + localFile.close(); + } } + globalFile.close(); + actualFile.close(); + confUpdate = true; + } else { + akError() << "Unable to create MySQL server configuration file."; + akError() << "This means that either the default configuration file (mysql-global.conf) was not readable"; + akFatal() << "or the target file (mysql.conf) could not be written."; } - actualFile.close(); - globalFile.close(); - } else { - akError() << "Unable to create MySQL server configuration file."; - akError() << "This means that either the default configuration file (mysql-global.conf) was not readable"; - akFatal() << "or the target file (mysql.conf) could not be written."; } // MySQL doesn't like world writeable config files (which makes sense), but @@ -276,6 +283,12 @@ } } + // clear mysql ib_logfile's in case innodb_log_file_size option changed in last confUpdate + if ( confUpdate ) { + QFile(dataDir + QDir::separator() + QString::fromLatin1( "ib_logfile0" )).remove(); + QFile(dataDir + QDir::separator() + QString::fromLatin1( "ib_logfile1" )).remove(); + } + // synthesize the mysqld command QStringList arguments; arguments << QString::fromLatin1( "--defaults-file=%1/mysql.conf" ).arg( akDir ); ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Remember to have fun... -- To unsubscribe, e-mail: opensuse-commit+unsubscribe@opensuse.org For additional commands, e-mail: opensuse-commit+help@opensuse.org