[SCM] Akonadi packaging branch, debian/sid, updated. debian/16.04.3-2-11-g4098a8b

[Sandro Knauß]

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

The following commit has been merged in the debian/sid branch:
commit 931e44884d7373e812fe0447ff8926ebdcfd3dac
Author: Sandro Knauß <hefee at debian.org>
Date:   Tue Nov 22 17:51:19 2016 +0100

    Add patch to work with uptodate mysql server
---
 debian/changelog                                   |  6 ++++++
 .../kubuntu_disable_secure_file_priv_check.diff    | 24 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index b19feb0..f1725b3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,12 @@ akonadi (4:16.04.3-4~) UNRELEASED; urgency=medium
 
   * Team upload.
 
+  [ Sandro Knauß ]
+  * Add patch from kubuntu: kubuntu_disable_secure_file_priv_check.diff
+    - fix compatibility with stricter defaults in mysql security update.
+      (Closes: 843534) Thanks to fld for the report and Marc Deslauriers
+      for the patch.
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Tue, 22 Nov 2016 17:36:51 +0100
 
 akonadi (4:16.04.3-3) unstable; urgency=medium
diff --git a/debian/patches/kubuntu_disable_secure_file_priv_check.diff b/debian/patches/kubuntu_disable_secure_file_priv_check.diff
new file mode 100644
index 0000000..e6e70d8
--- /dev/null
+++ b/debian/patches/kubuntu_disable_secure_file_priv_check.diff
@@ -0,0 +1,24 @@
+Description: disable the secure_file_priv check
+ MySQL 5.7 introduced a premission check for export and import operations.
+ In Ubuntu, only the full mysql-server package creates the set system wide
+ directory causing mysqld-akonadi to error out on startup if only
+ mysql-server-core-5.7 is installed.
+ To prevent that the key is set to empty, which reverts mysqld to the 5.6
+ behavior.
+ See http://dev.mysql.com/doc/refman/5.7/en/server-system-variables.html#sysvar_secure_file_priv
+Author: Philip Muskovac <yofel at gmx.net>
+Last-Update: 2016-04-18
+Forwarded: not-needed
+Origin: vendor
+--- a/src/server/storage/mysql-global.conf
++++ b/src/server/storage/mysql-global.conf
+@@ -100,5 +100,9 @@ wait_timeout=31536000
+ # We use InnoDB, so don't let MyISAM eat up memory
+ key_buffer_size=16K
+ 
++# KUBUNTU:
++# Unset the export dir check as only the full mysql-server package creates it
++secure_file_priv=
++
+ [client]
+ default-character-set=utf8
diff --git a/debian/patches/series b/debian/patches/series
index fe0021e..3fee9fc 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 postgresql-data-checksums.patch
 set_dependency_order.diff
 QSqlite3-fix-build-with-Qt-5.7.patch
+kubuntu_disable_secure_file_priv_check.diff

-- 
Akonadi packaging