component/mariadb: version up MariaDB 10.2.8.

component/mariadb/buildout.cfg

@@ -81,7 +81,12 @@ md5sum = d289667a60a6aa78d8bc276ab61b2996
 pre-configure = set -e
   rm -rf fake_mariadb_source
   mkdir -p fake_mariadb_source
-  ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql
+  test -d ${mariadb:location}/include/mysql/server/private && (
+    mkdir -p fake_mariadb_source/sql
+    cp -a ${mariadb:location}/include/mysql/server/private/* fake_mariadb_source/sql
+    cp -a ${mariadb:location}/include/mysql/server/*.h fake_mariadb_source/sql
+    cp -a ${mariadb:location}/include/mysql/server/mysql fake_mariadb_source/sql
+  ) || ln -s ${mariadb:location}/include/mysql/private fake_mariadb_source/sql
   cp -ar ${mariadb:location}/include fake_mariadb_source/include
   ! test -f fake_mariadb_source/include/mysql/mariadb_stmt.h ||
   sed -i -E -e '/^enum enum_(cursor|indicator)_type$/,/};/d' fake_mariadb_source/include/mysql/mariadb_stmt.h

component/mariadb/mariarocks.cfg

 # Do not extend any file that touch buildout:parts.
 
 [mariadb]
-url = https://downloads.mariadb.org/f/mariadb-10.2.7/source/mariadb-10.2.7.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
-md5sum = 81727986035c5835e0fbfdf99af71428
+url = https://downloads.mariadb.org/f/mariadb-10.2.8/source/mariadb-10.2.8.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve
+md5sum = f93cbd5bfde3c0d082994764ff7db580
 stable-patches =
 configure-options +=
   -DPLUGIN_DAEMON_EXAMPLE=NO

component/python-mysqlclient/buildout.cfg

@@ -16,7 +16,7 @@ recipe = zc.recipe.egg:custom
 egg = mysqlclient
 patches =
   https://github.com/PyMySQL/mysqlclient-python/commit/1693848c9f6ca863868d94d63499830f7f4f3a1f.diff#a493a91f9263243eb331fcab9901b8b0
-  ${:_profile_base_location_}/mysqlclient-1.3.10-mariadb-10.2.7.patch#b8a265dcb62a26bc87a79497756c415a
+  ${:_profile_base_location_}/mysqlclient-1.3.10-mariadb-10.2.8.patch#807b694fcd7ade4da4bcca321b1a29d2
 patch-options = -p1
 patch-binary = ${patch:location}/bin/patch
 environment = python-mysqlclient-env

component/python-mysqlclient/mysqlclient-1.3.10-mariadb-10.2.7.patch → component/python-mysqlclient/mysqlclient-1.3.10-mariadb-10.2.8.patch

 diff -ur mysqlclient-1.3.10.orig/_mysql.c mysqlclient-1.3.10/_mysql.c
 --- mysqlclient-1.3.10.orig/_mysql.c	2017-01-04 13:47:08.000000000 +0100
-+++ mysqlclient-1.3.10/_mysql.c	2017-07-18 01:28:29.021729572 +0200
++++ mysqlclient-1.3.10/_mysql.c	2017-08-21 10:53:21.014929937 +0200
 @@ -1060,7 +1060,7 @@
  	if (self && PyModule_Check((PyObject*)self))
  		self = NULL;
  	if (self && self->open) {
 -#if MYSQL_VERSION_ID >= 50707 && !defined(MARIADB_BASE_VERSION)
-+#if MYSQL_VERSION_ID >= 50707 && !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
++#if MYSQL_VERSION_ID >= 50707 && (!defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID))
  		len = mysql_real_escape_string_quote(&(self->connection), out, in, size, '\'');
  #else
  		len = mysql_real_escape_string(&(self->connection), out, in, size);
@@ -15,7 +15,19 @@ diff -ur mysqlclient-1.3.10.orig/_mysql.c mysqlclient-1.3.10/_mysql.c
  	check_server_init(NULL);
  	if (self && self->open) {
 -#if MYSQL_VERSION_ID >= 50707 && !defined(MARIADB_BASE_VERSION)
-+#if MYSQL_VERSION_ID >= 50707 && !defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID)
++#if MYSQL_VERSION_ID >= 50707 && (!defined(MARIADB_BASE_VERSION) && !defined(MARIADB_VERSION_ID))
  		len = mysql_real_escape_string_quote(&(self->connection), out+1, in, size, '\'');
  #else
  		len = mysql_real_escape_string(&(self->connection), out+1, in, size);
+diff -ur mysqlclient-1.3.10.orig/setup_posix.py mysqlclient-1.3.10/setup_posix.py
+--- mysqlclient-1.3.10.orig/setup_posix.py	2016-07-26 10:12:24.000000000 +0200
++++ mysqlclient-1.3.10/setup_posix.py	2017-08-21 10:54:59.643071374 +0200
+@@ -63,7 +63,7 @@
+         if extra_compile_args[i] == '-arch':
+             extra_link_args += ['-arch', extra_compile_args[i + 1]]
+ 
+-    include_dirs = [dequote(i[2:])
++    include_dirs = [dequote(os.path.isdir(i[2:]+'/server') and i[2:]+'/server' or i[2:])
+                     for i in mysql_config('include') if i.startswith('-I')]
+ 
+     if static: