cpet/freebsd-ports
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

databases/mariadb103-server: Update to 10.3.30

Browse Source 
PR:		256827 [1], 256618 [2]
Reported by:	<vincent jancso outlook com> [1], Robert Clausecker <fuz fuz su> [2]
This commit is contained in:
Bernard Spil 2021-06-30 08:30:18 +00:00
parent a314326885
commit 8d286ea381
4 changed files with 34 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/mariadb103-server/Makefile
View File

@ -1,7 +1,7 @@
# Created by: Bernard Spil <brnrd@FreeBSD.org>
PORTNAME?= mariadb
PORTVERSION= 10.3.29
PORTVERSION= 10.3.30
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
SUB_FILES= pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message

6
databases/mariadb103-server/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1620455361
SHA256 (mariadb-10.3.29.tar.gz) = 304a9e94c50636b591ac7cbfe459cb341d345c4bd0ef5e45fb9a692268e6db38
SIZE (mariadb-10.3.29.tar.gz) = 73261682
TIMESTAMP = 1624605956
SHA256 (mariadb-10.3.30.tar.gz) = bd8735c65bdb7ebcd5d779fb9d3de3f2fcd319ad6482278d73dfe7301ad4ae1b
SIZE (mariadb-10.3.30.tar.gz) = 73266479

20
databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
View File

@ -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"

22
databases/mariadb103-server/files/patch-sql_mysqld.cc
View File

@ -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));
}