Date: Wed, 30 Jun 2021 16:50:34 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 89b30bb9de06 - main - databases/mariadb104-server: Update to 10.4.20 Message-ID: <202106301650.15UGoYex039113@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=89b30bb9de066abf8e3710b8f5f37bbe0489b549 commit 89b30bb9de066abf8e3710b8f5f37bbe0489b549 Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2021-06-30 16:48:56 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2021-06-30 16:48:56 +0000 databases/mariadb104-server: Update to 10.4.20 * Fix build on RISC-V and i386 [1] * Fix plist issue with WSREP on i386 [1] PR: 256618 Submitted by: Robert Clausecker <fuz fuz su> --- databases/mariadb104-server/Makefile | 12 +++--------- databases/mariadb104-server/distinfo | 6 +++--- .../files/patch-scripts_wsrep__sst__mariabackup.sh | 20 ++++++++++---------- .../files/patch-scripts_wsrep__sst__rsync.sh | 18 ------------------ .../mariadb104-server/files/patch-sql_mysqld.cc | 22 ++++++++++++++++++++-- 5 files changed, 36 insertions(+), 42 deletions(-) diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile index afac272ac180..474b8c133db6 100644 --- a/databases/mariadb104-server/Makefile +++ b/databases/mariadb104-server/Makefile @@ -1,8 +1,7 @@ # Created by: Bernard Spil <brnrd@FreeBSD.org> PORTNAME?= mariadb -PORTVERSION= 10.4.19 -PORTREVISION?= 0 +PORTVERSION= 10.4.20 CATEGORIES= databases MASTER_SITES= http://mirrors.supportex.net/${SITESDIR}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ @@ -20,9 +19,6 @@ COMMENT?= Multithreaded SQL database (server) LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -BROKEN_i386= compile error: undeclared identifier 'my_atomic_add32' -BROKEN_riscv64= fails to compile: needs FP_X_INV from empty sys/riscv/include/ieeefp.h - USES= bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl SUB_FILES= pkg-message @@ -255,11 +251,9 @@ post-install: ${STAGEDIR}${PREFIX}/lib/mysql/pkgconfig ${MV} ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf \ ${STAGEDIR}${PREFIX}/etc/mysql/user_map.conf.sample - ${MKDIR} ${STAGEDIR}/${MARIADB_LOGDIR} - -post-install-WSREP-on: ${MV} ${STAGEDIR}${DATADIR}/wsrep.cnf \ - ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample + ${STAGEDIR}${ETCDIR}/conf.d/wsrep.cnf.sample || true + ${MKDIR} ${STAGEDIR}/${MARIADB_LOGDIR} .endif # ${PKGNAMESUFFIX:M*-client} .include <bsd.port.post.mk> diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo index cd993dbc8071..ca5fdaed7c2f 100644 --- a/databases/mariadb104-server/distinfo +++ b/databases/mariadb104-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1620481669 -SHA256 (mariadb-10.4.19.tar.gz) = ac4fcfeaaaf24a2d4aac8662be7b7da42de045a680fc1d5836263405341f3975 -SIZE (mariadb-10.4.19.tar.gz) = 82042449 +TIMESTAMP = 1625063243 +SHA256 (mariadb-10.4.20.tar.gz) = 87d5e29ee1f18de153266ec658138607703ed2a05b3ffb1f89091d33f4abf545 +SIZE (mariadb-10.4.20.tar.gz) = 82043644 diff --git a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh index 2b81b4eca7b8..dc45c2d238c7 100644 --- a/databases/mariadb104-server/files/patch-scripts_wsrep__sst__mariabackup.sh +++ b/databases/mariadb104-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-09 14:23:11.000000000 +0200 +++ 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 @@ + 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/mariadb104-server/files/patch-scripts_wsrep__sst__rsync.sh b/databases/mariadb104-server/files/patch-scripts_wsrep__sst__rsync.sh deleted file mode 100644 index 85d6c46a5f7d..000000000000 --- a/databases/mariadb104-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/mariadb104-server/files/patch-sql_mysqld.cc b/databases/mariadb104-server/files/patch-sql_mysqld.cc index ab4a1ed810a5..4109d800da4c 100644 --- a/databases/mariadb104-server/files/patch-sql_mysqld.cc +++ b/databases/mariadb104-server/files/patch-sql_mysqld.cc @@ -1,6 +1,24 @@ ---- sql/mysqld.cc.orig 2017-05-14 23:13:18 UTC +--- sql/mysqld.cc.orig 2021-05-05 15:26:23 UTC +++ sql/mysqld.cc -@@ -4838,8 +4840,9 @@ static void init_ssl() +@@ -206,7 +206,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. +@@ -219,7 +219,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 && defined(FP_X_INV) */ + + #ifdef HAVE_FEDISABLEEXCEPT + fedisableexcept(FE_ALL_EXCEPT); +@@ -5033,8 +5033,9 @@ static void init_ssl() while ((err= ERR_get_error())) sql_print_warning("SSL error: %s", ERR_error_string(err, NULL)); }
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202106301650.15UGoYex039113>