From nobody Sat May 25 09:21:04 2024 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4VmbxX5YwYz5L6Mj; Sat, 25 May 2024 09:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4VmbxX4sK9z4mGZ; Sat, 25 May 2024 09:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716628864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kHschtooX5VSnijxnrHCvgwSzDOHJdrpeBB0C5EZL0Y=; b=ht0VFaKvmIRDXgvdoYaeaCCE3oZXp4CrtbjO4ndrKMhOaHWA+Ypk/kqDHYAxkIZzCgi3GW tNCxIDJc0wP2m0yV6xMmRRMTush9J7BFg9VzMykCmRqx2fa8lJust4MCLaYrfl3M6ey26U Exq/9fCkB04ckfEMwxLIL9FC9SeKNTuMLnx039qJVqupV+35HTNv9s4uiYuEfYuLkKQiwA EVRfW8VBFD8gonSRZtoRiSCBMq8snWmDxJMgia9sm6yKD6/2E6TeChBom8RLwuV+cNAyBa LuKVDMQvtGG7M6bzCkbM74toqrQ7pG+/X2ap9fONM/teRs02ZPPxxZXYW9TDSQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716628864; a=rsa-sha256; cv=none; b=A9tlh1bTawWbo+Q56rFuXCDE08aFDIAeJrzlvv4Uf7zus21pHDz3QTt8PsXeQpl+84Fb+U Ev91yJxGyaww7W6P6ly+mSwu/3IWFxjprJcO6GLwmLM+5kM+IWPdFng2yRVN1zPfdYIHzF +zmVZUe+RTqjOfXKbRsJXpWEke6gpG0gheviTqVv6SdkpQ2pd64U7AK5aLTILj1pVm8y/b rz14KTQoPkH52uYiQ5vC9wQ7mLGKrtBzpe+n4wqyDmu4xNJuwgCY2Ucftq0xuYbgc6wR7Y O4As8uBGJmr+uvBMV8HofMDrBF41sXESJLuCtZcp3gtJunm+9/z7+SQlad9qTg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716628864; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=kHschtooX5VSnijxnrHCvgwSzDOHJdrpeBB0C5EZL0Y=; b=g056cnif/Nrpv0bhvmXug24JEIA6Nl/LAkFN7c3it+VTUC3iTYs75f6hpUU5sZQ3Qnpfbn ZUX9t6CiCQJGsb/1jnYPwqgOp2eTs38fKPJi6zH3IwVF7rKCgvr9Twg6ZsH97m0Mrv+sh5 r1DhHQi12isFZNA2OWh8VDHgKtxeI+l+liKg31Y8XGcTljbgPTv4ninged9YSQgaP55F0+ moV2382ragMtVvZgRvBBzTTIaKAt5ukr17P3ZKlARICL/WsryY2paYsH7Hw0ezQG2Y6HaD eblT+oPasla9Sff3ChtSnBPJXvJTV/enxkD1W/KSqkqfSJTigwBkvjRGk56w6A== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4VmbxX3trkz1B6S; Sat, 25 May 2024 09:21:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 44P9L4XD014145; Sat, 25 May 2024 09:21:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44P9L4ck014142; Sat, 25 May 2024 09:21:04 GMT (envelope-from git) Date: Sat, 25 May 2024 09:21:04 GMT Message-Id: <202405250921.44P9L4ck014142@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 2acbf8c60ce7 - main - databases/mariadb1011-server: Update to 10.11.8 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2acbf8c60ce7acabf0da2d40be4aaabcfab0d3b6 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2acbf8c60ce7acabf0da2d40be4aaabcfab0d3b6 commit 2acbf8c60ce7acabf0da2d40be4aaabcfab0d3b6 Author: Bernard Spil AuthorDate: 2024-05-25 09:19:52 +0000 Commit: Bernard Spil 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 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 -+#include -+#include -+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