git: e8c3493e925a - 2023Q2 - databases/mariadb104-server: Update to 10.4.29

The branch 2023Q2 has been updated by brnrd:

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

commit e8c3493e925a7befee1c278235bac9f5dd9504bf
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2023-05-28 18:58:45 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2023-05-31 12:08:12 +0000

    databases/mariadb104-server: Update to 10.4.29
    
    Security:       5d1b1a0a-fd36-11ed-a0d1-84a93843eb75
    MFH:            2023Q2
    (cherry picked from commit 7f97f2d5e99c9509fd16d7e6f3f6416aeef03be7)
---
 databases/mariadb104-server/Makefile                          |  2 +-
 databases/mariadb104-server/distinfo                          |  6 +++---
 databases/mariadb104-server/files/patch-include_ssl__compat.h | 11 -----------
 databases/mariadb104-server/pkg-plist                         |  1 +
 4 files changed, 5 insertions(+), 15 deletions(-)

diff --git a/databases/mariadb104-server/Makefile b/databases/mariadb104-server/Makefile
index 6422603a4d7d..7e068d699f13 100644
--- a/databases/mariadb104-server/Makefile
+++ b/databases/mariadb104-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	10.4.28
+PORTVERSION=	10.4.29
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
diff --git a/databases/mariadb104-server/distinfo b/databases/mariadb104-server/distinfo
index 5c84b608d86d..abec60118cce 100644
--- a/databases/mariadb104-server/distinfo
+++ b/databases/mariadb104-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1678023207
-SHA256 (mariadb-10.4.28.tar.gz) = 003fd23f3c6ee516176e1b62b0b43cdb6cdd3dcd4e30f855c1c5ab2baaf5a86c
-SIZE (mariadb-10.4.28.tar.gz) = 94731133
+TIMESTAMP = 1685281835
+SHA256 (mariadb-10.4.29.tar.gz) = 5b2d338792e79e68d6a545e2b15603bbbf7618c739e5f820f57b1d6b22092130
+SIZE (mariadb-10.4.29.tar.gz) = 94859830
diff --git a/databases/mariadb104-server/files/patch-include_ssl__compat.h b/databases/mariadb104-server/files/patch-include_ssl__compat.h
deleted file mode 100644
index 30d695673280..000000000000
--- a/databases/mariadb104-server/files/patch-include_ssl__compat.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- include/ssl_compat.h.orig	2022-11-02 12:18:48 UTC
-+++ include/ssl_compat.h
-@@ -19,7 +19,7 @@
- /* 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 < 0x30500000L)
- #define HAVE_OPENSSL11 1
- #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION)
- #define ERR_remove_state(X) ERR_clear_error()
diff --git a/databases/mariadb104-server/pkg-plist b/databases/mariadb104-server/pkg-plist
index 04d4feb152e6..707618dc2062 100644
--- a/databases/mariadb104-server/pkg-plist
+++ b/databases/mariadb104-server/pkg-plist
@@ -74,6 +74,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