git: 59398624c8d4 - 2023Q2 - databases/mariadb106-server: Update to 10.6.13

The branch 2023Q2 has been updated by brnrd:

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

commit 59398624c8d46d62884d13b8035605b9b4b555a4
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2023-05-28 18:53:06 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2023-05-31 12:03:00 +0000

    databases/mariadb106-server: Update to 10.6.13
    
    PR:             271549
    Reported by:    Miroslav Lachman <000.fbsd@quip.cz>
    Security:       5d1b1a0a-fd36-11ed-a0d1-84a93843eb75
    MFH:            2023Q2
    
    (cherry picked from commit 0cc2151714f7a11a1367a5b2d4bc2cd18bc26dbd)
---
 databases/mariadb106-client/pkg-plist              |  2 ++
 databases/mariadb106-server/Makefile               |  4 ++--
 databases/mariadb106-server/distinfo               |  6 +++---
 .../files/patch-include_ssl__compat.h              | 22 ----------------------
 databases/mariadb106-server/pkg-plist              |  1 +
 5 files changed, 8 insertions(+), 27 deletions(-)

diff --git a/databases/mariadb106-client/pkg-plist b/databases/mariadb106-client/pkg-plist
index 099f7d22ac24..2e475e5b99df 100644
--- a/databases/mariadb106-client/pkg-plist
+++ b/databases/mariadb106-client/pkg-plist
@@ -55,6 +55,7 @@ include/mysql/mariadb_dyncol.h
 include/mysql/mariadb_rpl.h
 include/mysql/mariadb_stmt.h
 include/mysql/mariadb_version.h
+include/mysql/my_alloca.h
 include/mysql/my_config.h
 include/mysql/my_global.h
 include/mysql/my_sys.h
@@ -81,6 +82,7 @@ lib/mysql/plugin/daemon_example.ini
 lib/mysql/plugin/dialog.so
 lib/mysql/plugin/mysql_clear_password.so
 lib/mysql/plugin/sha256_password.so
+@comment lib/mysql/plugin/zstd.so
 libdata/pkgconfig/libmariadb.pc
 share/man/man1/mariadb.1.gz
 share/man/man1/mariadb-access.1.gz
diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
index 83fffd842974..271d2dcee432 100644
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	10.6.12
+PORTVERSION=	10.6.13
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
@@ -164,7 +164,7 @@ ${ENGINE}_CMAKE_OFF=	-DPLUGIN_${ENGINE}=NO
 ${ENGINE}_CMAKE_ON=	-DPLUGIN_${ENGINE}=DYNAMIC
 .endfor
 INNOBASE_VARS_OFF=	disabled_plugins+=INNOBASE
-#COLUMNSTORE_BROKEN=	fatal error: 'sys/sysinfo.h' file not found
+COLUMNSTORE_BROKEN=	error: __float128 is not supported on this target
 CONNECT_EXTRA_LIB_DEPENDS=	libodbc.so:databases/unixODBC
 CONNECT_EXTRA_USE=		gnome=libxml2
 CONNECT_EXTRA_USES=		gnome
diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo
index e96a17eea53d..3077cde22cd3 100644
--- a/databases/mariadb106-server/distinfo
+++ b/databases/mariadb106-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1675594941
-SHA256 (mariadb-10.6.12.tar.gz) = 3ed2eb7429c2fae5423ca55c661742d107e35246f1ab0c107096f0c4b839463a
-SIZE (mariadb-10.6.12.tar.gz) = 95085449
+TIMESTAMP = 1685278588
+SHA256 (mariadb-10.6.13.tar.gz) = f085f379cf59ed2d365644fc5cd8558f882a886ec964070d65a28530ddbb75ba
+SIZE (mariadb-10.6.13.tar.gz) = 95285355
diff --git a/databases/mariadb106-server/files/patch-include_ssl__compat.h b/databases/mariadb106-server/files/patch-include_ssl__compat.h
deleted file mode 100644
index 132f629cf2eb..000000000000
--- a/databases/mariadb106-server/files/patch-include_ssl__compat.h
+++ /dev/null
@@ -1,22 +0,0 @@
---- include/ssl_compat.h.orig	2022-02-10 20:17:08 UTC
-+++ include/ssl_compat.h
-@@ -19,7 +19,8 @@
- /* OpenSSL version specific definitions */
- #if defined(OPENSSL_VERSION_NUMBER)
- 
--#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER >= 0x10100000L && \
-+	!(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) 
- #define HAVE_OPENSSL11 1
- #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
- #define ERR_remove_state(X) ERR_clear_error()
-@@ -73,7 +74,8 @@
- #define EVP_MD_CTX_SIZE                 sizeof(EVP_MD_CTX)
- #endif
- 
--#ifndef DH_set0_pqg
-+#if !defined(DH_set0_pqg) && \
-+	(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000)
- #define DH_set0_pqg(D,P,Q,G)            ((D)->p= (P), (D)->g= (G))
- #endif
- 
diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist
index 9867f566ebf2..d22fb2eed2f9 100644
--- a/databases/mariadb106-server/pkg-plist
+++ b/databases/mariadb106-server/pkg-plist
@@ -81,6 +81,7 @@ include/mysql/server/m_string.h
 include/mysql/server/ma_dyncol.h
 include/mysql/server/mariadb_capi_rename.h
 include/mysql/server/my_alloc.h
+include/mysql/server/my_alloca.h
 include/mysql/server/my_attribute.h
 include/mysql/server/my_byteorder.h
 include/mysql/server/my_compiler.h