databases/mariadb106-server: Security update to 10.6.21

Security:	7bcfca95-e563-11ef-873e-8447094a420f
MFH:		2025Q1

6 files changed, 6 insertions, 67 deletions

diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
index 3747af70ccb6..51cae9f1c2aa 100644
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	10.6.20
+PORTVERSION=	10.6.21
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo
index 4de0b5f14dbd..5cfe0d4ff1cd 100644
--- a/databases/mariadb106-server/distinfo
+++ b/databases/mariadb106-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731237766
-SHA256 (mariadb-10.6.20.tar.gz) = 47f05abc7dbebb3f26b31e75022b1b3969dbbc4752c4ae701f8920a604896d41
-SIZE (mariadb-10.6.20.tar.gz) = 102697156
+TIMESTAMP = 1738941493
+SHA256 (mariadb-10.6.21.tar.gz) = 8d7f97169b3ba2044858965b8cfc254364400df43e905042f92e24b8fa7b0d96
+SIZE (mariadb-10.6.21.tar.gz) = 103982296
diff --git a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
deleted file mode 100644
index 8a141435bd67..000000000000
--- a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
+++ /dev/null
@@ -1,29 +0,0 @@
---- mysys_ssl/openssl.c.orig	2024-02-01 17:44:37 UTC
-+++ mysys_ssl/openssl.c
-@@ -30,6 +30,11 @@ int check_openssl_compatibility()
- {
-   return 0;
- }
-+#elif defined(LIBRESSL_VERSION_NUMBER)
-+int check_openssl_compatibility()
-+{
-+  return 0;
-+}
- #else
- #include <openssl/evp.h>
- 
-@@ -36,8 +36,12 @@
- static uint testing;
- static size_t alloc_size, alloc_count;
- 
--static void *coc_malloc(size_t size, const char *f __attribute__((unused)),
--                                             int l __attribute__((unused)))
-+static void *coc_malloc(size_t size
-+#if !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L)
-+                                           , const char *f __attribute__((unused)),
-+                                             int l __attribute__((unused))
-+#endif
-+)
- {
-   if (unlikely(testing))
-   {
diff --git a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh b/databases/mariadb106-server/files/patch-scripts_mysql__config.sh
deleted file mode 100644
index f8321be63ecc..000000000000
--- a/databases/mariadb106-server/files/patch-scripts_mysql__config.sh
+++ /dev/null
@@ -1,10 +0,0 @@
---- scripts/mysql_config.sh.orig	2021-07-07 20:25:20 UTC
-+++ scripts/mysql_config.sh
-@@ -88,6 +88,7 @@ fi
- # Create options 
- libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
- embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
-+embedded_libs="$embedded_libs -%%LOCALBASE%%/lib "
- 
- include="-I$pkgincludedir"
- if [ "$basedir" != "/usr" ]; then
diff --git a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp b/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp
deleted file mode 100644
index 26ea3d16ecd7..000000000000
--- a/databases/mariadb106-server/files/patch-storage_columnstore_columnstore_utils_common_threadnaming.cpp
+++ /dev/null
@@ -1,24 +0,0 @@
---- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig	2022-05-18 08:34:17 UTC
-+++ storage/columnstore/columnstore/utils/common/threadnaming.cpp
-@@ -22,13 +22,21 @@ namespace utils
- {
- void setThreadName(const char* threadName)
- {
-+#ifdef __FreeBSD__
-+  pthread_set_name_np(pthread_self(), threadName);
-+#else
-   prctl(PR_SET_NAME, threadName, 0, 0, 0);
-+#endif
- }
- 
- std::string getThreadName()
- {
-   char buf[32];
-+#ifdef __FreeBSD__
-+  pthread_get_name_np(pthread_self(), buf, sizeof(buf));
-+#else
-   prctl(PR_GET_NAME, buf, 0, 0, 0);
-+#endif
-   return std::string(buf);
- }
- }  // namespace utils
diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist
index 51519ee68b20..5b4ab627d1d4 100644
--- a/databases/mariadb106-server/pkg-plist
+++ b/databases/mariadb106-server/pkg-plist
@@ -84,6 +84,7 @@ 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_cmp.h
 include/mysql/server/my_compiler.h
 include/mysql/server/my_config.h
 include/mysql/server/my_dbug.h
@@ -133,6 +134,7 @@ include/mysql/server/mysql/service_encryption.h
 include/mysql/server/mysql/service_encryption_scheme.h
 include/mysql/server/mysql/service_json.h
 include/mysql/server/mysql/service_kill_statement.h
+include/mysql/server/mysql/service_log_warnings.h
 include/mysql/server/mysql/service_logger.h
 include/mysql/server/mysql/service_md5.h
 include/mysql/server/mysql/service_my_crypt.h