Date: Sat, 9 Jun 2018 16:40:54 +0000 (UTC) From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r472070 - in head: Mk/Uses databases databases/mariadb103-client databases/mariadb103-client/files databases/mariadb103-server databases/mariadb103-server/files Message-ID: <201806091640.w59Gese4082332@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: brnrd Date: Sat Jun 9 16:40:54 2018 New Revision: 472070 URL: https://svnweb.freebsd.org/changeset/ports/472070 Log: databases/mariadb103-server: Add MariaDB 10.3 port Added: head/databases/mariadb103-client/ - copied from r471860, head/databases/mariadb102-client/ head/databases/mariadb103-server/ - copied from r471860, head/databases/mariadb102-server/ Deleted: head/databases/mariadb103-client/files/patch-client_CMakeLists.txt head/databases/mariadb103-client/files/patch-extra_CMakeLists.txt head/databases/mariadb103-client/files/patch-include_CMakeLists.txt head/databases/mariadb103-client/files/patch-include_my__compare.h head/databases/mariadb103-client/files/patch-include_mysql_service__encryption.h head/databases/mariadb103-client/files/patch-libmariadb_include_ma__pthread.h head/databases/mariadb103-client/files/patch-man_CMakeLists.txt head/databases/mariadb103-client/files/patch-mysys_my__default.c head/databases/mariadb103-client/files/patch-scripts_CMakeLists.txt head/databases/mariadb103-client/files/patch-scripts_mysql__config.sh head/databases/mariadb103-client/files/patch-support-files_CMakeLists.txt head/databases/mariadb103-server/files/patch-MDEV-15961 head/databases/mariadb103-server/files/patch-libmariadb_plugins_connection_CMakeLists.txt head/databases/mariadb103-server/files/patch-libmariadb_plugins_trace_CMakeLists.txt Modified: head/Mk/Uses/mysql.mk head/databases/Makefile head/databases/mariadb103-client/Makefile head/databases/mariadb103-client/files/patch-CMakeLists.txt head/databases/mariadb103-client/pkg-plist head/databases/mariadb103-server/Makefile head/databases/mariadb103-server/distinfo head/databases/mariadb103-server/files/mysql-server.in head/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt head/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt head/databases/mariadb103-server/files/patch-sql-common_client.c head/databases/mariadb103-server/files/patch-sql_mysqld.cc head/databases/mariadb103-server/files/patch-sql_sql__trigger.cc head/databases/mariadb103-server/files/patch-sql_sql__view.cc head/databases/mariadb103-server/files/pkg-message.in head/databases/mariadb103-server/pkg-plist Modified: head/Mk/Uses/mysql.mk ============================================================================== --- head/Mk/Uses/mysql.mk Sat Jun 9 16:31:29 2018 (r472069) +++ head/Mk/Uses/mysql.mk Sat Jun 9 16:40:54 2018 (r472070) @@ -72,6 +72,7 @@ MYSQL57_LIBVER= 20 MYSQL57p_LIBVER= 20 MYSQL80_LIBVER= 21 MYSQL102m_LIBVER= 3 +MYSQL103m_LIBVER= 3 # Setting/finding MySQL version we want. .if exists(${LOCALBASE}/bin/mysql) Modified: head/databases/Makefile ============================================================================== --- head/databases/Makefile Sat Jun 9 16:31:29 2018 (r472069) +++ head/databases/Makefile Sat Jun 9 16:40:54 2018 (r472070) @@ -188,6 +188,8 @@ SUBDIR += mariadb101-server SUBDIR += mariadb102-client SUBDIR += mariadb102-server + SUBDIR += mariadb103-client + SUBDIR += mariadb103-server SUBDIR += mariadb55-client SUBDIR += mariadb55-server SUBDIR += mdbtools Modified: head/databases/mariadb103-client/Makefile ============================================================================== --- head/databases/mariadb102-client/Makefile Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-client/Makefile Sat Jun 9 16:40:54 2018 (r472070) @@ -1,11 +1,13 @@ +# Created by: Bernard Spil <brnrd@FreeBSD.org> # $FreeBSD$ PORTNAME= mariadb -PKGNAMESUFFIX= 102-client +PORTREVISION= 0 +PKGNAMESUFFIX= 103-client COMMENT= Multithreaded SQL database (client) -MASTERDIR= ${.CURDIR}/../mariadb102-server +MASTERDIR= ${.CURDIR}/../mariadb103-server FILESDIR= ${.CURDIR}/files PATCHDIR= ${.CURDIR}/files @@ -22,18 +24,12 @@ CLIENT_ONLY= yes post-configure: ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ - -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ + -e 's|(#define LIBS.*)"\\ $$|\1 -L${PREFIX}/lib "\\|' \ ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c post-install: - ${RM} ${STAGEDIR}${PREFIX}/share/aclocal/mysql.m4 \ - ${STAGEDIR}${PREFIX}/man/man1/aria* \ - ${STAGEDIR}${PREFIX}/man/man1/myisam* - ${RM} -r ${STAGEDIR}${PREFIX}/share/pkgconfig \ - ${STAGEDIR}${DATADIR}/policy \ + ${RM} -r ${STAGEDIR}${DATADIR}/policy \ ${STAGEDIR}${PREFIX}/include/mysql/server - # Fix https://mariadb.atlassian.net/browse/MDEV-9388 - @${REINPLACE_CMD} 's/-l-pthread/-pthread/' ${STAGEDIR}${PREFIX}/bin/mysql_config post-install-GSSAPI_NONE: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so Modified: head/databases/mariadb103-client/files/patch-CMakeLists.txt ============================================================================== --- head/databases/mariadb102-client/files/patch-CMakeLists.txt Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-client/files/patch-CMakeLists.txt Sat Jun 9 16:40:54 2018 (r472070) @@ -1,27 +1,20 @@ ---- CMakeLists.txt.orig 2017-04-04 19:11:32 UTC +--- CMakeLists.txt.orig 2018-05-23 20:38:41 UTC +++ CMakeLists.txt -@@ -170,6 +170,8 @@ IF(DISABLE_SHARED) - ENDIF() - OPTION(ENABLED_PROFILING "Enable profiling" ON) - OPTION(WITHOUT_SERVER "Build only the client library and clients" OFF) -+OPTION(WITHOUT_CLIENT "Build only the server components" OFF) -+OPTION(WITHOUT_DOCS "Do not install documentation" OFF) - IF(UNIX) - OPTION(WITH_VALGRIND "Valgrind instrumentation" OFF) - ENDIF() -@@ -454,6 +456,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL +@@ -479,14 +479,16 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL WORKING_DIRECTORY ${CMAKE_BINARY_DIR} ) -+IF(NOT WITHOUT_DOCS) ++IF(FALSE) INSTALL_DOCUMENTATION(README.md CREDITS COPYING COPYING.thirdparty EXCEPTIONS-CLIENT COMPONENT Readme) ++ENDIF() -@@ -465,6 +468,7 @@ IF(UNIX) - INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme) + # MDEV-6526 these files are not installed anymore + #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC + # ${CMAKE_BINARY_DIR}/Docs/INFO_BIN) + +-IF(UNIX) ++IF(FALSE) INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY Docs/README-wsrep COMPONENT Readme) ENDIF() -+ENDIF() - - INCLUDE(CPack) Modified: head/databases/mariadb103-client/pkg-plist ============================================================================== --- head/databases/mariadb102-client/pkg-plist Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-client/pkg-plist Sat Jun 9 16:40:54 2018 (r472070) @@ -1,16 +1,32 @@ bin/mariadb_config bin/msql2mysql bin/mysql +bin/mysql_config +bin/mysql_convert_table_format bin/mysql_find_rows +@comment bin/mysql_install_db +@comment bin/mysql_plugin +@comment bin/mysql_secure_installation +bin/mysql_setpermission +bin/mysql_upgrade +bin/mysql_waitpid +@comment bin/mysqld_safe_helper bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump +bin/mysqlhotcopy bin/mysqlimport bin/mysqlshow bin/mysqlslap -bin/mysql_config +bin/mysqltest +bin/my_print_defaults +@comment bin/mytop +@comment bin/perror +bin/replace +@comment bin/resolve_stack_dump +@comment bin/resolveip include/mysql/errmsg.h include/mysql/ma_list.h include/mysql/ma_pvio.h @@ -45,6 +61,67 @@ lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so +@comment man/man1/aria_chk.1.gz +@comment man/man1/aria_dump_log.1.gz +@comment man/man1/aria_ftdump.1.gz +@comment man/man1/aria_pack.1.gz +@comment man/man1/aria_read_log.1.gz +@comment man/man1/galera_new_cluster.1.gz +@comment man/man1/galera_recovery.1.gz +@comment man/man1/innochecksum.1.gz +@comment man/man1/mariadb-service-convert.1.gz +man/man1/msql2mysql.1.gz +man/man1/my_print_defaults.1.gz +man/man1/my_safe_process.1.gz +@comment man/man1/myisam_ftdump.1.gz +@comment man/man1/myisamchk.1.gz +@comment man/man1/myisamlog.1.gz +@comment man/man1/myisampack.1.gz +man/man1/mysql-stress-test.pl.1.gz +man/man1/mysql-test-run.pl.1.gz +man/man1/mysql.1.gz +@comment man/man1/mysql.server.1.gz +man/man1/mysql_client_test.1.gz +man/man1/mysql_client_test_embedded.1.gz +man/man1/mysql_config.1.gz +man/man1/mysql_convert_table_format.1.gz +man/man1/mysql_find_rows.1.gz +@comment man/man1/mysql_fix_extensions.1.gz +@comment man/man1/mysql_install_db.1.gz +man/man1/mysql_plugin.1.gz +@comment 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_waitpid.1.gz +man/man1/mysqlaccess.1.gz +man/man1/mysqladmin.1.gz +man/man1/mysqlbinlog.1.gz +man/man1/mysqlcheck.1.gz +@comment man/man1/mysqld_multi.1.gz +@comment man/man1/mysqld_safe.1.gz +@comment man/man1/mysqld_safe_helper.1.gz +man/man1/mysqldump.1.gz +@comment man/man1/mysqldumpslow.1.gz +man/man1/mysqlhotcopy.1.gz +man/man1/mysqlimport.1.gz +man/man1/mysqlshow.1.gz +man/man1/mysqlslap.1.gz +man/man1/mysqltest.1.gz +man/man1/mysqltest_embedded.1.gz +@comment man/man1/perror.1.gz +man/man1/replace.1.gz +@comment man/man1/resolve_stack_dump.1.gz +@comment man/man1/resolveip.1.gz +@comment man/man1/tokuft_logdump.1.gz +@comment man/man1/tokuftdump.1.gz +@comment man/man1/wsrep_sst_common.1.gz +@comment man/man1/wsrep_sst_mysqldump.1.gz +@comment man/man1/wsrep_sst_rsync.1.gz +@comment man/man1/wsrep_sst_xtrabackup-v2.1.gz +@comment man/man1/wsrep_sst_xtrabackup.1.gz +@comment man/man8/mysqld.8.gz +@comment share/aclocal/mysql.m4 %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml @@ -96,17 +173,20 @@ lib/mysql/plugin/sha256_password.so %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys -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 +@comment %%DATADIR%%/binary-configure +@comment %%DATADIR%%/fill_help_tables.sql +@comment %%DATADIR%%/magic +@comment %%DATADIR%%/maria_add_gis_sp.sql +@comment %%DATADIR%%/maria_add_gis_sp_bootstrap.sql +@comment %%DATADIR%%/mysql-log-rotate +@comment %%DATADIR%%/mysql.server +@comment %%DATADIR%%/mysql_performance_tables.sql +@comment %%DATADIR%%/mysql_system_tables.sql +@comment %%DATADIR%%/mysql_system_tables_data.sql +@comment %%DATADIR%%/mysql_test_data_timezone.sql +@comment %%DATADIR%%/mysql_test_db.sql +@comment %%DATADIR%%/mysql_to_mariadb.sql +@comment %%DATADIR%%/mysqld_multi.server +@comment %%DATADIR%%/wsrep.cnf +@comment %%DATADIR%%/wsrep_notify +share/pkgconfig/mariadb.pc Modified: head/databases/mariadb103-server/Makefile ============================================================================== --- head/databases/mariadb102-server/Makefile Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/Makefile Sat Jun 9 16:40:54 2018 (r472070) @@ -1,7 +1,8 @@ +# Created by: Bernard Spil <brnrd@FreeBSD.org> # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.2.15 +PORTVERSION= 10.3.7 PORTREVISION?= 0 CATEGORIES= databases ipv6 MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ @@ -12,7 +13,7 @@ MASTER_SITES= http://mirrors.supportex.net/${SITESDIR} http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ \ http://ftp.osuosl.org/pub/${SITESDIR}/ -PKGNAMESUFFIX?= 102-server +PKGNAMESUFFIX?= 103-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) @@ -23,6 +24,7 @@ LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/Perco LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept SUB_FILES= pkg-message +PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb102-client USES= bison:build cmake:noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl @@ -102,12 +104,8 @@ CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ DATADIR= ${PREFIX}/share/mysql -.ifdef USE_MYSQL -.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again. -.endif - CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ - mariadb10[013-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* @@ -118,16 +116,19 @@ OPTIONS_SUB= yes .if defined(CLIENT_ONLY) # MySQL-Client part USES+= readline -GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=NO +GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF .else # MySQL-Server part -USES+= mysql:102m +NOT_FOR_ARCHS= i386 +NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ + https://jira.mariadb.org/browse/MDEV-9627 +USES+= mysql:103m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" \ - -DPLUGIN_AUTH_GSSAPI_CLIENT=NO \ + -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF \ -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 \ -DWITHOUT_CLIENT=1 @@ -163,40 +164,12 @@ ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_ON= -DWITH_ROCKSDB_ZSTD=ON ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd -NOT_FOR_ARCHS= i386 -NOT_FOR_ARCHS_REASON= currently does not compile on i386, see \ - https://jira.mariadb.org/browse/MDEV-9627 - post-install: -# Remove programs to avoid conflict with mariadb102-client -# These are "client" components, so there should be a switch that -# prevents them from being installed but it's unknown right now - ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ - ${STAGEDIR}${PREFIX}/bin/mysql_config \ - ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ - ${STAGEDIR}${PREFIX}/bin/mysqlaccess - ${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy \ - ${STAGEDIR}/${PREFIX}/share/pkgconfig - ${RM} ${STAGEDIR}${LOCALBASE}/lib/mysql/libmysqlclient* - ${RM} ${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING \ - ${STAGEDIR}${LOCALBASE}/share/doc/mysql/COPYING.thirdparty \ - ${STAGEDIR}${LOCALBASE}/share/groonga-normalizer-mysql/lgpl-2.0.txt \ - ${STAGEDIR}${LOCALBASE}/share/groonga/COPYING \ - ${STAGEDIR}${LOCALBASE}/storage/groonga/COPYING \ - ${STAGEDIR}${LOCALBASE}/share/mysql/mroonga/COPYING - ${RM} ${STAGEDIR}${PREFIX}/include/mysql/*.h + ${RM} -r ${STAGEDIR}/${PREFIX}/share/mysql/policy .endif # defined(CLIENT_ONLY) .if defined(WITH_OPENSSL_PORT) GSSAPI_BASE_IGNORE= BASE_GSSAPI is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system -.endif - -.include <bsd.port.options.mk> - -.if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 -SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" -.else -SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .include <bsd.port.pre.mk> Modified: head/databases/mariadb103-server/distinfo ============================================================================== --- head/databases/mariadb102-server/distinfo Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/distinfo Sat Jun 9 16:40:54 2018 (r472070) @@ -1,3 +1,3 @@ -TIMESTAMP = 1526556031 -SHA256 (mariadb-10.2.15.tar.gz) = 33de205158fc22fd8eb4e5770cc5ffa1cb4029f9c398dfd8c554ccb3e636ba11 -SIZE (mariadb-10.2.15.tar.gz) = 73329750 +TIMESTAMP = 1527449277 +SHA256 (mariadb-10.3.7.tar.gz) = e990afee6ae7cf9ac40154d0e150be359385dd6ef408ad80ea30df34e2c164cf +SIZE (mariadb-10.3.7.tar.gz) = 71816160 Modified: head/databases/mariadb103-server/files/mysql-server.in ============================================================================== --- head/databases/mariadb102-server/files/mysql-server.in Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/files/mysql-server.in Sat Jun 9 16:40:54 2018 (r472070) @@ -9,9 +9,9 @@ # Add the following line to /etc/rc.conf to enable mysql: # mysql_(instance_)?enable (bool): Set to "NO" by default. # Set it to "YES" to enable MySQL. -%%LEGACY_LIMITS%%# mysql_(instance_)?limits (bool): Set to "NO" by default. -%%LEGACY_LIMITS%%# Set it to yes to run `limits -e -U mysql` -%%LEGACY_LIMITS%%# just before mysql starts. +# mysql_(instance_)?limits (bool): Set to "NO" by default. +# Set it to yes to run `limits -e -U mysql` +# just before mysql starts. # mysql_(instance_)?dbdir (str): Default to "/var/db/mysql" # Base database directory. # mysql_(instance_)?args (str): Custom additional arguments to be passed @@ -22,7 +22,7 @@ # Default to "mysql" created by the port # mysql_(instance_)?optfile (str): Server-specific option file. # Default to "${mysql_dbdir}/my.cnf". -# mysql_instances (str): Set to "" by default. +# mysql_instances (str): Set to "" by default. # If defined, list of instances to enable . /etc/rc.subr @@ -33,9 +33,9 @@ rcvar=mysql_enable load_rc_config $name : ${mysql_enable="NO"} -%%LEGACY_LIMITS%%: ${mysql_limits="NO"} +: ${mysql_limits="NO"} : ${mysql_user="mysql"} -%%LEGACY_LIMITS%%: ${mysql_limits_args="-e -U $mysql_user"} +: ${mysql_limits_args="-e -U $mysql_user"} : ${mysql_dbdir="/var/db/mysql"} : ${mysql_optfile="${mysql_dbdir}/my.cnf"} @@ -51,9 +51,9 @@ if [ -n "$2" ]; then "$2 "*|*" $2 "*|*" $2"|"$2") eval mysql_args="\${mysql_${instance}_args:-\"${mysql_args}\"}" eval mysql_dbdir="\${mysql_${instance}_dbdir:-\"/var/db/mysql_${instance}\"}" -%%LEGACY_LIMITS%% eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" + eval mysql_limits="\${mysql_${instance}_limits:-\"${mysql_limits}\"}" eval mysql_user="\${mysql_${instance}_user:-\"${mysql_user}\"}" -%%LEGACY_LIMITS%% eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" + eval mysql_limits_args="\${mysql_${instance}_limits_args:-\"-e -U $mysql_user\"}" eval mysql_optfile="\${mysql_${instance}_optfile:-\"${mysql_dbdir}/my.cnf\"}" eval mysql_pidfile="\${mysql_${instance}_pidfile:-\"${mysql_dbdir}/`/bin/hostname`.pid\"}" ;; @@ -119,12 +119,11 @@ mysql_prestart() if [ ! -d "${mysql_dbdir}/mysql/." ]; then mysql_create_auth_tables || return 1 fi -%%LEGACY_LIMITS%% if checkyesno mysql_limits; then -%%LEGACY_LIMITS%% eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null -%%LEGACY_LIMITS%% else -%%LEGACY_LIMITS%% return 0 -%%LEGACY_LIMITS%% fi -%%MODERN_LIMITS%% return 0 + if checkyesno mysql_limits; then + eval `/usr/bin/limits ${mysql_limits_args:-"-e -U $mysql_user"}` 2>/dev/null + else + return 0 + fi } mysql_poststart() Modified: head/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt ============================================================================== --- head/databases/mariadb102-server/files/patch-libmariadb_CMakeLists.txt Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/files/patch-libmariadb_CMakeLists.txt Sat Jun 9 16:40:54 2018 (r472070) @@ -1,9 +1,9 @@ ---- libmariadb/CMakeLists.txt.orig 2017-05-28 18:41:39 UTC +--- libmariadb/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC +++ libmariadb/CMakeLists.txt -@@ -360,7 +360,7 @@ ENDIF() +@@ -371,7 +371,7 @@ ENDIF() + INCLUDE(${CC_SOURCE_DIR}/plugins/CMakeLists.txt) ADD_SUBDIRECTORY(include) ADD_SUBDIRECTORY(libmariadb) - ADD_SUBDIRECTORY(plugins) -IF(NOT WIN32) +IF(NOT WIN32 AND NOT WITHOUT_CLIENT) ADD_SUBDIRECTORY(mariadb_config) Modified: head/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt ============================================================================== --- head/databases/mariadb102-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt Sat Jun 9 16:40:54 2018 (r472070) @@ -1,31 +1,31 @@ ---- libmariadb/plugins/auth/CMakeLists.txt.orig 2017-05-14 23:13:15 UTC +--- libmariadb/plugins/auth/CMakeLists.txt.orig 2018-05-23 20:38:41 UTC +++ libmariadb/plugins/auth/CMakeLists.txt -@@ -26,6 +26,7 @@ IF(AUTH_DIALOG_PLUGIN_TYPE MATCHES "DYNA - INSTALL_PLUGIN(dialog ${CC_BINARY_DIR}/plugins/auth) +@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES) + LIBRARIES ${GSSAPI_LIBS}) ENDIF() +IF(NOT WITHOUT_CLIENT) - # SHA256 plugin - IF(AUTH_SHA256PW_PLUGIN_TYPE MATCHES "DYNAMIC") - ADD_DEFINITIONS(-DHAVE_SHA256PW_DYNAMIC=1) -@@ -51,6 +52,7 @@ IF(AUTH_SHA256PW_PLUGIN_TYPE MATCHES "DY - SIGN_TARGET(sha256_password) - INSTALL_PLUGIN(sha256_password ${CC_BINARY_DIR}/plugins/auth) + IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL") + IF(WIN32) + SET(SHA256_LIBS crypt32) +@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W + SOURCES ${AUTH_DIR}/sha256_pw.c + LIBRARIES ${SHA256_LIBS}) ENDIF() +ENDIF() # old_password plugin - IF(AUTH_OLDPASSWORD_PLUGIN_TYPE MATCHES "DYNAMIC") -@@ -72,6 +74,7 @@ IF(AUTH_OLDPASSWORD_PLUGIN_TYPE MATCHES - SIGN_TARGET(mysql_old_password) - ENDIF() + REGISTER_PLUGIN(TARGET mysql_old_password +@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor + SOURCES ${AUTH_DIR}/old_password.c) + +IF(NOT WITHOUT_CLIENT) # Cleartext - IF(AUTH_CLEARTEXT_PLUGIN_TYPE MATCHES "DYNAMIC") - ADD_DEFINITIONS(-DHAVE_CLEARTEXT_DYNAMIC=1) -@@ -124,3 +127,4 @@ IF(${AUTH_GSSAPI_PLUGIN_TYPE} MATCHES "D - INSTALL_PLUGIN(auth_gssapi_client ${CC_BINARY_DIR}/plugins/auth) - ENDIF() - ENDIF() + REGISTER_PLUGIN(TARGET mysql_clear_password + TYPE MARIADB_CLIENT_PLUGIN_AUTH + CONFIGURATIONS DYNAMIC STATIC OFF + DEFAULT DYNAMIC + SOURCES ${AUTH_DIR}/mariadb_cleartext.c) +- +ENDIF() Modified: head/databases/mariadb103-server/files/patch-sql-common_client.c ============================================================================== --- head/databases/mariadb102-server/files/patch-sql-common_client.c Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/files/patch-sql-common_client.c Sat Jun 9 16:40:54 2018 (r472070) @@ -1,6 +1,6 @@ ---- sql-common/client.c.orig 2018-01-03 14:48:29.000000000 +0100 -+++ sql-common/client.c 2018-01-24 00:45:11.194419000 +0100 -@@ -104,6 +104,10 @@ +--- sql-common/client.c.orig 2017-05-14 23:13:18 UTC ++++ sql-common/client.c +@@ -104,6 +104,10 @@ my_bool net_flush(NET *net); #define CONNECT_TIMEOUT 0 #endif Modified: head/databases/mariadb103-server/files/patch-sql_mysqld.cc ============================================================================== --- head/databases/mariadb102-server/files/patch-sql_mysqld.cc Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/files/patch-sql_mysqld.cc Sat Jun 9 16:40:54 2018 (r472070) @@ -1,5 +1,13 @@ --- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC +++ sql/mysqld.cc +@@ -120,6 +121,7 @@ + #define HAVE_CLOSE_SERVER_SOCK 1 + #endif + ++ + extern "C" { // Because of SCO 3.2V4.2 + #include <sys/stat.h> + #ifndef __GNU_LIBRARY__ @@ -4838,8 +4840,9 @@ static void init_ssl() while ((err= ERR_get_error())) sql_print_warning("SSL error: %s", ERR_error_string(err, NULL)); Modified: head/databases/mariadb103-server/files/patch-sql_sql__trigger.cc ============================================================================== --- head/databases/mariadb102-server/files/patch-sql_sql__trigger.cc Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/files/patch-sql_sql__trigger.cc Sat Jun 9 16:40:54 2018 (r472070) @@ -1,50 +1,54 @@ -Fix clang build error - ---- sql/sql_trigger.cc.orig 2017-05-14 23:13:18 UTC -+++ sql/sql_trigger.cc -@@ -177,32 +177,32 @@ static File_option triggers_file_paramet +--- sql/sql_trigger.cc.orig 2018-02-26 04:27:17.000000000 +0100 ++++ sql/sql_trigger.cc 2018-02-27 20:54:20.250859000 +0100 +@@ -178,37 +178,37 @@ static File_option triggers_file_paramet { { - { C_STRING_WITH_LEN("triggers") }, + { STRING_WITH_LEN("triggers") }, - my_offsetof(class Table_triggers_list, definitions_list), + static_cast<int>(my_offsetof(class Table_triggers_list, definitions_list)), FILE_OPTIONS_STRLIST }, { - { C_STRING_WITH_LEN("sql_modes") }, + { STRING_WITH_LEN("sql_modes") }, - my_offsetof(class Table_triggers_list, definition_modes_list), + static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), FILE_OPTIONS_ULLLIST }, { - { C_STRING_WITH_LEN("definers") }, + { STRING_WITH_LEN("definers") }, - my_offsetof(class Table_triggers_list, definers_list), + static_cast<int>(my_offsetof(class Table_triggers_list, definers_list)), FILE_OPTIONS_STRLIST }, { - { C_STRING_WITH_LEN("client_cs_names") }, + { STRING_WITH_LEN("client_cs_names") }, - my_offsetof(class Table_triggers_list, client_cs_names), + static_cast<int>(my_offsetof(class Table_triggers_list, client_cs_names)), FILE_OPTIONS_STRLIST }, { - { C_STRING_WITH_LEN("connection_cl_names") }, + { STRING_WITH_LEN("connection_cl_names") }, - my_offsetof(class Table_triggers_list, connection_cl_names), + static_cast<int>(my_offsetof(class Table_triggers_list, connection_cl_names)), FILE_OPTIONS_STRLIST }, { - { C_STRING_WITH_LEN("db_cl_names") }, + { STRING_WITH_LEN("db_cl_names") }, - my_offsetof(class Table_triggers_list, db_cl_names), + static_cast<int>(my_offsetof(class Table_triggers_list, db_cl_names)), FILE_OPTIONS_STRLIST }, { -@@ -216,7 +216,7 @@ static File_option triggers_file_paramet + { STRING_WITH_LEN("created") }, +- my_offsetof(class Table_triggers_list, create_times), ++ static_cast<int>(my_offsetof(class Table_triggers_list, create_times)), + FILE_OPTIONS_ULLLIST + }, + { { 0, 0 }, 0, FILE_OPTIONS_STRING } +@@ -217,7 +217,7 @@ static File_option triggers_file_paramet File_option sql_modes_parameters= { - { C_STRING_WITH_LEN("sql_modes") }, + { STRING_WITH_LEN("sql_modes") }, - my_offsetof(class Table_triggers_list, definition_modes_list), + static_cast<int>(my_offsetof(class Table_triggers_list, definition_modes_list)), FILE_OPTIONS_ULLLIST Modified: head/databases/mariadb103-server/files/patch-sql_sql__view.cc ============================================================================== --- head/databases/mariadb102-server/files/patch-sql_sql__view.cc Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/files/patch-sql_sql__view.cc Sat Jun 9 16:40:54 2018 (r472070) @@ -1,51 +1,49 @@ -Fix clang build error - ---- sql/sql_view.cc.orig 2017-05-14 23:13:18 UTC -+++ sql/sql_view.cc -@@ -736,46 +736,46 @@ static const int required_view_parameter +--- sql/sql_view.cc.orig 2018-02-26 04:27:17.000000000 +0100 ++++ sql/sql_view.cc 2018-02-27 20:56:59.769528000 +0100 +@@ -753,49 +753,49 @@ static const int required_view_parameter */ static File_option view_parameters[]= - {{{ C_STRING_WITH_LEN("query")}, + {{{ STRING_WITH_LEN("query")}, - my_offsetof(TABLE_LIST, select_stmt), + static_cast<int>(my_offsetof(TABLE_LIST, select_stmt)), FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("md5")}, + {{ STRING_WITH_LEN("md5")}, - my_offsetof(TABLE_LIST, md5), + static_cast<int>(my_offsetof(TABLE_LIST, md5)), FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("updatable")}, + {{ STRING_WITH_LEN("updatable")}, - my_offsetof(TABLE_LIST, updatable_view), + static_cast<int>(my_offsetof(TABLE_LIST, updatable_view)), FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("algorithm")}, + {{ STRING_WITH_LEN("algorithm")}, - my_offsetof(TABLE_LIST, algorithm), + static_cast<int>(my_offsetof(TABLE_LIST, algorithm)), FILE_OPTIONS_VIEW_ALGO}, - {{ C_STRING_WITH_LEN("definer_user")}, + {{ STRING_WITH_LEN("definer_user")}, - my_offsetof(TABLE_LIST, definer.user), + static_cast<int>(my_offsetof(TABLE_LIST, definer.user)), FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("definer_host")}, + {{ STRING_WITH_LEN("definer_host")}, - my_offsetof(TABLE_LIST, definer.host), + static_cast<int>(my_offsetof(TABLE_LIST, definer.host)), FILE_OPTIONS_STRING}, - {{ C_STRING_WITH_LEN("suid")}, + {{ STRING_WITH_LEN("suid")}, - my_offsetof(TABLE_LIST, view_suid), + static_cast<int>(my_offsetof(TABLE_LIST, view_suid)), FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("with_check_option")}, + {{ STRING_WITH_LEN("with_check_option")}, - my_offsetof(TABLE_LIST, with_check), + static_cast<int>(my_offsetof(TABLE_LIST, with_check)), FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("timestamp")}, + {{ STRING_WITH_LEN("timestamp")}, - my_offsetof(TABLE_LIST, timestamp), + static_cast<int>(my_offsetof(TABLE_LIST, timestamp)), FILE_OPTIONS_TIMESTAMP}, - {{ C_STRING_WITH_LEN("create-version")}, + {{ STRING_WITH_LEN("create-version")}, - my_offsetof(TABLE_LIST, file_version), + static_cast<int>(my_offsetof(TABLE_LIST, file_version)), FILE_OPTIONS_ULONGLONG}, - {{ C_STRING_WITH_LEN("source")}, + {{ STRING_WITH_LEN("source")}, - my_offsetof(TABLE_LIST, source), + static_cast<int>(my_offsetof(TABLE_LIST, source)), FILE_OPTIONS_ESTRING}, @@ -61,5 +59,9 @@ Fix clang build error - my_offsetof(TABLE_LIST, view_body_utf8), + static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)), FILE_OPTIONS_ESTRING}, - {{ C_STRING_WITH_LEN("mariadb-version")}, - my_offsetof(TABLE_LIST, mariadb_version), + {{ STRING_WITH_LEN("mariadb-version")}, +- my_offsetof(TABLE_LIST, mariadb_version), ++ static_cast<int>(my_offsetof(TABLE_LIST, mariadb_version)), + FILE_OPTIONS_ULONGLONG}, + {{NullS, 0}, 0, + FILE_OPTIONS_STRING} Modified: head/databases/mariadb103-server/files/pkg-message.in ============================================================================== --- head/databases/mariadb102-server/files/pkg-message.in Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/files/pkg-message.in Sat Jun 9 16:40:54 2018 (r472070) @@ -1,12 +1,5 @@ ************************************************************************ -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! -!! !! -!! The default InnoDB storage engine is no longer XtraDB, check your !! -!! configuration and switch it to InnoDB !! -!! !! -!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!! - Remember to run mysql_upgrade (with the optional --datadir=<dbdir> flag) the first time you start the MySQL server after an upgrade from an earlier version. Modified: head/databases/mariadb103-server/pkg-plist ============================================================================== --- head/databases/mariadb102-server/pkg-plist Wed Jun 6 16:56:52 2018 (r471860) +++ head/databases/mariadb103-server/pkg-plist Sat Jun 9 16:40:54 2018 (r472070) @@ -6,34 +6,38 @@ bin/aria_read_log bin/innochecksum bin/mariabackup bin/mbstream -bin/my_print_defaults +@comment bin/msql2mysql +@comment bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack +%%ROCKSDB%%bin/myrocks_hotbackup bin/mysql_client_test bin/mysql_client_test_embedded -bin/mysql_convert_table_format +@comment bin/mysql_config +@comment bin/mysql_convert_table_format bin/mysql_embedded +@comment bin/mysql_find_rows bin/mysql_fix_extensions bin/mysql_install_db %%ROCKSDB%%bin/mysql_ldb -%%ROCKSDB%%bin/myrocks_hotbackup bin/mysql_plugin bin/mysql_secure_installation -bin/mysql_setpermission -bin/mysql_tzinfo_to_sql -bin/mysql_upgrade +@comment bin/mysql_setpermission +@comment bin/mysql_tzinfo_to_sql +@comment bin/mysql_upgrade +@comment bin/mysqlaccess bin/mysqld_multi bin/mysqld_safe bin/mysqld_safe_helper bin/mysqldumpslow -bin/mysqlhotcopy -bin/mysqltest -bin/mysqltest_embedded +@comment bin/mysqlhotcopy +@comment bin/mysqltest +@comment bin/mysqltest_embedded @comment bin/mytop -bin/perror -bin/replace +@comment bin/perror +@comment bin/replace bin/resolve_stack_dump bin/resolveip %%ROCKSDB%%bin/sst_dump @@ -45,13 +49,25 @@ bin/wsrep_sst_mysqldump bin/wsrep_sst_rsync bin/wsrep_sst_xtrabackup bin/wsrep_sst_xtrabackup-v2 +@comment include/mysql/my_config.h +@comment include/mysql/my_global.h +@comment include/mysql/my_sys.h +@comment include/mysql/mysql_com.h +@comment include/mysql/mysql_version.h +@comment include/mysql/mysqld_error.h include/mysql/server/private/embedded_priv.h @comment lib/mysql/libmariadb.so @comment lib/mysql/libmariadb.so.3 @comment lib/mysql/libmariadbclient.a +lib/mysql/libmariadbd.a +lib/mysql/libmariadbd.so +lib/mysql/libmariadbd.so.19 +@comment lib/mysql/libmysqlclient.a +@comment lib/mysql/libmysqlclient.so +@comment lib/mysql/libmysqlclient_r.a +@comment lib/mysql/libmysqlclient_r.so lib/mysql/libmysqld.a lib/mysql/libmysqld.so -lib/mysql/libmysqld.so.19 lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_ed25519.so @@ -87,11 +103,10 @@ lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/query_cache_info.so lib/mysql/plugin/query_response_time.so -lib/mysql/plugin/semisync_master.so -lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/simple_password_check.so lib/mysql/plugin/sql_errlog.so +lib/mysql/plugin/test_versioning.so lib/mysql/plugin/wsrep_info.so libexec/mysqld man/man1/aria_chk.1.gz @@ -102,32 +117,32 @@ man/man1/aria_read_log.1.gz man/man1/galera_new_cluster.1.gz man/man1/galera_recovery.1.gz man/man1/innochecksum.1.gz -man/man1/mariadb-service-convert.1.gz -man/man1/my_print_defaults.1.gz +@comment man/man1/mariadb-service-convert.1.gz +@comment man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz 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 +@comment 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_secure_installation.1.gz -man/man1/mysql_setpermission.1.gz -man/man1/mysql_tzinfo_to_sql.1.gz -man/man1/mysql_upgrade.1.gz +@comment man/man1/mysql_setpermission.1.gz +@comment man/man1/mysql_tzinfo_to_sql.1.gz +@comment man/man1/mysql_upgrade.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqld_safe_helper.1.gz man/man1/mysqldumpslow.1.gz -man/man1/mysqlhotcopy.1.gz -man/man1/mysqltest.1.gz -man/man1/perror.1.gz -man/man1/replace.1.gz +@comment man/man1/mysqlhotcopy.1.gz +@comment man/man1/mysqltest.1.gz +@comment man/man1/perror.1.gz +@comment man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz -man/man1/tokuft_logdump.1.gz -man/man1/tokuftdump.1.gz +%%TOKUDB%%man/man1/tokuft_logdump.1.gz +%%TOKUDB%%man/man1/tokuftdump.1.gz man/man1/wsrep_sst_common.1.gz man/man1/wsrep_sst_mysqldump.1.gz man/man1/wsrep_sst_rsync.1.gz @@ -143,20 +158,23 @@ man/man8/mysqld.8.gz %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%MROONGA%%%%DATADIR%%/mroonga/AUTHORS -%%DATADIR%%/my-huge.cnf -%%DATADIR%%/my-innodb-heavy-4G.cnf -%%DATADIR%%/my-large.cnf -%%DATADIR%%/my-medium.cnf -%%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_performance_tables.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql +%%DATADIR%%/mysql_test_db.sql %%DATADIR%%/mysql_to_mariadb.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/wsrep.cnf %%DATADIR%%/wsrep_notify +@comment %%DOCSDIR%%/COPYING +@comment %%DOCSDIR%%/COPYING.thirdparty +@comment share/groonga-normalizer-mysql/lgpl-2.0.txt +@comment share/groonga/COPYING +@comment storage/groonga/COPYING +@comment share/mysql/mroonga/COPYING %%MROONGA%%share/groonga-normalizer-mysql/README.md %%MROONGA%%share/groonga/README.md +@comment share/pkgconfig/mariadb.pc
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201806091640.w59Gese4082332>