diff options
Diffstat (limited to 'databases/mariadb102-client/files')
13 files changed, 0 insertions, 348 deletions
diff --git a/databases/mariadb102-client/files/patch-CMakeLists.txt b/databases/mariadb102-client/files/patch-CMakeLists.txt deleted file mode 100644 index 32d2060f9302..000000000000 --- a/databases/mariadb102-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,27 +0,0 @@ ---- CMakeLists.txt.orig 2019-06-14 18:29:40 UTC -+++ CMakeLists.txt -@@ -172,6 +172,8 @@ IF(DISABLE_SHARED) - ENDIF() - OPTION(ENABLED_PROFILING "Enable profiling" ON) - OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF) -+OPTION(WITHOUT_CLIENT "Build only the server components" OFF) -+OPTION(WITHOUT_DOCS "Do not install documentation" OFF) - IF(UNIX) - OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF) - ENDIF() -@@ -472,6 +474,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(NOT WITHOUT_DOCS) - INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY - EXCEPTIONS-CLIENT COMPONENT Readme) - -@@ -481,6 +484,7 @@ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDP - - IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) -+ENDIF() - ENDIF() - - INCLUDE(build_depends) diff --git a/databases/mariadb102-client/files/patch-MDEV-20463 b/databases/mariadb102-client/files/patch-MDEV-20463 deleted file mode 100644 index 412a6d6fc92e..000000000000 --- a/databases/mariadb102-client/files/patch-MDEV-20463 +++ /dev/null @@ -1,11 +0,0 @@ ---- plugin/auth_ed25519/CMakeLists.txt.orig 2019-07-26 21:26:44 UTC -+++ plugin/auth_ed25519/CMakeLists.txt -@@ -11,7 +11,7 @@ SET(REF10_SOURCES - ref10/ge_sub.c ref10/ge_tobytes.c ref10/keypair.c ref10/open.c - ref10/sc_muladd.c ref10/sc_reduce.c ref10/sign.c ref10/verify.c) - --INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR}) -+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ../../include) - - ADD_CONVENIENCE_LIBRARY(ref10 ${REF10_SOURCES}) - IF(MSVC) diff --git a/databases/mariadb102-client/files/patch-client_CMakeLists.txt b/databases/mariadb102-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index 36294c44e82a..000000000000 --- a/databases/mariadb102-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,62 +0,0 @@ ---- client/CMakeLists.txt.orig 2019-02-09 23:24:08 UTC -+++ client/CMakeLists.txt -@@ -44,12 +44,13 @@ IF(UNIX) - SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) - ENDIF(UNIX) - -+IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest ${CLIENT_LIB} pcreposix pcre) - SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -+ENDIF() - -- - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck ${CLIENT_LIB}) - -@@ -61,15 +62,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqlimport ${CLIENT_LIB}) - -+IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysql_upgrade ${CLIENT_LIB}) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow ${CLIENT_LIB}) - -+IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin ${CLIENT_LIB}) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog ${CLIENT_LIB}) -@@ -90,14 +95,21 @@ ENDIF(WIN32) - ADD_EXECUTABLE(async_example async_example.c) - TARGET_LINK_LIBRARIES(async_example ${CLIENT_LIB}) - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example -+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap async_example - PROPERTIES HAS_CXX TRUE) - -- --FOREACH(t mysql mysqltest mysqltest mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysql_plugin mysqlbinlog -+FOREACH(t mysql mysqlcheck mysqldump mysqlimport mysqlshow mysqlbinlog - mysqladmin mysqlslap async_example) - ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) - ENDFOREACH() -+ -+IF(NOT WITHOUT_SERVER) -+SET_TARGET_PROPERTIES (mysql_upgrade mysql_plugin PROPERTIES HAS_CXX TRUE) -+FOREACH(t mysqltest mysql_upgrade mysql_plugin) -+ ADD_DEPENDENCIES(${t} GenError ${CLIENT_LIB}) -+ENDFOREACH() -+ENDIF() -+ - - ADD_DEFINITIONS(-DHAVE_DLOPEN) - diff --git a/databases/mariadb102-client/files/patch-extra_CMakeLists.txt b/databases/mariadb102-client/files/patch-extra_CMakeLists.txt deleted file mode 100644 index 95e7e7f4d845..000000000000 --- a/databases/mariadb102-client/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,35 +0,0 @@ ---- extra/CMakeLists.txt.orig 2017-04-04 19:11:33 UTC -+++ extra/CMakeLists.txt -@@ -46,6 +46,7 @@ ADD_CUSTOM_TARGET(GenError - DEPENDS - ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) - TARGET_LINK_LIBRARIES(my_print_defaults mysys) - -@@ -84,15 +85,19 @@ IF(WITH_INNOBASE_STORAGE_ENGINE OR WITH_ - ) - - -+IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) - TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) - ADD_DEPENDENCIES(innochecksum GenError) - ENDIF() -+ENDIF() - - MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) - TARGET_LINK_LIBRARIES(replace mysys) -+ENDIF() - - IF(UNIX) -+IF(NOT WITHOUT_SERVER) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) - -@@ -102,3 +107,4 @@ IF(UNIX) - MYSQL_ADD_EXECUTABLE(mysqld_safe_helper mysqld_safe_helper.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysqld_safe_helper mysys) - ENDIF() -+ENDIF() diff --git a/databases/mariadb102-client/files/patch-include_CMakeLists.txt b/databases/mariadb102-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index 159c833bc898..000000000000 --- a/databases/mariadb102-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,17 +0,0 @@ ---- include/CMakeLists.txt.orig 2017-08-17 10:05:38 UTC -+++ include/CMakeLists.txt -@@ -80,12 +80,14 @@ STRING(REPLACE "." "\\." EXCL_RE "${HEAD - STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") - - MACRO(INSTALL_PRIVATE DIR) -+IF(FALSE) - INSTALL(DIRECTORY ${DIR}/. - DESTINATION ${INSTALL_INCLUDEDIR}/server/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN CMakeFiles EXCLUDE - PATTERN mysql EXCLUDE - REGEX "\\./(${EXCL_RE}$)" EXCLUDE) -+ENDIF() - ENDMACRO() - - INSTALL_PRIVATE(${CMAKE_CURRENT_BINARY_DIR}) diff --git a/databases/mariadb102-client/files/patch-include_my__compare.h b/databases/mariadb102-client/files/patch-include_my__compare.h deleted file mode 100644 index f0cbc1d11ab6..000000000000 --- a/databases/mariadb102-client/files/patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2017-04-04 19:11:34 UTC -+++ include/my_compare.h -@@ -40,7 +40,7 @@ extern "C" { - But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH. - */ - --#define HA_MAX_KEY_LENGTH 1000 /* Max length in bytes */ -+#define HA_MAX_KEY_LENGTH 4000 /* Max length in bytes */ - #define HA_MAX_KEY_SEG 32 /* Max segments for key */ - - #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) diff --git a/databases/mariadb102-client/files/patch-include_mysql_service__encryption.h b/databases/mariadb102-client/files/patch-include_mysql_service__encryption.h deleted file mode 100644 index 92ac035569a3..000000000000 --- a/databases/mariadb102-client/files/patch-include_mysql_service__encryption.h +++ /dev/null @@ -1,14 +0,0 @@ ---- include/mysql/service_encryption.h.orig 2017-04-04 19:11:35 UTC -+++ include/mysql/service_encryption.h -@@ -37,9 +37,11 @@ extern "C" { - #elif defined(__FreeBSD__) || defined(__OpenBSD__) || defined(__NetBSD__) || defined(__DragonFly__) - #include <stdlib.h> - #else -+#ifndef __FreeBSD__ - #include <alloca.h> - #endif - #endif -+#endif - - /* returned from encryption_key_get_latest_version() */ - #define ENCRYPTION_KEY_VERSION_INVALID (~(unsigned int)0) diff --git a/databases/mariadb102-client/files/patch-man_CMakeLists.txt b/databases/mariadb102-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index 0fbb708cce2d..000000000000 --- a/databases/mariadb102-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- man/CMakeLists.txt.orig 2017-04-04 19:11:35 UTC -+++ man/CMakeLists.txt -@@ -36,9 +36,13 @@ SET(MAN1_DEVEL mysql_config.1) - SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1 - mysqltest_embedded.1 mysql_client_test_embedded.1) - -+IF(NOT WITHOUT_SERVER) - INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer) - INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer) -+ENDIF() - INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient) - INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment) -+IF(FALSE) - INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest) -+ENDIF() - diff --git a/databases/mariadb102-client/files/patch-mysys_my__default.c b/databases/mariadb102-client/files/patch-mysys_my__default.c deleted file mode 100644 index ce1b2338b9a9..000000000000 --- a/databases/mariadb102-client/files/patch-mysys_my__default.c +++ /dev/null @@ -1,52 +0,0 @@ ---- mysys/my_default.c.orig 2017-04-04 19:11:51 UTC -+++ mysys/my_default.c -@@ -785,7 +785,7 @@ static int search_default_file_with_ext( - { - MY_STAT stat_info; - if (!my_stat(name,&stat_info,MYF(0))) -- return 1; -+ return 0; - /* - Ignore world-writable regular files. - This is mainly done to protect us to not read a file created by -@@ -803,6 +803,14 @@ static int search_default_file_with_ext( - if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0)))) - return 1; /* Ignore wrong files */ - -+ if (strstr(name, "/etc") == name) -+ { -+ fprintf(stderr, -+ "error: Config file %s in invalid location, please move to or merge with /usr/local%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) - { - line++; -@@ -1067,7 +1075,8 @@ void my_print_default_files(const char * - if (name[0] == FN_HOMELIB) /* Add . to filenames in home */ - *end++= '.'; - strxmov(end, conf_file, *ext, " ", NullS); -- fputs(name, stdout); -+ if (strstr(name, "/etc") != name) -+ fputs(name, stdout); - } - } - } -@@ -1192,13 +1201,10 @@ static const char **init_default_directo - - #else - --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#else - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "/usr/local/etc/", dirs); -+ errors += add_directory(alloc, "/usr/local/etc/mysql/", dirs); - - #endif - diff --git a/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index 36927c672ddd..000000000000 --- a/databases/mariadb102-client/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,49 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2017-04-04 19:11:52 UTC -+++ scripts/CMakeLists.txt -@@ -21,7 +21,7 @@ IF(NOT CMAKE_CROSSCOMPILING) - TARGET_LINK_LIBRARIES(comp_sql) - ENDIF() - -- -+IF(NOT WITHOUT_SERVER) - # Build mysql_fix_privilege_tables.sql (concatenate 3 sql scripts) - IF(NOT WIN32 OR CMAKE_CROSSCOMPILING) - FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable") -@@ -65,6 +65,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs - ALL - DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c - ) -+ENDIF() - - IF(UNIX) - FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution -@@ -126,6 +127,7 @@ ELSE() - SET (PERL_PATH "/usr/bin/perl") - ENDIF() - -+IF(NOT WITHOUT_SERVER) - IF(UNIX) - # FIND_PROC and CHECK_PID are used by mysqld_safe - IF(CMAKE_SYSTEM_NAME MATCHES "Linux") -@@ -207,6 +209,7 @@ INSTALL_SCRIPT( - COMPONENT Server - ) - ENDIF() -+ENDIF() - - SET(prefix "${CMAKE_INSTALL_PREFIX}") - IF(INSTALL_SYSCONFDIR) -@@ -298,13 +301,8 @@ ELSE() - SET(BIN_SCRIPTS - msql2mysql - mysql_config -- mysql_setpermission -- mysql_secure_installation - mysqlaccess -- mysql_convert_table_format - mysql_find_rows -- mytop -- mysqlhotcopy - ${SERVER_SCRIPTS} - ${WSREP_SCRIPTS} - ${SYSTEMD_SCRIPTS} diff --git a/databases/mariadb102-client/files/patch-scripts_mysql__config.sh b/databases/mariadb102-client/files/patch-scripts_mysql__config.sh deleted file mode 100644 index 790708a776fe..000000000000 --- a/databases/mariadb102-client/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,12 +0,0 @@ ---- scripts/mysql_config.sh.orig 2017-05-21 07:34:41 UTC -+++ scripts/mysql_config.sh -@@ -106,7 +106,9 @@ fi - - # Create options - libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@" -+libs="$libs -L/usr/local/lib " - embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@" -+embedded_libs="$embedded_libs -L/usr/local/lib " - - include="-I$pkgincludedir" - if [ "$basedir" != "/usr" ]; then diff --git a/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index d2c099b5656d..000000000000 --- a/databases/mariadb102-client/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,33 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2020-05-08 11:45:27 UTC -+++ support-files/CMakeLists.txt -@@ -59,6 +59,7 @@ ENDIF() - - IF(UNIX) - SET(prefix ${CMAKE_INSTALL_PREFIX}) -+ IF(NOT WITHOUT_SERVER) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure wsrep_notify) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -98,12 +99,14 @@ IF(UNIX) - ENDIF() - ENDIF() - ENDIF() -+ ENDIF() - - CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_LIBDIR}/pkgconfig COMPONENT Development) - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) - -+ IF(NOT WITHOUT_SERVER) - SET(bindir ${INSTALL_BINDIRABS}) - SET(sbindir ${INSTALL_SBINDIRABS}) - SET(scriptdir ${INSTALL_SCRIPTDIRABS}) -@@ -175,6 +178,7 @@ IF(UNIX) - INSTALL(PROGRAMS ${CMAKE_CURRENT_BINARY_DIR}/mysql.server - DESTINATION ${INSTALL_SYSCONFDIR}/init.d - RENAME mysql COMPONENT SupportFiles) -+ ENDIF() - - INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR} - COMPONENT Common) diff --git a/databases/mariadb102-client/files/pkg-message.in b/databases/mariadb102-client/files/pkg-message.in deleted file mode 100644 index 00ac47038607..000000000000 --- a/databases/mariadb102-client/files/pkg-message.in +++ /dev/null @@ -1,9 +0,0 @@ -[ -{ type: install - message: <<EOM -MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for -my.cnf. Please move existing my.cnf files from those paths to -%%PREFIX%%/etc and %%PREFIX%%/etc/mysql. -EOM -} -] |