[SCM] Akonadi packaging branch, jessie, updated. debian/1.13.0-2+deb8u1-5-ga8cdeca

[Maximiliano Curia]

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

The following commit has been merged in the jessie branch:
commit f64b0d35dc3e45f268ef7154e45372c9ac8f697f
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Nov 10 14:19:55 2016 +0100

    Add patch from kubuntu: kubuntu_disable_secure_file_priv_check.diff
    
    Closes: 843534
    Gbp-Dch: Ignore
---
 debian/changelog                                   |  5 ++++-
 .../kubuntu_disable_secure_file_priv_check.diff    | 26 ++++++++++++++++++++++
 debian/patches/series                              |  1 +
 3 files changed, 31 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 75c52ca..524015c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,9 @@
 akonadi (1.13.0-2+deb8u2~) UNRELEASED; urgency=medium
 
-  * 
+  * 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.
 
  -- Maximiliano Curia <maxy at debian.org>  Thu, 10 Nov 2016 14:08:47 +0100
 
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..5a35b64
--- /dev/null
+++ b/debian/patches/kubuntu_disable_secure_file_priv_check.diff
@@ -0,0 +1,26 @@
+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
+Index: b/server/src/storage/mysql-global.conf
+===================================================================
+--- a/server/src/storage/mysql-global.conf
++++ b/server/src/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 584311c..aaecbd5 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -3,3 +3,4 @@ upstream-fix_buffer_overflow_in_AKTEST_FAKESERVER_MAIN
 upstream-do_not_crash_when_setmntent_returns_NULL
 upstream_dont_call_insert_from_Q_ASSERT
 upstream_dont_leak_old_external_payload_files.patch
+kubuntu_disable_secure_file_priv_check.diff

-- 
Akonadi packaging