Date: Tue, 10 Jan 2017 18:54:33 +0000 (UTC) From: Mark Felder <feld@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r431126 - in head: Mk Mk/Uses databases databases/percona57-client databases/percona57-client/files databases/percona57-pam-for-mysql databases/percona57-server databases/percona57-serv... Message-ID: <201701101854.v0AIsXiQ027837@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: feld Date: Tue Jan 10 18:54:32 2017 New Revision: 431126 URL: https://svnweb.freebsd.org/changeset/ports/431126 Log: Welcome Percona 5.7 ports to the tree - client and server version 5.7.16-10 - pam-for-mysql: compatible with newer MySQL API (MySQL 5.7+) Thanks to all who have worked on Percona, MariaDB, and MySQL ports. Your tireless efforts have been instrumental in making this port happen. Differential Revision: https://reviews.freebsd.org/D8785 Added: head/databases/percona57-client/ - copied from r431097, head/databases/percona56-client/ head/databases/percona57-client/files/patch-include_CMakeLists.txt (contents, props changed) head/databases/percona57-client/files/patch-include_my__compare.h (contents, props changed) head/databases/percona57-client/files/patch-mysys__ssl_my__default.cc (contents, props changed) head/databases/percona57-pam-for-mysql/ - copied from r431097, head/databases/percona-pam-for-mysql/ head/databases/percona57-server/ - copied from r431097, head/databases/percona56-server/ head/databases/percona57-server/files/patch-include_my__compare.h (contents, props changed) head/databases/percona57-server/files/patch-mysys__ssl_my__default.cc (contents, props changed) head/databases/percona57-server/files/patch-sql_json__dom.h - copied unchanged from r431097, head/databases/mysql80-server/files/patch-sql_json__dom.h head/databases/percona57-server/files/patch-sql_sql__view.cc (contents, props changed) head/databases/percona57-server/files/patch-sql_sys__vars.cc - copied, changed from r431097, head/databases/mysql80-server/files/patch-sql_sys__vars.cc head/databases/percona57-server/files/patch-storage_innobase_buf_buf0buf.cc - copied, changed from r431097, head/databases/mysql80-server/files/patch-storage_innobase_buf_buf0buf.cc head/databases/percona57-server/files/patch-storage_innobase_dict_dict0stats.cc - copied, changed from r431097, head/databases/mysql80-server/files/patch-storage_innobase_dict_dict0stats.cc head/databases/percona57-server/files/patch-storage_innobase_include_srv0mon.h - copied, changed from r431097, head/databases/mysql80-server/files/patch-storage_innobase_include_srv0mon.h head/databases/percona57-server/files/patch-storage_innobase_sync_sync0debug.cc - copied, changed from r431097, head/databases/mysql80-server/files/patch-storage_innobase_sync_sync0debug.cc head/databases/percona57-server/files/patch-storage_myisam_mi__dynrec.c - copied, changed from r431097, head/databases/mysql80-server/files/patch-storage_myisam_mi__dynrec.c Deleted: head/databases/percona57-client/files/patch-include_my_compare.h head/databases/percona57-client/files/patch-mysys__posix_timers.c head/databases/percona57-client/files/patch-mysys_ssl_my_default.cc head/databases/percona57-client/pkg-message head/databases/percona57-server/files/patch-cmake_plugin.cmake head/databases/percona57-server/files/patch-extra_CMakeLists.txt head/databases/percona57-server/files/patch-include_my_compare.h head/databases/percona57-server/files/patch-mysys__posix_timers.c head/databases/percona57-server/files/patch-mysys_ssl_my_default.cc head/databases/percona57-server/files/patch-plugin_password_validation_validate_password.cc head/databases/percona57-server/files/patch-scripts_mysqld_safe.sh head/databases/percona57-server/files/patch-sql_CMakeLists.txt head/databases/percona57-server/files/patch-sql_sql_trigger.cc head/databases/percona57-server/files/patch-sql_sql_view.cc head/databases/percona57-server/files/patch-sql_sys_vars.cc Modified: head/Mk/Uses/mysql.mk head/Mk/bsd.default-versions.mk head/databases/Makefile head/databases/percona57-client/Makefile head/databases/percona57-client/files/patch-CMakeLists.txt head/databases/percona57-client/files/patch-client_CMakeLists.txt head/databases/percona57-client/files/patch-client__mysql.cc head/databases/percona57-client/files/patch-extra_CMakeLists.txt head/databases/percona57-client/files/patch-include_myisam.h head/databases/percona57-client/files/patch-man_CMakeLists.txt head/databases/percona57-client/files/patch-scripts_CMakeLists.txt head/databases/percona57-client/files/patch-support-files_CMakeLists.txt head/databases/percona57-client/files/patch-vio_viosocket.c head/databases/percona57-client/pkg-plist head/databases/percona57-pam-for-mysql/Makefile head/databases/percona57-pam-for-mysql/pkg-message head/databases/percona57-pam-for-mysql/pkg-plist head/databases/percona57-server/Makefile head/databases/percona57-server/distinfo head/databases/percona57-server/files/patch-CMakeLists.txt head/databases/percona57-server/files/patch-client_CMakeLists.txt head/databases/percona57-server/files/patch-include_CMakeLists.txt head/databases/percona57-server/files/patch-include_myisam.h head/databases/percona57-server/files/patch-libmysql_CMakeLists.txt head/databases/percona57-server/files/patch-libservices_CMakeLists.txt head/databases/percona57-server/files/patch-man_CMakeLists.txt head/databases/percona57-server/files/patch-scripts_CMakeLists.txt head/databases/percona57-server/files/patch-sql_mysqld.cc head/databases/percona57-server/files/patch-support-files_CMakeLists.txt head/databases/percona57-server/files/patch-vio_viosocket.c head/databases/percona57-server/pkg-plist Modified: head/Mk/Uses/mysql.mk ============================================================================== --- head/Mk/Uses/mysql.mk Tue Jan 10 18:52:13 2017 (r431125) +++ head/Mk/Uses/mysql.mk Tue Jan 10 18:54:32 2017 (r431126) @@ -65,6 +65,7 @@ MYSQL55p_LIBVER= 18 MYSQL56_LIBVER= 18 MYSQL56p_LIBVER= 18 MYSQL57_LIBVER= 20 +MYSQL57p_LIBVER= 20 MYSQL80_LIBVER= 21 MYSQL100m_LIBVER= 18 MYSQL101m_LIBVER= 18 Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Tue Jan 10 18:52:13 2017 (r431125) +++ head/Mk/bsd.default-versions.mk Tue Jan 10 18:54:32 2017 (r431126) @@ -49,7 +49,7 @@ WARNING+= "OVERRIDE_LINUX_BASE_PORT is .endif # Possible values: 5.1, 5.2, 5.3 LUA_DEFAULT?= 5.2 -# Possible values: 5.1, 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p +# Possible values: 5.1, 5.5, 5.6, 5.7, 8.0, 5.5m, 10.0m, 10.1m, 5.5p, 5.6p, 5.7p MYSQL_DEFAULT?= 5.6 # Possible values: 5.20, 5.22, devel .if !exists(${LOCALBASE}/bin/perl) || (!defined(_PORTS_ENV_CHECK) && \ Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Tue Jan 10 18:52:13 2017 (r431125) +++ head/databases/Makefile Tue Jan 10 18:54:32 2017 (r431126) @@ -557,6 +557,9 @@ SUBDIR += percona55-server SUBDIR += percona56-client SUBDIR += percona56-server + SUBDIR += percona57-client + SUBDIR += percona57-pam-for-mysql + SUBDIR += percona57-server SUBDIR += pg_activity SUBDIR += pg_citus SUBDIR += pg_qualstats Modified: head/databases/percona57-client/Makefile ============================================================================== --- head/databases/percona56-client/Makefile Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/Makefile Tue Jan 10 18:54:32 2017 (r431126) @@ -1,12 +1,14 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> +# Created by: Mark Felder <feld@FreeBSD.org> # $FreeBSD$ PORTNAME= percona -PKGNAMESUFFIX= 56-client +PKGNAMESUFFIX= 57-client COMMENT= Multithreaded SQL database (client) -MASTERDIR= ${.CURDIR}/../percona56-server +LICENSE= GPLv2+ + +MASTERDIR= ${.CURDIR}/../percona57-server OPTIONS_EXCLUDE=TOKUDB @@ -16,14 +18,14 @@ PLIST= ${.CURDIR}/pkg-plist CONFLICTS_INSTALL= mysql*-client-* \ mariadb*-client-* \ - percona5[0-57-9]-client-* + percona5[0-68-9]-client-* CMAKE_ARGS+= -DWITHOUT_SERVER=1 USE_LDCONFIG= ${PREFIX}/lib/mysql -MANPAGES= comp_err.1 msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \ - mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \ +MANPAGES= comp_err.1 mysql.1 mysql_config.1 mysql_config_editor.1 \ + mysql_waitpid.1 mysqladmin.1 mysqlbinlog.1 \ mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1 CLIENT_ONLY= yes @@ -32,8 +34,9 @@ CLIENT_ONLY= yes # to prevent breaking installed ports. post-install: ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so - ${LN} -s libperconaserverclient.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.18 - ${LN} -s libperconaserverclient_r.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so - ${LN} -s libperconaserverclient_r.so.18 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.18 + ${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient.so.20 + ${LN} -s libperconaserverclient.a ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.a + ${LN} -s libperconaserverclient.so ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so + ${LN} -s libperconaserverclient.so.20 ${STAGEDIR}${PREFIX}/lib/mysql/libmysqlclient_r.so.20 .include "${MASTERDIR}/Makefile" Modified: head/databases/percona57-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/percona56-client/files/patch-CMakeLists.txt Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/files/patch-CMakeLists.txt Tue Jan 10 18:54:32 2017 (r431126) @@ -1,6 +1,6 @@ ---- CMakeLists.txt 2015-09-14 17:49:16.000000000 +0200 -+++ CMakeLists.txt.new 2015-09-16 09:04:18.149047561 +0200 -@@ -471,41 +471,17 @@ +--- CMakeLists.txt.orig 2016-11-27 19:44:54 UTC ++++ CMakeLists.txt +@@ -613,8 +613,8 @@ ENDIF() ADD_SUBDIRECTORY(extra) ADD_SUBDIRECTORY(client) @@ -10,49 +10,12 @@ IF(UNIX) ADD_SUBDIRECTORY(man) - ENDIF() - --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) --ENDIF() -- - # scripts/mysql_config depends on client and server targets loaded above. - # It is referenced by some of the directories below, so we insert it here. - 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() -- ADD_SUBDIRECTORY(packaging/rpm-oel) -- ADD_SUBDIRECTORY(packaging/rpm-fedora) -- ADD_SUBDIRECTORY(packaging/rpm-sles) -- ADD_SUBDIRECTORY(packaging/rpm-docker) --ENDIF() -- - INCLUDE(cmake/abi_check.cmake) - INCLUDE(cmake/tags.cmake) - -@@ -542,18 +518,17 @@ +@@ -684,14 +684,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() @@ -63,10 +26,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -579,6 +554,7 @@ +@@ -714,6 +713,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + Modified: head/databases/percona57-client/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/percona56-client/files/patch-client_CMakeLists.txt Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/files/patch-client_CMakeLists.txt Tue Jan 10 18:54:32 2017 (r431126) @@ -1,27 +1,28 @@ ---- client/CMakeLists.txt.orig 2014-03-15 18:08:38.000000000 +0100 -+++ client/CMakeLists.txt 2014-03-22 19:41:40.272474641 +0100 -@@ -37,9 +37,11 @@ - TARGET_LINK_LIBRARIES(mysql ${EDITLINE_LIBRARY}) +--- client/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC ++++ client/CMakeLists.txt +@@ -47,6 +47,7 @@ IF(UNIX) + TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_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 perconaserverclient regex) + IF(NOT WITHOUT_SERVER) + MYSQL_ADD_EXECUTABLE(mysql_upgrade + upgrade/program.cc +@@ -57,10 +58,13 @@ ADD_COMPILE_FLAGS( + TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient client_base mysqlcheck_core) + ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs GenSysSchema) + ENDIF() +ENDIF() - - MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c) -@@ -51,15 +53,19 @@ - MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c) - TARGET_LINK_LIBRARIES(mysqlimport perconaserverclient) - +IF(FALSE) - MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c) - TARGET_LINK_LIBRARIES(mysql_upgrade perconaserverclient) - 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 perconaserverclient regex) +ENDIF() + ADD_CONVENIENCE_LIBRARY(mysqlcheck_core check/mysqlcheck_core.cc) + TARGET_LINK_LIBRARIES(mysqlcheck_core perconaserverclient) +@@ -78,8 +82,10 @@ TARGET_LINK_LIBRARIES(mysqlimport percon MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c) TARGET_LINK_LIBRARIES(mysqlshow perconaserverclient) @@ -30,14 +31,13 @@ TARGET_LINK_LIBRARIES(mysql_plugin perconaserverclient) +ENDIF() - MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc sql_string.cc - ../sql/rpl_filter.cc ../sql/sql_list.cc) -@@ -81,8 +87,6 @@ + MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc) + ADD_COMPILE_FLAGS( +@@ -122,7 +128,6 @@ IF(WIN32) ENDIF(WIN32) SET_TARGET_PROPERTIES ( -- mysql_plugin -- mysql_upgrade +- mysql_plugin mysqlcheck mysqldump mysqlimport Modified: head/databases/percona57-client/files/patch-client__mysql.cc ============================================================================== --- head/databases/percona56-client/files/patch-client__mysql.cc Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/files/patch-client__mysql.cc Tue Jan 10 18:54:32 2017 (r431126) @@ -1,6 +1,6 @@ ---- client/mysql.cc.orig 2012-02-27 19:15:22.271243107 +0000 -+++ client/mysql.cc 2012-02-27 19:16:16.645241508 +0000 -@@ -1601,11 +1601,11 @@ +--- client/mysql.cc.orig 2016-11-27 19:44:54 UTC ++++ client/mysql.cc +@@ -1903,11 +1903,11 @@ static void usage(int version) #endif #ifdef HAVE_READLINE Modified: head/databases/percona57-client/files/patch-extra_CMakeLists.txt ============================================================================== --- head/databases/percona56-client/files/patch-extra_CMakeLists.txt Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/files/patch-extra_CMakeLists.txt Tue Jan 10 18:54:32 2017 (r431126) @@ -1,25 +1,33 @@ ---- extra/CMakeLists.txt.orig 2016-03-03 15:27:37.000000000 +0200 -+++ extra/CMakeLists.txt 2016-03-10 21:04:51.367091216 +0200 -@@ -59,7 +59,7 @@ - ADD_DEPENDENCIES(GenError copy_openssl_extra) +--- extra/CMakeLists.txt.orig 2016-11-27 19:44:54 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() -- + +IF(FALSE) 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) -@@ -98,10 +98,13 @@ - 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) + IF(UNIX) MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.cc) TARGET_LINK_LIBRARIES(resolve_stack_dump mysys mysys_ssl) + 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 Added: head/databases/percona57-client/files/patch-include_CMakeLists.txt ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona57-client/files/patch-include_CMakeLists.txt Tue Jan 10 18:54:32 2017 (r431126) @@ -0,0 +1,10 @@ +--- include/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC ++++ include/CMakeLists.txt +@@ -38,6 +38,7 @@ SET(HEADERS_ABI + + SET(HEADERS + ${HEADERS_ABI} ++ hash.h + my_dbug.h + m_string.h + my_sys.h Added: head/databases/percona57-client/files/patch-include_my__compare.h ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona57-client/files/patch-include_my__compare.h Tue Jan 10 18:54:32 2017 (r431126) @@ -0,0 +1,11 @@ +--- include/my_compare.h.orig 2016-11-27 19:44:54 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 16 /* Max segments for key */ + + #define HA_MAX_POSSIBLE_KEY_BUFF (HA_MAX_KEY_LENGTH + 24+ 6+6) Modified: head/databases/percona57-client/files/patch-include_myisam.h ============================================================================== --- head/databases/percona56-client/files/patch-include_myisam.h Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/files/patch-include_myisam.h Tue Jan 10 18:54:32 2017 (r431126) @@ -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 2016-11-27 19:44:54 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. */ Modified: head/databases/percona57-client/files/patch-man_CMakeLists.txt ============================================================================== --- head/databases/percona56-client/files/patch-man_CMakeLists.txt Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/files/patch-man_CMakeLists.txt Tue Jan 10 18:54:32 2017 (r431126) @@ -1,5 +1,5 @@ ---- man/CMakeLists.txt.orig 2011-10-22 14:08:32.000000000 +0200 -+++ man/CMakeLists.txt 2011-10-22 14:22:42.000000000 +0200 +--- man/CMakeLists.txt.orig 2015-11-29 19:16:24 UTC ++++ man/CMakeLists.txt @@ -15,10 +15,6 @@ # Copy man pages Added: head/databases/percona57-client/files/patch-mysys__ssl_my__default.cc ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/databases/percona57-client/files/patch-mysys__ssl_my__default.cc Tue Jan 10 18:54:32 2017 (r431126) @@ -0,0 +1,31 @@ +--- mysys_ssl/my_default.cc.orig 2016-11-27 19:44:54 UTC ++++ mysys_ssl/my_default.cc +@@ -114,7 +114,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; + +@@ -1416,7 +1416,10 @@ static const char **init_default_directo + + #if defined(DEFAULT_SYSCONFDIR) + if (DEFAULT_SYSCONFDIR[0]) ++ { + errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs); ++ errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs); ++ } + #endif /* DEFAULT_SYSCONFDIR */ + + #endif +@@ -1488,7 +1491,7 @@ int check_file_permissions(const char *f + MY_STAT stat_info; + + if (!my_stat(file_name,&stat_info,MYF(0))) +- return 1; ++ return 0; + /* + Ignore .mylogin.cnf file if not exclusively readable/writable + by current user. Modified: head/databases/percona57-client/files/patch-scripts_CMakeLists.txt ============================================================================== --- head/databases/percona56-client/files/patch-scripts_CMakeLists.txt Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/files/patch-scripts_CMakeLists.txt Tue Jan 10 18:54:32 2017 (r431126) @@ -1,93 +1,67 @@ ---- scripts/CMakeLists.txt.orig 2015-02-05 14:28:58.000000000 +0100 -+++ scripts/CMakeLists.txt 2015-02-12 23:27:08.364991000 +0100 -@@ -71,6 +71,7 @@ - ) +--- scripts/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC ++++ scripts/CMakeLists.txt +@@ -19,7 +19,7 @@ IF(NOT CMAKE_CROSSCOMPILING) + TARGET_LINK_LIBRARIES(comp_sql) 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.sql (concatenate 2 sql scripts) + IF(NOT WIN32 OR CMAKE_CROSSCOMPILING) + FIND_PROGRAM(CAT_EXECUTABLE cat DOC "path to the executable") +@@ -63,6 +63,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) -@@ -143,6 +145,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}) -@@ -179,6 +182,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 +144,7 @@ IF(NOT WITHOUT_SERVER) ) -+ENDIF() - - ENDIF(UNIX) - -@@ -203,6 +207,7 @@ - SET(localstatedir ${MYSQL_DATADIR}) ENDIF() +IF(FALSE) IF(UNIX) - SET(EXT) - ELSE() -@@ -217,6 +222,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 +152,7 @@ IF(UNIX) + COMMAND chmod +x ${CMAKE_CURRENT_BINARY_DIR}/make_binary_distribution + ) + ENDIF() +ENDIF() - SET(prefix "${CMAKE_INSTALL_PREFIX}") - SET(sysconfdir ${prefix}) -@@ -273,6 +279,8 @@ + IF(NOT WITHOUT_SERVER) + INSTALL(FILES +@@ -347,6 +350,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} " ) + ELSEIF(lib STREQUAL "-pthread") -+ SET(${var} "${${var}}-pthread " ) ++ SET(${var} "${${var}}-pthread " ) ELSE() SET(${var} "${${var}}-l${lib} " ) ENDIF() -@@ -328,17 +336,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 - ps_tokudb_admin - ) - FOREACH(file ${BIN_SCRIPTS}) -@@ -363,6 +363,7 @@ - ) - ENDFOREACH() - -+IF(FALSE) - # Input files with pl.in extension - drop the extension completely - SET(PLIN_FILES mysql_secure_installation) - FOREACH(file ${PLIN_FILES}) -@@ -375,6 +376,7 @@ - INSTALL_SCRIPT(${CMAKE_CURRENT_BINARY_DIR}/${file} COMPONENT ${${file}_COMPONENT}) - ENDFOREACH() - ENDIF() -+ENDIF() +@@ -430,21 +435,7 @@ ELSE() + # On Unix, most of the files end up in the bin directory + SET(mysql_config_COMPONENT COMPONENT Development) + +- IF(WITH_SYSTEMD) +- SET(BIN_SCRIPTS +- mysql_config +- mysqldumpslow +- ps_tokudb_admin +- ) +- ELSE() +- SET(BIN_SCRIPTS +- mysql_config +- mysqldumpslow +- mysqld_multi +- mysqld_safe +- ps_tokudb_admin +- ) +- 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}") Modified: head/databases/percona57-client/files/patch-support-files_CMakeLists.txt ============================================================================== --- head/databases/percona56-client/files/patch-support-files_CMakeLists.txt Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/files/patch-support-files_CMakeLists.txt Tue Jan 10 18:54:32 2017 (r431126) @@ -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 2016-11-27 19:44:54 UTC ++++ support-files/CMakeLists.txt +@@ -44,14 +44,17 @@ ELSE() SET(inst_location ${INSTALL_SUPPORTFILESDIR}) ENDIF() @@ -15,21 +15,22 @@ 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,9 +71,11 @@ IF(UNIX) IF(INSTALL_SUPPORTFILESDIR) INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles) 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,3 +99,4 @@ ++IF(FALSE) + SET(bindir ${prefix}/${INSTALL_BINDIR}) + SET(sbindir ${prefix}/${INSTALL_SBINDIR}) + SET(scriptdir ${prefix}/${INSTALL_SCRIPTDIR}) +@@ -83,3 +88,4 @@ IF(UNIX) PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ GROUP_EXECUTE WORLD_READ WORLD_EXECUTE) ENDIF() Modified: head/databases/percona57-client/files/patch-vio_viosocket.c ============================================================================== --- head/databases/percona56-client/files/patch-vio_viosocket.c Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/files/patch-vio_viosocket.c Tue Jan 10 18:54:32 2017 (r431126) @@ -1,6 +1,6 @@ ---- vio/viosocket.c.orig 2015-07-08 07:38:39 UTC +--- vio/viosocket.c.orig 2016-11-27 19:44:54 UTC +++ vio/viosocket.c -@@ -33,6 +33,10 @@ +@@ -45,6 +45,10 @@ static void (*before_io_wait)(void)= 0; static void (*after_io_wait)(void)= 0; Modified: head/databases/percona57-client/pkg-plist ============================================================================== --- head/databases/percona56-client/pkg-plist Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-client/pkg-plist Tue Jan 10 18:54:32 2017 (r431126) @@ -1,32 +1,30 @@ -bin/msql2mysql bin/mysql -bin/mysql_config -bin/mysql_config_editor -bin/mysql_find_rows -bin/mysql_waitpid -bin/mysqlaccess -bin/mysqlaccess.conf bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck +bin/mysql_config +bin/mysql_config_editor bin/mysqldump bin/mysqlimport +bin/mysqlpump +bin/mysql_secure_installation bin/mysqlshow bin/mysqlslap -bin/ps_tokudb_admin +bin/mysql_ssl_rsa_setup include/mysql/big_endian.h +include/mysql/binary_log_types.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 include/mysql/keycache.h 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,79 +32,110 @@ 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_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_com.h +include/mysql/mysql_com_server.h +include/mysql/mysqld_ername.h +include/mysql/mysqld_error.h +include/mysql/mysql_embed.h include/mysql/mysql/get_password.h +include/mysql/mysql/group_replication_priv.h +include/mysql/mysql.h include/mysql/mysql/innodb_priv.h -include/mysql/mysql/plugin.h +include/mysql/mysql/mysql_lex_string.h include/mysql/mysql/plugin_audit.h include/mysql/mysql/plugin_audit.h.pp +include/mysql/mysql/plugin_auth_common.h include/mysql/mysql/plugin_auth.h 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.h +include/mysql/mysql/plugin_keyring.h +include/mysql/mysql/plugin_keyring.h.pp +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_base.h include/mysql/mysql/psi/psi.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_keyring.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/services.h +include/mysql/mysql/services.h.pp +include/mysql/mysql/service_srv_session.h +include/mysql/mysql/service_srv_session_info.h +include/mysql/mysql/service_ssl_wrapper.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/thread_pool_priv.h -include/mysql/mysql_com.h -include/mysql/mysql_com_server.h -include/mysql/mysql_embed.h +include/mysql/mysql/thread_type.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/my_sys.h +include/mysql/my_thread.h +include/mysql/my_thread_local.h +include/mysql/my_xml.h include/mysql/plugin_audit.h include/mysql/plugin_ftparser.h +include/mysql/plugin_group_replication.h +include/mysql/plugin.h +include/mysql/plugin_keyring.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.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_r.so.20 +lib/mysql/libmysqlclient.so +lib/mysql/libmysqlclient.so.20 +lib/mysql/libmysqlservices.a lib/mysql/libperconaserverclient.a lib/mysql/libperconaserverclient.so -lib/mysql/libperconaserverclient.so.18 -lib/mysql/libperconaserverclient_r.a -lib/mysql/libperconaserverclient_r.so -lib/mysql/libperconaserverclient_r.so.18 -lib/mysql/libmysqlservices.a +lib/mysql/libperconaserverclient.so.20 +libdata/pkgconfig/perconaserverclient.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_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 +man/man1/mysql_config.1.gz +man/man1/mysql_config_editor.1.gz man/man1/mysqldump.1.gz man/man1/mysqlimport.1.gz man/man1/mysqlshow.1.gz Modified: head/databases/percona57-pam-for-mysql/Makefile ============================================================================== --- head/databases/percona-pam-for-mysql/Makefile Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-pam-for-mysql/Makefile Tue Jan 10 18:54:32 2017 (r431126) @@ -1,13 +1,16 @@ # Created by: Mark Felder <feld@FreeBSD.org> # $FreeBSD$ -PORTNAME= percona -PORTREVISION= 1 +PORTNAME= percona57 PKGNAMESUFFIX= -pam-for-mysql COMMENT= PAM plugin for MySQL -MASTERDIR= ${.CURDIR}/../percona56-server +LICENSE= GPLv2+ + +RUN_DEPENDS=# This plugin has no run dependencies. It should work with any desired mysql client/server. + +MASTERDIR= ${.CURDIR}/../percona57-server PKGMESSAGE= ${.CURDIR}/pkg-message PATCHDIR= ${MASTERDIR}/files @@ -15,6 +18,9 @@ FILESDIR= ${.CURDIR}/files PLIST= ${.CURDIR}/pkg-plist DESCR= ${.CURDIR}/pkg-descr +CONFLICTS_INSTALL= percona5[0-68-9]-pam-for-mysql* \ + percona-pam-for-mysql* + CMAKE_ARGS+= -DWITH_PAM=1 PLUGIN_ONLY= yes @@ -24,5 +30,3 @@ do-install: ${INSTALL_DATA} ${FILESDIR}/pam.conf ${STAGEDIR}${PREFIX}/etc/pam.d/mysqld.sample .include "${MASTERDIR}/Makefile" - -RUN_DEPENDS= # This plugin has no run dependencies. It should work with any desired mysql client/server. Modified: head/databases/percona57-pam-for-mysql/pkg-message ============================================================================== --- head/databases/percona-pam-for-mysql/pkg-message Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-pam-for-mysql/pkg-message Tue Jan 10 18:54:32 2017 (r431126) @@ -5,3 +5,6 @@ https://www.percona.com/doc/percona-pam- Please note that you need this plugin installed on both the client and server for authentication to be successful. + +This version of the plugin is compatible with the new auth plugin API +introduced in MySQL 5.7. Modified: head/databases/percona57-pam-for-mysql/pkg-plist ============================================================================== --- head/databases/percona-pam-for-mysql/pkg-plist Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-pam-for-mysql/pkg-plist Tue Jan 10 18:54:32 2017 (r431126) @@ -2,3 +2,4 @@ lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_pam_compat.so lib/mysql/plugin/dialog.so +@dir lib/mysql/plugin/debug Modified: head/databases/percona57-server/Makefile ============================================================================== --- head/databases/percona56-server/Makefile Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-server/Makefile Tue Jan 10 18:54:32 2017 (r431126) @@ -1,39 +1,39 @@ -# Created by: Alex Dupre <ale@FreeBSD.org> +# Created by: Mark Felder <feld@FreeBSD.org> # $FreeBSD$ PORTNAME?= percona -DISTVERSION= 5.6.33-79.0 +DISTVERSION= 5.7.16-10 PORTREVISION?= 0 CATEGORIES= databases ipv6 -MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.6/Percona-Server-${DISTVERSION}/source/tarball/ -PKGNAMESUFFIX?= 56-server +MASTER_SITES= http://www.percona.com/downloads/Percona-Server-5.7/Percona-Server-${DISTVERSION}/source/tarball/:percona \ + SF/boost/boost/1.59.0:boost +PKGNAMESUFFIX?= 57-server DISTNAME= percona-server-${DISTVERSION} +DISTFILES= percona-server-${DISTVERSION}${EXTRACT_SUFX}:percona \ + boost_1_59_0${EXTRACT_SUFX}:boost -MAINTAINER= flo@FreeBSD.org +MAINTAINER= feld@FreeBSD.org COMMENT?= Multithreaded SQL database (server) -BROKEN_powerpc64= Does not build - -SLAVEDIRS= databases/percona56-client \ - databases/percona-pam-for-mysql -USES= bison cmake perl5 shebangfix +LICENSE?= GPLv2+ -OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB -OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED -OPTIONS_SUB= yes - -FASTMTX_DESC= Replace mutexes with spinlocks -FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 -INNODBMEMCACHED_DESC= InnoDB Memcached plugin -INNODBMEMCACHED_CMAKE_ON= -DWITH_INNODB_MEMCACHED=1 -OPENSSL_CMAKE_ON= -DWITH_SSL=bundled -TOKUDB_DESC= TokuDB Engine (experimental) -TOKUDB_CMAKE_ON= -DUSE_CTAGS=0 -TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb +LIB_DEPENDS= libevent.so:devel/libevent2 \ + liblz4.so:archivers/liblz4 -DATADIR= ${PREFIX}/share/mysql +BROKEN_powerpc64= Does not build -CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ +SLAVEDIRS= databases/percona57-client \ + databases/percona57-pam-for-mysql +USES= bison:build cmake compiler:c11 compiler:c++11-lib \ + cpe libedit localbase perl5 shebangfix + +DATADIR= ${LOCALBASE}/share/mysql +DOCSDIR= ${LOCALBASE}/share/doc/mysql + +CMAKE_ARGS+= -DINSTALL_LAYOUT=FREEBSD \ + -DINSTALL_DOCDIR="share/doc/mysql" \ + -DINSTALL_LDCONFIGDIR="${LOCALBASE}/libdata/ldconfig" \ + -DINSTALL_PKGCONFIGDIR="${LOCALBASE}/libdata/pkgconfig" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ @@ -48,8 +48,13 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR="share/mysql" \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ + -DWITH_UNIT_TESTS=0 \ -DWITH_EDITLINE=system \ - -DWITH_LIBWRAP=1 + -DWITH_LIBWRAP=0 \ + -DWITH_LZ4=system \ + -DWITH_ZLIB=system \ + -DINSTALL_MYSQLTESTDIR=0 \ + -DWITH_BOOST="${WRKDIR}/boost_1_59_0" SHEBANG_FILES= scripts/*.pl* scripts/*.sh @@ -66,11 +71,25 @@ USES+= libedit USES+= libedit .else # MySQL-Server part -USES+=mysql:56p +OPTIONS_DEFINE= OPENSSL FASTMTX INNODBMEMCACHED TOKUDB +OPTIONS_DEFAULT= OPENSSL INNODBMEMCACHED +OPTIONS_SUB= yes + +FASTMTX_DESC= Replace mutexes with spinlocks +FASTMTX_CMAKE_ON= -DWITH_FAST_MUTEXES=1 +INNODBMEMCACHED_DESC= InnoDB Memcached plugin +INNODBMEMCACHED_CMAKE_ON= -DWITH_INNODB_MEMCACHED=1 +OPENSSL_CMAKE_ON= -DWITH_SSL=system +OPENSSL_USES= ssl +TOKUDB_DESC= TokuDB Engine (experimental) +TOKUDB_CMAKE_ON= -DUSE_CTAGS=0 +TOKUDB_EXTRA_PATCHES=${PATCHDIR}/extrapatch-tokudb + +USES+=mysql:57p CONFLICTS_INSTALL= mysql*-server-* \ mariadb*-server-* \ - percona5[0-57-9]-server-* + percona5[0-68-9]-server-* USE_RC_SUBR= mysql-server @@ -79,6 +98,8 @@ GROUPS= mysql INFO= mysql +USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin + MANPAGES= 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 \ Modified: head/databases/percona57-server/distinfo ============================================================================== --- head/databases/percona56-server/distinfo Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-server/distinfo Tue Jan 10 18:54:32 2017 (r431126) @@ -1,3 +1,5 @@ -TIMESTAMP = 1476817557 -SHA256 (percona-server-5.6.33-79.0.tar.gz) = ed8372340740faca1f58735938823eaf65ffbda64a5c65b18d187b959afbd34e -SIZE (percona-server-5.6.33-79.0.tar.gz) = 55184504 +TIMESTAMP = 1481662079 +SHA256 (percona-server-5.7.16-10.tar.gz) = 1e88233d4bc5fd9a6910f2cc01ad5aca7d751f036cdba5a1c9954e1e25300347 +SIZE (percona-server-5.7.16-10.tar.gz) = 74341476 +SHA256 (boost_1_59_0.tar.gz) = 47f11c8844e579d02691a607fbd32540104a9ac7a2534a8ddaef50daf502baac +SIZE (boost_1_59_0.tar.gz) = 83709983 Modified: head/databases/percona57-server/files/patch-CMakeLists.txt ============================================================================== --- head/databases/percona56-server/files/patch-CMakeLists.txt Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-server/files/patch-CMakeLists.txt Tue Jan 10 18:54:32 2017 (r431126) @@ -1,10 +1,10 @@ ---- CMakeLists.txt.orig 2014-10-06 18:06:02.000000000 +0200 -+++ CMakeLists.txt 2014-10-18 18:37:40.964417855 +0200 -@@ -508,12 +508,10 @@ +--- CMakeLists.txt.orig 2016-11-27 19:44:54 UTC ++++ CMakeLists.txt +@@ -621,12 +621,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,26 +13,16 @@ ENDIF(WITH_EMBEDDED_SERVER) ENDIF() -@@ -522,10 +520,7 @@ +@@ -635,8 +633,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() -@@ -568,7 +563,6 @@ - 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) -@@ -580,6 +574,7 @@ +@@ -692,6 +688,7 @@ ENDIF() # # RPM installs documentation directly from the source tree # @@ -40,10 +30,11 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") INSTALL(FILES COPYING LICENSE.mysql DESTINATION ${INSTALL_DOCREADMEDIR} -@@ -605,5 +600,6 @@ +@@ -714,6 +711,7 @@ IF(NOT INSTALL_LAYOUT MATCHES "RPM") PATTERN "sp-imp-spec.txt" EXCLUDE ) ENDIF() +ENDIF() INCLUDE(CPack) + Modified: head/databases/percona57-server/files/patch-client_CMakeLists.txt ============================================================================== --- head/databases/percona56-server/files/patch-client_CMakeLists.txt Tue Jan 10 15:52:56 2017 (r431097) +++ head/databases/percona57-server/files/patch-client_CMakeLists.txt Tue Jan 10 18:54:32 2017 (r431126) @@ -1,37 +1,38 @@ ---- client/CMakeLists.txt 2015-11-03 12:14:08.000000000 +0100 -+++ client/CMakeLists.txt.new 2015-11-06 10:28:27.753882068 +0100 -@@ -31,17 +31,20 @@ +--- client/CMakeLists.txt.orig 2016-11-27 19:44:54 UTC ++++ client/CMakeLists.txt +@@ -32,8 +32,6 @@ INCLUDE(${MYSQL_CMAKE_SCRIPT_DIR}/compil + + ## Subdirectory with common client code. + ADD_SUBDIRECTORY(base) +-## Subdirectory for mysqlpump code. +-ADD_SUBDIRECTORY(dump) + *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201701101854.v0AIsXiQ027837>