diff --git a/databases/mariadb105-client/Makefile b/databases/mariadb105-client/Makefile index aa72da837c8d..1374ded8512f 100644 --- a/databases/mariadb105-client/Makefile +++ b/databases/mariadb105-client/Makefile @@ -1,13 +1,12 @@ # Created by: Bernard Spil PORTNAME= mariadb -PORTREVISION= 1 PKGNAMESUFFIX= 105-client COMMENT= Multithreaded SQL database (client) MASTERDIR= ${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/} PLIST= ${.CURDIR}/pkg-plist .include "${MASTERDIR}/Makefile" diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index 79d61be57b65..20076043c55b 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,284 +1,282 @@ # Created by: Bernard Spil PORTNAME?= mariadb -PORTVERSION= 10.5.10 +PORTVERSION= 10.5.11 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_riscv64= fails to compile: needs FP_X_INV from empty sys/riscv/include/ieeefp.h - LIB_DEPENDS+= libpcre2-8.so:devel/pcre2 # Ugly workaround for MariaDB/CMake library detection LDFLAGS+= -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_DBDIR?= /var/db/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_DEFINE_aarch64= 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="${MARIADB_DBDIR}" \ -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_RUNDIR="${MARIADB_RUNDIR}" \ MARIADB_SOCK="${MARIADB_SOCK}" .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 .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_DBDIR="${MARIADB_DBDIR}" \ MARIADB_LOGDIR="${MARIADB_LOGDIR}" \ MARIADB_USER="${MARIADB_USER}" PLIST_SUB+= MARIADB_LOGDIR="${MARIADB_LOGDIR}" \ MARIADB_USER="${MARIADB_USER}" \ MARIADB_GROUP="${MARIADB_GROUP}" .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 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 && ${ARCH} != aarch64 PLIST_SUB+= WSREP="@comment " .endif .if ${ARCH} == i386 USE_GCC= 9 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 pre-configure: ${REINPLACE_CMD} 's|\(CHECK_LIBRARY_EXISTS.*\) "" HAVE_|\1 ${LOCALBASE}/lib HAVE_|' \ ${WRKSRC}/cmake/pcre.cmake \ ${WRKSRC}/storage/innobase/*.cmake 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 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 diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index 4baff27514dc..e6392dc83a4c 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620475151 -SHA256 (mariadb-10.5.10.tar.gz) = a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb -SIZE (mariadb-10.5.10.tar.gz) = 99019617 +TIMESTAMP = 1624477722 +SHA256 (mariadb-10.5.11.tar.gz) = 761053605fe30ce393f324852117990350840a93b3e6305ef4d2f8c8305cc47a +SIZE (mariadb-10.5.11.tar.gz) = 99037098 diff --git a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh index 2b81b4eca7b8..291b11edadbe 100644 --- a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh @@ -1,11 +1,11 @@ ---- scripts/wsrep_sst_mariabackup.sh.orig 2019-12-11 19:29:57 UTC +--- scripts/wsrep_sst_mariabackup.sh.orig 2021-06-24 09:33:04 UTC +++ scripts/wsrep_sst_mariabackup.sh -@@ -605,7 +605,7 @@ recv_joiner() - set +e - - if [[ $tmt -gt 0 ]] && command -v timeout >/dev/null;then -- if timeout --help | grep -q -- '-k';then -+ if timeout --help 2>&1 | grep -q -- '-k';then - ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" - else - ltcmd="timeout -s9 $tmt $tcmd" +@@ -696,7 +696,7 @@ recv_joiner() + local ltcmd="$tcmd" + if [ $tmt -gt 0 ]; then + if [ -n "$(command -v timeout)" ]; then +- if timeout --help | grep -qw -- '-k'; then ++ if timeout --help 2>&1 | grep -qw -- '-k'; then + ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd" + else + ltcmd="timeout -s9 $tmt $tcmd" diff --git a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__rsync.sh b/databases/mariadb105-server/files/patch-scripts_wsrep__sst__rsync.sh deleted file mode 100644 index 85d6c46a5f7d..000000000000 --- a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__rsync.sh +++ /dev/null @@ -1,18 +0,0 @@ ---- scripts/wsrep_sst_rsync.sh.orig 2020-05-09 19:28:00 UTC -+++ scripts/wsrep_sst_rsync.sh -@@ -390,7 +390,14 @@ EOF - - elif [ "$WSREP_SST_OPT_ROLE" = "joiner" ] - then -- wsrep_check_programs lsof -+ case $OS in -+ FreeBSD) -+ wsrep_check_programs sockstat -+ ;; -+ *) -+ wsrep_check_programs lsof -+ ;; -+ esac - - touch $SST_PROGRESS_FILE - MYSQLD_PID=$WSREP_SST_OPT_PARENT diff --git a/databases/mariadb105-server/files/patch-sql_mysqld.cc b/databases/mariadb105-server/files/patch-sql_mysqld.cc new file mode 100644 index 000000000000..e433bfc7d450 --- /dev/null +++ b/databases/mariadb105-server/files/patch-sql_mysqld.cc @@ -0,0 +1,20 @@ +--- sql/mysqld.cc.orig 2021-06-15 10:16:51 UTC ++++ sql/mysqld.cc +@@ -205,7 +205,7 @@ typedef fp_except fp_except_t; + + inline void setup_fpu() + { +-#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) ++#if defined(__FreeBSD__) && defined(HAVE_IEEEFP_H) && !defined(HAVE_FEDISABLEEXCEPT) && defined(FP_X_INV) + /* We can't handle floating point exceptions with threads, so disable + this on freebsd + Don't fall for overflow, underflow,divide-by-zero or loss of precision. +@@ -218,7 +218,7 @@ inline void setup_fpu() + fpsetmask(~(FP_X_INV | FP_X_OFL | FP_X_UFL | FP_X_DZ | + FP_X_IMP)); + #endif /* FP_X_DNML */ +-#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT */ ++#endif /* __FreeBSD__ && HAVE_IEEEFP_H && !HAVE_FEDISABLEEXCEPT && FP_X_INV */ + + #ifdef HAVE_FEDISABLEEXCEPT + fedisableexcept(FE_ALL_EXCEPT);