diff options
| author | Kurt Jaeger <pi@FreeBSD.org> | 2016-01-10 20:07:48 +0000 |
|---|---|---|
| committer | Kurt Jaeger <pi@FreeBSD.org> | 2016-01-10 20:07:48 +0000 |
| commit | f8d239353c3514a7e0205b49a4a33fab92b07f48 (patch) | |
| tree | b5a40cf04ded95238cb509cd32cab0974fe31146 /databases | |
| parent | 79c95318b4b6bb92d2ed30ac56c149a368607e8f (diff) | |
| download | ports-f8d239353c3514a7e0205b49a4a33fab92b07f48.tar.gz ports-f8d239353c3514a7e0205b49a4a33fab92b07f48.zip | |
databases/mysql57-client, databases/mysql57-server:
change all files that were missed in the last commit
PR: 204607
Notes
Notes:
svn path=/head/; revision=405742
Diffstat (limited to 'databases')
25 files changed, 392 insertions, 322 deletions
diff --git a/databases/mysql57-client/Makefile b/databases/mysql57-client/Makefile index ccc596133774..67b1d94224c7 100644 --- a/databases/mysql57-client/Makefile +++ b/databases/mysql57-client/Makefile @@ -1,24 +1,27 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> +# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>" # $FreeBSD$ PORTNAME= mysql -PKGNAMESUFFIX= 56-client +PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) -MASTERDIR= ${.CURDIR}/../mysql56-server +LICENSE+= LGPL21 + +MASTERDIR= ${.CURDIR}/../mysql57-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist -CONFLICTS_INSTALL= mysql5[0-57-9]-client-* \ - mariadb*-client-* \ - percona*-client-* +CONFLICTS_INSTALL= mysql5.[0-57-9]-client-* mysql[0-46-9][0-9]-client-* mariadb[0-9][0-9]-client-* percona[0-9][0-9]-client-* -CMAKE_ARGS+= -DWITHOUT_SERVER=1 +CMAKE_ARGS+= -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ + -DINSTALL_LDCONFIGDIR=${PREFIX}/libdata/ldconfig/ \ + -DWITHOUT_SERVER=1 \ + -DWITH_SYSTEMD=0 -USE_LDCONFIG= ${PREFIX}/lib/mysql +USE_LDCONFIG+= ${PREFIX}/lib/mysql MMAN1= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 \ mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ diff --git a/databases/mysql57-client/files/patch-CMakeLists.txt b/databases/mysql57-client/files/patch-CMakeLists.txt index e8efec8c25a5..4e9091fae53e 100644 --- a/databases/mysql57-client/files/patch-CMakeLists.txt +++ b/databases/mysql57-client/files/patch-CMakeLists.txt @@ -1,6 +1,6 @@ ---- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 -+++ CMakeLists.txt 2014-08-04 13:56:19.445692503 +0000 -@@ -492,8 +492,8 @@ +--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ CMakeLists.txt +@@ -569,8 +569,8 @@ ENDIF() ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -10,16 +10,12 @@ IF(UNIX) ADD_SUBDIRECTORY(man) -@@ -560,18 +560,17 @@ +@@ -639,14 +639,13 @@ ELSE() SET(CPACK_GENERATOR "TGZ") ENDIF() ADD_SUBDIRECTORY(packaging/WiX) -ADD_SUBDIRECTORY(packaging/solaris) - # Create a single package with "make package" - # (see http://public.kitware.com/Bug/view.php?id=11452) - SET(CPACK_MONOLITHIC_INSTALL 1 CACHE INTERNAL "") - IF(UNIX) - INSTALL(FILES Docs/mysql.info DESTINATION ${INSTALL_INFODIR} OPTIONAL COMPONENT Info) ENDIF() @@ -30,10 +26,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -597,5 +596,6 @@ +@@ -673,6 +672,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + diff --git a/databases/mysql57-client/files/patch-client_CMakeLists.txt b/databases/mysql57-client/files/patch-client_CMakeLists.txt index f3a7372b69f7..5b0e752138e7 100644 --- a/databases/mysql57-client/files/patch-client_CMakeLists.txt +++ b/databases/mysql57-client/files/patch-client_CMakeLists.txt @@ -1,27 +1,28 @@ ---- client/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ client/CMakeLists.txt 2013-02-13 10:36:50.000000000 +0100 -@@ -39,9 +39,11 @@ - TARGET_LINK_LIBRARIES(mysql ${READLINE_LIBRARY}) +--- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ client/CMakeLists.txt +@@ -121,6 +121,7 @@ IF(UNIX) + TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) 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) + IF(NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysql_upgrade + upgrade/program.cc +@@ -131,10 +132,13 @@ ADD_COMPILE_FLAGS( + TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient client_base mysqlcheck_core) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) + ENDIF() +ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -53,15 +55,19 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) - +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) + MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) + SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") + TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) +ENDIF() + ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) + TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) +@@ -152,8 +156,10 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) @@ -31,13 +32,23 @@ +ENDIF() MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) -@@ -82,8 +88,6 @@ + ADD_COMPILE_FLAGS( +@@ -172,8 +178,10 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli + MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) + TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) + TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) ++ENDIF() + + IF(UNIX AND NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysql_install_db +@@ -196,7 +204,6 @@ IF(WIN32) ENDIF(WIN32) SET_TARGET_PROPERTIES ( -- mysql_plugin -- mysql_upgrade +- mysql_plugin mysqlcheck mysqldump mysqlimport diff --git a/databases/mysql57-client/files/patch-extra_CMakeLists.txt b/databases/mysql57-client/files/patch-extra_CMakeLists.txt index bd078ede4a7c..185a6f785e69 100644 --- a/databases/mysql57-client/files/patch-extra_CMakeLists.txt +++ b/databases/mysql57-client/files/patch-extra_CMakeLists.txt @@ -1,6 +1,14 @@ ---- extra/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ extra/CMakeLists.txt 2013-02-13 11:02:40.000000000 +0100 -@@ -60,6 +60,7 @@ +--- extra/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ extra/CMakeLists.txt +@@ -45,6 +45,7 @@ ENDIF() + + ADD_CUSTOM_COMMAND(OUTPUT ${PROJECT_BINARY_DIR}/include/mysqld_error.h + ${PROJECT_BINARY_DIR}/sql/share/english/errmsg.sys ++ COMMAND mkdir -p ${PROJECT_BINARY_DIR}/sql/share/ + COMMAND comp_err + --charset=${PROJECT_SOURCE_DIR}/sql/share/charsets + --out-dir=${PROJECT_BINARY_DIR}/sql/share/ +@@ -73,6 +74,7 @@ IF (WIN32 AND WITH_SSL_PATH AND HAVE_CRY ENDIF() @@ -8,18 +16,18 @@ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c) TARGET_LINK_LIBRARIES(my_print_defaults mysys mysys_ssl) SET_TARGET_PROPERTIES(my_print_defaults PROPERTIES LINKER_LANGUAGE CXX) -@@ -96,11 +97,14 @@ - MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.cc ${INNOBASE_SOURCES}) - TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl) +@@ -142,11 +144,14 @@ IF(WITH_INNOBASE_STORAGE_ENGINE) + TARGET_LINK_LIBRARIES(innochecksum mysys mysys_ssl ${LZ4_LIBRARY}) + ADD_DEPENDENCIES(innochecksum GenError) ENDIF() +ENDIF() - IF(UNIX) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c) + IF(UNIX) + MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) - SET_TARGET_PROPERTIES(resolve_stack_dump PROPERTIES LINKER_LANGUAGE CXX) + ENDIF() +ENDIF() - MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c) - TARGET_LINK_LIBRARIES(mysql_waitpid mysys mysys_ssl) + # In published release builds on Solaris, we need to bundle gcc source. + # PB2 will take care of putting it in extra/ when needed diff --git a/databases/mysql57-client/files/patch-include_myisam.h b/databases/mysql57-client/files/patch-include_myisam.h index 450645400dd5..7a9ab13220ea 100644 --- a/databases/mysql57-client/files/patch-include_myisam.h +++ b/databases/mysql57-client/files/patch-include_myisam.h @@ -1,6 +1,6 @@ ---- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100 -+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100 -@@ -48,7 +48,7 @@ +--- include/myisam.h.orig 2015-11-29 19:16:24 UTC ++++ include/myisam.h +@@ -45,7 +45,7 @@ extern "C" { The following defines can be increased if necessary. But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. */ diff --git a/databases/mysql57-client/files/patch-man_CMakeLists.txt b/databases/mysql57-client/files/patch-man_CMakeLists.txt index 0f79f3e2403d..617676556213 100644 --- a/databases/mysql57-client/files/patch-man_CMakeLists.txt +++ b/databases/mysql57-client/files/patch-man_CMakeLists.txt @@ -1,13 +1,15 @@ ---- man/CMakeLists.txt.orig 2011-10-22 14:08:32.000000000 +0200 -+++ man/CMakeLists.txt 2011-10-22 14:22:42.000000000 +0200 -@@ -15,10 +15,6 @@ +--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ man/CMakeLists.txt +@@ -14,11 +14,7 @@ + # Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA # Copy man pages - FILE(GLOB MAN1_FILES *.1) +-FILE(GLOB MAN1_FILES *.1) -FILE(GLOB MAN1_EXCLUDE make_win_bin_dist.1) -FILE(GLOB MAN1_NDB ndb*.1) -FILE(GLOB MAN8_FILES *.8) -FILE(GLOB MAN8_NDB ndb*.8) ++FILE(GLOB MAN1_FILES comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_config_editor.1 mysql_find_rows.1 mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1) IF(MAN1_FILES) IF(MAN1_EXCLUDE) LIST(REMOVE_ITEM MAN1_FILES ${MAN1_EXCLUDE}) diff --git a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt b/databases/mysql57-client/files/patch-scripts_CMakeLists.txt index 0235dc2f305f..7bbaae22bbcf 100644 --- a/databases/mysql57-client/files/patch-scripts_CMakeLists.txt +++ b/databases/mysql57-client/files/patch-scripts_CMakeLists.txt @@ -1,54 +1,38 @@ ---- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 -+++ scripts/CMakeLists.txt 2013-02-13 14:14:11.000000000 +0100 -@@ -71,6 +71,7 @@ - ) +--- scripts/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ scripts/CMakeLists.txt +@@ -43,6 +43,7 @@ ELSE() + MESSAGE(FATAL_ERROR "Cannot concatenate files") ENDIF() +IF(FALSE) - INSTALL(FILES - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql - ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql -@@ -80,6 +81,7 @@ - ${FIX_PRIVILEGES_SQL} - DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server + # Build mysql_fix_privilege_tables.c + ADD_CUSTOM_COMMAND( + OUTPUT ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c +@@ -63,6 +64,7 @@ ADD_CUSTOM_TARGET(GenFixPrivs + DEPENDS ${CMAKE_CURRENT_BINARY_DIR}/mysql_fix_privilege_tables_sql.c + ${CMAKE_CURRENT_BINARY_DIR}/sql_commands_sys_schema.h ) +ENDIF() - # TCMalloc hacks - IF(MALLOC_LIB) -@@ -139,6 +141,7 @@ - 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}) -@@ -175,6 +178,7 @@ - DESTINATION ${INSTALL_BINDIR} - COMPONENT Server + # If we do not have performance schema compiled in then sys will not work, + # so only create an empty sys database with an auto-generated file, +@@ -143,6 +145,7 @@ IF(NOT WITHOUT_SERVER) ) -+ENDIF() - - ENDIF(UNIX) - -@@ -199,6 +203,7 @@ - SET(localstatedir ${MYSQL_DATADIR}) ENDIF() +IF(FALSE) IF(UNIX) - SET(EXT) - ELSE() -@@ -213,6 +218,7 @@ - DESTINATION ${DEST} - COMPONENT Server - ) + FILE(WRITE ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution + "cd ${CMAKE_BINARY_DIR} && '${CMAKE_CPACK_COMMAND}' -G TGZ --config CPackConfig.cmake\n" ) +@@ -150,6 +153,7 @@ IF(UNIX) + COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution + ) + ENDIF() +ENDIF() - - SET(prefix "${CMAKE_INSTALL_PREFIX}") -@@ -264,6 +270,8 @@ + IF(NOT WITHOUT_SERVER) + INSTALL(FILES +@@ -347,6 +351,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -57,37 +41,24 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -316,17 +324,9 @@ - SET(BIN_SCRIPTS - msql2mysql - mysql_config -- mysql_fix_extensions -- mysql_setpermission -- mysql_zap - mysqlaccess - mysqlaccess.conf -- mysql_convert_table_format - mysql_find_rows -- mysqlhotcopy -- mysqldumpslow -- mysqld_multi -- mysqld_safe - ) - FOREACH(file ${BIN_SCRIPTS}) - IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) -@@ -350,6 +350,7 @@ - ) - ENDFOREACH() +@@ -430,19 +436,7 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(mysql_config_COMPONENT COMPONENT Development) -+IF(FALSE) - # Input files with pl.in extension - drop the extension completely - SET(PLIN_FILES mysql_secure_installation) - FOREACH(file ${PLIN_FILES}) -@@ -362,6 +363,7 @@ - INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT}) - ENDFOREACH() - ENDIF() -+ENDIF() +- IF(WITH_SYSTEMD) +- SET(BIN_SCRIPTS +- mysql_config +- mysqldumpslow +- ) +- ELSE() +- SET(BIN_SCRIPTS +- mysql_config +- mysqldumpslow +- mysqld_multi +- mysqld_safe +- ) +- ENDIF() ++ SET(BIN_SCRIPTS mysql_config) - # Install libgcc as mylibgcc.a - IF(CMAKE_COMPILER_IS_GNUCXX AND CMAKE_CXX_FLAGS MATCHES "-static") + SET(PKGCONFIG_FILE ${LIBMYSQL_OS_OUTPUT_NAME}.pc) + STRING(REGEX REPLACE "/mysql$" "" PKGCONFIG_DIR "${INSTALL_LIBDIR}") diff --git a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt index 33803dc525b9..29eb39c02628 100644 --- a/databases/mysql57-client/files/patch-support-files_CMakeLists.txt +++ b/databases/mysql57-client/files/patch-support-files_CMakeLists.txt @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2013-01-22 17:54:50.000000000 +0100 -+++ support-files/CMakeLists.txt 2013-02-13 11:13:32.000000000 +0100 -@@ -44,14 +44,17 @@ +--- support-files/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ support-files/CMakeLists.txt +@@ -44,14 +44,17 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() @@ -15,10 +15,10 @@ IF(UNIX) SET(prefix ${CMAKE_INSTALL_PREFIX}) +IF(FALSE) - FOREACH(script mysqld_multi.server mysql-log-rotate binary-configure) + FOREACH(script mysqld_multi.server mysql-log-rotate) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY ) -@@ -68,8 +71,10 @@ +@@ -68,8 +71,10 @@ IF(UNIX) IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() @@ -27,9 +27,9 @@ 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,3 +99,4 @@ + SET(bindir ${prefix}/${INSTALL_BINDIR}) +@@ -84,3 +89,4 @@ IF(UNIX) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() diff --git a/databases/mysql57-client/pkg-message b/databases/mysql57-client/pkg-message index 2cf54a1cf930..0e53a2bace9c 100644 --- a/databases/mysql57-client/pkg-message +++ b/databases/mysql57-client/pkg-message @@ -1,15 +1,6 @@ * * * * * * * * * * * * * * * * * * * * * * * * -Please be aware the database client is vulnerable -to CVE-2015-3152 - SSL Downgrade aka "BACKRONYM". -You may find more information at the following URL: - -http://www.vuxml.org/freebsd/36bd352d-299b-11e5-86ff-14dae9d210b8.html - -Although this database client is not listed as -"affected", it is vulnerable and will not be -receiving a patch. Please take note of this when -deploying this software. +This is the mysql CLIENT without the server. +for complete server and client, please install databases/mysql57-server * * * * * * * * * * * * * * * * * * * * * * * * - diff --git a/databases/mysql57-client/pkg-plist b/databases/mysql57-client/pkg-plist index d890a7d2a08f..c27500c1bf15 100644 --- a/databases/mysql57-client/pkg-plist +++ b/databases/mysql57-client/pkg-plist @@ -1,22 +1,18 @@ -bin/msql2mysql bin/mysql bin/mysql_config bin/mysql_config_editor -bin/mysql_find_rows -bin/mysql_waitpid -bin/mysqlaccess -bin/mysqlaccess.conf +bin/mysql_ssl_rsa_setup bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlimport +bin/mysqlpump bin/mysqlshow bin/mysqlslap include/mysql/big_endian.h include/mysql/byte_order_generic.h include/mysql/byte_order_generic_x86.h -include/mysql/byte_order_generic_x86_64.h include/mysql/decimal.h include/mysql/errmsg.h include/mysql/hash.h @@ -25,8 +21,8 @@ include/mysql/little_endian.h include/mysql/m_ctype.h include/mysql/m_string.h include/mysql/my_alloc.h -include/mysql/my_attribute.h include/mysql/my_byteorder.h +include/mysql/my_command.h include/mysql/my_compiler.h include/mysql/my_config.h include/mysql/my_dbug.h @@ -34,16 +30,19 @@ 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_thread.h +include/mysql/my_thread_local.h include/mysql/my_xml.h include/mysql/mysql.h include/mysql/mysql/client_authentication.h include/mysql/mysql/client_plugin.h include/mysql/mysql/client_plugin.h.pp +include/mysql/mysql/com_data.h include/mysql/mysql/get_password.h +include/mysql/mysql/group_replication_priv.h include/mysql/mysql/innodb_priv.h +include/mysql/mysql/mysql_lex_string.h include/mysql/mysql/plugin.h include/mysql/mysql/plugin_audit.h include/mysql/mysql/plugin_audit.h.pp @@ -52,23 +51,46 @@ include/mysql/mysql/plugin_auth.h.pp include/mysql/mysql/plugin_auth_common.h include/mysql/mysql/plugin_ftparser.h include/mysql/mysql/plugin_ftparser.h.pp +include/mysql/mysql/plugin_group_replication.h +include/mysql/mysql/plugin_trace.h include/mysql/mysql/plugin_validate_password.h include/mysql/mysql/psi/mysql_file.h include/mysql/mysql/psi/mysql_idle.h +include/mysql/mysql/psi/mysql_mdl.h +include/mysql/mysql/psi/mysql_memory.h +include/mysql/mysql/psi/mysql_ps.h include/mysql/mysql/psi/mysql_socket.h +include/mysql/mysql/psi/mysql_sp.h include/mysql/mysql/psi/mysql_stage.h include/mysql/mysql/psi/mysql_statement.h include/mysql/mysql/psi/mysql_table.h include/mysql/mysql/psi/mysql_thread.h +include/mysql/mysql/psi/mysql_transaction.h include/mysql/mysql/psi/psi.h +include/mysql/mysql/psi/psi_base.h +include/mysql/mysql/psi/psi_memory.h +include/mysql/mysql/service_command.h +include/mysql/mysql/service_locking.h include/mysql/mysql/service_my_plugin_log.h include/mysql/mysql/service_my_snprintf.h +include/mysql/mysql/service_mysql_alloc.h +include/mysql/mysql/service_mysql_password_policy.h include/mysql/mysql/service_mysql_string.h +include/mysql/mysql/service_parser.h +include/mysql/mysql/service_rpl_transaction_ctx.h +include/mysql/mysql/service_rpl_transaction_write_set.h +include/mysql/mysql/service_rules_table.h +include/mysql/mysql/service_security_context.h +include/mysql/mysql/service_srv_session.h +include/mysql/mysql/service_srv_session_info.h include/mysql/mysql/service_thd_alloc.h +include/mysql/mysql/service_thd_engine_lock.h include/mysql/mysql/service_thd_wait.h include/mysql/mysql/service_thread_scheduler.h include/mysql/mysql/services.h +include/mysql/mysql/services.h.pp include/mysql/mysql/thread_pool_priv.h +include/mysql/mysql/thread_type.h include/mysql/mysql_com.h include/mysql/mysql_com_server.h include/mysql/mysql_embed.h @@ -79,28 +101,26 @@ include/mysql/mysqld_error.h include/mysql/plugin.h include/mysql/plugin_audit.h include/mysql/plugin_ftparser.h +include/mysql/plugin_group_replication.h include/mysql/plugin_validate_password.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/thr_cond.h +include/mysql/thr_mutex.h +include/mysql/thr_rwlock.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 +lib/mysql/libmysqlclient.so.20 lib/mysql/libmysqlservices.a +libdata/pkgconfig/mysqlclient.pc man/man1/comp_err.1.gz -man/man1/msql2mysql.1.gz man/man1/mysql.1.gz man/man1/mysql_config.1.gz man/man1/mysql_config_editor.1.gz -man/man1/mysql_find_rows.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 diff --git a/databases/mysql57-server/Makefile b/databases/mysql57-server/Makefile index dcdf07062b95..8d891a3b7c0c 100644 --- a/databases/mysql57-server/Makefile +++ b/databases/mysql57-server/Makefile @@ -1,24 +1,36 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> +# Created by: "Mahdi Mokhtari <mokhi64@gmail.com>" # $FreeBSD$ -PORTNAME?= mysql -PORTVERSION= 5.6.27 -PORTREVISION?= 0 +PORTNAME= mysql +PORTVERSION= 5.7.10 +PORTREVISION= 1 CATEGORIES= databases ipv6 -MASTER_SITES= MYSQL/MySQL-5.6 -PKGNAMESUFFIX?= 56-server +MASTER_SITES= MYSQL/MySQL-5.7:MySQL SF/boost/boost/1.59.0:boost +PKGNAMESUFFIX?= 57-server +DISTFILES= ${DISTNAME}${EXTRACT_SUFX}:MySQL boost_1_59_0.tar.gz:boost -MAINTAINER= ale@FreeBSD.org -COMMENT?= Multithreaded SQL database (server) +MAINTAINER= mokhi64@gmail.com +COMMENT= Multithreaded SQL database (server) -SLAVEDIRS= databases/mysql56-client -USES= cmake shebangfix +LICENSE= GPLv2 + +SLAVEDIRS= databases/mysql57-client +USES= cmake:outsource shebangfix + +OPTIONS_RADIO= SSL +OPTIONS_RADIO_SSL= BUNDLED_SSL OPENSSL WITHOUT_SSL +OPTIONS_DEFAULT+= OPENSSL +NO_OPTIONS_SORT= yes + +BUNDLED_SSL_DESC= SSL/TLS support via (bundled) CyaSSL +WITHOUT_SSL_DESC= No SSL/TLS support CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ + -DINSTALL_PKGCONFIGDIR=${PREFIX}/libdata/pkgconfig \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ @@ -27,10 +39,10 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ - -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DWITH_EDITLINE=system \ - -DWITH_LIBWRAP=1 + -DLOCAL_BOOST_DIR=${WRKDIR}/boost_1_59_0 \ + -DBOOST_INCLUDE_DIR=${WRKDIR}/boost_1_59_0 \ + -DWITH_INNODB_EXTRA_DEBUG=0 SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -38,42 +50,78 @@ SHEBANG_FILES= scripts/*.pl* scripts/*.sh .error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif +BUNDLED_SSL_CMAKE_ON= -DWITH_SSL=bundled +OPENSSL_USE= OPENSSL=yes +WITHOUT_SSL_CMAKE_ON= -DWITH_SSL=no + # MySQL-Server part .if !defined(CLIENT_ONLY) USE_MYSQL= yes -WANT_MYSQL_VER= 56 +WANT_MYSQL_VER= 57 -USES+= perl5 +USES+= bison:build cpe perl5 USE_PERL5= run -CONFLICTS_INSTALL= mysql5[0-57-9]-server-* \ - mariadb*-server-* \ - percona*-server-* +CONFLICTS_INSTALL= mariadb[0-9]*-server-* \ + mysql[0-46-9][0-689]-server-* \ + percona[0-9]*-server-* USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql +USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin + MMAN1= my_print_defaults.1 myisam_ftdump.1 myisamchk.1 myisamlog.1 myisampack.1 \ mysql.server.1 mysql_convert_table_format.1 mysql_fix_extensions.1 \ mysql_install_db.1 mysql_plugin.1 mysql_secure_installation.1 mysql_setpermission.1 \ - mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ + mysql_tzinfo_to_sql.1 mysql_upgrade.1 mysql_zap.1 mysqlbug.1 \ mysqld_multi.1 mysqld_safe.1 mysqldumpslow.1 mysqlhotcopy.1 mysqlman.1 \ mysqltest.1 perror.1 replace.1 resolve_stack_dump.1 resolveip.1 CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" + +OPTIONS_GROUP= STORAGE +OPTIONS_GROUP_STORAGE= ARCHIVE BLACKHOLE EXAMPLE FEDERATED INNOBASE PARTITION PERFSCHEMA +STORAGE_DESC= Permissible "Storage Engines" (to compile statically into the server) +ARCHIVE_DESC= Compile "Archive Storage" statically in server +BLACKHOLE_DESC= Compile "Blackhole Storage" statically in server +EXAMPLE_DESC= Compile "Example Storage" statically in server +FEDERATED_DESC= Compile "Federated Storage" statically in server +INNOBASE_DESC= Compile "InnoDB Storage" statically in server +PARTITION_DESC= Compile "Partitioning support Storage" statically in server +PERFSCHEMA_DESC= Compile "Performance Schema Storage" statically in server + +ARCHIVE_CMAKE_ON= -DWITH_ARCHIVE_STORAGE_ENGINE=1 +BLACKHOLE_CMAKE_ON= -DWITH_BLACKHOLE_STORAGE_ENGINE=1 +EXAMPLE_CMAKE_ON= -DWITH_EXAMPLE_STORAGE_ENGINE=1 +FEDERATED_CMAKE_ON= -DWITH_FEDERATED_STORAGE_ENGINE=1 +INNOBASE_CMAKE_ON= -DWITH_INNOBASE_STORAGE_ENGINE=1 +PARTITION_CMAKE_ON= -DWITH_PARTITION_STORAGE_ENGINE=1 +PERFSCHEMA_CMAKE_ON= -DWITH_PERFSCHEMA_STORAGE_ENGINE=1 + .else -USES+= libedit +USES+= readline .endif -post-patch: - @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt - .include <bsd.port.pre.mk> -.if ${ARCH} == "armv6" -EXTRA_PATCHES+= ${FILESDIR}/extra-patch-config.h.cmake +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1000000 +CC= clang +CXX= clang++ +CPP= clang-cpp +OPENSSL_CMAKE_ON= -DWITH_SSL=system +.elif ${OSVERSION} >= 1000000 +OPENSSL_CMAKE_ON= -DWITH_SSL=yes .endif +USE_CLANG= 3.3+ + +post-extract: + ${RM} -rvf ${WRKSRC}/sql/sql_hints.yy.cc ${WRKSRC}/sql/sql_hints.yy.h + +post-patch: + @${REINPLACE_CMD} 's/*.1/${MMAN1}/' ${WRKSRC}/man/CMakeLists.txt + .include <bsd.port.post.mk> diff --git a/databases/mysql57-server/distinfo b/databases/mysql57-server/distinfo index 1e5ae0a617d4..4bbc0e948069 100644 --- a/databases/mysql57-server/distinfo +++ b/databases/mysql57-server/distinfo @@ -1,2 +1,4 @@ -SHA256 (mysql-5.6.27.tar.gz) = 8356bba23f3f6c0c2d4806110c41d1c4d6a4b9c50825e11c5be4bbee2b20b71d -SIZE (mysql-5.6.27.tar.gz) = 33327156 +SHA256 (mysql-5.7.10.tar.gz) = 1ea1644884d086a23eafd8ccb04d517fbd43da3a6a06036f23c5c3a111e25c74 +SIZE (mysql-5.7.10.tar.gz) = 48919371 +SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac +SIZE (boost_1_59_0.tar.gz) = 83709983 diff --git a/databases/mysql57-server/files/mysql-server.in b/databases/mysql57-server/files/mysql-server.in index b5015e5505f3..037310374cb1 100644 --- a/databases/mysql57-server/files/mysql-server.in +++ b/databases/mysql57-server/files/mysql-server.in @@ -46,7 +46,7 @@ procname="%%PREFIX%%/libexec/mysqld" start_precmd="${name}_prestart" start_postcmd="${name}_poststart" mysql_install_db="%%PREFIX%%/bin/mysql_install_db" -mysql_install_db_args="--basedir=%%PREFIX%% --defaults-extra-file=${mysql_optfile} --datadir=${mysql_dbdir} --force" +mysql_install_db_args="--defaults-extra-file=${mysql_optfile} --basedir=%%PREFIX%% --datadir=${mysql_dbdir} --mysqld-file=${procname}" mysql_create_auth_tables() { diff --git a/databases/mysql57-server/files/patch-CMakeLists.txt b/databases/mysql57-server/files/patch-CMakeLists.txt index 6fcde7d4b214..ad3a6a0d9bf4 100644 --- a/databases/mysql57-server/files/patch-CMakeLists.txt +++ b/databases/mysql57-server/files/patch-CMakeLists.txt @@ -1,10 +1,10 @@ ---- CMakeLists.txt.orig 2014-07-18 15:48:39.000000000 +0000 -+++ CMakeLists.txt 2014-08-04 14:18:38.795491147 +0000 -@@ -500,12 +500,10 @@ +--- CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ CMakeLists.txt +@@ -577,12 +577,10 @@ IF(UNIX) ENDIF() IF(NOT WITHOUT_SERVER) -- ADD_SUBDIRECTORY(tests) +- ADD_SUBDIRECTORY(testclients) ADD_SUBDIRECTORY(sql) OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF) IF(WITH_EMBEDDED_SERVER) @@ -13,18 +13,16 @@ ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -514,10 +512,7 @@ +@@ -591,8 +589,6 @@ ENDIF() ADD_SUBDIRECTORY(scripts) IF(NOT WITHOUT_SERVER) - ADD_SUBDIRECTORY(mysql-test) - ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess) ADD_SUBDIRECTORY(support-files) -- ADD_SUBDIRECTORY(sql-bench) IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt) ADD_SUBDIRECTORY(internal) - ENDIF() -@@ -572,6 +567,7 @@ +@@ -647,6 +643,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # @@ -32,10 +30,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -597,5 +593,6 @@ +@@ -673,6 +670,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + diff --git a/databases/mysql57-server/files/patch-client_CMakeLists.txt b/databases/mysql57-server/files/patch-client_CMakeLists.txt index 3acc651e0544..e8f06254e2ca 100644 --- a/databases/mysql57-server/files/patch-client_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-client_CMakeLists.txt @@ -1,37 +1,38 @@ ---- client/CMakeLists.txt.orig 2013-05-21 17:18:39.000000000 +0200 -+++ client/CMakeLists.txt 2013-06-10 15:43:33.000000000 +0200 -@@ -31,17 +31,20 @@ +--- client/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ client/CMakeLists.txt +@@ -38,8 +38,6 @@ ADD_DEFINITIONS( + + ## Subdirectory with common client code. + ADD_SUBDIRECTORY(base) +-## Subdirectory for mysqlpump code. +-ADD_SUBDIRECTORY(dump) + + ## We will need libeay32.dll and ssleay32.dll when running client executables. COPY_OPENSSL_DLLS(copy_openssl_client) +@@ -115,11 +113,13 @@ IF(CMAKE_USE_PTHREADS_INIT AND CMAKE_C_F + ENDIF() ADD_DEFINITIONS(${SSL_DEFINES}) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc sql_string.cc) + MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc ../sql-common/sql_string.cc) TARGET_LINK_LIBRARIES(mysql mysqlclient) IF(UNIX) TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) ENDIF(UNIX) +ENDIF() - MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test) - SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS") - TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex) - + IF(NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysql_upgrade +@@ -139,6 +139,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli + ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) + TARGET_LINK_LIBRARIES(mysqlcheck_core mysqlclient) +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) - TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient) + MYSQL_ADD_EXECUTABLE(mysqlcheck check/mysqlcheck.cc) + TARGET_LINK_LIBRARIES(mysqlcheck mysqlcheck_core) -@@ -50,17 +53,21 @@ +@@ -151,10 +152,12 @@ TARGET_LINK_LIBRARIES(mysqlimport mysqlc - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport mysqlclient) -+ENDIF() - - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) - TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient) - ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs) - -+IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow mysqlclient) +ENDIF() @@ -41,20 +42,32 @@ +IF(FALSE) MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) - TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient) - -@@ -73,6 +80,7 @@ + ADD_COMPILE_FLAGS( + mysqlbinlog.cc +@@ -171,6 +174,7 @@ TARGET_LINK_LIBRARIES(mysqlslap mysqlcli MYSQL_ADD_EXECUTABLE(mysql_config_editor mysql_config_editor.cc) TARGET_LINK_LIBRARIES(mysql_config_editor mysqlclient) +ENDIF() + MYSQL_ADD_EXECUTABLE(mysql_secure_installation mysql_secure_installation.cc) + TARGET_LINK_LIBRARIES(mysql_secure_installation mysqlclient) +@@ -186,9 +190,11 @@ IF(UNIX AND NOT WITHOUT_SERVER) + ADD_DEPENDENCIES(mysql_install_db GenBootstrapPriv GenSysSchema) + ENDIF() + ++IF(FALSE) + MYSQL_ADD_EXECUTABLE(mysql_ssl_rsa_setup mysql_ssl_rsa_setup.cc path.cc logger.cc) + TARGET_LINK_LIBRARIES(mysql_ssl_rsa_setup mysys mysys_ssl) + SET_TARGET_PROPERTIES(mysql_ssl_rsa_setup PROPERTIES LINKER_LANGUAGE CXX) ++ENDIF() + # "WIN32" also covers 64 bit. "echo" is used in some files below "mysql-test/". IF(WIN32) -@@ -82,11 +90,6 @@ +@@ -197,11 +203,6 @@ ENDIF(WIN32) + SET_TARGET_PROPERTIES ( - mysql_plugin - mysql_upgrade + mysql_plugin - mysqlcheck - mysqldump - mysqlimport diff --git a/databases/mysql57-server/files/patch-cmake_plugin.cmake b/databases/mysql57-server/files/patch-cmake_plugin.cmake index c151ea35f4ee..c4e468ce5452 100644 --- a/databases/mysql57-server/files/patch-cmake_plugin.cmake +++ b/databases/mysql57-server/files/patch-cmake_plugin.cmake @@ -1,10 +1,12 @@ ---- cmake/plugin.cmake.orig 2011-09-09 17:56:39.000000000 +0200 -+++ cmake/plugin.cmake 2011-10-07 10:56:37.000000000 +0200 -@@ -195,7 +195,6 @@ - OUTPUT_NAME "${ARG_MODULE_OUTPUT_NAME}") - # Install dynamic library - MYSQL_INSTALL_TARGETS(${target} DESTINATION ${INSTALL_PLUGINDIR} COMPONENT Server) -- INSTALL_DEBUG_TARGET(${target} DESTINATION ${INSTALL_PLUGINDIR}/debug) +--- cmake/plugin.cmake.orig 2015-11-29 19:16:24 UTC ++++ cmake/plugin.cmake +@@ -236,9 +236,6 @@ MACRO(MYSQL_ADD_PLUGIN) + MYSQL_INSTALL_TARGETS(${target} + DESTINATION ${INSTALL_PLUGINDIR} + COMPONENT ${INSTALL_COMPONENT}) +- INSTALL_DEBUG_TARGET(${target} +- DESTINATION ${INSTALL_PLUGINDIR}/debug +- COMPONENT ${INSTALL_COMPONENT}) # Add installed files to list for RPMs FILE(APPEND ${CMAKE_BINARY_DIR}/support-files/plugins.files "%attr(755, root, root) %{_prefix}/${INSTALL_PLUGINDIR}/${ARG_MODULE_OUTPUT_NAME}.so\n" diff --git a/databases/mysql57-server/files/patch-include_CMakeLists.txt b/databases/mysql57-server/files/patch-include_CMakeLists.txt index 5d5e96a0f1d7..6bb0dfd10172 100644 --- a/databases/mysql57-server/files/patch-include_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-include_CMakeLists.txt @@ -1,9 +1,9 @@ ---- include/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 -+++ include/CMakeLists.txt 2013-02-13 14:53:40.000000000 +0100 -@@ -65,10 +65,12 @@ - ${HEADERS_GEN_CONFIGURE} +--- include/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ include/CMakeLists.txt +@@ -69,10 +69,12 @@ SET(HEADERS ) + INSTALL(FILES ../libbinlogevents/export/binary_log_types.h DESTINATION ${INSTALL_INCLUDEDIR}) +IF(FALSE) INSTALL(FILES ${HEADERS} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development) INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR}/mysql COMPONENT Development diff --git a/databases/mysql57-server/files/patch-include_myisam.h b/databases/mysql57-server/files/patch-include_myisam.h index 450645400dd5..7a9ab13220ea 100644 --- a/databases/mysql57-server/files/patch-include_myisam.h +++ b/databases/mysql57-server/files/patch-include_myisam.h @@ -1,6 +1,6 @@ ---- include/myisam.h.orig 2009-02-16 23:04:54.000000000 +0100 -+++ include/myisam.h 2009-02-16 23:10:08.000000000 +0100 -@@ -48,7 +48,7 @@ +--- include/myisam.h.orig 2015-11-29 19:16:24 UTC ++++ include/myisam.h +@@ -45,7 +45,7 @@ extern "C" { The following defines can be increased if necessary. But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and MI_MAX_KEY_LENGTH. */ diff --git a/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt b/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt index 1f9b8282e5d3..9a503132172a 100644 --- a/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-libmysql_CMakeLists.txt @@ -1,6 +1,6 @@ ---- libmysql/CMakeLists.txt.orig 2013-07-10 18:17:29.000000000 +0200 -+++ libmysql/CMakeLists.txt 2013-08-12 08:59:49.000000000 +0200 -@@ -173,7 +173,7 @@ +--- libmysql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ libmysql/CMakeLists.txt +@@ -215,7 +215,7 @@ IF(WIN32) ENDIF() # Merge several convenience libraries into one big mysqlclient @@ -9,33 +9,21 @@ # Visual Studio users need debug static library for debug projects IF(MSVC) -@@ -200,19 +200,22 @@ - ENDMACRO() - ENDIF() - -+IF(FALSE) - IF(UNIX) - GET_TARGET_NAME(mysqlclient lib_name) - INSTALL_SYMLINK(mysqlclient - ${lib_name} ${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a - ${INSTALL_LIBDIR} Development) - ENDIF() -+ENDIF() - - IF(NOT DISABLE_SHARED) - # Merge several convenience libraries into one big mysqlclient +@@ -257,7 +257,8 @@ IF(NOT DISABLE_SHARED) # and link them together into shared library. MERGE_LIBRARIES(libmysql SHARED ${LIBS} - EXPORTS ${CLIENT_API_FUNCTIONS} + EXPORTS ${CLIENT_API_FUNCTIONS} ${CLIENT_API_FUNCTIONS_UNDOCUMENTED} - COMPONENT SharedLibraries) + COMPONENT SharedLibraries NOINSTALL) -+ IF(FALSE) ++IF(FALSE) IF(UNIX) # libtool compatability IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE) -@@ -271,4 +274,5 @@ - ${INSTALL_LIBDIR} SharedLibraries) - ENDFOREACH() - ENDIF() +@@ -313,6 +314,7 @@ ENDIF() + # to initialize api_calls[] array in api_test.c + # + SET(CLIENT_API_FUNCTION_LIST "") + ENDIF() - ENDIF() + FOREACH(api ${CLIENT_API_FUNCTIONS}) + SET(CLIENT_API_FUNCTION_LIST "${CLIENT_API_FUNCTION_LIST} ${api},") + ENDFOREACH() diff --git a/databases/mysql57-server/files/patch-libservices_CMakeLists.txt b/databases/mysql57-server/files/patch-libservices_CMakeLists.txt index fcbcea7aed21..23471c512116 100644 --- a/databases/mysql57-server/files/patch-libservices_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-libservices_CMakeLists.txt @@ -1,9 +1,9 @@ ---- libservices/CMakeLists.txt.orig 2010-12-23 17:13:03.000000000 +0100 -+++ libservices/CMakeLists.txt 2010-12-23 17:13:17.000000000 +0100 -@@ -22,4 +22,6 @@ - my_thread_scheduler_service.c) +--- libservices/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ libservices/CMakeLists.txt +@@ -34,4 +34,6 @@ SET(MYSQLSERVICES_SOURCES + security_context_service.c) - ADD_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) + ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES}) +IF(FALSE) INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development) +ENDIF() diff --git a/databases/mysql57-server/files/patch-man_CMakeLists.txt b/databases/mysql57-server/files/patch-man_CMakeLists.txt index 7849c77af111..b771ae6214f0 100644 --- a/databases/mysql57-server/files/patch-man_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-man_CMakeLists.txt @@ -1,5 +1,5 @@ ---- man/CMakeLists.txt.orig 2011-10-22 14:36:06.000000000 +0200 -+++ man/CMakeLists.txt 2011-10-22 14:36:23.000000000 +0200 +--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ man/CMakeLists.txt @@ -15,8 +15,6 @@ # Copy man pages diff --git a/databases/mysql57-server/files/patch-scripts_CMakeLists.txt b/databases/mysql57-server/files/patch-scripts_CMakeLists.txt index ef7b3a1b506b..8e7b3fdf37dd 100644 --- a/databases/mysql57-server/files/patch-scripts_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-scripts_CMakeLists.txt @@ -1,6 +1,6 @@ ---- scripts/CMakeLists.txt.orig 2013-01-22 17:54:49.000000000 +0100 -+++ scripts/CMakeLists.txt 2013-02-13 14:39:57.000000000 +0100 -@@ -264,6 +264,8 @@ +--- scripts/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ scripts/CMakeLists.txt +@@ -347,6 +347,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var) GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE) STRING(REGEX REPLACE "^lib" "" lib "${lib}") SET(${var} "${${var}}-l${lib} " ) @@ -9,23 +9,23 @@ ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -314,15 +316,10 @@ +@@ -430,14 +432,13 @@ ELSE() # On Unix, most of the files end up in the bin directory SET(mysql_config_COMPONENT COMPONENT Development) - SET(BIN_SCRIPTS -- msql2mysql -- mysql_config - mysql_fix_extensions - mysql_setpermission - mysql_zap -- mysqlaccess -- mysqlaccess.conf - mysql_convert_table_format -- mysql_find_rows - mysqlhotcopy - mysqldumpslow - mysqld_multi -@@ -331,7 +328,7 @@ + ++ + IF(WITH_SYSTEMD) + SET(BIN_SCRIPTS +- mysql_config + mysqldumpslow + ) + ELSE() + SET(BIN_SCRIPTS +- mysql_config + mysqldumpslow + mysqld_multi + mysqld_safe +@@ -471,7 +472,7 @@ ELSE() FOREACH(file ${BIN_SCRIPTS}) IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh) CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh diff --git a/databases/mysql57-server/files/patch-sql_CMakeLists.txt b/databases/mysql57-server/files/patch-sql_CMakeLists.txt index 2eeb4edfd51c..e72f6719ed0e 100644 --- a/databases/mysql57-server/files/patch-sql_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-sql_CMakeLists.txt @@ -1,18 +1,11 @@ ---- sql/CMakeLists.txt.orig 2013-04-05 14:27:18.000000000 +0200 -+++ sql/CMakeLists.txt 2013-04-19 15:08:12.000000000 +0200 -@@ -423,6 +423,7 @@ +--- sql/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ sql/CMakeLists.txt +@@ -24,6 +24,8 @@ INCLUDE_DIRECTORIES( + ${ZLIB_INCLUDE_DIR} + ${SSL_INCLUDE_DIRS} + ${CMAKE_BINARY_DIR}/sql ++ ${CMAKE_BINARY_DIR}/include ++ ${CMAKE_BINARY_DIR} + ) - IF(INSTALL_LAYOUT STREQUAL "STANDALONE") - -+IF(FALSE) - # Copy db.opt into data/test/ - SET(DBOPT_FILE ${CMAKE_CURRENT_SOURCE_DIR}/db.opt ) - INSTALL(FILES ${DBOPT_FILE} DESTINATION data/test COMPONENT DataFiles) -@@ -467,6 +468,7 @@ - INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles) - ENDIF() - ENDIF() -+ENDIF() - - ADD_CUSTOM_TARGET(show-dist-name - COMMAND ${CMAKE_COMMAND} -E echo "${CPACK_PACKAGE_FILE_NAME}" + SET(CONF_SOURCES diff --git a/databases/mysql57-server/files/patch-support-files_CMakeLists.txt b/databases/mysql57-server/files/patch-support-files_CMakeLists.txt index 159e1fa71ba2..f429986920cc 100644 --- a/databases/mysql57-server/files/patch-support-files_CMakeLists.txt +++ b/databases/mysql57-server/files/patch-support-files_CMakeLists.txt @@ -1,6 +1,6 @@ ---- support-files/CMakeLists.txt.orig 2010-12-23 17:38:19.000000000 +0100 -+++ support-files/CMakeLists.txt 2010-12-23 17:41:11.000000000 +0100 -@@ -74,7 +74,9 @@ +--- support-files/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ support-files/CMakeLists.txt +@@ -69,7 +69,9 @@ IF(UNIX) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) ENDIF() @@ -8,5 +8,5 @@ INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development) +ENDIF() 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) - CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY) + + SET(bindir ${prefix}/${INSTALL_BINDIR}) diff --git a/databases/mysql57-server/pkg-plist b/databases/mysql57-server/pkg-plist index c013a15e16fe..0f57789bb2b5 100644 --- a/databases/mysql57-server/pkg-plist +++ b/databases/mysql57-server/pkg-plist @@ -1,42 +1,68 @@ bin/innochecksum +bin/lz4_decompress bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack -bin/mysql_convert_table_format -bin/mysql_fix_extensions bin/mysql_install_db bin/mysql_plugin bin/mysql_secure_installation -bin/mysql_setpermission bin/mysql_tzinfo_to_sql bin/mysql_upgrade -bin/mysql_zap -bin/mysqlbug bin/mysqld_multi bin/mysqld_safe bin/mysqldumpslow -bin/mysqlhotcopy bin/mysqltest bin/perror bin/replace bin/resolve_stack_dump bin/resolveip +bin/zlib_decompress +include/mysql/binary_log_types.h lib/mysql/libmysqld.a lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/daemon_example.ini +lib/mysql/plugin/ha_example.so lib/mysql/plugin/libdaemon_example.so +lib/mysql/plugin/libtest_framework.so +lib/mysql/plugin/libtest_services.so +lib/mysql/plugin/libtest_services_threaded.so +lib/mysql/plugin/libtest_session_detach.so +lib/mysql/plugin/libtest_session_in_thd.so +lib/mysql/plugin/libtest_session_info.so +lib/mysql/plugin/libtest_sql_2_sessions.so +lib/mysql/plugin/libtest_sql_all_col_types.so +lib/mysql/plugin/libtest_sql_cmds_1.so +lib/mysql/plugin/libtest_sql_commit.so +lib/mysql/plugin/libtest_sql_complex.so +lib/mysql/plugin/libtest_sql_errors.so +lib/mysql/plugin/libtest_sql_lock.so +lib/mysql/plugin/libtest_sql_processlist.so +lib/mysql/plugin/libtest_sql_replication.so +lib/mysql/plugin/libtest_sql_shutdown.so +lib/mysql/plugin/libtest_sql_sqlmode.so +lib/mysql/plugin/libtest_sql_stored_procedures_functions.so +lib/mysql/plugin/libtest_sql_views_triggers.so +lib/mysql/plugin/libtest_x_sessions_deinit.so +lib/mysql/plugin/libtest_x_sessions_init.so +lib/mysql/plugin/locking_service.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/mysql_no_login.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so +lib/mysql/plugin/replication_observers_example_plugin.so +lib/mysql/plugin/rewrite_example.so +lib/mysql/plugin/rewriter.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so +lib/mysql/plugin/test_security_context.so lib/mysql/plugin/validate_password.so +lib/mysql/plugin/version_token.so +libdata/pkgconfig/LIBMYSQL_OS_OUTPUT_NAME-NOTFOUND.pc libexec/mysqld man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz @@ -44,20 +70,14 @@ man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz -man/man1/mysql_convert_table_format.1.gz -man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_plugin.1.gz man/man1/mysql_secure_installation.1.gz -man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz -man/man1/mysql_zap.1.gz -man/man1/mysqlbug.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqldumpslow.1.gz -man/man1/mysqlhotcopy.1.gz man/man1/mysqlman.1.gz man/man1/mysqltest.1.gz man/man1/perror.1.gz @@ -65,7 +85,6 @@ man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz man/man8/mysqld.8.gz -%%DATADIR%%/binary-configure %%DATADIR%%/bulgarian/errmsg.sys %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README @@ -106,6 +125,7 @@ man/man8/mysqld.8.gz %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/innodb_memcached_config.sql +%%DATADIR%%/install_rewriter.sql %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys @@ -114,6 +134,7 @@ man/man8/mysqld.8.gz %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_security_commands.sql +%%DATADIR%%/mysql_sys_schema.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql @@ -129,3 +150,4 @@ man/man8/mysqld.8.gz %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys +%%DATADIR%%/uninstall_rewriter.sql |