diff --git a/component/mariadb/buildout.cfg b/component/mariadb/buildout.cfg index f1479bb6479a0db388b479c8ac12e198c4a818ac..062bef53e421b4dfbd9539e7977ffd5be5d591a5 100644 --- a/component/mariadb/buildout.cfg +++ b/component/mariadb/buildout.cfg @@ -17,8 +17,6 @@ extends = ../xz-utils/buildout.cfg ../zlib/buildout.cfg ../unixodbc/buildout.cfg -# The following lines are only for mariarocks.cfg -# to be extended last without touching 'parts'. ../gcc/buildout.cfg ../zstd/buildout.cfg @@ -28,11 +26,11 @@ parts = [mariadb] recipe = slapos.recipe.cmmi url = https://downloads.mariadb.org/f/mariadb-${:version}/source/mariadb-${:version}.tar.gz/from/http%3A//fr.mirror.babylon.network/mariadb/?serve -version = 10.1.34 -md5sum = 2fc6c7809be74e9e7718e8863df26b2b +version = 10.2.16 +md5sum = 234156a94f8ea6cff92c4751880b8316 patch-options = -p0 patches = - ${:_profile_base_location_}/mariadb_10.1.21_create_system_tables__no_test.patch#3c76aa9564a162f13aced7c0a3f783b3 + ${:_profile_base_location_}/mariadb_10.2.16_create_system_tables__no_test.patch#3fd5f9febabdb42d4b6653969a0194f9 location = ${buildout:parts-directory}/${:_buildout_section_name_} configure-command = ${cmake:location}/bin/cmake configure-options = @@ -63,14 +61,13 @@ configure-options = -DCMAKE_INSTALL_RPATH=${:CMAKE_LIBRARY_PATH} -DCMAKE_INCLUDE_PATH=${unixodbc:location}/include -DCMAKE_LIBRARY_PATH=${unixodbc:location}/lib -CMAKE_CFLAGS = -I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include ${:extra_cflags} -CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${:extra_library_path} -extra_cflags = -extra_include_path = -extra_library_path = + -DCMAKE_C_COMPILER=${gcc:location}/bin/gcc + -DCMAKE_CXX_COMPILER=${gcc:location}/bin/g++ +CMAKE_CFLAGS = -I${bzip2:location}/include -I${jemalloc:location}/include -I${libaio:location}/include -I${libxml2:location}/include -I${ncurses:location}/include -I${openssl:location}/include -I${readline5:location}/include -I${xz-utils:location}/include -I${zlib:location}/include -I${unixodbc:location}/include -I${zstd:location}/include +CMAKE_LIBRARY_PATH = ${bzip2:location}/lib:${jemalloc:location}/lib:${libaio:location}/lib:${libxml2:location}/lib:${ncurses:location}/lib:${openssl:location}/lib:${readline5:location}/lib:${xz-utils:location}/lib:${zlib:location}/lib:${unixodbc:location}/lib:${zstd:location}/lib:${gcc:location}/lib:${gcc:location}/lib64 environment = CMAKE_PROGRAM_PATH=${cmake:location}/bin - CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${:extra_include_path} + CMAKE_INCLUDE_PATH=${bzip2:location}/include:${libaio:location}/include:${libaio:location}/include:${libxml2:location}/include:${ncurses:location}/include:${openssl:location}/include:${readline5:location}/include:${xz-utils:location}/include:${zlib:location}/include:${unixodbc:location}/include:${zstd:location}/include CMAKE_LIBRARY_PATH=${:CMAKE_LIBRARY_PATH} LDFLAGS=-L${bzip2:location}/lib -L${jemalloc:location}/lib -L${libaio:location}/lib -L${xz-utils:location}/lib -L${zlib:location}/lib -L${unixodbc:location}/lib PATH=${patch:location}/bin:%(PATH)s diff --git a/component/mariadb/mariadb_10.1.21_create_system_tables__no_test.patch b/component/mariadb/mariadb_10.1.21_create_system_tables__no_test.patch deleted file mode 100644 index 4cdc130bf745820f16b725eaa547693c33b8dcbf..0000000000000000000000000000000000000000 --- a/component/mariadb/mariadb_10.1.21_create_system_tables__no_test.patch +++ /dev/null @@ -1,28 +0,0 @@ -# 33_scripts__mysql_create_system_tables__no_test.dpatch by <ch@debian.org> - -A user with no password prevents a normal user from login under certain -circumstances as it is checked first. -See http://bugs.debian.org/301741 -and http://bugs.mysql.com/bug.php?id=6901 - ---- scripts/mysql_system_tables_data.sql.orig 2017-01-17 20:38:26.000000000 +0100 -+++ scripts/mysql_system_tables_data.sql 2017-01-18 17:03:23.795082252 +0100 -@@ -30,8 +30,6 @@ - -- Fill "db" table with default grants for anyone to - -- access database 'test' and 'test_%' if "db" table didn't exist - CREATE TEMPORARY TABLE tmp_db LIKE db; --INSERT INTO tmp_db VALUES ('%','test','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); --INSERT INTO tmp_db VALUES ('%','test\_%','','Y','Y','Y','Y','Y','Y','N','Y','Y','Y','Y','Y','Y','Y','Y','N','N','Y','Y'); - INSERT INTO db SELECT * FROM tmp_db WHERE @had_db_table=0; - DROP TABLE tmp_db; - -@@ -48,9 +46,6 @@ - REPLACE INTO tmp_user_nopasswd VALUES ('::1','root','','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'','','N','N', '', 0); - -- More secure root account using unix sucket auth. - INSERT INTO tmp_user_socket VALUES ('localhost',IFNULL(@auth_root_socket, 'root'),'','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','Y','','','','',0,0,0,0,'unix_socket','','N', 'N','', 0); ---- Anonymous user with no privileges. --INSERT INTO tmp_user_anonymous (host,user) VALUES ('localhost',''); --INSERT INTO tmp_user_anonymous (host,user) SELECT @current_hostname,'' FROM dual WHERE @current_hostname != 'localhost'; - - INSERT INTO user SELECT * FROM tmp_user_nopasswd WHERE @had_user_table=0 AND @skip_auth_root_nopasswd IS NULL; - INSERT INTO user SELECT * FROM tmp_user_socket WHERE @had_user_table=0 AND @auth_root_socket IS NOT NULL; diff --git a/component/mariadb/mariarocks.cfg b/component/mariadb/mariarocks.cfg deleted file mode 100644 index fc639a8e5d9006cead0dc919d47833507efba72a..0000000000000000000000000000000000000000 --- a/component/mariadb/mariarocks.cfg +++ /dev/null @@ -1,13 +0,0 @@ -# Do not extend any file that touch buildout:parts. - -[mariadb] -version = 10.2.16 -md5sum = 234156a94f8ea6cff92c4751880b8316 -patches = - ${:_profile_base_location_}/mariadb_10.2.16_create_system_tables__no_test.patch#3fd5f9febabdb42d4b6653969a0194f9 -configure-options += - -DCMAKE_C_COMPILER=${gcc:location}/bin/gcc - -DCMAKE_CXX_COMPILER=${gcc:location}/bin/g++ -extra_cflags = -I${zstd:location}/include -extra_include_path = :${zstd:location}/include -extra_library_path = :${zstd:location}/lib:${gcc:location}/lib:${gcc:location}/lib64 diff --git a/software/erp5/software-erp5-component.cfg b/software/erp5/software-erp5-component.cfg deleted file mode 100644 index cd73aa9771e8820fcfc6e2b351853a4e39340cc3..0000000000000000000000000000000000000000 --- a/software/erp5/software-erp5-component.cfg +++ /dev/null @@ -1,20 +0,0 @@ -# This file is for building ERP5 software release using erp5-component -# branch. - -[buildout] -extends = - software.cfg - ../../component/mariadb/mariarocks.cfg - -[slapos.cookbook-repository] -branch = erp5-component - -[erp5] -branch = erp5-component - -[cloudooo-repository] -branch = master -revision = - -[versions] -cloudooo = diff --git a/software/neoppod/software-myrocks-dev.cfg b/software/neoppod/software-myrocks-dev.cfg deleted file mode 100644 index fff028e678478e9383658c176760d522c0a1c832..0000000000000000000000000000000000000000 --- a/software/neoppod/software-myrocks-dev.cfg +++ /dev/null @@ -1,4 +0,0 @@ -[buildout] -extends = - software.cfg - ../../component/mariadb/mariarocks.cfg diff --git a/software/wendelin-scalability/test-common.cfg b/software/wendelin-scalability/test-common.cfg index 4bbfa6e01678d495de6a3d312a43ca02e7ecd24f..4ea9a0fd8055e8de3fa8b6ab98afbe9dbc23204c 100644 --- a/software/wendelin-scalability/test-common.cfg +++ b/software/wendelin-scalability/test-common.cfg @@ -1,7 +1,6 @@ [buildout] extends = ../wendelin/software.cfg - ../../component/mariadb/mariarocks.cfg [local-bt5-repository] list += ${slapos.cookbook-repository:location}/software/wendelin-scalability