git: f194935cd9b9 - 2022Q2 - databases/mariadb103-server: Security update to 10.3.35

The branch 2022Q2 has been updated by brnrd:

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

commit f194935cd9b9c0b5aa196b4e8a0b7fcd1dc3fd65
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2022-05-24 15:40:12 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2022-05-24 15:54:25 +0000

    databases/mariadb103-server: Security update to 10.3.35
    
    PR:             264170
    Submitted by:   Vincent Jancso <vincent jancso outlook com>
    Security:       04fecc47-dad2-11ec-8fbd-d4c9ef517024
    MFH:            2022Q2
    
    (cherry picked from commit 6202520020d9c4f553a2c522a8004521dfa20418)
---
 databases/mariadb103-server/Makefile               | 24 +++++++++++++---------
 databases/mariadb103-server/distinfo               |  6 +++---
 .../files/patch-scripts_wsrep__sst__mariabackup.sh |  8 ++++----
 databases/mariadb103-server/pkg-plist              |  1 +
 4 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
index 3f1cd3808b50..d2291a6fcf6b 100644
--- a/databases/mariadb103-server/Makefile
+++ b/databases/mariadb103-server/Makefile
@@ -1,17 +1,21 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.3.34
-PORTREVISION?=	3
+PORTVERSION=	10.3.35
+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?=	103-server
 
 MAINTAINER=	brnrd@FreeBSD.org
diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo
index 0531466b9f73..85dd7e89a589 100644
--- a/databases/mariadb103-server/distinfo
+++ b/databases/mariadb103-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1645042460
-SHA256 (mariadb-10.3.34.tar.gz) = 7b7013448519d20590ec90eac54ca54e9ac9c4b7d90eaacb7451650e38be0627
-SIZE (mariadb-10.3.34.tar.gz) = 73455446
+TIMESTAMP = 1653403585
+SHA256 (mariadb-10.3.35.tar.gz) = 89a67dbb3f386533d393859106a61d1bca5eea9d9dc89e217e8d094ebc5109db
+SIZE (mariadb-10.3.35.tar.gz) = 73496487
diff --git a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
index 74b1efd3cb67..7f3ea98f52e1 100644
--- a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
+++ b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
@@ -1,11 +1,11 @@
---- scripts/wsrep_sst_mariabackup.sh.orig	2022-02-16 20:18:40 UTC
+--- scripts/wsrep_sst_mariabackup.sh.orig	2022-05-24 14:46:36 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/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist
index 1fc101501ad0..2911a72f9f0d 100644
--- a/databases/mariadb103-server/pkg-plist
+++ b/databases/mariadb103-server/pkg-plist
@@ -44,6 +44,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