diff -Nru akonadi-1.12.1/debian/changelog akonadi-1.12.1/debian/changelog
--- akonadi-1.12.1/debian/changelog	2014-04-23 10:23:20.000000000 +0000
+++ akonadi-1.12.1/debian/changelog	2016-10-27 11:22:57.000000000 +0000
@@ -1,3 +1,11 @@
+akonadi (1.12.1-0ubuntu1.2) trusty-security; urgency=medium
+
+  * debian/patches/kubuntu_disable_secure_file_priv_check.diff: fix
+    compatibility with stricter defaults in mysql security update.
+    (LP: #1633855)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 27 Oct 2016 07:21:38 -0400
+
 akonadi (1.12.1-0ubuntu1.1) trusty; urgency=medium
 
   * Add upstream_Remove-the-invalid-GID-part-from-PartTable-before-st.patch
diff -Nru akonadi-1.12.1/debian/patches/kubuntu_disable_secure_file_priv_check.diff akonadi-1.12.1/debian/patches/kubuntu_disable_secure_file_priv_check.diff
--- akonadi-1.12.1/debian/patches/kubuntu_disable_secure_file_priv_check.diff	1970-01-01 00:00:00.000000000 +0000
+++ akonadi-1.12.1/debian/patches/kubuntu_disable_secure_file_priv_check.diff	2016-10-27 11:21:30.000000000 +0000
@@ -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@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 -Nru akonadi-1.12.1/debian/patches/series akonadi-1.12.1/debian/patches/series
--- akonadi-1.12.1/debian/patches/series	2014-04-23 10:23:20.000000000 +0000
+++ akonadi-1.12.1/debian/patches/series	2016-10-27 11:21:30.000000000 +0000
@@ -1,2 +1,3 @@
 #disable_dbus_requiring_tests.diff
 upstream_Remove-the-invalid-GID-part-from-PartTable-before-st.patch
+kubuntu_disable_secure_file_priv_check.diff