diff options
author | Rene Ladan <rene@FreeBSD.org> | 2020-04-12 10:23:29 +0000 |
---|---|---|
committer | Rene Ladan <rene@FreeBSD.org> | 2020-04-12 10:23:29 +0000 |
commit | 4d21eb6b103589f39bd276f2ec1aca7d3fe46a05 (patch) | |
tree | f6611995a5200f2728931e4b8326296b96c00513 /databases/mariadb55-client | |
parent | Document new vulnerabilities in www/chromium < 81.0.4044.92 (diff) |
Remove expired ports:
2020-04-11 databases/mariadb55-server: Upstream end-of-life 2020-04-11, switch to a newer version
2020-04-11 databases/mariadb55-client: Upstream end-of-life 2020-04-11, switch to a newer version
Notes
Notes:
svn path=/head/; revision=531502
Diffstat (limited to 'databases/mariadb55-client')
17 files changed, 0 insertions, 547 deletions
diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile deleted file mode 100644 index 42536a9fca2f..000000000000 --- a/databases/mariadb55-client/Makefile +++ /dev/null @@ -1,30 +0,0 @@ -# $FreeBSD$ - -PORTNAME= mariadb -PKGNAMESUFFIX= 55-client - -COMMENT= Multithreaded SQL database (client) - -LICENSE+= LGPL21 - -MASTERDIR= ${.CURDIR}/../mariadb55-server - -FILESDIR= ${.CURDIR}/files -PATCHDIR= ${.CURDIR}/files -PLIST= ${.CURDIR}/pkg-plist - -CONFLICTS_INSTALL= mariadb5[0-46-9]-client-* \ - mariadb1*-client-* \ - mysql*-client-* \ - percona*-client-* - -CMAKE_ARGS+= -DWITHOUT_SERVER=1 -CLIENT_ONLY= yes - -USES= ncurses readline - -post-install: - ${RM} ${STAGEDIR}${PREFIX}/bin/mysqld_safe_helper - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/private - -.include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt deleted file mode 100644 index 5135eaf3f489..000000000000 --- a/databases/mariadb55-client/files/patch-CMakeLists.txt +++ /dev/null @@ -1,55 +0,0 @@ ---- CMakeLists.txt.orig 2017-04-30 11:09:29 UTC -+++ CMakeLists.txt -@@ -393,28 +393,8 @@ ADD_SUBDIRECTORY(client) - ADD_SUBDIRECTORY(extra) - ADD_SUBDIRECTORY(libservices) - ADD_SUBDIRECTORY(scripts) --ADD_SUBDIRECTORY(sql/share) - ADD_SUBDIRECTORY(support-files) - --IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(tests) -- ADD_SUBDIRECTORY(sql) -- OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) -- IF(WITH_EMBEDDED_SERVER) -- ADD_SUBDIRECTORY(libmysqld) -- ADD_SUBDIRECTORY(libmysqld/examples) -- ENDIF(WITH_EMBEDDED_SERVER) -- -- ADD_SUBDIRECTORY(mysql-test) -- ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) -- ADD_SUBDIRECTORY(sql-bench) -- -- IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) -- ADD_SUBDIRECTORY(internal) -- ENDIF() -- ADD_SUBDIRECTORY(packaging/rpm-oel) --ENDIF() -- - IF(UNIX) - ADD_SUBDIRECTORY(man) - ENDIF() -@@ -426,7 +406,6 @@ IF(WIN32) - ADD_SUBDIRECTORY(win/upgrade_wizard) - ADD_SUBDIRECTORY(win/packaging) - ENDIF() --ADD_SUBDIRECTORY(packaging/solaris) - - CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/my_config.h) - CONFIGURE_FILE(config.h.cmake ${CMAKE_BINARY_DIR}/include/config.h) -@@ -460,6 +439,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL - WORKING_DIRECTORY ${CMAKE_BINARY_DIR} - ) - -+IF(FALSE) - INSTALL_DOCUMENTATION(README COPYING EXCEPTIONS-CLIENT COMPONENT Readme) - - # MDEV-6526 these files are not installed anymore -@@ -469,6 +449,7 @@ INSTALL_DOCUMENTATION(README COPYING EXC - IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) - ENDIF() -+ENDIF() - - INCLUDE(CPack) - diff --git a/databases/mariadb55-client/files/patch-client_CMakeLists.txt b/databases/mariadb55-client/files/patch-client_CMakeLists.txt deleted file mode 100644 index cd2f4feaff4b..000000000000 --- a/databases/mariadb55-client/files/patch-client_CMakeLists.txt +++ /dev/null @@ -1,52 +0,0 @@ ---- client/CMakeLists.txt.orig 2019-04-26 12:37:01 UTC -+++ client/CMakeLists.txt -@@ -35,12 +35,13 @@ IF(UNIX) - SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE) - ENDIF(UNIX) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) - SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE) -+ENDIF() - -- - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) - -@@ -51,15 +52,19 @@ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - SET_SOURCE_FILES_PROPERTIES(mysqlimport.c PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) - TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) - -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c) - TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -76,11 +81,13 @@ IF(WIN32) - MYSQL_ADD_EXECUTABLE(echo echo.c COMPONENT Junk) - ENDIF(WIN32) - -+IF(FALSE) - # async_example is just a code example, do not install it. - ADD_EXECUTABLE(async_example async_example.c) - TARGET_LINK_LIBRARIES(async_example mysqlclient) -+ENDIF() - --SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin async_example -+SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap - PROPERTIES HAS_CXX TRUE) - - ADD_DEFINITIONS(-DHAVE_DLOPEN) diff --git a/databases/mariadb55-client/files/patch-cmake_jemalloc.cmake b/databases/mariadb55-client/files/patch-cmake_jemalloc.cmake deleted file mode 100644 index f075ff3b7990..000000000000 --- a/databases/mariadb55-client/files/patch-cmake_jemalloc.cmake +++ /dev/null @@ -1,16 +0,0 @@ ---- cmake/jemalloc.cmake.orig 2017-04-30 11:09:29 UTC -+++ cmake/jemalloc.cmake -@@ -22,11 +22,11 @@ MACRO (CHECK_JEMALLOC) - SET(libname jemalloc) - ENDIF() - -- CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC) -+ CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC) - SET(CMAKE_REQUIRED_LIBRARIES) - - IF (HAVE_JEMALLOC) -- SET(LIBJEMALLOC ${libname}) -+ SET(LIBJEMALLOC c) - ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto") - MESSAGE(FATAL_ERROR "${libname} is not found") - ENDIF() diff --git a/databases/mariadb55-client/files/patch-extra_CMakeLists.txt b/databases/mariadb55-client/files/patch-extra_CMakeLists.txt deleted file mode 100644 index ff7938f19948..000000000000 --- a/databases/mariadb55-client/files/patch-extra_CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- extra/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC -+++ extra/CMakeLists.txt -@@ -54,6 +54,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) - -@@ -74,11 +75,14 @@ ENDIF() - - MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server) - TARGET_LINK_LIBRARIES(replace mysys) -+ENDIF() - IF(UNIX) -+IF(FALSE) - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c) - - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) - TARGET_LINK_LIBRARIES(resolve_stack_dump mysys) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys) diff --git a/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp deleted file mode 100644 index 67c12b4e8112..000000000000 --- a/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- extra/yassl/taocrypt/src/integer.cpp.orig 2017-04-30 11:09:29 UTC -+++ extra/yassl/taocrypt/src/integer.cpp -@@ -74,7 +74,7 @@ template <class T> - CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate( - size_type n, const void *) - { -- if (n > this->max_size()) -+ if (n > AlignedAllocator<T>::max_size()) - return 0; - if (n == 0) - return 0; diff --git a/databases/mariadb55-client/files/patch-include_CMakeLists.txt b/databases/mariadb55-client/files/patch-include_CMakeLists.txt deleted file mode 100644 index 57c37be4426c..000000000000 --- a/databases/mariadb55-client/files/patch-include_CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- include/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC -+++ include/CMakeLists.txt -@@ -59,16 +59,21 @@ INSTALL(FILES ${HEADERS} DESTINATION ${I - FOREACH(f ${HEADERS_GEN_CONFIGURE}) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ) - ENDFOREACH(f) --INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h") -+INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development -+ FILES_MATCHING PATTERN "*.h" -+ PATTERN "psi_abi*" EXCLUDE -+) - - STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}") - STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}") - -+IF(FALSE) - INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" - PATTERN CMakeFiles EXCLUDE - PATTERN mysql EXCLUDE - REGEX "\\./(${EXCL_RE}$)" EXCLUDE) -+ENDIF() - - INSTALL(DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/. DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development - FILES_MATCHING PATTERN "*.h" diff --git a/databases/mariadb55-client/files/patch-include_my__compare.h b/databases/mariadb55-client/files/patch-include_my__compare.h deleted file mode 100644 index 0d9945b156c2..000000000000 --- a/databases/mariadb55-client/files/patch-include_my__compare.h +++ /dev/null @@ -1,11 +0,0 @@ ---- include/my_compare.h.orig 2017-04-30 11:09:29 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/mariadb55-client/files/patch-libservices_CMakeLists.txt b/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt deleted file mode 100644 index 415787052dfa..000000000000 --- a/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- libservices/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC -+++ libservices/CMakeLists.txt -@@ -26,4 +26,6 @@ SET(MYSQLSERVICES_SOURCES - logger_service.c) - - ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) -+IF(FALSE) - INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) -+ENDIF() diff --git a/databases/mariadb55-client/files/patch-man_CMakeLists.txt b/databases/mariadb55-client/files/patch-man_CMakeLists.txt deleted file mode 100644 index df40cfa389f7..000000000000 --- a/databases/mariadb55-client/files/patch-man_CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- man/CMakeLists.txt.orig 2017-04-30 11:09:29 UTC -+++ man/CMakeLists.txt -@@ -32,9 +32,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(FALSE) - 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/mariadb55-client/files/patch-mysys_default.c b/databases/mariadb55-client/files/patch-mysys_default.c deleted file mode 100644 index e36841601a62..000000000000 --- a/databases/mariadb55-client/files/patch-mysys_default.c +++ /dev/null @@ -1,58 +0,0 @@ ---- mysys/default.c.orig 2017-04-30 11:09:31 UTC -+++ mysys/default.c -@@ -89,7 +89,7 @@ static my_bool defaults_already_read= FA - - /* Which directories are searched for options (and in which order) */ - --#define MAX_DEFAULT_DIRS 6 -+#define MAX_DEFAULT_DIRS 7 - #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1) /* Terminate with NULL */ - static const char **default_directories = NULL; - -@@ -786,7 +786,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 -@@ -804,6 +804,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 %%PREFIX%%%s\n", -+ name,name); -+ goto err; -+ } -+ - while (mysql_file_fgets(buff, sizeof(buff) - 1, fp)) - { - line++; -@@ -1068,7 +1076,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); - } - } - } -@@ -1227,10 +1236,8 @@ static const char **init_default_directo - errors += add_directory(alloc, "/etc/", dirs); - errors += add_directory(alloc, "/etc/mysql/", dirs); - --#if defined(DEFAULT_SYSCONFDIR) -- if (DEFAULT_SYSCONFDIR[0]) -- errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); --#endif /* DEFAULT_SYSCONFDIR */ -+ errors += add_directory(alloc, "%%PREFIX%%/etc/", dirs); -+ errors += add_directory(alloc, "%%PREFIX%%/etc/mysql/", dirs); - - #endif - diff --git a/databases/mariadb55-client/files/patch-regex_CMakeLists.txt b/databases/mariadb55-client/files/patch-regex_CMakeLists.txt deleted file mode 100644 index ab79c3bf56c0..000000000000 --- a/databases/mariadb55-client/files/patch-regex_CMakeLists.txt +++ /dev/null @@ -1,9 +0,0 @@ ---- regex/CMakeLists.txt.orig 2017-04-30 11:09:31 UTC -+++ regex/CMakeLists.txt -@@ -18,4 +18,6 @@ INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/ - SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c) - ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES}) - -+IF(FALSE) - INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development) -+ENDIF() diff --git a/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt deleted file mode 100644 index ea769d7f3d2d..000000000000 --- a/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt +++ /dev/null @@ -1,78 +0,0 @@ ---- scripts/CMakeLists.txt.orig 2017-04-30 11:09:31 UTC -+++ scripts/CMakeLists.txt -@@ -72,6 +72,7 @@ IF(UNIX) - ) - ENDIF() - -+IF(FALSE) - INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -81,6 +82,7 @@ INSTALL(FILES - ${FIX_PRIVILEGES_SQL} - DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server - ) -+ENDIF() - - # TCMalloc hacks - IF(MALLOC_LIB) -@@ -133,6 +135,7 @@ ENDIF() - SET(HOSTNAME "hostname") - SET(MYSQLD_USER "mysql") - -+IF(FALSE) - # Required for mysqlbug until autotools are deprecated, once done remove these - # and expand default cmake variables - SET(CC ${CMAKE_C_COMPILER}) -@@ -173,6 +176,7 @@ INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DI - DESTINATION ${INSTALL_BINDIR} - COMPONENT Server - ) -+ENDIF() - - ENDIF(UNIX) - -@@ -197,6 +201,7 @@ ELSE() - SET(localstatedir ${MYSQL_DATADIR}) - ENDIF() - -+IF() - IF(UNIX) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh - ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY) -@@ -212,6 +217,7 @@ INSTALL_SCRIPT( - COMPONENT Server - ) - ENDIF() -+ENDIF() - - SET(prefix "${CMAKE_INSTALL_PREFIX}") - SET(sysconfdir ${prefix}) -@@ -270,6 +276,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) - STRING(REGEX REPLACE "^lib" "" lib "${lib}") - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -+ ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) - ELSE() - SET(${var} "${${var}}-l${lib} " ) - ENDIF() -@@ -328,18 +336,8 @@ ELSE() - SET(BIN_SCRIPTS - msql2mysql - mysql_config -- mysql_fix_extensions -- mysql_setpermission -- mysql_secure_installation -- mysql_zap - mysqlaccess -- mysql_convert_table_format - mysql_find_rows -- mytop -- mysqlhotcopy -- mysqldumpslow -- mysqld_multi -- mysqld_safe - ) - FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) diff --git a/databases/mariadb55-client/files/patch-scripts_mysql__config.sh b/databases/mariadb55-client/files/patch-scripts_mysql__config.sh deleted file mode 100644 index 8788844b5670..000000000000 --- a/databases/mariadb55-client/files/patch-scripts_mysql__config.sh +++ /dev/null @@ -1,14 +0,0 @@ ---- scripts/mysql_config.sh.orig 2017-04-30 11:09:31 UTC -+++ scripts/mysql_config.sh -@@ -109,8 +109,11 @@ fi - # We intentionally add a space to the beginning and end of lib strings, simplifies replace later - libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@" - libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ " -+libs="$libs -L%%LOCALBASE%%/lib " - libs_r=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient_r @ZLIB_DEPS@ @CLIENT_LIBS@ @openssl_libs@ " -+libs_r="$libs_r -L%%LOCALBASE%%/lib " - embedded_libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqld @LIBDL@ @ZLIB_DEPS@ @LIBS@ @WRAPLIBS@ @openssl_libs@ " -+embedded_libs="$embedded_libs -L%%LOCALBASE%%/lib " - - if [ -r "$pkglibdir/libmygcc.a" ]; then - # When linking against the static library with a different version of GCC diff --git a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt deleted file mode 100644 index 90098d933cbe..000000000000 --- a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt +++ /dev/null @@ -1,40 +0,0 @@ ---- support-files/CMakeLists.txt.orig 2017-04-30 11:09:34 UTC -+++ support-files/CMakeLists.txt -@@ -41,15 +41,18 @@ ELSE() - SET(inst_location ${INSTALL_SUPPORTFILESDIR}) - ENDIF() - -+IF(FALSE) - FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh - ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} - DESTINATION ${inst_location} COMPONENT IniFiles) - ENDFOREACH() -+ENDIF() - - IF(UNIX) - SET(prefix ${CMAKE_INSTALL_PREFIX}) -+ IF(FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) - CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh - ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -69,8 +72,10 @@ IF(UNIX) - INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) - ADD_SUBDIRECTORY(SELinux) - ENDIF() -+ ENDIF() - - INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) -+ IF(FALSE) - CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY) - -@@ -94,6 +99,7 @@ IF(UNIX) - DESTINATION ${inst_location} COMPONENT SupportFiles - PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ - GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) -+ ENDIF() - - IF (INSTALL_SYSCONFDIR) - INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d diff --git a/databases/mariadb55-client/files/pkg-message.in b/databases/mariadb55-client/files/pkg-message.in deleted file mode 100644 index 00ac47038607..000000000000 --- a/databases/mariadb55-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 -} -] diff --git a/databases/mariadb55-client/pkg-plist b/databases/mariadb55-client/pkg-plist deleted file mode 100644 index edd22fcf57f5..000000000000 --- a/databases/mariadb55-client/pkg-plist +++ /dev/null @@ -1,89 +0,0 @@ -bin/msql2mysql -bin/mysql -bin/mysql_config -bin/mysql_find_rows -bin/mysql_waitpid -bin/mysqlaccess -bin/mysqladmin -bin/mysqlbinlog -bin/mysqlcheck -bin/mysqldump -bin/mysqlimport -bin/mysqlshow -bin/mysqlslap -include/mysql/auth_dialog_client.h -include/mysql/client_plugin.h -include/mysql/decimal.h -include/mysql/errmsg.h -include/mysql/handler_ername.h -include/mysql/handler_state.h -include/mysql/keycache.h -include/mysql/m_ctype.h -include/mysql/m_string.h -include/mysql/ma_dyncol.h -include/mysql/my_alloc.h -include/mysql/my_attribute.h -include/mysql/my_compiler.h -include/mysql/my_config.h -include/mysql/my_dbug.h -include/mysql/my_decimal_limits.h -include/mysql/my_dir.h -include/mysql/my_getopt.h -include/mysql/my_global.h -include/mysql/my_list.h -include/mysql/my_net.h -include/mysql/my_pthread.h -include/mysql/my_sys.h -include/mysql/my_valgrind.h -include/mysql/my_xml.h -include/mysql/mysql.h -include/mysql/mysql_com.h -include/mysql/mysql_embed.h -include/mysql/mysql_time.h -include/mysql/mysql_version.h -include/mysql/mysqld_ername.h -include/mysql/mysqld_error.h -include/mysql/plugin.h -include/mysql/plugin_audit.h -include/mysql/plugin_auth.h -include/mysql/plugin_auth_common.h -include/mysql/plugin_ftparser.h -include/mysql/psi/mysql_file.h -include/mysql/psi/mysql_thread.h -include/mysql/psi/psi.h -include/mysql/service_debug_sync.h -include/mysql/service_kill_statement.h -include/mysql/service_logger.h -include/mysql/service_my_snprintf.h -include/mysql/service_progress_report.h -include/mysql/service_thd_alloc.h -include/mysql/service_thd_wait.h -include/mysql/service_thread_scheduler.h -include/mysql/services.h -include/mysql/sql_common.h -include/mysql/sql_state.h -include/mysql/sslopt-case.h -include/mysql/sslopt-longopts.h -include/mysql/sslopt-vars.h -include/mysql/typelib.h -lib/mysql/libmysqlclient.a -lib/mysql/libmysqlclient.so -lib/mysql/libmysqlclient.so.18 -lib/mysql/libmysqlclient_r.a -lib/mysql/libmysqlclient_r.so -lib/mysql/libmysqlclient_r.so.18 -man/man1/msql2mysql.1.gz -man/man1/mysql.1.gz -man/man1/mysql_config.1.gz -man/man1/mysql_find_rows.1.gz -man/man1/mysql_plugin.1.gz -man/man1/mysql_waitpid.1.gz -man/man1/mysqlaccess.1.gz -man/man1/mysqladmin.1.gz -man/man1/mysqlbinlog.1.gz -man/man1/mysqlcheck.1.gz -man/man1/mysqldump.1.gz -man/man1/mysqlimport.1.gz -man/man1/mysqlshow.1.gz -man/man1/mysqlslap.1.gz -share/aclocal/mysql.m4 |