Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Support
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
slapos
Project overview
Project overview
Details
Activity
Releases
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Analytics
Analytics
CI / CD
Repository
Value Stream
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
HongzheWang
slapos
Commits
9177824c
Commit
9177824c
authored
May 23, 2017
by
Kazuhiko Shiozaki
Committed by
Julien Muchembled
Jun 12, 2017
Browse files
Options
Browse Files
Download
Plain Diff
version up: mariarocks 10.2.6 (GA)
See
https://jira.mariadb.org/browse/MDEV-12950
for API changes.
parents
09cf12fd
d71aa037
Changes
10
Show whitespace changes
Inline
Side-by-side
Showing
10 changed files
with
58 additions
and
12 deletions
+58
-12
component/mariadb/buildout.cfg
component/mariadb/buildout.cfg
+8
-2
component/mariadb/mariarocks.cfg
component/mariadb/mariarocks.cfg
+2
-5
component/perl-DBD-MySQL/DBD-mysql-4.042.mariadb.patch
component/perl-DBD-MySQL/DBD-mysql-4.042.mariadb.patch
+36
-0
component/perl-DBD-MySQL/buildout.cfg
component/perl-DBD-MySQL/buildout.cfg
+2
-0
component/python-mysqlclient/buildout.cfg
component/python-mysqlclient/buildout.cfg
+5
-0
software/dream/software.cfg
software/dream/software.cfg
+1
-1
software/neoppod/software-common.cfg
software/neoppod/software-common.cfg
+1
-1
stack/boinc/buildout.cfg
stack/boinc/buildout.cfg
+1
-1
stack/lamp.cfg
stack/lamp.cfg
+1
-1
stack/lamp/buildout.cfg
stack/lamp/buildout.cfg
+1
-1
No files found.
component/mariadb/buildout.cfg
View file @
9177824c
...
@@ -75,9 +75,13 @@ post-install =
...
@@ -75,9 +75,13 @@ post-install =
recipe = slapos.recipe.cmmi
recipe = slapos.recipe.cmmi
url = http://packages.groonga.org/source/mroonga/mroonga-7.03.tar.gz
url = http://packages.groonga.org/source/mroonga/mroonga-7.03.tar.gz
md5sum = 045be7c932e80cedaa756ea94ae24883
md5sum = 045be7c932e80cedaa756ea94ae24883
pre-configure =
pre-configure = set -e
mkdir fake_mariadb_source &&
rm -rf fake_mariadb_source
mkdir -p fake_mariadb_source
ln -s ${mariadb:location}/include/mysql/private 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
configure-options =
configure-options =
--with-mysql-source=fake_mariadb_source
--with-mysql-source=fake_mariadb_source
--with-mysql-config=${mariadb:location}/bin/mysql_config
--with-mysql-config=${mariadb:location}/bin/mysql_config
...
@@ -86,6 +90,8 @@ configure-options =
...
@@ -86,6 +90,8 @@ configure-options =
patch-options = -p1
patch-options = -p1
patches =
patches =
${:_profile_base_location_}/mroonga_boolean.patch#29f85fc98e85d39b31e53b1e1683d288
${:_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 =
environment =
PATH=${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
PATH=${groonga:location}/bin:${patch:location}/bin:${pkgconfig:location}/bin:%(PATH)s
CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
CPPFLAGS=-I${groonga:location}/include/groonga -I${pcre:location}/include
...
...
component/mariadb/mariarocks.cfg
View file @
9177824c
[mariadb]
[mariadb]
url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.
5/source/mariadb-10.2.5
.tar.gz
url = https://downloads.mariadb.com/MariaDB/mariadb-10.2.
6/source/mariadb-10.2.6
.tar.gz
md5sum =
16fb01bb375c8d8a91a9ecf491397d51
md5sum =
3d454cdadbd3208e1c9c23e5338a62b0
stable-patches =
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 +=
configure-options +=
-DPLUGIN_DAEMON_EXAMPLE=NO
-DPLUGIN_DAEMON_EXAMPLE=NO
-DPLUGIN_EXAMPLE=NO
-DPLUGIN_EXAMPLE=NO
...
...
component/perl-DBD-MySQL/DBD-mysql-4.042.mariadb.patch
0 → 100644
View file @
9177824c
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
View file @
9177824c
...
@@ -17,6 +17,8 @@ url = http://www.cpan.org/modules/by-module/DBD/DBD-mysql-4.042.tar.gz
...
@@ -17,6 +17,8 @@ url = http://www.cpan.org/modules/by-module/DBD/DBD-mysql-4.042.tar.gz
md5sum = a144bd950b55af68835d44bc4ea6e5aa
md5sum = a144bd950b55af68835d44bc4ea6e5aa
patches =
patches =
${:_profile_base_location_}/DBD-mysql-4.027.rpathsupport.patch#a932982b7725e6621cfce3a3d7917e03
${:_profile_base_location_}/DBD-mysql-4.027.rpathsupport.patch#a932982b7725e6621cfce3a3d7917e03
${:_profile_base_location_}/DBD-mysql-4.042.mariadb.patch#5864d36d19c4a05034b3a4873f7c659a
patch-options = -p1
patch-options = -p1
[perl-DBD-MySQL]
[perl-DBD-MySQL]
...
...
component/python-mysqlclient/buildout.cfg
View file @
9177824c
...
@@ -2,6 +2,7 @@
...
@@ -2,6 +2,7 @@
extends =
extends =
../mariadb/buildout.cfg
../mariadb/buildout.cfg
../openssl/buildout.cfg
../openssl/buildout.cfg
../patch/buildout.cfg
../zlib/buildout.cfg
../zlib/buildout.cfg
parts =
parts =
...
@@ -13,6 +14,10 @@ PATH =${mariadb:location}/bin:%(PATH)s
...
@@ -13,6 +14,10 @@ PATH =${mariadb:location}/bin:%(PATH)s
[python-mysqlclient]
[python-mysqlclient]
recipe = zc.recipe.egg:custom
recipe = zc.recipe.egg:custom
egg = mysqlclient
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
environment = python-mysqlclient-env
library-dirs =
library-dirs =
${zlib:location}/lib/
${zlib:location}/lib/
...
...
software/dream/software.cfg
View file @
9177824c
...
@@ -48,7 +48,7 @@ scipy = 0.13.3
...
@@ -48,7 +48,7 @@ scipy = 0.13.3
simpy = 3.0.5
simpy = 3.0.5
zope.dottedname = 4.1.0
zope.dottedname = 4.1.0
tablib = 0.10.0
tablib = 0.10.0
mysqlclient = 1.3.10
mysqlclient = 1.3.10
+SlapOSPatched001
# indirect dependancies
# indirect dependancies
cp.recipe.cmd = 0.5
cp.recipe.cmd = 0.5
...
...
software/neoppod/software-common.cfg
View file @
9177824c
...
@@ -113,7 +113,7 @@ apache-libcloud = 1.5.0
...
@@ -113,7 +113,7 @@ apache-libcloud = 1.5.0
ecdsa = 0.13
ecdsa = 0.13
gitdb2 = 2.0.0
gitdb2 = 2.0.0
msgpack-python = 0.4.8
msgpack-python = 0.4.8
mysqlclient = 1.3.10
mysqlclient = 1.3.10
+SlapOSPatched001
persistent = 4.2.3
persistent = 4.2.3
pycrypto = 2.6.1
pycrypto = 2.6.1
pycurl = 7.43.0
pycurl = 7.43.0
...
...
stack/boinc/buildout.cfg
View file @
9177824c
...
@@ -69,7 +69,7 @@ pycrypto = 2.6
...
@@ -69,7 +69,7 @@ pycrypto = 2.6
apache-libcloud = 0.12.4
apache-libcloud = 0.12.4
async = 0.6.1
async = 0.6.1
gitdb = 0.5.4
gitdb = 0.5.4
mysqlclient = 1.3.10
mysqlclient = 1.3.10
+SlapOSPatched001
plone.recipe.command = 1.1
plone.recipe.command = 1.1
slapos.recipe.template = 2.4.2
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.40.4
slapos.toolbox = 0.40.4
...
...
stack/lamp.cfg
View file @
9177824c
...
@@ -42,7 +42,7 @@ keep-compile-dir = false
...
@@ -42,7 +42,7 @@ keep-compile-dir = false
apache-libcloud = 0.9.1
apache-libcloud = 0.9.1
async = 0.6.1
async = 0.6.1
gitdb = 0.5.4
gitdb = 0.5.4
mysqlclient = 1.3.10
mysqlclient = 1.3.10
+SlapOSPatched001
plone.recipe.command = 1.1
plone.recipe.command = 1.1
slapos.recipe.template = 2.3
slapos.recipe.template = 2.3
slapos.toolbox = 0.40.4
slapos.toolbox = 0.40.4
...
...
stack/lamp/buildout.cfg
View file @
9177824c
...
@@ -185,7 +185,7 @@ eggs =
...
@@ -185,7 +185,7 @@ eggs =
apache-libcloud = 0.12.3
apache-libcloud = 0.12.3
async = 0.6.1
async = 0.6.1
gitdb = 0.5.4
gitdb = 0.5.4
mysqlclient = 1.3.10
mysqlclient = 1.3.10
+SlapOSPatched001
pycrypto = 2.6
pycrypto = 2.6
rdiff-backup = 1.0.5+SlapOSPatched001
rdiff-backup = 1.0.5+SlapOSPatched001
slapos.recipe.template = 2.4.2
slapos.recipe.template = 2.4.2
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment