git: 54e6064d4674 - main - databases/mariadb106-server: Update to 10.6.17

The branch main has been updated by brnrd:

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

commit 54e6064d4674e9adb362b0f9c08f50b69b0526da
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2024-03-16 12:50:42 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2024-03-16 12:50:42 +0000

    databases/mariadb106-server: Update to 10.6.17
---
 databases/mariadb106-server/Makefile                       |  3 ++-
 databases/mariadb106-server/distinfo                       |  6 +++---
 databases/mariadb106-server/files/patch-include_m__ctype.h | 13 -------------
 .../mariadb106-server/files/patch-mysys__ssl_openssl.c     | 14 ++++++++++++++
 databases/mariadb106-server/pkg-plist                      |  1 +
 5 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
index 553f33adf1aa..73fa26d42b38 100644
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	10.6.16
+PORTVERSION=	10.6.17
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
@@ -105,6 +105,7 @@ CMAKE_ARGS+=	-DCMAKE_PREFIX_PATH=${PREFIX} \
 		-DINSTALL_SYSCONF2DIR="${ETCDIR}/conf.d" \
 		-DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \
 		-DWITH_PCRE=system \
+		-DPCRE_LIBRARY_DIRS=${PREFIX}/lib \
 		-DWITH_SSL="${OPENSSLBASE}" \
 		-DCURSES_CURSES_LIBRARY="/usr/lib/libcurses.so" \
 		-DCURSES_FORM_LIBRARY="/usr/lib/libform.so" \
diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo
index 687491d8a986..861a22bde861 100644
--- a/databases/mariadb106-server/distinfo
+++ b/databases/mariadb106-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701019842
-SHA256 (mariadb-10.6.16.tar.gz) = 5ef83843e796dcda9aea47b24690ddf6d848f43f43e11f9d9a0cc21c78fbb9cf
-SIZE (mariadb-10.6.16.tar.gz) = 98224346
+TIMESTAMP = 1710088429
+SHA256 (mariadb-10.6.17.tar.gz) = fb41b0702059c046832d60138733acb73e4c0e5a1a0681061709d25591e4b086
+SIZE (mariadb-10.6.17.tar.gz) = 99067793
diff --git a/databases/mariadb106-server/files/patch-include_m__ctype.h b/databases/mariadb106-server/files/patch-include_m__ctype.h
deleted file mode 100644
index 8e323646752e..000000000000
--- a/databases/mariadb106-server/files/patch-include_m__ctype.h
+++ /dev/null
@@ -1,13 +0,0 @@
---- include/m_ctype.h.orig	2021-08-04 18:00:35 UTC
-+++ include/m_ctype.h
-@@ -43,6 +43,10 @@ extern "C" {
- 
- #define CHARSET_DIR	"charsets/"
- 
-+#ifndef ulong
-+typedef unsigned long ulong;
-+#endif
-+
- #define my_wc_t ulong
- 
- #define MY_CS_REPLACEMENT_CHARACTER 0xFFFD
diff --git a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
new file mode 100644
index 000000000000..0ef6a3c29540
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
@@ -0,0 +1,14 @@
+--- 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 1;
++}
+ #else
+ #include <openssl/evp.h>
+ 
diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist
index 352ff9781592..505d81bfc44c 100644
--- a/databases/mariadb106-server/pkg-plist
+++ b/databases/mariadb106-server/pkg-plist
@@ -141,6 +141,7 @@ include/mysql/server/mysql/service_my_snprintf.h
 include/mysql/server/mysql/service_progress_report.h
 include/mysql/server/mysql/service_sha1.h
 include/mysql/server/mysql/service_sha2.h
+include/mysql/server/mysql/service_sql.h
 include/mysql/server/mysql/service_thd_alloc.h
 include/mysql/server/mysql/service_thd_autoinc.h
 include/mysql/server/mysql/service_thd_error_context.h