git: 343566fef1e1 - 2022Q1 - databases/mariadb103-server: Security update to 10.3.34

The branch 2022Q1 has been updated by brnrd:

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

commit 343566fef1e114a293b66e3fa04808529fee6981
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2022-02-17 10:09:09 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2022-02-19 13:05:40 +0000

    databases/mariadb103-server: Security update to 10.3.34
    
    PR:             261969
    Security:       ff5606f7-8a45-11ec-8be6-d4c9ef517024
    MFH:            2022Q1
    (cherry picked from commit b7f811a8ea8132998af511b9a105a25137dcb20d)
---
 databases/mariadb103-client/pkg-plist                  |  1 +
 databases/mariadb103-server/Makefile                   |  4 ++--
 databases/mariadb103-server/distinfo                   |  6 +++---
 .../files/patch-libmariadb_libmariadb_CMakeLists.txt   | 18 +++++++++++-------
 .../files/patch-scripts_wsrep__sst__mariabackup.sh     |  6 +++---
 databases/mariadb103-server/pkg-plist                  |  1 +
 6 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/databases/mariadb103-client/pkg-plist b/databases/mariadb103-client/pkg-plist
index 2bf148b27732..7e71f3d1ebe8 100644
--- a/databases/mariadb103-client/pkg-plist
+++ b/databases/mariadb103-client/pkg-plist
@@ -46,6 +46,7 @@ include/mysql/mysqld_error.h
 @sample etc/my.cnf.sample
 @comment libexec/rcmysql
 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
+lib/mysql/libmariadb.a
 lib/mysql/libmariadb.so
 lib/mysql/libmariadb.so.3
 lib/mysql/libmariadbclient.a
diff --git a/databases/mariadb103-server/Makefile b/databases/mariadb103-server/Makefile
index 8ae086ab6851..e909d791df8c 100644
--- a/databases/mariadb103-server/Makefile
+++ b/databases/mariadb103-server/Makefile
@@ -1,10 +1,10 @@
 # Created by: Bernard Spil <brnrd@FreeBSD.org>
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.3.32
+PORTVERSION=	10.3.34
 PORTREVISION?=	0
 CATEGORIES=	databases
-MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
+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}/ \
diff --git a/databases/mariadb103-server/distinfo b/databases/mariadb103-server/distinfo
index 12faf4cdb3be..0531466b9f73 100644
--- a/databases/mariadb103-server/distinfo
+++ b/databases/mariadb103-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1636550062
-SHA256 (mariadb-10.3.32.tar.gz) = 948d0cdf2f92c60cff4232af9d724e0a4bbeafbb35762fa429e7ba5c3811c064
-SIZE (mariadb-10.3.32.tar.gz) = 73389214
+TIMESTAMP = 1645042460
+SHA256 (mariadb-10.3.34.tar.gz) = 7b7013448519d20590ec90eac54ca54e9ac9c4b7d90eaacb7451650e38be0627
+SIZE (mariadb-10.3.34.tar.gz) = 73455446
diff --git a/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt b/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
index 0542221db134..d94132520da5 100644
--- a/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
+++ b/databases/mariadb103-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
@@ -1,14 +1,18 @@
---- libmariadb/libmariadb/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
+--- libmariadb/libmariadb/CMakeLists.txt.orig	2022-02-10 19:31:02 UTC
 +++ libmariadb/libmariadb/CMakeLists.txt
-@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
+@@ -459,6 +459,7 @@ IF(NOT WIN32)
+   SET_TARGET_PROPERTIES(mariadbclient PROPERTIES OUTPUT_NAME "${LIBMARIADB_STATIC_NAME}")
+ ENDIF()
+ 
++IF(NOT WITHOUT_CLIENT)
  INSTALL(TARGETS mariadbclient
            COMPONENT Development
            DESTINATION ${INSTALL_LIBDIR})
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(TARGETS libmariadb
-           COMPONENT SharedLibraries
-         DESTINATION ${INSTALL_LIBDIR})
+@@ -470,6 +471,7 @@ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTA
+         COMPONENT SharedLibraries NAMELINK_SKIP)
+ INSTALL(TARGETS libmariadb LIBRARY DESTINATION ${INSTALL_LIBDIR}
+         COMPONENT Development NAMELINK_ONLY)
 +ENDIF()
  
- IF(WIN32)
+ IF(MSVC)
     # On Windows, install PDB
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 dc45c2d238c7..74b1efd3cb67 100644
--- a/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
+++ b/databases/mariadb103-server/files/patch-scripts_wsrep__sst__mariabackup.sh
@@ -1,9 +1,9 @@
---- scripts/wsrep_sst_mariabackup.sh.orig	2021-06-09 14:23:11.000000000 +0200
+--- scripts/wsrep_sst_mariabackup.sh.orig	2022-02-16 20:18:40 UTC
 +++ scripts/wsrep_sst_mariabackup.sh
-@@ -696,7 +696,7 @@
+@@ -715,7 +715,7 @@ recv_joiner()
      local ltcmd="$tcmd"
      if [ $tmt -gt 0 ]; then
-         if [ -n "$(command -v timeout)" ]; 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"
diff --git a/databases/mariadb103-server/pkg-plist b/databases/mariadb103-server/pkg-plist
index 8ec9d7fffce5..1fc101501ad0 100644
--- a/databases/mariadb103-server/pkg-plist
+++ b/databases/mariadb103-server/pkg-plist
@@ -150,6 +150,7 @@ include/mysql/server/sslopt-case.h
 include/mysql/server/sslopt-longopts.h
 include/mysql/server/sslopt-vars.h
 include/mysql/server/typelib.h
+@comment lib/mysql/libmariadb.a
 @comment lib/mysql/libmariadbclient.a
 lib/mysql/libmariadbd.a
 lib/mysql/libmariadbd.so