version up: mariarocks 10.2.6 (GA)

See https://jira.mariadb.org/browse/MDEV-12950 for API changes.

component/mariadb/buildout.cfg

@@ -75,9 +75,13 @@ post-install =
 recipe = slapos.recipe.cmmi
 url = http://packages.groonga.org/source/mroonga/mroonga-7.03.tar.gz
 md5sum = 045be7c932e80cedaa756ea94ae24883
-pre-configure =
-  mkdir fake_mariadb_source &&
+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
+  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
 configure-options =
   --with-mysql-source=fake_mariadb_source
   --with-mysql-config=${mariadb:location}/bin/mysql_config
@@ -86,6 +90,8 @@ configure-options =
 patch-options = -p1
 patches =
   ${:_profile_base_location_}/mroonga_boolean.patch#29f85fc98e85d39b31e53b1e1683d288
+pre-build =
+  sed -i -e "s,${mariadb:location}/include,$(pwd)/fake_mariadb_source/include,g" Makefile */Makefile
 environment =
   PATH=${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
   CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include

component/mariadb/mariarocks.cfg

 [mariadb]
-url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.5/source/mariadb-10.2.5.tar.gz
-md5sum = 16fb01bb375c8d8a91a9ecf491397d51
+url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.6/source/mariadb-10.2.6.tar.gz
+md5sum = 3d454cdadbd3208e1c9c23e5338a62b0
 stable-patches =
-pre-configure =
-  sed -i -e '/(rc == -1 || errno == EINTR)/s/||/\&\&/' libmariadb/plugins/pvio/pvio_socket.c
-  sed -i -e 's,set(SYSTEM_LIBS $${CMAKE_THREAD_LIBS_INIT}),set(SYSTEM_LIBS $${CMAKE_THREAD_LIBS_INIT} $${LIBRT}),' storage/rocksdb/build_rocksdb.cmake
 configure-options +=
   -DPLUGIN_DAEMON_EXAMPLE=NO
   -DPLUGIN_EXAMPLE=NO

component/perl-DBD-MySQL/DBD-mysql-4.042.mariadb.patch

+diff -u DBD-mysql-4.042/dbdimp.c DBD-mysql-4.042/dbdimp.c
+--- DBD-mysql-4.042/dbdimp.c	2017-02-28 14:36:40.000000000 +0100
++++ DBD-mysql-4.042/dbdimp.c	2017-06-08 12:43:39.704228470 +0200
+@@ -2139,6 +2139,7 @@
+ 
+     if (result)
+     {
++      my_bool reconnect= 0;
+ #if MYSQL_VERSION_ID >=SERVER_PREPARE_VERSION
+       /* connection succeeded. */
+       /* imp_dbh == NULL when mysql_dr_connect() is called from mysql.xs
+@@ -2155,7 +2156,7 @@
+         we turn off Mysql's auto reconnect and handle re-connecting ourselves
+         so that we can keep track of when this happens.
+       */
+-      result->reconnect=0;
++      mysql_options(result, MYSQL_OPT_RECONNECT, &reconnect);
+     }
+     else {
+       /* 
+diff -u DBD-mysql-4.042/dbdimp.h DBD-mysql-4.042/dbdimp.h
+--- DBD-mysql-4.042/dbdimp.h	2017-02-28 14:36:40.000000000 +0100
++++ DBD-mysql-4.042/dbdimp.h	2017-06-08 12:44:21.233948264 +0200
+@@ -67,6 +67,12 @@
+ #define SSL_LAST_VERIFY_VERSION 50799
+ #define MYSQL_VERSION_5_0 50001
+ /* This is to avoid the ugly #ifdef mess in dbdimp.c */
++
++/* MariaDB Connector/C has MARIADB_VERSION_ID instead of MYSQL_VERSION_ID */
++#if !defined(MYSQL_VERSION_ID) && defined(MARIADB_VERSION_ID)
++#define MYSQL_VERSION_ID MARIADB_VERSION_ID
++#endif
++
+ #if MYSQL_VERSION_ID < SQL_STATE_VERSION
+ #define mysql_sqlstate(svsock) (NULL)
+ #endif

component/perl-DBD-MySQL/buildout.cfg

@@ -17,6 +17,8 @@ url = http://www.cpan.org/modules/by-module/DBD/DBD-mysql-4.042.tar.gz
 md5sum = a144bd950b55af68835d44bc4ea6e5aa
 patches =
   ${:_profile_base_location_}/DBD-mysql-4.027.rpathsupport.patch#a932982b7725e6621cfce3a3d7917e03
+  ${:_profile_base_location_}/DBD-mysql-4.042.mariadb.patch#5864d36d19c4a05034b3a4873f7c659a
+
 patch-options = -p1
 
 [perl-DBD-MySQL]

component/python-mysqlclient/buildout.cfg

@@ -2,6 +2,7 @@
 extends =
   ../mariadb/buildout.cfg
   ../openssl/buildout.cfg
+  ../patch/buildout.cfg
   ../zlib/buildout.cfg
 
 parts =
@@ -13,6 +14,10 @@ PATH =${mariadb:location}/bin:%(PATH)s
 [python-mysqlclient]
 recipe = zc.recipe.egg:custom
 egg = mysqlclient
+patches =
+  https://github.com/PyMySQL/mysqlclient-python/commit/1693848c9f6ca863868d94d63499830f7f4f3a1f.diff#a493a91f9263243eb331fcab9901b8b0
+patch-options = -p1
+patch-binary = ${patch:location}/bin/patch
 environment = python-mysqlclient-env
 library-dirs =
   ${zlib:location}/lib/

software/dream/software.cfg

@@ -48,7 +48,7 @@ scipy = 0.13.3
 simpy = 3.0.5
 zope.dottedname = 4.1.0
 tablib = 0.10.0
-mysqlclient = 1.3.10
+mysqlclient = 1.3.10+SlapOSPatched001
 
 # indirect dependancies
 cp.recipe.cmd = 0.5

software/neoppod/software-common.cfg

@@ -113,7 +113,7 @@ apache-libcloud = 1.5.0
 ecdsa = 0.13
 gitdb2 = 2.0.0
 msgpack-python = 0.4.8
-mysqlclient = 1.3.10
+mysqlclient = 1.3.10+SlapOSPatched001
 persistent = 4.2.3
 pycrypto = 2.6.1
 pycurl = 7.43.0

stack/boinc/buildout.cfg

@@ -69,7 +69,7 @@ pycrypto = 2.6
 apache-libcloud = 0.12.4
 async = 0.6.1
 gitdb = 0.5.4
-mysqlclient = 1.3.10
+mysqlclient = 1.3.10+SlapOSPatched001
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.4.2
 slapos.toolbox = 0.40.4

stack/lamp.cfg

@@ -42,7 +42,7 @@ keep-compile-dir = false
 apache-libcloud = 0.9.1
 async = 0.6.1
 gitdb = 0.5.4
-mysqlclient = 1.3.10
+mysqlclient = 1.3.10+SlapOSPatched001
 plone.recipe.command = 1.1
 slapos.recipe.template = 2.3
 slapos.toolbox = 0.40.4

stack/lamp/buildout.cfg

@@ -185,7 +185,7 @@ eggs =
 apache-libcloud = 0.12.3
 async = 0.6.1
 gitdb = 0.5.4
-mysqlclient = 1.3.10
+mysqlclient = 1.3.10+SlapOSPatched001
 pycrypto = 2.6
 rdiff-backup = 1.0.5+SlapOSPatched001
 slapos.recipe.template = 2.4.2