git: 403d9a8d740d - 2022Q2 - databases/mariadb104-server: Security update to 10.4.25

The branch 2022Q2 has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=403d9a8d740dc8f8ff234c4a8ac93dc43e4eacc1

commit 403d9a8d740dc8f8ff234c4a8ac93dc43e4eacc1
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2022-05-24 14:43:33 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2022-05-24 15:51:06 +0000

    databases/mariadb104-server: Security update to 10.4.25
    
    Security:       04fecc47-dad2-11ec-8fbd-d4c9ef517024
    MFH:            2022Q2
    (cherry picked from commit be54a31d4abb841c61e50f2478ec2127dcb18e75)
---
 databases/mariadb104-server/Makefile               | 24 +++++++++++++---------
 databases/mariadb104-server/distinfo               |  6 +++---
 .../files/patch-scripts_wsrep__sst__mariabackup.sh |  8 ++++----
 databases/mariadb104-server/pkg-plist              |  3 +++
 4 files changed, 24 insertions(+), 17 deletions(-)

diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
index d55d7a7b671f..c140b714813f 100644
--- a/databases/mariadb104-server/Makefile
+++ b/databases/mariadb104-server/Makefile
@@ -1,17 +1,21 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.4.24
-PORTREVISION?=	3
+PORTVERSION=	10.4.25
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	http://ftp.nluug.nl/db/${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}/
+MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
+		https://mirror.one.com/${SITESDIR}/ \
+		https://ftp.nluug.nl/db/${SITESDIR}/ \
+		https://ftp.icm.edu.pl/pub/unix/database/${SITESDIR}/ \
+		https://mirror.truenetwork.ru/${SITESDIR}/ \
+		https://mirrors.aliyun.com/${SITESDIR}/ \
+		https://ftp.ubuntu-tw.org/mirror/${SITESDIR}/ \
+		https://mirror.kku.ac.th/${SITESDIR}/ \
+		https://espejito.fder.edu.uy/${SITESDIR}/ \
+		https://mirror1.cl.netactuate.com/${SITESDIR}/ \
+		https://ftp.osuosl.org/pub/${SITESDIR}/ \
+		https://downloads.mariadb.org/rest-api/mariadb/${PORTVERSION}/
 PKGNAMESUFFIX?=	104-server
 
 MAINTAINER=	brnrd@FreeBSD.org
diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo
index 28d88b848050..822ff7862035 100644
--- a/databases/mariadb104-server/distinfo
+++ b/databases/mariadb104-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645092859
-SHA256 (mariadb-10.4.24.tar.gz) = fe975551b37f095640ea5e380eb896a37e331caf113dbe5d05564714338df846
-SIZE (mariadb-10.4.24.tar.gz) = 85669405
+TIMESTAMP = 1653396574
+SHA256 (mariadb-10.4.25.tar.gz) = ff963c4e11bc06b775f66f2b1ddef184996208fb4b23cfdb50d95fb02eaa7ef8
+SIZE (mariadb-10.4.25.tar.gz) = 88680777
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 3e3d42812b67..0b4dc528c293 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	2022-02-17 10:18:49 UTC
+--- scripts/wsrep_sst_mariabackup.sh.orig	2022-05-24 12:49:43 UTC
 +++ scripts/wsrep_sst_mariabackup.sh
-@@ -715,7 +715,7 @@ recv_joiner()
+@@ -725,7 +725,7 @@ recv_joiner()
      local ltcmd="$tcmd"
      if [ $tmt -gt 0 ]; then
          if [ -n "$(commandex timeout)" ]; then
--            if timeout --help | grep -qw -- '-k'; then
-+            if timeout --help 2>&1 | grep -qw -- '-k'; then
+-            if timeout --help | grep -qw -F -- '-k'; then
++            if timeout --help 2>&1 | grep -qw -F -- '-k'; then
                  ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
              else
                  ltcmd="timeout -s9 $tmt $tcmd"
diff --git a/databases/mariadb104-server/pkg-plist b/databases/mariadb104-server/pkg-plist
index 7a65cd836c1d..34e0809f8d96 100644
--- a/databases/mariadb104-server/pkg-plist
+++ b/databases/mariadb104-server/pkg-plist
@@ -48,6 +48,7 @@ bin/resolveip
 @comment bin/test-connect-t
 %%TOKUDB%%bin/tokuft_logprint
 %%TOKUDB%%bin/tokuftdump
+%%WSREP%%bin/wsrep_sst_backup
 %%WSREP%%bin/wsrep_sst_common
 %%WSREP%%bin/wsrep_sst_mariabackup
 %%WSREP%%bin/wsrep_sst_mysqldump
@@ -244,6 +245,7 @@ man/man1/resolveip.1.gz
 man/man8/mariadbd.8.gz
 man/man8/mysqld.8.gz
 %%DATADIR%%/binary-configure
+%%DATADIR%%/bulgarian/errmsg.sys
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
 %%DATADIR%%/charsets/armscii8.xml
@@ -270,6 +272,7 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/charsets/macce.xml
 %%DATADIR%%/charsets/macroman.xml
 %%DATADIR%%/charsets/swe7.xml
+%%DATADIR%%/chinese/errmsg.sys
 %%DATADIR%%/czech/errmsg.sys
 %%DATADIR%%/danish/errmsg.sys
 %%DATADIR%%/dutch/errmsg.sys