[SCM] Akonadi packaging branch, kubuntu_xenial_archive, updated. ubuntu/4%15.12.3-0ubuntu6

[Philip Muškovac]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/akonadi.git;a=commitdiff;h=ac84862

The following commit has been merged in the kubuntu_xenial_archive branch:
commit ac84862fb2bcfe03d8ccba66c9ae7555f8bf68e6
Author: Philip Muškovac <yofel at gmx.net>
Date:   Wed Apr 20 10:36:49 2016 +0200

    Fix MySQL DB first run setup
---
 debian/changelog                                   |  9 +++--
 .../patches/kubuntu_fix_mysql_db_creation_57.diff  | 40 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0282eef..c9961f3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
-akonadi (4:15.12.3-0ubuntu6) UNRELEASED; urgency=medium
+akonadi (4:15.12.3-0ubuntu6) xenial; urgency=medium
 
-  * Add DEP-3 information to kubuntu_disable_secure_file_priv_check.diff 
+  * kubuntu_fix_mysql_db_creation_57.diff:
+    Fix MySQL DB first run setup (LP: #1572100)
+    (Thanks to Lars Tangvald for the patches)
+  * Add DEP3 headers for kubuntu_disable_secure_file_priv_check.diff
 
- -- Philip Muškovac <yofel at kubuntu.org>  Mon, 18 Apr 2016 15:38:23 +0200
+ -- Philip Muškovac <yofel at kubuntu.org>  Wed, 20 Apr 2016 10:25:18 +0200
 
 akonadi (4:15.12.3-0ubuntu5) xenial; urgency=medium
 
diff --git a/debian/patches/kubuntu_fix_mysql_db_creation_57.diff b/debian/patches/kubuntu_fix_mysql_db_creation_57.diff
new file mode 100644
index 0000000..7f57506
--- /dev/null
+++ b/debian/patches/kubuntu_fix_mysql_db_creation_57.diff
@@ -0,0 +1,40 @@
+Description: Fix MySQL DB creation
+ 1) The --force parameter has been removed in 5.7, so use --insecure and
+    --basedir to keep the behavior
+ 2) The current DB init scripts get rejected by 5.7's stricter default mode.
+    So to keep it working for now set sql_mode=NO_ENGINE_SUBSTITUTION
+    which was the default value in 5.6
+ (Thanks to Lars Tangvald for the patches)
+Origin: vendor
+Bug-Ubuntu: https://bugs.launchpad.net/ubuntu/+source/akonadi/+bug/1572100
+Forwarded: https://bugs.kde.org/show_bug.cgi?id=361485
+Author: Philip Muskovac <yofel at gmx.net>
+Updated: 2016-04-20
+Index: b/src/server/storage/dbconfigmysql.cpp
+===================================================================
+--- a/src/server/storage/dbconfigmysql.cpp
++++ b/src/server/storage/dbconfigmysql.cpp
+@@ -285,7 +285,7 @@ bool DbConfigMysql::startInternalServer(
+     // first run, some MySQL versions need a mysql_install_db run for that
+     const QString confFile = XdgBaseDirs::findResourceFile("config", QStringLiteral("akonadi/mysql-global.conf"));
+     if (QDir(dataDir).entryList(QDir::NoDotAndDotDot | QDir::AllEntries).isEmpty() && !mMysqlInstallDbPath.isEmpty()) {
+-        const QStringList arguments = QStringList() << QStringLiteral("--force") << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--datadir=%1/").arg(dataDir);
++        const QStringList arguments = QStringList() << QStringLiteral("--defaults-file=%1").arg(confFile) << QStringLiteral("--insecure") << QStringLiteral("--basedir=/usr") << QStringLiteral("--datadir=%1/").arg(dataDir);
+         QProcess::execute(mMysqlInstallDbPath, arguments);
+     }
+ 
+Index: b/src/server/storage/mysql-global.conf
+===================================================================
+--- a/src/server/storage/mysql-global.conf
++++ b/src/server/storage/mysql-global.conf
+@@ -104,5 +104,10 @@ key_buffer_size=16K
+ # Unset the export dir check as only the full mysql-server package creates it
+ secure_file_priv=
+ 
++# KUBUNTU:
++# workaround for 5.7 being more strict with column types
++# (reverts to 5.6 behavior)
++sql_mode=NO_ENGINE_SUBSTITUTION
++
+ [client]
+ default-character-set=utf8
diff --git a/debian/patches/series b/debian/patches/series
index 3daf2d3..b791501 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 postgresql-data-checksums.patch
 postgresql9.5.patch
 kubuntu_disable_secure_file_priv_check.diff
+kubuntu_fix_mysql_db_creation_57.diff

-- 
Akonadi packaging