From nobody Sat May 25 11:14:36 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 4VmfSX2Tkhz5LKB1; Sat, 25 May 2024 11:14:36 +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 4VmfSX1rh3z3wlD; Sat, 25 May 2024 11:14:36 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1716635676; 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=TGCiWDsAKKdnoBbSm/elgTVq0yvs87WgLtjf27KYiCo=; b=ZUcaJ1HBok+uZguTPvrtkiVWFcAQAn1CefF29GO80r8mAQi7md8SPpJGW3LXVYfJo4DkC3 w1Ich0CP19G9ks5r/nl/t9APZ104OckHYPaFlTlsS5ysoPGmbaWIa5/2Et6Yvo/rufV2MD 2V4xdFVk89I4UTpwMpwLwjlayMg3S3DZx8nfY6GTwLePFgtEn98kGOuTetB3dxyXzTTISB iJGPc8xlzMOqRKEh9b9vaF8jWZ9HRtNU/IJtHdtJ9yxi3YjdcgfRR0vQS6Dlz+uBY1E77k Qltv04RZcgD0Dtw7jnLbywBY3RLe2HmchJnxP7e8xslLGZQnCZuDfed9CssLYg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1716635676; a=rsa-sha256; cv=none; b=m7BjDlvEtHqsZ3p+hWzW1pVJbpmdm4yweF6jTcHvDf6f6A6a+pfOVchIM0aKsCG7/XR5g5 k+P0ID3LTCz2HbuR1GZUFFSgt/FrdBBKFfPre5vUj+u3tBNyKslJpuFuWK3xJWsg3vj9QH X/sf95zwHGIrb6aMEerU3se/xJ28RX3jtgyt2QMbHFHCRm0mcSv9teet5F/2P1s7IFbDYH 8Hm7QE7NBXiN4B5Jfj38hLMyknGDqJH3P1ez4w4Qc1ccNjdO1K5EbNvTIzevrw7PUbvw5D 9VQgfsjy9ckiPFP9gZn+oxJkjoexhtCmamFfhpK1GlAk4XdnId0EJQuavvlj2A== 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=1716635676; 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=TGCiWDsAKKdnoBbSm/elgTVq0yvs87WgLtjf27KYiCo=; b=paBmlQQfeHSSoay7HXzpNuTGBsawwNmsu/IRQ1ZByluZPbwjrBPvOkSc1J7TJQlUXMyy89 OE2adU49H0YkKBUIgXc/w5sRcnRTxUO6vYV/FUYdtErL+MIwAeR6zyKYXmn7S72JsOfj1R 0r/demfD5qjUdLEesisBVzLOXBkh5WbA4LV1dRzBuNVwdg2CKNF8eNwWOVG+00VWuOGyoz 2+MBSMqNelxYW6KSC8Xpeybn5/xFgIyOvwMH/1Z2+/NX4ZsHFFutCbdlAiLAVt71FGS1d4 MiiLPaIXiXb29tlTl8/XK+T3RXrVYm6+AEIazbmX4bniT+lrZ8BOAv/YR5Satw== 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 4VmfSX0v2DzFQj; Sat, 25 May 2024 11:14:36 +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 44PBEalq002486; Sat, 25 May 2024 11:14:36 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 44PBEasT002483; Sat, 25 May 2024 11:14:36 GMT (envelope-from git) Date: Sat, 25 May 2024 11:14:36 GMT Message-Id: <202405251114.44PBEasT002483@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: f4f3f6357ae2 - main - databases/mariadb106-server: Update to 10.6.18 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: f4f3f6357ae2ae8c0cde9a0f90bb8592f7cfa019 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=f4f3f6357ae2ae8c0cde9a0f90bb8592f7cfa019 commit f4f3f6357ae2ae8c0cde9a0f90bb8592f7cfa019 Author: Bernard Spil AuthorDate: 2024-05-25 10:53:36 +0000 Commit: Bernard Spil 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 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 -+#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/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