git: 394caeee0711 - 2022Q2 - databases/mariadb105-server: Security update to 10.5.16

The branch 2022Q2 has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=394caeee071133239580dcfae79b1d678269a86d

commit 394caeee071133239580dcfae79b1d678269a86d
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2022-05-24 12:47:20 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2022-05-24 15:49:32 +0000

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

diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index c24577943a5d..1504557ec493 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -1,16 +1,22 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.5.15
-PORTREVISION?=	3
+PORTVERSION=	10.5.16
+PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	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?=	105-server
 
 MAINTAINER=	brnrd@FreeBSD.org
diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo
index ff789d036591..680786683170 100644
--- a/databases/mariadb105-server/distinfo
+++ b/databases/mariadb105-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1644826126
-SHA256 (mariadb-10.5.15.tar.gz) = 8980ed37f870ce3217c3c7a1b223a8362c28f277afc4d0005d1a9f1256f7db59
-SIZE (mariadb-10.5.15.tar.gz) = 102803624
+TIMESTAMP = 1653332795
+SHA256 (mariadb-10.5.16.tar.gz) = c13e87258d9b70d5dcc8ce81c4d4b912bb775330a4c3bff74f1aab30693cd2a6
+SIZE (mariadb-10.5.16.tar.gz) = 105798374
diff --git a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh
deleted file mode 100644
index 0c2fb501b208..000000000000
--- a/databases/mariadb105-server/files/patch-scripts_wsrep__sst__mariabackup.sh
+++ /dev/null
@@ -1,11 +0,0 @@
---- scripts/wsrep_sst_mariabackup.sh.orig	2022-02-14 08:10:09 UTC
-+++ scripts/wsrep_sst_mariabackup.sh
-@@ -715,7 +715,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
-                 ltcmd="timeout -k $(( tmt+10 )) $tmt $tcmd"
-             else
-                 ltcmd="timeout -s9 $tmt $tcmd"
diff --git a/databases/mariadb105-server/pkg-plist b/databases/mariadb105-server/pkg-plist
index 42bfa4d8e6a8..93ad5a237622 100644
--- a/databases/mariadb105-server/pkg-plist
+++ b/databases/mariadb105-server/pkg-plist
@@ -49,6 +49,7 @@ bin/resolve_stack_dump
 bin/resolveip
 %%ROCKSDB%%bin/sst_dump
 @comment bin/test-connect-t
+%%WSREP%%bin/wsrep_sst_backup
 %%WSREP%%bin/wsrep_sst_common
 %%WSREP%%bin/wsrep_sst_mariabackup
 %%WSREP%%bin/wsrep_sst_mysqldump
@@ -270,6 +271,7 @@ man/man8/mariadbd.8.gz
 man/man8/mysqld.8.gz
 @comment share/aclocal/mysql.m4
 %%DATADIR%%/binary-configure
+%%DATADIR%%/bulgarian/errmsg.sys
 %%DATADIR%%/charsets/Index.xml
 %%DATADIR%%/charsets/README
 %%DATADIR%%/charsets/armscii8.xml
@@ -296,6 +298,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