From owner-dev-commits-ports-all@freebsd.org Wed Jun 30 14:24:57 2021 Return-Path: Delivered-To: dev-commits-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 195216654D9; Wed, 30 Jun 2021 14:24:57 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4GFNsN75Hlz4Xcd; Wed, 30 Jun 2021 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id CD60D64BA; Wed, 30 Jun 2021 14:24:56 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 15UEOuLi045236; Wed, 30 Jun 2021 14:24:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 15UEOu58045235; Wed, 30 Jun 2021 14:24:56 GMT (envelope-from git) Date: Wed, 30 Jun 2021 14:24:56 GMT Message-Id: <202106301424.15UEOu58045235@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: c930ca58ddbb - main - databases/mariadb105-server: Update to 10.5.11 MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: c930ca58ddbb4e9e86c2cba0ff30a4c31bfdfc56 Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-all@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commit messages for all branches of the ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 30 Jun 2021 14:24:57 -0000 The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=c930ca58ddbb4e9e86c2cba0ff30a4c31bfdfc56 commit c930ca58ddbb4e9e86c2cba0ff30a4c31bfdfc56 Author: Bernard Spil AuthorDate: 2021-06-30 14:23:30 +0000 Commit: Bernard Spil CommitDate: 2021-06-30 14:23:30 +0000 databases/mariadb105-server: Update to 10.5.11 * Fix build with RISC-V [1] PR: 256618 [1] Submitted by: Robert Clausecker [1] --- databases/mariadb105-client/Makefile | 1 - databases/mariadb105-server/Makefile | 4 +--- databases/mariadb105-server/distinfo | 6 +++--- .../files/patch-scripts_wsrep__sst__mariabackup.sh | 20 ++++++++++---------- .../files/patch-scripts_wsrep__sst__rsync.sh | 18 ------------------ .../mariadb105-server/files/patch-sql_mysqld.cc | 20 ++++++++++++++++++++ 6 files changed, 34 insertions(+), 35 deletions(-) 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,7 +1,6 @@ # Created by: Bernard Spil PORTNAME= mariadb -PORTREVISION= 1 PKGNAMESUFFIX= 105-client COMMENT= Multithreaded SQL database (client) 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,7 +1,7 @@ # 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}/ \ @@ -20,8 +20,6 @@ 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 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);