git: f4f3f6357ae2 - main - databases/mariadb106-server: Update to 10.6.18

The branch main has been updated by brnrd:

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

commit f4f3f6357ae2ae8c0cde9a0f90bb8592f7cfa019
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2024-05-25 10:53:36 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2024-05-25 10:53:36 +0000

    databases/mariadb106-server: Update to 10.6.18
    
    PR:             279246
    Reported by:    i dani outlook com
---
 databases/mariadb106-client/pkg-plist              |  1 -
 databases/mariadb106-server/Makefile               |  2 +-
 databases/mariadb106-server/distinfo               |  6 +++---
 .../files/patch-mysys__ssl_openssl.c               |  2 +-
 .../files/patch-mysys_crc32_crc32c.cc              | 24 ----------------------
 databases/mariadb106-server/pkg-plist              |  2 ++
 6 files changed, 7 insertions(+), 30 deletions(-)

diff --git a/databases/mariadb106-client/pkg-plist b/databases/mariadb106-client/pkg-plist
index 2e475e5b99df..88168392f335 100644
--- a/databases/mariadb106-client/pkg-plist
+++ b/databases/mariadb106-client/pkg-plist
@@ -64,7 +64,6 @@ include/mysql/mysql_com.h
 include/mysql/mysql_version.h
 include/mysql/mysql/client_plugin.h
 include/mysql/mysql/plugin_auth.h
-include/mysql/mysql/plugin_auth_common.h
 include/mysql/mysqld_error.h
 %%NO_GSSAPI_NONE%%lib/mysql/plugin/auth_gssapi_client.so
 lib/mysql/libmariadb.a
diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile
index a86624b801dd..9195f49ada30 100644
--- a/databases/mariadb106-server/Makefile
+++ b/databases/mariadb106-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	10.6.17
+PORTVERSION=	10.6.18
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo
index 861a22bde861..8d8248c62249 100644
--- a/databases/mariadb106-server/distinfo
+++ b/databases/mariadb106-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1710088429
-SHA256 (mariadb-10.6.17.tar.gz) = fb41b0702059c046832d60138733acb73e4c0e5a1a0681061709d25591e4b086
-SIZE (mariadb-10.6.17.tar.gz) = 99067793
+TIMESTAMP = 1716446883
+SHA256 (mariadb-10.6.18.tar.gz) = 6898a1111f47130709e28ba2c7bd1a57e4bb57101f6e109e597d51e6d385cf18
+SIZE (mariadb-10.6.18.tar.gz) = 99344652
diff --git a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
index 0ef6a3c29540..dd66a716fa84 100644
--- a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
+++ b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
@@ -7,7 +7,7 @@
 +#elif defined(LIBRESSL_VERSION_NUMBER)
 +int check_openssl_compatibility()
 +{
-+  return 1;
++  return 0;
 +}
  #else
  #include <openssl/evp.h>
diff --git a/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc
deleted file mode 100644
index 445fd0e97865..000000000000
--- a/databases/mariadb106-server/files/patch-mysys_crc32_crc32c.cc
+++ /dev/null
@@ -1,24 +0,0 @@
---- mysys/crc32/crc32c.cc.orig	2021-08-04 18:00:35 UTC
-+++ mysys/crc32/crc32c.cc
-@@ -543,6 +543,21 @@ static int arch_ppc_probe(void) {
- 
-   return arch_ppc_crc32;
- }
-+#elif __FreeBSD__
-+#include <machine/cpu.h>
-+#include <sys/auxv.h>
-+#include <sys/elf_common.h>
-+static int arch_ppc_probe(void) {
-+  unsigned long cpufeatures;
-+  arch_ppc_crc32 = 0;
-+
-+#if defined(__powerpc64__)
-+  elf_aux_info(AT_HWCAP2, &cpufeatures, sizeof(cpufeatures));
-+  if (cpufeatures & PPC_FEATURE2_HAS_VEC_CRYPTO) arch_ppc_crc32 = 1;
-+#endif  /* __powerpc64__ */
-+
-+  return arch_ppc_crc32;
-+}
- #endif  // __linux__
- #endif
- 
diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist
index 505d81bfc44c..51519ee68b20 100644
--- a/databases/mariadb106-server/pkg-plist
+++ b/databases/mariadb106-server/pkg-plist
@@ -138,6 +138,7 @@ include/mysql/server/mysql/service_md5.h
 include/mysql/server/mysql/service_my_crypt.h
 include/mysql/server/mysql/service_my_print_error.h
 include/mysql/server/mysql/service_my_snprintf.h
+include/mysql/server/mysql/service_print_check_msg.h
 include/mysql/server/mysql/service_progress_report.h
 include/mysql/server/mysql/service_sha1.h
 include/mysql/server/mysql/service_sha2.h
@@ -308,6 +309,7 @@ libexec/mysqld
 @comment share/man/man1/replace.1.gz
 @comment share/man/man1/resolve_stack_dump.1.gz
 @comment share/man/man1/resolveip.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_backup.1.gz
 @comment %%WSREP%%share/man/man1/wsrep_sst_common.1.gz
 @comment %%WSREP%%share/man/man1/wsrep_sst_mariabackup.1.gz
 @comment %%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz