Hello community, here is the log from the commit of package quassel for openSUSE:Factory checked in at 2015-05-07 08:29:11 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Comparing /work/SRC/openSUSE:Factory/quassel (Old) and /work/SRC/openSUSE:Factory/.quassel.new (New) ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "quassel" Changes: -------- --- /work/SRC/openSUSE:Factory/quassel/quassel.changes 2015-04-22 01:19:38.000000000 +0200 +++ /work/SRC/openSUSE:Factory/.quassel.new/quassel.changes 2015-05-07 08:29:25.000000000 +0200 @@ -1,0 +2,16 @@ +Wed May 6 13:00:35 UTC 2015 - [email protected] + +- Move the notifyrc file to the base package, so that both the mono + and client subpackages can use it. Without this file there are + no notifications. + +------------------------------------------------------------------- +Wed May 6 11:00:35 UTC 2015 - [email protected] + +- Version bump to 0.12.2 bnc#928728: + * Fix PostgreSQL not re-initializing after reconnect (raising CVE-2013-4422 + from the dead) + * Remove warning on startup due to a change in Kdelibs4ConfigMigrator + * Emergency fix for behavior change in Qt5's psql driver regarding timezones + +------------------------------------------------------------------- Old: ---- quassel-0.12.0.tar.bz2 New: ---- quassel-0.12.2.tar.bz2 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ Other differences: ------------------ ++++++ quassel.spec ++++++ --- /var/tmp/diff_new_pack.mqoobK/_old 2015-05-07 08:29:26.000000000 +0200 +++ /var/tmp/diff_new_pack.mqoobK/_new 2015-05-07 08:29:26.000000000 +0200 @@ -17,7 +17,7 @@ Name: quassel -Version: 0.12.0 +Version: 0.12.2 Release: 0 Summary: Modern, cross-platform, distributed IRC client License: GPL-2.0 or GPL-3.0 @@ -210,7 +210,6 @@ %defattr(-,root,root) %doc AUTHORS ChangeLog README %{_datadir}/applications/%{name}client.desktop -%{_datadir}/knotifications5/%{name}.notifyrc %{_bindir}/%{name}client %files core @@ -238,5 +237,6 @@ %{_datadir}/icons/hicolor/*/actions/im-user-offline.png %{_datadir}/icons/hicolor/*/actions/im-user.png %{_datadir}/icons/hicolor/scalable/*/* +%{_datadir}/knotifications5/%{name}.notifyrc %changelog ++++++ quassel-0.12.0.tar.bz2 -> quassel-0.12.2.tar.bz2 ++++++ diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quassel-0.12.0/CMakeLists.txt new/quassel-0.12.2/CMakeLists.txt --- old/quassel-0.12.0/CMakeLists.txt 2015-04-15 22:58:17.000000000 +0200 +++ new/quassel-0.12.2/CMakeLists.txt 2015-04-23 22:47:17.000000000 +0200 @@ -11,8 +11,8 @@ # Versions set(QUASSEL_MAJOR 0) set(QUASSEL_MINOR 12) -set(QUASSEL_PATCH 0) -set(QUASSEL_VERSION_STRING "0.12.0") +set(QUASSEL_PATCH 2) +set(QUASSEL_VERSION_STRING "0.12.2") # We want to know CMake's version for debug reasons message(STATUS "Using CMake ${CMAKE_VERSION}") diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quassel-0.12.0/ChangeLog new/quassel-0.12.2/ChangeLog --- old/quassel-0.12.0/ChangeLog 2015-04-15 22:58:17.000000000 +0200 +++ new/quassel-0.12.2/ChangeLog 2015-04-23 22:47:17.000000000 +0200 @@ -13,6 +13,17 @@ Without further ado, let's start: +Version 0.12.2 (2015-04-23) +=========================== + +* Fix PostgreSQL not re-initializing after reconnect (raising CVE-2013-4422 from the dead) +* Remove warning on startup due to a change in Kdelibs4ConfigMigrator + +Version 0.12.1 (2015-04-21) +=========================== + +* Emergency fix for behavior change in Qt5's psql driver regarding timezones + Version 0.12.0 (2015-04-15) =========================== diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quassel-0.12.0/src/common/main.cpp new/quassel-0.12.2/src/common/main.cpp --- old/quassel-0.12.0/src/common/main.cpp 2015-04-15 22:58:17.000000000 +0200 +++ new/quassel-0.12.2/src/common/main.cpp 2015-04-23 22:47:17.000000000 +0200 @@ -103,13 +103,6 @@ # endif #endif - // Migrate settings from KDE4 to KF5 if appropriate -#ifdef HAVE_KF5 - Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName()); - migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc"); - migrator.migrate(); -#endif - AbstractCliParser *cliParser; #ifdef HAVE_KDE4 @@ -198,6 +191,13 @@ } #endif +// Migrate settings from KDE4 to KF5 if appropriate +#ifdef HAVE_KF5 + Kdelibs4ConfigMigrator migrator(QCoreApplication::applicationName()); + migrator.setConfigFiles(QStringList() << "quasselrc" << "quassel.notifyrc"); + migrator.migrate(); +#endif + #ifdef HAVE_KF5 // FIXME: This should be done after loading the translation catalogue, but still in main() AboutData aboutData; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quassel-0.12.0/src/core/abstractsqlstorage.cpp new/quassel-0.12.2/src/core/abstractsqlstorage.cpp --- old/quassel-0.12.0/src/core/abstractsqlstorage.cpp 2015-04-15 22:58:17.000000000 +0200 +++ new/quassel-0.12.2/src/core/abstractsqlstorage.cpp 2015-04-23 22:47:17.000000000 +0200 @@ -53,7 +53,14 @@ if (!_connectionPool.contains(QThread::currentThread())) addConnectionToPool(); - return QSqlDatabase::database(_connectionPool[QThread::currentThread()]->name()); + QSqlDatabase db = QSqlDatabase::database(_connectionPool[QThread::currentThread()]->name(),false); + + if (!db.isOpen()) { + qWarning() << "Database connection" << displayName() << "for thread" << QThread::currentThread() << "was lost, attempting to reconnect..."; + dbConnect(db); + } + + return db; } @@ -90,6 +97,12 @@ db.setPassword(password()); } + dbConnect(db); +} + + +void AbstractSqlStorage::dbConnect(QSqlDatabase &db) +{ if (!db.open()) { quWarning() << "Unable to open database" << displayName() << "for thread" << QThread::currentThread(); quWarning() << "-" << db.lastError().text(); diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quassel-0.12.0/src/core/abstractsqlstorage.h new/quassel-0.12.2/src/core/abstractsqlstorage.h --- old/quassel-0.12.0/src/core/abstractsqlstorage.h 2015-04-15 22:58:17.000000000 +0200 +++ new/quassel-0.12.2/src/core/abstractsqlstorage.h 2015-04-23 22:47:17.000000000 +0200 @@ -87,6 +87,7 @@ private: void addConnectionToPool(); + void dbConnect(QSqlDatabase &db); int _schemaVersion; bool _debug; diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quassel-0.12.0/src/core/postgresqlstorage.cpp new/quassel-0.12.2/src/core/postgresqlstorage.cpp --- old/quassel-0.12.0/src/core/postgresqlstorage.cpp 2015-04-15 22:58:17.000000000 +0200 +++ new/quassel-0.12.2/src/core/postgresqlstorage.cpp 2015-04-23 22:47:17.000000000 +0200 @@ -136,6 +136,14 @@ return false; break; } + + // Set the PostgreSQL session timezone to UTC, since we want timestamps stored in UTC + QSqlQuery tzQuery = db.exec("SET timezone = 'UTC'"); + if (tzQuery.lastError().isValid()) { + quError() << "Failed to set timezone to UTC!"; + return false; + } + return true; } diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn' '--exclude=.svnignore' old/quassel-0.12.0/version.h.in new/quassel-0.12.2/version.h.in --- old/quassel-0.12.0/version.h.in 2015-04-15 22:58:17.000000000 +0200 +++ new/quassel-0.12.2/version.h.in 2015-04-23 22:47:17.000000000 +0200 @@ -9,5 +9,5 @@ #define GIT_DESCRIBE "@GIT_DESCRIBE@" // Will be substituted in official tarballs -#define DIST_HASH "585ef1dab1790c7edb7c73df801560ba6b7842d1" -#define DIST_DATE "1429131497" +#define DIST_HASH "9c5e6c666d5faa976eec2e0ac8bf8e1dd6c0332c" +#define DIST_DATE "1429822037"
