Index: head/databases/mariadb103-client/files/patch-MDEV-15961 =================================================================== --- head/databases/mariadb103-client/files/patch-MDEV-15961 (revision 546947) +++ head/databases/mariadb103-client/files/patch-MDEV-15961 (nonexistent) @@ -1,50 +0,0 @@ -MDEV-15961: Fix stacktraces under FreeBSD - -https://jira.mariadb.org/browse/MDEV-15961 ---- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC -+++ mysys/stacktrace.c -@@ -34,19 +34,19 @@ - #include - #endif - -+#ifdef __linux__ - #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) -- - static char *heap_start; -- --#if(defined HAVE_BSS_START) && !(defined __linux__) - extern char *__bss_start; --#endif -+#else -+#define PTR_SANE(p) (p) -+#endif /* __linux */ - - void my_init_stacktrace() - { --#if(defined HAVE_BSS_START) && !(defined __linux__) -+#ifdef __linux__ - heap_start = (char*) &__bss_start; --#endif -+#endif /* __linux__ */ - } - - #ifdef __linux__ -@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad - - int my_safe_print_str(const char* val, size_t max_len) - { -+#ifdef __linux__ -+/* Only needed by the linux version of PTR_SANE */ - char *heap_end; - --#ifdef __linux__ - // Try and make use of /proc filesystem to safely print memory contents. - if (!safe_print_str(val, max_len)) - return 0; --#endif - - heap_end= (char*) sbrk(0); -+#endif - - if (!PTR_SANE(val)) - { Property changes on: head/databases/mariadb103-client/files/patch-MDEV-15961 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb103-client/pkg-plist =================================================================== --- head/databases/mariadb103-client/pkg-plist (revision 546947) +++ head/databases/mariadb103-client/pkg-plist (revision 546948) @@ -1,125 +1,129 @@ bin/mariadb_config bin/msql2mysql bin/mysql bin/mysql_config bin/mysql_convert_table_format bin/mysql_find_rows bin/mysql_setpermission @comment bin/mysql_plugin bin/mysql_waitpid bin/mysqlaccess bin/mysqladmin bin/mysqlbinlog bin/mysqlcheck bin/mysqldump bin/mysqlhotcopy bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysqltest bin/mytop bin/replace @comment bin/wsrep_sst_rsync_wan include/mysql/errmsg.h include/mysql/ma_list.h include/mysql/ma_pvio.h include/mysql/ma_tls.h include/mysql/mariadb/ma_io.h include/mysql/mariadb_com.h include/mysql/mariadb_ctype.h include/mysql/mariadb_dyncol.h include/mysql/mariadb_rpl.h include/mysql/mariadb_stmt.h include/mysql/mariadb_version.h include/mysql/my_config.h include/mysql/my_global.h include/mysql/my_sys.h include/mysql/mysql.h include/mysql/mysql_com.h include/mysql/mysql_version.h include/mysql/mysql/client_plugin.h include/mysql/mysql/plugin_auth.h include/mysql/mysql/plugin_auth_common.h include/mysql/mysqld_error.h +@comment etc/init.d/mysql +@comment etc/logrotate.d/mysql +etc/my.cnf +@comment libexec/rcmysql %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so lib/mysql/libmariadb.so lib/mysql/libmariadb.so.3 lib/mysql/libmariadbclient.a lib/mysql/libmysqlservices.a lib/mysql/libmysqlclient.a lib/mysql/libmysqlclient.so lib/mysql/libmysqlclient_r.a lib/mysql/libmysqlclient_r.so @comment lib/mysql/plugin/caching_sha2_password.so lib/mysql/plugin/client_ed25519.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so libdata/pkgconfig/libmariadb.pc libdata/pkgconfig/mariadb.pc @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/mariabackup.1.gz @comment man/man1/mariadb-service-convert.1.gz man/man1/msql2mysql.1.gz @comment man/man1/mbstream.1.gz @comment 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 @comment man/man1/mysql_embedded.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 @comment man/man1/mysql_ldb.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 @comment 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_logprint.1.gz -@comment man/man1/tokuftdump.1.gz @comment man/man1/wsrep_sst_common.1.gz @comment man/man1/wsrep_sst_mariabackup.1.gz @comment man/man1/wsrep_sst_mysqldump.1.gz @comment man/man1/wsrep_sst_rsync.1.gz @comment man/man1/wsrep_sst_rsync_wan.1.gz @comment man/man8/mysqld.8.gz @comment share/aclocal/mysql.m4 +@dir etc/mysql +@dir etc/mysql/conf.d Index: head/databases/mariadb103-server/Makefile =================================================================== --- head/databases/mariadb103-server/Makefile (revision 546947) +++ head/databases/mariadb103-server/Makefile (revision 546948) @@ -1,232 +1,226 @@ # Created by: Bernard Spil # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.3.23 +PORTVERSION= 10.3.24 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ \ http://ftp.osuosl.org/pub/${SITESDIR}/ PKGNAMESUFFIX?= 103-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_NAME_PerconaFT= PerconaFT patents license LICENSE_FILE_PerconaFT= ${WRKSRC}/storage/tokudb/PerconaFT/PATENTS LICENSE_PERMS_PerconaFT= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE .if ${PKGNAMESUFFIX:M*-server} # MySQL-Server options OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP OPTIONS_GROUP= COMPRESSION ENGINES GROONGA OPTIONS_DEFINE= CONNECT_EXTRA DOCS OPTIONS_DEFINE_amd64= WSREP OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD OPTIONS_GROUP_ENGINES= INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB OPTIONS_GROUP_GROONGA= ZMQ MSGPACK OPTIONS_EXCLUDE_i386= TOKUDB CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine COMPRESSION_DESC= Optional page compression ENGINES_DESC= Optional MariaDB storage engines GROONGA_DESC= Optional Mroonga features INNOBASE_DESC= InnoDB default engine MROONGA_DESC= Mroonga Full Text Search engine MSGPACK_DESC= MsgPack support OQGRAPH_DESC= Open Query Graph Computation engine ROCKSDB_DESC= RocksDB LSM engine (Alpha) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine TOKUDB_DESC= Fractal tree index tree data structure engine WSREP_DESC= Build wsrep clustering ZMQ_DESC= ZeroMQ support ZSTD_DESC+= Zstandard compression support (RocksDB only) .endif CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ - -DDEFAULT_SYSCONFDIR="${PREFIX}/etc" \ + -DINSTALL_SYSCONFDIR="${PREFIX}/etc" \ -DWITH_SSL="${OPENSSLBASE}" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ -DKRB5_CONFIG="${KRB5CONFIG}" \ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ -DCOMPILATION_COMMENT="FreeBSD Ports" \ -DCMAKE_PREFIX_PATH=${PREFIX} \ CMAKE_OFF+= CONNECT_WITH_MONGO WITH_UNIT_TESTS CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS DISABLED_PLUGINS+= DAEMON_EXAMPLE DIALOG_EXAMPLES EXAMPLE \ EXAMPLE_KEY_MANAGEMENT FTEXAMPLE DATADIR= ${PREFIX}/share/mysql -CONFLICTS_INSTALL= mariadb5*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ - mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ +CONFLICTS_INSTALL= mariadb10[0-24-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF OPTIONS_SUB= yes .if ${PKGNAMESUFFIX:M*-client} # MySQL-Client part CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER CMAKE_OFF+= CONC_WITH_UNITTEST WITH_WSREP USES+= readline USE_LDCONFIG= ${PREFIX}/lib/mysql .else # ! ${PKGNAMESUFFIX:M*-client} # MySQL-Server part USES+= mysql:103m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER CMAKE_OFF+= WITH_CLIENT .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 CONNECT_EXTRA_USES= gnome CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python +ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy TOKUDB_IMPLIES= SNAPPY TOKUDB_PORTDOCS= README.md TOKUDB_VARS= LICENSE+=PerconaFT LICENSE_COMB=multi WSREP_CMAKE_BOOL= WITH_WSREP WSREP_LIB_DEPENDS= libgalera.so:databases/galera +WSREP_RUN_DEPENDS= bash:shells/bash \ + rsync:net/rsync \ + # stunnel:security/stunnel ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_ON= -DWITH_ROCKSDB_zstd=ON ZSTD_CMAKE_OFF= -DWITH_ROCKSDB_zstd=OFF ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .include .for PLUGIN in ${DISABLED_PLUGINS} CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO .endfor .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .endif # ${PKGNAMESUFFIX:M*-client} .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 .if ${ARCH} != amd64 PLIST_SUB+= WSREP="@comment " .endif .if ${OPSYS} == DragonFly CMAKE_OFF+= WITH_TOKUDB .endif post-patch: - ${REINPLACE_CMD} 's|/usr/bin/env python|${PYTHON_CMD}|' ${WRKSRC}/CMakeLists.txt ${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c - ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh \ + ${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' \ ${WRKSRC}/storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake + ${REINPLACE_CMD} 's|/etc/my.cnf.d|${LOCALBASE}/etc/mysql/conf.d|' \ + ${WRKSRC}/support-files/rpm/my.cnf ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif -post-configure: - ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ - -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ - ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c - -# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 -post-configure-INNOBASE-on: - ${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \ - -e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \ - -e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \ - -e 's| -llzma\(.* -llzma\)|\1|;s| -lbz2\(.* -lbz2\)|\1|;' \ - ${WRKSRC}/extra/mariabackup/CMakeFiles/mbstream.dir/link.txt - .if ${PKGNAMESUFFIX:M*-client} post-install: - ${RM} -r ${STAGEDIR}${DATADIR} - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc - ${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig + ${RM} -r ${STAGEDIR}${DATADIR} \ + ${STAGEDIR}${PREFIX}/include/mysql/server \ + ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig + ${MKDIR} -p ${STAGEDIR}${PREFIX}/etc/mysql/conf.d post-install-GSSAPI_NONE-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so .else # ! ${PKGNAMESUFFIX:M*-client} post-install: - ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy - ${RM} -r ${STAGEDIR}${PREFIX}/include/mysql/server/private - ${RM} -r ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig + ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ + ${STAGEDIR}${PREFIX}/include/mysql/server/private \ + ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig + ${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \ + ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample .endif # ${PKGNAMESUFFIX:M*-client} .include Index: head/databases/mariadb103-server/distinfo =================================================================== --- head/databases/mariadb103-server/distinfo (revision 546947) +++ head/databases/mariadb103-server/distinfo (revision 546948) @@ -1,3 +1,3 @@ -TIMESTAMP = 1589620713 -SHA256 (mariadb-10.3.23.tar.gz) = fc405022457d8eec5991b870cc1c9a07b83b551d6165c414c4d8f31523aa86ae -SIZE (mariadb-10.3.23.tar.gz) = 72582611 +TIMESTAMP = 1597410090 +SHA256 (mariadb-10.3.24.tar.gz) = 713cfbe78475bf152d711280096756bd12cce3ba01a1130027da4901598a9a4e +SIZE (mariadb-10.3.24.tar.gz) = 72714002 Index: head/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake =================================================================== --- head/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake (revision 546947) +++ head/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake (nonexistent) @@ -1,13 +0,0 @@ ---- storage/rocksdb/build_rocksdb.cmake.orig 2018-10-02 09:45:43 UTC -+++ storage/rocksdb/build_rocksdb.cmake -@@ -69,10 +69,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD - SET(CMAKE_REQUIRED_LIBRARIES zstd) - CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID) - UNSET(CMAKE_REQUIRED_LIBRARIES) -- if (WITH_ROCKSDB_ZSTD STREQUAL "ON" AND NOT ZSTD_VALID) -- MESSAGE(FATAL_ERROR -- "WITH_ROCKSDB_ZSTD is ON and ZSTD library was found, but the version needs to be >= 1.1.3") -- endif() - if (ZSTD_VALID) - add_definitions(-DZSTD) - include_directories(${ZSTD_INCLUDE_DIR}) Property changes on: head/databases/mariadb103-server/files/patch-storage_rocksdb_build__rocksdb.cmake ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb103-server/files/patch-MDEV-15961 =================================================================== --- head/databases/mariadb103-server/files/patch-MDEV-15961 (revision 546947) +++ head/databases/mariadb103-server/files/patch-MDEV-15961 (nonexistent) @@ -1,50 +0,0 @@ -MDEV-15961: Fix stacktraces under FreeBSD - -https://jira.mariadb.org/browse/MDEV-15961 ---- mysys/stacktrace.c.orig 2018-07-02 07:34:11 UTC -+++ mysys/stacktrace.c -@@ -34,19 +34,19 @@ - #include - #endif - -+#ifdef __linux__ - #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) -- - static char *heap_start; -- --#if(defined HAVE_BSS_START) && !(defined __linux__) - extern char *__bss_start; --#endif -+#else -+#define PTR_SANE(p) (p) -+#endif /* __linux */ - - void my_init_stacktrace() - { --#if(defined HAVE_BSS_START) && !(defined __linux__) -+#ifdef __linux__ - heap_start = (char*) &__bss_start; --#endif -+#endif /* __linux__ */ - } - - #ifdef __linux__ -@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad - - int my_safe_print_str(const char* val, size_t max_len) - { -+#ifdef __linux__ -+/* Only needed by the linux version of PTR_SANE */ - char *heap_end; - --#ifdef __linux__ - // Try and make use of /proc filesystem to safely print memory contents. - if (!safe_print_str(val, max_len)) - return 0; --#endif - - heap_end= (char*) sbrk(0); -+#endif - - if (!PTR_SANE(val)) - { Property changes on: head/databases/mariadb103-server/files/patch-MDEV-15961 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb103-server/files/patch-cmake_install__layout.cmake =================================================================== --- head/databases/mariadb103-server/files/patch-cmake_install__layout.cmake (nonexistent) +++ head/databases/mariadb103-server/files/patch-cmake_install__layout.cmake (revision 546948) @@ -0,0 +1,13 @@ +--- cmake/install_layout.cmake.orig 2020-05-09 19:27:56 UTC ++++ cmake/install_layout.cmake +@@ -128,8 +128,8 @@ SET(INSTALL_SUPPORTFILESDIR_STANDALONE "support-files + SET(INSTALL_MYSQLDATADIR_STANDALONE "data") + + SET(INSTALL_UNIX_ADDRDIR_STANDALONE "/tmp/mysql.sock") +-SET(INSTALL_PAMDIR_STANDALONE "share") +-SET(INSTALL_PAMDATADIR_STANDALONE "share") ++SET(INSTALL_PAMDIR_STANDALONE "lib/mysql/plugin") ++SET(INSTALL_PAMDATADIR_STANDALONE "etc/mysql") + # + # RPM layout + # Property changes on: head/databases/mariadb103-server/files/patch-cmake_install__layout.cmake ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mariadb103-server/pkg-plist =================================================================== --- head/databases/mariadb103-server/pkg-plist (revision 546947) +++ head/databases/mariadb103-server/pkg-plist (revision 546948) @@ -1,352 +1,354 @@ bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log %%INNOBASE%%bin/innochecksum %%INNOBASE%%bin/mariabackup %%INNOBASE%%bin/mbstream @comment bin/msql2mysql 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 @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 bin/mysql_plugin bin/mysql_secure_installation @comment bin/mysql_setpermission bin/mysql_tzinfo_to_sql bin/mysql_upgrade @comment bin/mysqlaccess bin/mysqld_multi bin/mysqld_safe bin/mysqld_safe_helper bin/mysqldumpslow @comment bin/mysqlhotcopy @comment bin/mysqltest @comment bin/mysqltest_embedded @comment bin/mytop bin/perror @comment bin/replace bin/resolve_stack_dump bin/resolveip %%ROCKSDB%%bin/sst_dump @comment bin/test-connect-t %%TOKUDB%%bin/tokuft_logprint %%TOKUDB%%bin/tokuftdump %%WSREP%%bin/wsrep_sst_common %%WSREP%%bin/wsrep_sst_mariabackup %%WSREP%%bin/wsrep_sst_mysqldump %%WSREP%%bin/wsrep_sst_rsync %%WSREP%%bin/wsrep_sst_rsync_wan @comment data/test/db.opt +@comment etc/init.d/mysql +etc/logrotate.d/mysql +@comment etc/my.cnf +@sample etc/mysql/user_map.conf.sample @comment include/mysql/mariadb_rpl.h @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/big_endian.h include/mysql/server/byte_order_generic.h include/mysql/server/byte_order_generic_x86.h include/mysql/server/byte_order_generic_x86_64.h include/mysql/server/decimal.h include/mysql/server/errmsg.h include/mysql/server/handler_ername.h include/mysql/server/handler_state.h include/mysql/server/json_lib.h include/mysql/server/keycache.h include/mysql/server/little_endian.h include/mysql/server/m_ctype.h include/mysql/server/m_string.h include/mysql/server/ma_dyncol.h include/mysql/server/my_alloc.h include/mysql/server/my_attribute.h include/mysql/server/my_byteorder.h include/mysql/server/my_compiler.h include/mysql/server/my_config.h include/mysql/server/my_dbug.h include/mysql/server/my_decimal_limits.h include/mysql/server/my_dir.h include/mysql/server/my_getopt.h include/mysql/server/my_global.h include/mysql/server/my_list.h include/mysql/server/my_net.h include/mysql/server/my_pthread.h include/mysql/server/my_sys.h include/mysql/server/my_valgrind.h include/mysql/server/my_xml.h include/mysql/server/mysql.h include/mysql/server/mysql/auth_dialog_client.h include/mysql/server/mysql/client_plugin.h include/mysql/server/mysql/plugin.h include/mysql/server/mysql/plugin_audit.h include/mysql/server/mysql/plugin_auth.h include/mysql/server/mysql/plugin_auth_common.h include/mysql/server/mysql/plugin_encryption.h include/mysql/server/mysql/plugin_ftparser.h include/mysql/server/mysql/plugin_password_validation.h include/mysql/server/mysql/psi/mysql_file.h include/mysql/server/mysql/psi/mysql_idle.h include/mysql/server/mysql/psi/mysql_socket.h include/mysql/server/mysql/psi/mysql_stage.h include/mysql/server/mysql/psi/mysql_statement.h include/mysql/server/mysql/psi/mysql_table.h include/mysql/server/mysql/psi/mysql_thread.h include/mysql/server/mysql/psi/psi.h include/mysql/server/mysql/psi/psi_abi_v0.h include/mysql/server/mysql/psi/psi_abi_v1.h include/mysql/server/mysql/psi/psi_abi_v2.h include/mysql/server/mysql/psi/psi_base.h include/mysql/server/mysql/psi/psi_memory.h include/mysql/server/mysql/service_base64.h include/mysql/server/mysql/service_debug_sync.h include/mysql/server/mysql/service_encryption.h include/mysql/server/mysql/service_encryption_scheme.h include/mysql/server/mysql/service_kill_statement.h include/mysql/server/mysql/service_logger.h include/mysql/server/mysql/service_md5.h include/mysql/server/mysql/service_my_crypt.h include/mysql/server/mysql/service_my_print_error.h include/mysql/server/mysql/service_my_snprintf.h include/mysql/server/mysql/service_progress_report.h include/mysql/server/mysql/service_sha1.h include/mysql/server/mysql/service_sha2.h include/mysql/server/mysql/service_thd_alloc.h include/mysql/server/mysql/service_thd_autoinc.h include/mysql/server/mysql/service_thd_error_context.h include/mysql/server/mysql/service_thd_rnd.h include/mysql/server/mysql/service_thd_specifics.h include/mysql/server/mysql/service_thd_timezone.h include/mysql/server/mysql/service_thd_wait.h include/mysql/server/mysql/service_wsrep.h include/mysql/server/mysql/services.h include/mysql/server/mysql_com.h include/mysql/server/mysql_com_server.h include/mysql/server/mysql_embed.h include/mysql/server/mysql_time.h include/mysql/server/mysql_version.h include/mysql/server/mysqld_ername.h include/mysql/server/mysqld_error.h include/mysql/server/pack.h include/mysql/server/sql_common.h include/mysql/server/sql_state.h include/mysql/server/sslopt-case.h include/mysql/server/sslopt-longopts.h include/mysql/server/sslopt-vars.h include/mysql/server/typelib.h @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/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_ed25519.so %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/caching_sha2_password.so lib/mysql/plugin/debug_key_management.so @comment lib/mysql/plugin/dialog.so lib/mysql/plugin/file_key_management.so lib/mysql/plugin/ha_archive.so lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_connect.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so %%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so %%ROCKSDB%%lib/mysql/plugin/ha_rocksdb.so %%SPHINX%%lib/mysql/plugin/ha_sphinx.so %%SPIDER%%lib/mysql/plugin/ha_spider.so %%TOKUDB%%lib/mysql/plugin/ha_tokudb.so @comment lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/ha_test_sql_discovery.so lib/mysql/plugin/handlersocket.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so +lib/mysql/plugin/pam_user_map.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/query_cache_info.so lib/mysql/plugin/query_response_time.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 %%WSREP%%lib/mysql/plugin/wsrep_info.so libexec/mysqld +@comment libexec/rcmysql man/man1/aria_chk.1.gz man/man1/aria_dump_log.1.gz man/man1/aria_ftdump.1.gz man/man1/aria_pack.1.gz 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 @comment man/man1/mariadb-service-convert.1.gz man/man1/mariabackup.1.gz man/man1/mbstream.1.gz 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 @comment man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz %%ROCKSDB%%man/man1/mysql_ldb.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz @comment man/man1/mysql_setpermission.1.gz @comment man/man1/mysql_tzinfo_to_sql.1.gz 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 @comment man/man1/mysqlhotcopy.1.gz @comment man/man1/mysqltest.1.gz man/man1/perror.1.gz @comment man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz %%TOKUDB%%man/man1/tokuft_logprint.1.gz %%TOKUDB%%man/man1/tokuftdump.1.gz %%WSREP%%man/man1/wsrep_sst_common.1.gz %%WSREP%%man/man1/wsrep_sst_mariabackup.1.gz %%WSREP%%man/man1/wsrep_sst_mysqldump.1.gz %%WSREP%%man/man1/wsrep_sst_rsync.1.gz %%WSREP%%man/man1/wsrep_sst_rsync_wan.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/magic %%SPIDER%%%%DATADIR%%/install_spider.sql %%DATADIR%%/maria_add_gis_sp.sql %%DATADIR%%/maria_add_gis_sp_bootstrap.sql %%MROONGA%%%%DATADIR%%/mroonga/AUTHORS +@comment %%DATADIR%%/mroonga/COPYING %%MROONGA%%%%DATADIR%%/mroonga/install.sql %%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%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%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hindi/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/italian/errmsg.sys %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys %%WSREP%%%%DATADIR%%/wsrep.cnf %%WSREP%%%%DATADIR%%/wsrep_notify -share/pam_user_map.so -share/user_map.conf @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 @comment bin/mariadb_config @comment bin/mysql @comment bin/mysqladmin @comment bin/mysqlbinlog @comment bin/mysqlcheck @comment bin/mysqldump @comment bin/mysqlimport @comment bin/mysqlshow @comment bin/mysqlslap @comment include/mysql/errmsg.h @comment include/mysql/ma_list.h @comment include/mysql/ma_pvio.h @comment include/mysql/ma_tls.h @comment include/mysql/mariadb/ma_io.h @comment include/mysql/mariadb_com.h @comment include/mysql/mariadb_ctype.h @comment include/mysql/mariadb_dyncol.h @comment include/mysql/mariadb_stmt.h @comment include/mysql/mariadb_version.h @comment include/mysql/mysql.h @comment include/mysql/mysql/client_plugin.h @comment include/mysql/mysql/plugin_auth.h @comment include/mysql/mysql/plugin_auth_common.h @comment lib/mysql/libmariadb.so @comment lib/mysql/libmariadb.so.3 @comment lib/mysql/plugin/auth_gssapi_client.so @comment lib/mysql/plugin/client_ed25519.so @comment lib/mysql/plugin/mysql_clear_password.so @comment lib/mysql/plugin/sha256_password.so @comment libdata/pkgconfig/libmariadb.pc Index: head/databases/mariadb105-server/Makefile =================================================================== --- head/databases/mariadb105-server/Makefile (revision 546947) +++ head/databases/mariadb105-server/Makefile (revision 546948) @@ -1,280 +1,280 @@ # Created by: Bernard Spil # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.5.4 -PORTREVISION?= 2 +PORTVERSION= 10.5.5 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ \ http://ftp.osuosl.org/pub/${SITESDIR}/ PKGNAMESUFFIX?= 105-server MAINTAINER= brnrd@FreeBSD.org COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING # BROKEN_i386= compile error: undeclared identifier 'my_atomic_add32' LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 # Ugly workaround for MariaDB/CMake library detection CFLAGS+= -L${LOCALBASE}/lib USES= bison:build cmake:insource compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message USE_LDCONFIG= ${PREFIX}/lib/mysql SHEBANG_FILES= scripts/*.sh SITESDIR= mariadb/mariadb-${PORTVERSION}/source DOCSDIR= ${PREFIX}/share/doc/mysql MARIADB_USER?= mysql MARIADB_GROUP?= mysql MARIADB_RUNDIR?= /var/run/mysql MARIADB_SOCK?= mysql.sock MARIADB_LOGDIR?= /var/log/mysql USERS= ${MARIADB_USER} GROUPS= ${MARIADB_GROUP} OPTIONS_SINGLE= GSSAPI OPTIONS_SINGLE_GSSAPI= GSSAPI_BASE GSSAPI_HEIMDAL GSSAPI_MIT GSSAPI_NONE OPTIONS_DEFAULT= GSSAPI_BASE .if ${PKGNAMESUFFIX:M*-server} # MySQL-Server options OPTIONS_DEFAULT+= CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP OPTIONS_GROUP= COMPRESSION ENGINES GROONGA OPTIONS_DEFINE= CONNECT_EXTRA DOCS OPTIONS_DEFINE_amd64= WSREP OPTIONS_GROUP_COMPRESSION= LZ4 LZO SNAPPY ZSTD OPTIONS_GROUP_ENGINES= COLUMNSTORE INNOBASE MROONGA OQGRAPH ROCKSDB S3 SPHINX SPIDER OPTIONS_GROUP_GROONGA= ZMQ MSGPACK OPTIONS_EXCLUDE_i386= ROCKSDB COLUMNSTORE_DESC= Columnar storage egine (BETA) CONNECT_EXTRA_DESC= Enable ODBC and XML in CONNECT engine COMPRESSION_DESC= Optional page compression ENGINES_DESC= Optional MariaDB storage engines GROONGA_DESC= Optional Mroonga features INNOBASE_DESC= InnoDB default engine MROONGA_DESC= Mroonga Full Text Search engine MSGPACK_DESC= MsgPack support OQGRAPH_DESC= Open Query Graph Computation engine ROCKSDB_DESC= RocksDB LSM engine S3_DESC= S3 storage engine (Alpha) SPHINX_DESC= SphinxSE engine SPIDER_DESC= Partitioning and XA-transactions engine WSREP_DESC= Build wsrep clustering ZMQ_DESC= ZeroMQ support ZSTD_DESC+= Zstandard compression support (RocksDB only) .endif CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX} \ -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DINSTALL_SYSCONFDIR="${ETCDIR}" \ -DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \ -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \ -DWITH_PCRE=system \ -DWITH_SSL="${OPENSSLBASE}" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \ -DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \ -DCURSES_CURSES_LIBRARY="/usr/lib/libncurses.so" \ -DKRB5_CONFIG="${KRB5CONFIG}" \ -DCURSES_NCURSES_LIBRARY="${NCURSESLIB}/libncurses.so" \ -DCOMPILATION_COMMENT="FreeBSD Ports" \ -DPLUGIN_AUTH_TEST_PLUGIN=NO CMAKE_OFF+= CONC_WITH_UNIT_TESTS CONNECT_WITH_MONGO WITH_UNIT_TESTS CMAKE_ON+= WITH_LIBWRAP WITHOUT_DOCS DISABLED_PLUGINS+= AUTH_TEST_PLUGIN DAEMON_EXAMPLE DIALOG_EXAMPLES \ EXAMPLE EXAMPLE_KEY_MANAGEMENT FTEXAMPLE TOKUDB DATADIR= ${PREFIX}/share/mysql ETCDIR= ${PREFIX}/etc/mysql CONFLICTS_INSTALL= mariadb10[0-46-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi GSSAPI_HEIMDAL_USES= gssapi:heimdal GSSAPI_MIT_USES= gssapi:mit GSSAPI_NONE_CMAKE_ON= -DPLUGIN_AUTH_GSSAPI_CLIENT=OFF OPTIONS_SUB= yes SUB_LIST+= MARIADB_USER="${MARIADB_USER}" \ MARIADB_RUNDIR="${MARIADB_RUNDIR}" \ MARIADB_SOCK="${MARIADB_SOCK}" PLIST_SUB+= MARIADB_USER="${MARIADB_USER}" \ MARIADB_GROUP="${MARIADB_GROUP}" .if ${PKGNAMESUFFIX:M*-client} # MySQL-Client part CMAKE_ON+= CONC_WITH_MYSQLCOMPAT WITHOUT_SERVER CMAKE_OFF+= WITH_WSREP USES+= readline USE_LDCONFIG= ${PREFIX}/lib/mysql SUB_FILES+= my.cnf.sample client.cnf.sample PLIST_SUB+= MARIADB_RUNDIR="${MARIADB_RUNDIR}" .else # ! ${PKGNAMESUFFIX:M*-client} # MySQL-Server part USES+= mysql:105m USE_LDCONFIG+= ${PREFIX}/lib/mysql/plugin USE_RC_SUBR= mysql-server CMAKE_ON+= CMAKE_SKIP_BUILD_RPATH WITH_EMBEDDED_SERVER CMAKE_OFF+= WITH_CLIENT SUB_FILES+= server.cnf.sample SUB_LIST+= MARIADB_GROUP="${MARIADB_GROUP}" \ MARIADB_LOGDIR="${MARIADB_LOGDIR}" PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" .for ENGINE in ${OPTIONS_GROUP_ENGINES:NINNOBASE} ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE -COLUMNSTORE_BROKEN= fatal error: 'sys/sysinfo.h' file not found +#COLUMNSTORE_BROKEN= fatal error: 'sys/sysinfo.h' file not found CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 CONNECT_EXTRA_USES= gnome CONNECT_EXTRA_CMAKE_BOOL= CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC GSSAPI_NONE_VARS= disabled_plugins+=AUTH_GSSAPI LZ4_CMAKE_ON= -DGRN_WITH_LZ4=ON -DWITH_INNODB_LZ4=ON -DWITH_ROCKSDB_LZ4=ON LZ4_CMAKE_OFF= -DGRN_WITH_LZ4=OFF -DWITH_INNODB_LZ4=OFF -DWITH_ROCKSDB_LZ4=OFF LZ4_LIB_DEPENDS= liblz4.so:archivers/liblz4 LZO_CMAKE_ON= -DWITH_INNODB_LZO=ON LZO_CMAKE_OFF= -DWITH_INNODB_LZO=OFF LZO_LIB_DEPENDS= liblzo2.so:archivers/lzo2 MROONGA_IMPLIES= LZ4 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy ROCKSDB_USES= python ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON SNAPPY_CMAKE_OFF= -DWITH_INNODB_SNAPPY=OFF -DWITH_ROCKSDB_snappy=OFF SNAPPY_LIB_DEPENDS= libsnappy.so:archivers/snappy WSREP_CMAKE_BOOL= WITH_WSREP WSREP_LIB_DEPENDS= libgalera.so:databases/galera26 WSREP_RUN_DEPENDS= bash:shells/bash \ rsync:net/rsync \ #stunnel:security/stunnel WSREP_SHEBANG_FILES= bin/wsrep_sst_rsync ZMQ_LIB_DEPENDS= libzmq.so:net/libzmq4 ZSTD_CMAKE_ON= -DWITH_ROCKSDB_zstd=ON ZSTD_CMAKE_OFF= -DWITH_ROCKSDB_zstd=OFF ZSTD_LIB_DEPENDS= libzstd.so:archivers/zstd .for PLUGIN in ${DISABLED_PLUGINS} CMAKE_ARGS+= -DPLUGIN_${PLUGIN}=NO .endfor .endif # ${PKGNAMESUFFIX:M*-client} .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1200057 SUB_LIST+= LEGACY_LIMITS="@comment " MODERN_LIMITS="" .else SUB_LIST+= LEGACY_LIMITS="" MODERN_LIMITS="@comment " .endif .if ${SSL_DEFAULT} != base && ${PORT_OPTIONS:MGSSAPI_BASE} GSSAPI_BASE_IGNORE= GSSAPI_BASE is not compatible with OpenSSL from ports. Use other GSSAPI options or OpenSSL from base system .endif .if ${ARCH} != amd64 PLIST_SUB+= WSREP="@comment " .endif .if ${ARCH} == i386 USE_GCC= yes CFLAGS+= -DHAVE_GCC_C11_ATOMICS -latomic -DUSE_NEW_READLINE_INTERFACE CXXFLAGS+= -fpermissive .endif post-patch: ${MV} ${WRKSRC}/storage/mroonga/version ${WRKSRC}/storage/mroonga/version_txt .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake .endif post-configure: ${REINPLACE_CMD} -Ee 's|(#define INCLUDE.*)"$$|\1 -I${PREFIX}/include"|' \ -e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \ ${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c ${REINPLACE_CMD} 's|%%LOCALBASE%%|${PREFIX}|' \ ${WRKSRC}/scripts/mysql_config.sh pre-install: ${MKDIR} ${STAGEDIR}${ETCDIR}/conf.d .if ${PKGNAMESUFFIX:M*-client} post-install: ${INSTALL_DATA} ${WRKDIR}/my.cnf.sample ${STAGEDIR}${ETCDIR}/my.cnf.sample ${INSTALL_DATA} ${WRKDIR}/client.cnf.sample \ ${STAGEDIR}${ETCDIR}/conf.d/client.cnf.sample ${MV} ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig/mariadb.pc \ ${STAGEDIR}${PREFIX}/libdata/pkgconfig/mariadb.pc ${RM} -r ${STAGEDIR}${DATADIR} \ ${STAGEDIR}${PREFIX}/include/mysql/server \ ${STAGEDIR}${ETCDIR}/init.d \ ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig ${MKDIR} ${STAGEDIR}${MARIADB_RUNDIR} post-install-GSSAPI_NONE-off: ${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/mysql/plugin/auth_gssapi_client.so .else # ! ${PKGNAMESUFFIX:M*-client} post-install: ${INSTALL_DATA} ${WRKDIR}/server.cnf.sample \ ${STAGEDIR}${ETCDIR}/conf.d/server.cnf.sample ${MV} ${STAGEDIR}${PREFIX}/share/user_map.conf \ ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample ${MV} ${STAGEDIR}${PREFIX}/share/pam_user_map.so \ ${STAGEDIR}${PREFIX}/lib/mysql/ ${RM} -r ${STAGEDIR}${PREFIX}/share/mysql/policy \ ${STAGEDIR}${PREFIX}/include/mysql/server/private \ ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig \ ${STAGEDIR}/suite \ ${STAGEDIR}${ETCDIR}/init.d \ ${STAGEDIR}${ETCDIR}/logrotate.d ${MKDIR} ${STAGEDIR}${MARIADB_LOGDIR} post-install-WSREP-on: ${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \ ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample post-install-SPIDER-on: ${MV} ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf \ ${STAGEDIR}${ETCDIR}/conf.d/spider.cnf.sample .endif # ${PKGNAMESUFFIX:M*-client} .include Index: head/databases/mariadb105-server/distinfo =================================================================== --- head/databases/mariadb105-server/distinfo (revision 546947) +++ head/databases/mariadb105-server/distinfo (revision 546948) @@ -1,3 +1,3 @@ -TIMESTAMP = 1593020847 -SHA256 (mariadb-10.5.4.tar.gz) = 26db2becc9cec37e99a4e73390bd2eaa74568e21f9cf110359f4f68b37154c72 -SIZE (mariadb-10.5.4.tar.gz) = 86793964 +TIMESTAMP = 1597213394 +SHA256 (mariadb-10.5.5.tar.gz) = cf6b2c061754c07bbb1d20b29ae111bf2d098297c9b8c321b810638a179088a4 +SIZE (mariadb-10.5.5.tar.gz) = 86880268 Index: head/databases/mariadb105-server/files/patch-MDEV-15961 =================================================================== --- head/databases/mariadb105-server/files/patch-MDEV-15961 (revision 546947) +++ head/databases/mariadb105-server/files/patch-MDEV-15961 (nonexistent) @@ -1,54 +0,0 @@ -MDEV-15961: Fix stacktraces under FreeBSD - -https://jira.mariadb.org/browse/MDEV-15961 ---- mysys/stacktrace.c.orig 2020-06-23 15:10:17 UTC -+++ mysys/stacktrace.c -@@ -33,13 +33,13 @@ - #include - #endif - -+#ifdef __linux__ - #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end) -- - static char *heap_start; -- --#if(defined HAVE_BSS_START) && !(defined __linux__) - extern char *__bss_start; --#endif -+#else -+#define PTR_SANE(p) (p) -+#endif /* __linux */ - - /** - Default handler for printing stacktrace -@@ -67,9 +67,9 @@ static sig_handler default_handle_fatal_signal(int sig - - void my_init_stacktrace(int setup_handlers) - { --#if(defined HAVE_BSS_START) && !(defined __linux__) -+#ifdef __linux__ - heap_start = (char*) &__bss_start; --#endif -+#endif /* __linux__ */ - if (setup_handlers) - { - struct sigaction sa; -@@ -186,15 +186,16 @@ static int safe_print_str(const char *addr, size_t max - - int my_safe_print_str(const char* val, size_t max_len) - { -+#ifdef __linux__ -+/* Only needed by the linux version of PTR_SANE */ - char *heap_end; - --#ifdef __linux__ - // Try and make use of /proc filesystem to safely print memory contents. - if (!safe_print_str(val, max_len)) - return 0; --#endif - - heap_end= (char*) sbrk(0); -+#endif - - if (!PTR_SANE(val)) - { Property changes on: head/databases/mariadb105-server/files/patch-MDEV-15961 ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb105-server/files/patch-storage_perfschema_my__thread.h =================================================================== --- head/databases/mariadb105-server/files/patch-storage_perfschema_my__thread.h (revision 546947) +++ head/databases/mariadb105-server/files/patch-storage_perfschema_my__thread.h (nonexistent) @@ -1,13 +0,0 @@ ---- storage/perfschema/my_thread.h.orig 2020-06-23 15:10:17 UTC -+++ storage/perfschema/my_thread.h -@@ -10,6 +10,10 @@ - #include - #endif - -+#ifdef HAVE_PTHREAD_GETTHREADID_NP -+#include -+#endif -+ - typedef pthread_key_t thread_local_key_t; - typedef pthread_t my_thread_handle; - typedef pthread_attr_t my_thread_attr_t; Property changes on: head/databases/mariadb105-server/files/patch-storage_perfschema_my__thread.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mydumper/files/patch-config.h =================================================================== --- head/databases/mydumper/files/patch-config.h (nonexistent) +++ head/databases/mydumper/files/patch-config.h (revision 546948) @@ -0,0 +1,15 @@ +--- config.h.orig 2017-10-24 17:27:46 UTC ++++ config.h +@@ -4,4 +4,12 @@ + #define VERSION "0.9.3" + /* #undef WITH_BINLOG */ + ++#if defined(LIBMYSQL_VERSION) ++#define MYSQL_VERSION_STR LIBMYSQL_VERSION ++#elif defined(MARIADB_CLIENT_VERSION_STR) ++#define MYSQL_VERSION_STR MARIADB_CLIENT_VERSION_STR ++#else ++#define MYSQL_VERSION_STR MYSQL_VERSION_NUMBER ++#endif ++ + #endif Property changes on: head/databases/mydumper/files/patch-config.h ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mydumper/files/patch-mydumper.c =================================================================== --- head/databases/mydumper/files/patch-mydumper.c (nonexistent) +++ head/databases/mydumper/files/patch-mydumper.c (revision 546948) @@ -0,0 +1,11 @@ +--- mydumper.c.orig 2017-09-07 14:53:02 UTC ++++ mydumper.c +@@ -824,7 +824,7 @@ int main(int argc, char *argv[]) + g_option_context_free(context); + + if (program_version) { +- g_print("mydumper %s, built against MySQL %s\n", VERSION, MYSQL_SERVER_VERSION); ++ g_print("mydumper %s, built against MySQL %s\n", VERSION, MYSQL_VERSION_STR); + exit (EXIT_SUCCESS); + } + Property changes on: head/databases/mydumper/files/patch-mydumper.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/mydumper/files/patch-myloader.c =================================================================== --- head/databases/mydumper/files/patch-myloader.c (nonexistent) +++ head/databases/mydumper/files/patch-myloader.c (revision 546948) @@ -0,0 +1,11 @@ +--- myloader.c.orig 2017-09-07 14:53:02 UTC ++++ myloader.c +@@ -114,7 +114,7 @@ int main(int argc, char *argv[]) { + g_option_context_free(context); + + if (program_version) { +- g_print("myloader %s, built against MySQL %s\n", VERSION, MYSQL_SERVER_VERSION); ++ g_print("myloader %s, built against MySQL %s\n", VERSION, MYSQL_VERSION_STR); + exit(EXIT_SUCCESS); + } + Property changes on: head/databases/mydumper/files/patch-myloader.c ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/p5-DBD-MariaDB/Makefile =================================================================== --- head/databases/p5-DBD-MariaDB/Makefile (nonexistent) +++ head/databases/p5-DBD-MariaDB/Makefile (revision 546948) @@ -0,0 +1,37 @@ +# Created by: Sergey Skvortsov +# $FreeBSD$ + +PORTNAME= DBD-MariaDB +PORTVERSION= 1.21 +CATEGORIES= databases perl5 +MASTER_SITES= CPAN +MASTER_SITE_SUBDIR= CPAN:CAPTTOFU +PKGNAMEPREFIX= p5- + +MAINTAINER= perl@FreeBSD.org +COMMENT?= MariaDB driver for the Perl5 Database Interface (DBI) + +LICENSE= ART10 GPLv1+ +LICENSE_COMB= dual +LICENSE_FILE= ${WRKSRC}/LICENSE + +BUILD_DEPENDS= ${RUN_DEPENDS} \ + p5-Devel-CheckLib>=1.09:devel/p5-Devel-CheckLib +RUN_DEPENDS= p5-DBI>=1.08:databases/p5-DBI +TEST_DEPENDS= p5-Test-Deep>=0:devel/p5-Test-Deep + +CONFLICTS_INSTALL?= p5-DBD-mysql* + +USES= compiler:c11 mysql perl5 +CONFIGURE_ARGS= ${CONFIGURE_ARGS_${CHOSEN_COMPILER_TYPE}} +CONFIGURE_ARGS_gcc= --libs="-L${PREFIX}/lib/gcc${GCC_DEFAULT} `mysql_config --libs | ${SED} 's/-pthread //'`" +USE_PERL5= configure + +OPTIONS_DEFINE= SSL +SSL_RUN_DEPENDS= p5-Crypt-SSLeay>=0:security/p5-Crypt-SSLeay +SSL_USES= ssl + +post-install: + ${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/DBD/MariaDB/MariaDB.so + +.include Property changes on: head/databases/p5-DBD-MariaDB/Makefile ___________________________________________________________________ Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:keywords ## -0,0 +1 ## +FreeBSD=%H \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/p5-DBD-MariaDB/distinfo =================================================================== --- head/databases/p5-DBD-MariaDB/distinfo (nonexistent) +++ head/databases/p5-DBD-MariaDB/distinfo (revision 546948) @@ -0,0 +1,3 @@ +TIMESTAMP = 1590929587 +SHA256 (DBD-MariaDB-1.21.tar.gz) = f5972b337a0d1d4726b2471eb79f23ee0cdd034bf43f4e13f2b5162597271419 +SIZE (DBD-MariaDB-1.21.tar.gz) = 179911 Property changes on: head/databases/p5-DBD-MariaDB/distinfo ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/p5-DBD-MariaDB/pkg-plist =================================================================== --- head/databases/p5-DBD-MariaDB/pkg-plist (nonexistent) +++ head/databases/p5-DBD-MariaDB/pkg-plist (revision 546948) @@ -0,0 +1,6 @@ +%%SITE_ARCH%%/DBD/MariaDB.pm +%%SITE_ARCH%%/DBD/MariaDB.pod +%%SITE_ARCH%%/DBD/MariaDB/INSTALL.pod +%%SITE_ARCH%%/auto/DBD/MariaDB/MariaDB.so +%%PERL5_MAN3%%/DBD::MariaDB.3.gz +%%PERL5_MAN3%%/DBD::MariaDB::INSTALL.3.gz Property changes on: head/databases/p5-DBD-MariaDB/pkg-plist ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property Index: head/databases/p5-DBD-MariaDB/pkg-descr =================================================================== --- head/databases/p5-DBD-MariaDB/pkg-descr (nonexistent) +++ head/databases/p5-DBD-MariaDB/pkg-descr (revision 546948) @@ -0,0 +1,8 @@ +DBD::mysql is the Perl5 Database Interface driver for the MySQL +database. In other words: DBD::mysql is an interface between the Perl +programming language and the MySQL programming API that comes with the +MySQL relational database management system. Most functions provided by +this programming API are supported. Some rarely used functions are +missing, mainly because noone ever requested them. + +WWW: https://metacpan.org/release/DBD-mysql Property changes on: head/databases/p5-DBD-MariaDB/pkg-descr ___________________________________________________________________ Added: fbsd:nokeywords ## -0,0 +1 ## +yes \ No newline at end of property Added: svn:eol-style ## -0,0 +1 ## +native \ No newline at end of property Added: svn:mime-type ## -0,0 +1 ## +text/plain \ No newline at end of property