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
Stephane VAROQUI
slapos
Commits
ff4d792f
Commit
ff4d792f
authored
Jul 13, 2017
by
Kazuhiko Shiozaki
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
component/mariadb: version up MariaDB 10.2.7.
parent
f9027597
Changes
8
Show whitespace changes
Inline
Side-by-side
Showing
8 changed files
with
29 additions
and
7 deletions
+29
-7
component/mariadb/mariarocks.cfg
component/mariadb/mariarocks.cfg
+2
-2
component/python-mysqlclient/buildout.cfg
component/python-mysqlclient/buildout.cfg
+1
-0
component/python-mysqlclient/mysqlclient-1.3.10-mariadb-10.2.7.patch
...ython-mysqlclient/mysqlclient-1.3.10-mariadb-10.2.7.patch
+21
-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/mariarocks.cfg
View file @
ff4d792f
# Do not extend any file that touch buildout:parts.
[mariadb]
url = https://downloads.mariadb.
com/MariaDB/mariadb-10.2.6/source/mariadb-10.2.6.tar.gz
md5sum =
3d454cdadbd3208e1c9c23e5338a62b0
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
stable-patches =
configure-options +=
-DPLUGIN_DAEMON_EXAMPLE=NO
...
...
component/python-mysqlclient/buildout.cfg
View file @
ff4d792f
...
...
@@ -16,6 +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
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
0 → 100644
View file @
ff4d792f
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
@@ -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)
len = mysql_real_escape_string_quote(&(self->connection), out, in, size, '\'');
#else
len = mysql_real_escape_string(&(self->connection), out, in, size);
@@ -1118,7 +1118,7 @@
out = PyBytes_AS_STRING(str);
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)
len = mysql_real_escape_string_quote(&(self->connection), out+1, in, size, '\'');
#else
len = mysql_real_escape_string(&(self->connection), out+1, in, size);
software/dream/software.cfg
View file @
ff4d792f
...
...
@@ -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+SlapOSPatched00
1
mysqlclient = 1.3.10+SlapOSPatched00
2
# indirect dependancies
cp.recipe.cmd = 0.5
...
...
software/neoppod/software-common.cfg
View file @
ff4d792f
...
...
@@ -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+SlapOSPatched00
1
mysqlclient = 1.3.10+SlapOSPatched00
2
persistent = 4.2.3
pycrypto = 2.6.1
pycurl = 7.43.0
...
...
stack/boinc/buildout.cfg
View file @
ff4d792f
...
...
@@ -69,7 +69,7 @@ pycrypto = 2.6
apache-libcloud = 0.12.4
async = 0.6.1
gitdb = 0.5.4
mysqlclient = 1.3.10+SlapOSPatched00
1
mysqlclient = 1.3.10+SlapOSPatched00
2
plone.recipe.command = 1.1
slapos.recipe.template = 2.4.2
slapos.toolbox = 0.40.4
...
...
stack/lamp.cfg
View file @
ff4d792f
...
...
@@ -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+SlapOSPatched00
1
mysqlclient = 1.3.10+SlapOSPatched00
2
plone.recipe.command = 1.1
slapos.recipe.template = 2.3
slapos.toolbox = 0.40.4
...
...
stack/lamp/buildout.cfg
View file @
ff4d792f
...
...
@@ -185,7 +185,7 @@ eggs =
apache-libcloud = 0.12.3
async = 0.6.1
gitdb = 0.5.4
mysqlclient = 1.3.10+SlapOSPatched00
1
mysqlclient = 1.3.10+SlapOSPatched00
2
pycrypto = 2.6
rdiff-backup = 1.0.5+SlapOSPatched001
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