git: d86cc48e3f35 - main - databases/mariadb105-server: Security update to 10.5.10

[Bernard Spil]

The branch main has been updated by brnrd:

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

commit d86cc48e3f351a1abb106dfaceb9184b7ea9457e
Author:     Bernard Spil <brnrd at FreeBSD.org>
AuthorDate: 2021-05-13 16:13:08 +0000
Commit:     Bernard Spil <brnrd at FreeBSD.org>
CommitDate: 2021-05-13 16:32:46 +0000

    databases/mariadb105-server: Security update to 10.5.10
    
    Security:       56ba4513-a1be-11eb-9072-d4c9ef517024
    MFH:            2021Q2
---
 databases/mariadb105-server/Makefile                          |  2 +-
 databases/mariadb105-server/distinfo                          |  6 +++---
 .../files/patch-libmariadb_cmake_ConnectorName.cmake          | 11 -----------
 databases/mariadb105-server/pkg-plist                         |  4 +---
 4 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index 197f083f989d..79d61be57b65 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -1,7 +1,7 @@
 # Created by: Bernard Spil <brnrd at FreeBSD.org>
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.5.9
+PORTVERSION=	10.5.10
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo
index 5426ce71e7d8..4baff27514dc 100644
--- a/databases/mariadb105-server/distinfo
+++ b/databases/mariadb105-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1614442530
-SHA256 (mariadb-10.5.9.tar.gz) = 40ab19aeb8de141fdc188cf2251213c9e7351bee4d0cd29db704fae68d1068cf
-SIZE (mariadb-10.5.9.tar.gz) = 88639930
+TIMESTAMP = 1620475151
+SHA256 (mariadb-10.5.10.tar.gz) = a5ff32f9fcaaf26bf5cba94accc7b246d2d5eb75710d027e40122df6bac0babb
+SIZE (mariadb-10.5.10.tar.gz) = 99019617
diff --git a/databases/mariadb105-server/files/patch-libmariadb_cmake_ConnectorName.cmake b/databases/mariadb105-server/files/patch-libmariadb_cmake_ConnectorName.cmake
deleted file mode 100644
index b052c93a494a..000000000000
--- a/databases/mariadb105-server/files/patch-libmariadb_cmake_ConnectorName.cmake
+++ /dev/null
@@ -1,11 +0,0 @@
---- libmariadb/cmake/ConnectorName.cmake.orig	2021-04-02 09:49:25 UTC
-+++ libmariadb/cmake/ConnectorName.cmake
-@@ -22,7 +22,7 @@ IF(CMAKE_SYSTEM_NAME MATCHES "Windows")
-     SET(MACHINE_NAME "x64")
-   ELSE()
-     SET(MACHINE_NAME "32")
--  END()
-+  ENDIF()
- ENDIF()
- 
- SET(product_name "mysql-connector-c-${CPACK_PACKAGE_VERSION}-${PLATFORM_NAME}${CONCAT_SIGN}${MACHINE_NAME}")
diff --git a/databases/mariadb105-server/pkg-plist b/databases/mariadb105-server/pkg-plist
index 74025a286e78..2e6f8dd92eb7 100644
--- a/databases/mariadb105-server/pkg-plist
+++ b/databases/mariadb105-server/pkg-plist
@@ -58,7 +58,7 @@ bin/resolveip
 @comment %%ETCDIR%%/conf.d/client.cnf
 %%ETCDIR%%/conf.d/enable_encryption.preset
 @comment %%ETCDIR%%/conf.d/mysql-clients.cnf
-%%S3%%%%ETCDIR%%/conf.d/s3.cnf.sample
+%%S3%%%%ETCDIR%%/conf.d/s3.cnf
 @sample %%ETCDIR%%/conf.d/server.cnf.sample
 %%SPIDER%%@sample %%ETCDIR%%/conf.d/spider.cnf.sample
 @comment %%DATADIR%%/wsrep.cnf
@@ -323,7 +323,6 @@ man/man8/mysqld.8.gz
 %%DATADIR%%/mysql_system_tables_data.sql
 %%DATADIR%%/mysql_test_data_timezone.sql
 %%DATADIR%%/mysql_test_db.sql
-%%DATADIR%%/mysql_to_mariadb.sql
 %%DATADIR%%/mysqld_multi.server
 %%DATADIR%%/norwegian-ny/errmsg.sys
 %%DATADIR%%/norwegian/errmsg.sys
@@ -339,7 +338,6 @@ man/man8/mysqld.8.gz
 %%WSREP%%%%DATADIR%%/wsrep_notify
 @comment %%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/CREDITS
-%%PORTDOCS%%%%DOCSDIR%%/EXCEPTIONS-CLIENT
 %%PORTDOCS%%%%DOCSDIR%%/INSTALL-BINARY
 %%PORTDOCS%%%%DOCSDIR%%/README.md
 %%PORTDOCS%%%%WSREP%%%%DOCSDIR%%/README-wsrep