git: 2acbf8c60ce7 - main - databases/mariadb1011-server: Update to 10.11.8

The branch main has been updated by brnrd:

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

commit 2acbf8c60ce7acabf0da2d40be4aaabcfab0d3b6
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2024-05-25 09:19:52 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
CommitDate: 2024-05-25 09:19:52 +0000

    databases/mariadb1011-server: Update to 10.11.8
    
     * Fix HashiCorp Vault option [1]
    
    PR:             276109 [1]
    Reported by:    vapaaphohjola gmail com [1]
---
 databases/mariadb1011-client/pkg-plist             |  1 -
 databases/mariadb1011-server/Makefile              |  4 ++--
 databases/mariadb1011-server/distinfo              |  6 +++---
 .../files/patch-mysys__ssl_openssl.c               |  2 +-
 .../files/patch-mysys_crc32_crc32c.cc              | 24 ----------------------
 databases/mariadb1011-server/pkg-plist             |  2 ++
 6 files changed, 8 insertions(+), 31 deletions(-)

diff --git a/databases/mariadb1011-client/pkg-plist b/databases/mariadb1011-client/pkg-plist
index 98ad22c80283..4a870eb11fd0 100644
--- a/databases/mariadb1011-client/pkg-plist
+++ b/databases/mariadb1011-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/mariadb1011-server/Makefile b/databases/mariadb1011-server/Makefile
index a30c91ba2b5e..c05402fe66d9 100644
--- a/databases/mariadb1011-server/Makefile
+++ b/databases/mariadb1011-server/Makefile
@@ -1,5 +1,5 @@
 PORTNAME?=	mariadb
-PORTVERSION=	10.11.7
+PORTVERSION=	10.11.8
 CATEGORIES=	databases
 MASTER_SITES=	https://mirror.nodesdirect.com/${SITESDIR}/ \
 		https://mirror.one.com/${SITESDIR}/ \
@@ -179,7 +179,7 @@ CONNECT_EXTRA_USE=		gnome=libxml2
 CONNECT_EXTRA_USES=		gnome
 CONNECT_EXTRA_CMAKE_BOOL=	CONNECT_WITH_LIBXML2 CONNECT_WITH_ODBC
 GSSAPI_NONE_VARS=	disabled_plugins+=AUTH_GSSAPI
-HASHICORP_VAULT_CMAKE_OFF=	-DPLUGIN_HASHICORP_KEY_MANAGEMENT=OFF
+HASHICORP_VAULT_CMAKE_OFF=	-DPLUGIN_HASHICORP_KEY_MANAGEMENT=NO
 HASHICORP_VAULT_LIB_DEPENDS=	libcurl.so:ftp/curl
 LZO_CMAKE_ON=		-DWITH_INNODB_LZO=ON
 LZO_CMAKE_OFF=		-DWITH_INNODB_LZO=OFF
diff --git a/databases/mariadb1011-server/distinfo b/databases/mariadb1011-server/distinfo
index 284ca03c1efb..6b0e0badf4b8 100644
--- a/databases/mariadb1011-server/distinfo
+++ b/databases/mariadb1011-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1709979504
-SHA256 (mariadb-10.11.7.tar.gz) = 5239a245ed90517e96396605cd01ccd8f73cd7442d1b3076b6ffe258110e5157
-SIZE (mariadb-10.11.7.tar.gz) = 100584592
+TIMESTAMP = 1716456949
+SHA256 (mariadb-10.11.8.tar.gz) = 5f04f3e33d9f1cbeff05e79c54d41d302630500c995aee72b0638e2f9dfcdf0f
+SIZE (mariadb-10.11.8.tar.gz) = 100913048
diff --git a/databases/mariadb1011-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb1011-server/files/patch-mysys__ssl_openssl.c
index 0ef6a3c29540..dd66a716fa84 100644
--- a/databases/mariadb1011-server/files/patch-mysys__ssl_openssl.c
+++ b/databases/mariadb1011-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/mariadb1011-server/files/patch-mysys_crc32_crc32c.cc b/databases/mariadb1011-server/files/patch-mysys_crc32_crc32c.cc
deleted file mode 100644
index 445fd0e97865..000000000000
--- a/databases/mariadb1011-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/mariadb1011-server/pkg-plist b/databases/mariadb1011-server/pkg-plist
index cbe019bf499e..2f45fcfa3815 100644
--- a/databases/mariadb1011-server/pkg-plist
+++ b/databases/mariadb1011-server/pkg-plist
@@ -144,6 +144,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
@@ -326,6 +327,7 @@ libexec/mysqld
 @comment %%WSREP%%share/man/man1/wsrep_sst_mysqldump.1.gz
 @comment %%WSREP%%share/man/man1/wsrep_sst_rsync.1.gz
 @comment %%WSREP%%share/man/man1/wsrep_sst_rsync_wan.1.gz
+%%WSREP%%share/man/man1/wsrep_sst_backup.1.gz
 @comment share/man/man3/mariadb_cancel.3.gz
 @comment share/man/man3/mariadb_connection.3.gz
 @comment share/man/man3/mariadb_dyncol_check.3.gz