Hello community,
here is the log from the commit of package akonadi-server for
openSUSE:Leap:15.2 checked in at 2020-05-24 18:06:44
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Leap:15.2/akonadi-server (Old)
and /work/SRC/openSUSE:Leap:15.2/.akonadi-server.new.2738 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "akonadi-server"
Sun May 24 18:06:44 2020 rev:56 rq:806312 version:20.04.1
Changes:
--------
--- /work/SRC/openSUSE:Leap:15.2/akonadi-server/akonadi-server.changes
2020-05-12 11:32:56.691812992 +0200
+++
/work/SRC/openSUSE:Leap:15.2/.akonadi-server.new.2738/akonadi-server.changes
2020-05-24 18:06:46.181859987 +0200
@@ -1,0 +2,12 @@
+Fri May 15 15:40:47 UTC 2020 - Luca Beltrame <[email protected]>
+
+- Update to 20.04.1
+ * New bugfix release
+ * For more details please see:
+ * https://kde.org/announcements/releases/2020-05-apps-update
+- Changes since 20.04.0:
+ * Fix potential double-free corruption in RemoteLog
+ * Windows: Handle QLocalSocket behavior gracefully
+ * Save configuration when creating resources for new user
+
+-------------------------------------------------------------------
@@ -19,2 +30,0 @@
- * For more details please see:
- * https://kde.org/announcements/releases/20.04-rc
@@ -28,2 +37,0 @@
- * For more details please see:
- * https://kde.org/announcements/releases/20.04-beta
@@ -38 +46 @@
- * https://www.kde.org/announcements/releases/19.12.3
+ * https://kde.org/announcements/releases/2020-03-apps-update
@@ -52 +60 @@
- * https://www.kde.org/announcements/releases/19.12.2
+ * https://kde.org/announcements/releases/2020-02-apps-update
Old:
----
akonadi-20.04.0.tar.xz
akonadi-20.04.0.tar.xz.sig
New:
----
akonadi-20.04.1.tar.xz
akonadi-20.04.1.tar.xz.sig
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ akonadi-server.spec ++++++
--- /var/tmp/diff_new_pack.muqmj8/_old 2020-05-24 18:06:46.621860939 +0200
+++ /var/tmp/diff_new_pack.muqmj8/_new 2020-05-24 18:06:46.625860947 +0200
@@ -22,7 +22,7 @@
%{!?_kapp_version: %define _kapp_version %(echo %{version}| awk -F. '{print
$1"."$2}')}
%bcond_without lang
Name: akonadi-server
-Version: 20.04.0
+Version: 20.04.1
Release: 0
Summary: PIM Storage Service
License: LGPL-2.1-or-later
++++++ akonadi-20.04.0.tar.xz -> akonadi-20.04.1.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-20.04.0/CMakeLists.txt
new/akonadi-20.04.1/CMakeLists.txt
--- old/akonadi-20.04.0/CMakeLists.txt 2020-04-22 13:12:57.000000000 +0200
+++ new/akonadi-20.04.1/CMakeLists.txt 2020-05-12 03:24:14.000000000 +0200
@@ -1,6 +1,6 @@
cmake_minimum_required(VERSION 3.5)
-set(PIM_VERSION "5.14.0")
+set(PIM_VERSION "5.14.1")
project(Akonadi VERSION ${PIM_VERSION})
if (MSVC)
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-20.04.0/po/it/libakonadi5.po
new/akonadi-20.04.1/po/it/libakonadi5.po
--- old/akonadi-20.04.0/po/it/libakonadi5.po 2020-04-22 13:12:38.000000000
+0200
+++ new/akonadi-20.04.1/po/it/libakonadi5.po 2020-05-12 03:24:13.000000000
+0200
@@ -19,7 +19,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=2; plural=(n != 1);\n"
-"X-Generator: Lokalize 19.12.3\n"
+"X-Generator: Lokalize 20.04.0\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-20.04.0/po/ko/libakonadi5.po
new/akonadi-20.04.1/po/ko/libakonadi5.po
--- old/akonadi-20.04.0/po/ko/libakonadi5.po 2020-04-22 13:12:40.000000000
+0200
+++ new/akonadi-20.04.1/po/ko/libakonadi5.po 2020-05-12 03:24:13.000000000
+0200
@@ -15,7 +15,7 @@
"Content-Type: text/plain; charset=UTF-8\n"
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=1; plural=0;\n"
-"X-Generator: Lokalize 19.04.3\n"
+"X-Generator: Lokalize 19.12.3\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-20.04.0/po/pl/libakonadi5.po
new/akonadi-20.04.1/po/pl/libakonadi5.po
--- old/akonadi-20.04.0/po/pl/libakonadi5.po 2020-04-22 13:12:48.000000000
+0200
+++ new/akonadi-20.04.1/po/pl/libakonadi5.po 2020-05-12 03:24:13.000000000
+0200
@@ -1,13 +1,13 @@
# Copyright (C) YEAR This_file_is_part_of_KDE
# This file is distributed under the same license as the PACKAGE package.
#
-# Łukasz Wojniłowicz <[email protected]>, 2014, 2015, 2016, 2017,
2018, 2019.
+# Łukasz Wojniłowicz <[email protected]>, 2014, 2015, 2016, 2017,
2018, 2019, 2020.
msgid ""
msgstr ""
"Project-Id-Version: \n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-02-21 03:16+0100\n"
-"PO-Revision-Date: 2019-09-23 09:02+0200\n"
+"PO-Revision-Date: 2020-04-19 09:33+0200\n"
"Last-Translator: Łukasz Wojniłowicz <[email protected]>\n"
"Language-Team: Polish <[email protected]>\n"
"Language: pl\n"
@@ -16,7 +16,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=3; plural=(n==1 ? 0 : n%10>=2 && n%10<=4 && (n%100<10 "
"|| n%100>=20) ? 1 : 2);\n"
-"X-Generator: Lokalize 19.07.70\n"
+"X-Generator: Lokalize 20.07.70\n"
#, kde-format
msgctxt "NAME OF TRANSLATORS"
@@ -977,7 +977,7 @@
#: widgets/collectionview.cpp:232
#, kde-format
msgid "Cancel"
-msgstr "Zaniechaj"
+msgstr "Anuluj"
#: widgets/conflictresolvedialog.cpp:141
#, kde-format
@@ -1068,7 +1068,7 @@
#: widgets/dragdropmanager.cpp:244
#, kde-format
msgid "C&ancel"
-msgstr "Z&aniechaj"
+msgstr "&Anuluj"
#: widgets/erroroverlay.cpp:241
#, kde-format
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-20.04.0/po/ru/libakonadi5.po
new/akonadi-20.04.1/po/ru/libakonadi5.po
--- old/akonadi-20.04.0/po/ru/libakonadi5.po 2020-04-22 13:12:51.000000000
+0200
+++ new/akonadi-20.04.1/po/ru/libakonadi5.po 2020-05-12 03:24:13.000000000
+0200
@@ -5,13 +5,13 @@
# Andrey Cherepanov <[email protected]>, 2009.
# Alexander Potashev <[email protected]>, 2010, 2011, 2014, 2015, 2016,
2017.
# Alexander Lakhin <[email protected]>, 2013.
-# Alexander Yavorsky <[email protected]>, 2017, 2018, 2019.
+# Alexander Yavorsky <[email protected]>, 2017, 2018, 2019, 2020.
msgid ""
msgstr ""
"Project-Id-Version: libakonadi\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-02-21 03:16+0100\n"
-"PO-Revision-Date: 2019-07-24 20:55+0300\n"
+"PO-Revision-Date: 2020-04-24 15:34+0300\n"
"Last-Translator: Alexander Yavorsky <[email protected]>\n"
"Language-Team: Russian <[email protected]>\n"
"Language: ru\n"
@@ -20,7 +20,7 @@
"Content-Transfer-Encoding: 8bit\n"
"Plural-Forms: nplurals=4; plural=n==1 ? 3 : n%10==1 && n%100!=11 ? 0 : n"
"%10>=2 && n%10<=4 && (n%100<10 || n%100>=20) ? 1 : 2;\n"
-"X-Generator: Lokalize 19.04.3\n"
+"X-Generator: Lokalize 20.04.0\n"
"X-Environment: kde\n"
"X-Accelerator-Marker: &\n"
"X-Text-Markup: kde4\n"
@@ -42,12 +42,12 @@
#: agentbase/accountsintegration.cpp:100
#, kde-format
msgid "There is currently no account configured."
-msgstr ""
+msgstr "Отсутствуют настроенные учётные записи."
#: agentbase/accountsintegration.cpp:118
#, kde-format
msgid "Accounts integration is not supported"
-msgstr ""
+msgstr "Встраивание учётных записей не поддерживается"
#: agentbase/agentbase.cpp:386 agentbase/preprocessorbase_p.cpp:42
#, kde-format
@@ -976,8 +976,7 @@
msgstr "Открыть диалоговое окно выбора коллекции"
#: widgets/collectionrequester.cpp:149
-#, fuzzy, kde-format
-#| msgid "Select a collection"
+#, kde-format
msgctxt "@title:window"
msgid "Select a collection"
msgstr "Выбор коллекции"
@@ -1224,8 +1223,7 @@
msgstr "Имя по умолчанию"
#: widgets/selftestdialog.cpp:73
-#, fuzzy, kde-format
-#| msgid "Akonadi Server Self-Test"
+#, kde-format
msgctxt "@title:window"
msgid "Akonadi Server Self-Test"
msgstr "Внутренние тесты сервера Akonadi"
@@ -2406,8 +2404,7 @@
# BUGME: what does this mean exactly? --aspotashev
#: widgets/subscriptiondialog.cpp:160
-#, fuzzy, kde-format
-#| msgid "Local Subscriptions"
+#, kde-format
msgctxt "@title:window"
msgid "Local Subscriptions"
msgstr "Локальные подписки"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-20.04.0/po/zh_CN/akonadi_knut_resource.po
new/akonadi-20.04.1/po/zh_CN/akonadi_knut_resource.po
--- old/akonadi-20.04.0/po/zh_CN/akonadi_knut_resource.po 2020-04-22
13:12:56.000000000 +0200
+++ new/akonadi-20.04.1/po/zh_CN/akonadi_knut_resource.po 2020-05-12
03:24:14.000000000 +0200
@@ -8,7 +8,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2019-05-20 03:13+0200\n"
-"PO-Revision-Date: 2020-03-25 19:56\n"
+"PO-Revision-Date: 2020-05-09 13:51\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-20.04.0/po/zh_CN/libakonadi5.po
new/akonadi-20.04.1/po/zh_CN/libakonadi5.po
--- old/akonadi-20.04.0/po/zh_CN/libakonadi5.po 2020-04-22 13:12:56.000000000
+0200
+++ new/akonadi-20.04.1/po/zh_CN/libakonadi5.po 2020-05-12 03:24:14.000000000
+0200
@@ -8,7 +8,7 @@
"Project-Id-Version: kdeorg\n"
"Report-Msgid-Bugs-To: https://bugs.kde.org\n";
"POT-Creation-Date: 2020-02-21 03:16+0100\n"
-"PO-Revision-Date: 2020-03-25 19:56\n"
+"PO-Revision-Date: 2020-05-09 13:51\n"
"Last-Translator: FULL NAME <EMAIL@ADDRESS>\n"
"Language-Team: Chinese Simplified\n"
"Language: zh_CN\n"
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-20.04.0/src/core/connection.cpp
new/akonadi-20.04.1/src/core/connection.cpp
--- old/akonadi-20.04.0/src/core/connection.cpp 2020-04-19 00:26:57.000000000
+0200
+++ new/akonadi-20.04.1/src/core/connection.cpp 2020-05-08 11:49:29.000000000
+0200
@@ -180,6 +180,7 @@
Q_EMIT socketDisconnected();
});
connect(mSocket.data(), &QLocalSocket::disconnected, this,
&Connection::socketDisconnected);
+ // note: we temporarily disconnect from readyRead-signal inside
handleIncomingData()
connect(mSocket.data(), &QLocalSocket::readyRead, this,
&Connection::handleIncomingData);
// actually do connect
@@ -253,6 +254,10 @@
qint64 tag;
stream >> tag;
+ // temporarily disconnect from readyRead-signal to avoid re-entering
this function when we
+ // call waitForData() deep inside Protocol::deserialize
+ disconnect(mSocket.data(), &QLocalSocket::readyRead, this,
&Connection::handleIncomingData);
+
Protocol::CommandPtr cmd;
try {
cmd = Protocol::deserialize(mSocket.data());
@@ -260,6 +265,10 @@
qCWarning(AKONADICORE_LOG) << "Protocol exception:" << e.what();
// cmd's type will be Invalid by default, so fall-through
}
+
+ // reconnect to the signal again
+ connect(mSocket.data(), &QLocalSocket::readyRead, this,
&Connection::handleIncomingData);
+
if (!cmd || (cmd->type() == Protocol::Command::Invalid)) {
qCWarning(AKONADICORE_LOG) << "Invalid command, the world is going
to end!";
mSocket->close();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-20.04.0/src/core/firstrun.cpp
new/akonadi-20.04.1/src/core/firstrun.cpp
--- old/akonadi-20.04.0/src/core/firstrun.cpp 2020-04-19 00:26:57.000000000
+0200
+++ new/akonadi-20.04.1/src/core/firstrun.cpp 2020-05-08 11:49:29.000000000
+0200
@@ -189,7 +189,7 @@
}
}
- iface->call(QStringLiteral("writeConfig"));
+ iface->call(QStringLiteral("save"));
instance.reconfigure();
instance.synchronize();
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/akonadi-20.04.0/src/core/jobs/specialcollectionshelperjobs.cpp
new/akonadi-20.04.1/src/core/jobs/specialcollectionshelperjobs.cpp
--- old/akonadi-20.04.0/src/core/jobs/specialcollectionshelperjobs.cpp
2020-04-19 00:26:57.000000000 +0200
+++ new/akonadi-20.04.1/src/core/jobs/specialcollectionshelperjobs.cpp
2020-05-08 11:49:29.000000000 +0200
@@ -368,7 +368,7 @@
}
}
- conf.call(QStringLiteral("writeConfig"));
+ conf.call(QStringLiteral("save"));
agent.reconfigure();
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/akonadi-20.04.0/src/shared/akremotelog.cpp
new/akonadi-20.04.1/src/shared/akremotelog.cpp
--- old/akonadi-20.04.0/src/shared/akremotelog.cpp 2020-04-19
00:26:57.000000000 +0200
+++ new/akonadi-20.04.1/src/shared/akremotelog.cpp 2020-05-08
11:49:29.000000000 +0200
@@ -74,7 +74,6 @@
qInstallMessageHandler(mOldHandler);
mEnabled = false;
- delete mAkonadiConsoleInterface;
}
static RemoteLogger *self()
@@ -85,17 +84,16 @@
private Q_SLOTS:
void serviceRegistered(const QString &service)
{
- delete mAkonadiConsoleInterface;
- mAkonadiConsoleInterface = new QDBusInterface(service,
+ mAkonadiConsoleInterface = std::make_unique<QDBusInterface>(service,
QStringLiteral(AKONADICONSOLE_LOGGER_PATH),
QStringLiteral(AKONADICONSOLE_LOGGER_INTERFACE),
QDBusConnection::sessionBus(), this);
if (!mAkonadiConsoleInterface->isValid()) {
- delete mAkonadiConsoleInterface;
+ mAkonadiConsoleInterface.reset();
return;
}
- connect(mAkonadiConsoleInterface, SIGNAL(enabledChanged(bool)),
+ connect(mAkonadiConsoleInterface.get(), SIGNAL(enabledChanged(bool)),
this, SLOT(onAkonadiConsoleLoggingEnabled(bool)));
QTimer::singleShot(0, this, [this]() {
@@ -115,8 +113,7 @@
void serviceUnregistered(const QString &)
{
onAkonadiConsoleLoggingEnabled(false);
- delete mAkonadiConsoleInterface;
- mAkonadiConsoleInterface = nullptr;
+ mAkonadiConsoleInterface.reset();
}
void onAkonadiConsoleLoggingEnabled(bool enabled)
@@ -192,7 +189,7 @@
QDBusServiceWatcher mWatcher;
QLoggingCategory::CategoryFilter mOldFilter = nullptr;
QtMessageHandler mOldHandler = nullptr;
- QDBusInterface *mAkonadiConsoleInterface = nullptr;
+ std::unique_ptr<QDBusInterface> mAkonadiConsoleInterface;
bool mEnabled = false;
static RemoteLogger *sInstance;
