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

[Philip Muškovac]

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

The following commit has been merged in the kubuntu_xenial_archive branch:
commit 2731ca9384966a7c79b226a4a46b64480549f128
Author: Philip Muškovac <yofel at gmx.net>
Date:   Mon Apr 18 15:29:55 2016 +0200

    Set secure_file_priv to empty as that directory is not set in a default kubuntu install
---
 debian/changelog                                           |  8 ++++++++
 debian/patches/kubuntu_disable_secure_file_priv_check.diff | 14 ++++++++++++++
 debian/patches/series                                      |  1 +
 3 files changed, 23 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 01fcd10..a2ef223 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+akonadi (4:15.12.3-0ubuntu5) xenial; urgency=medium
+
+  * kubuntu_disable_secure_file_priv_check.diff: 
+    - Set secure_file_priv to empty as that directory is not set in a default
+      kubuntu install
+
+ -- Philip Muškovac <yofel at kubuntu.org>  Mon, 18 Apr 2016 15:24:43 +0200
+
 akonadi (4:15.12.3-0ubuntu4) xenial; urgency=medium
 
   * Bring in Robie Basak commits made in launchpad...
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..23f3c7c
--- /dev/null
+++ b/debian/patches/kubuntu_disable_secure_file_priv_check.diff
@@ -0,0 +1,14 @@
+Index: b/src/server/storage/mysql-global.conf
+===================================================================
+--- 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 f52e7e8..3daf2d3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 postgresql-data-checksums.patch
 postgresql9.5.patch
+kubuntu_disable_secure_file_priv_check.diff

-- 
Akonadi packaging