From nobody Sat Dec 17 11:55:40 2022 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 4NZ4DD5qyxz1CV3n; Sat, 17 Dec 2022 11:55:40 +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 4NZ4DD3vqmz4ZcS; Sat, 17 Dec 2022 11:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671278140; 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=AKSumTbE7YPBdN7wZUptGp5nJLOtnFI7EX9RZyAgyro=; b=ffZSKcfw3EBAcRTnaoAZYH1hrwsS14hPNAkG9U4/aUhHYZp+K8eRjMKsOU/h/7r39YfIuz Z/CJJASzAg6nEf+21jtGipeC93iu1wdHPJ6IpR4wDUTZgjqoznrB0H77HN2qgRMjuLkW4s CRm/0XmsLRiVe+bKd+O6HT8EK6tLH5yw0NPeDVdSEwYxQuL5SJwJSzHieePqnwfqUSr3Uz wZ27LW4LAcOsp5hz8otaBLjyTJiJrpbr/uTD1dQ91X6hozU5AFwKhfddpaJsXPag33LgCm 3ITUmrUzKsP4AbOnrmVJZ2O8mdSp0Z6G95RmOOwnK6XvHbsNa/LTO7zsdWnxaA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1671278140; 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=AKSumTbE7YPBdN7wZUptGp5nJLOtnFI7EX9RZyAgyro=; b=lX646hRAGddShwd3LdyNc9vCJ01FrDk4ZRdE2HC80hcPwDGxjFsFYGnWvmC2EHkGzRbIQs KtU1OTIfxk3OXrN7/GaufGvtzCyiE/Vj6uPG5p7wZHBSKuA42Tv+nsH4Pej82GiaxYd/yN TGvImOW2DG70K3IAj1kUI6TqzAatbzgzwMX/8fi7Sf6t8uCIV348HoiLyBrPPVlMSX0+8T fJyQpHKLbz0cdiYM/fOCNaIxpb4bB2Yu7OkzMKVsUVdkldQRQB5hPpILxsOHDPIDCxqwSH K30q+TReHL6DYR/EVdqXsbPy67DZMDHGKVXaPXFTYvLcJMfrl7FzuIMFVLZrVw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1671278140; a=rsa-sha256; cv=none; b=BA7cOGgnDX0ZtsV+9WOWp5T5QL52TrQmXc3PbXZ1FH1Naz/hDefj8PEnkk+Ri1c9bpFpd0 pIsy5OD38/E+7+z80h1t5C0g+9/pSvOc82hF6D0afVuszu0xMnznBXEQrpgyCebKzAfL9V Q1v59INQ4t2dR0g5o9z1gq6W7ghV6rrisZUBc1AanbeOlm9hb2/aQlZYcvMpEEC4OEDaS+ GBlfdZIRFN6U5tpKZeFdR3b1fbMkXJwf+qV8vlxKR7M2VWujqqK2ejWa5jN9F+9d6rMww1 0zlkOvsFSvnhzt2H2vzeWuVoRNEQ0zHEgcGSVQUtivzzM+zWKiCIUrKrrnY6dg== 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 4NZ4DD2f6dzrQ0; Sat, 17 Dec 2022 11:55:40 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 2BHBte32043254; Sat, 17 Dec 2022 11:55:40 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 2BHBtePm043253; Sat, 17 Dec 2022 11:55:40 GMT (envelope-from git) Date: Sat, 17 Dec 2022 11:55:40 GMT Message-Id: <202212171155.2BHBtePm043253@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: 3a8101a26b19 - main - databases/mariadb105-server: Update to 10.5.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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: 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: 3a8101a26b19b4249640f53b8501f63ac04de4e3 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3a8101a26b19b4249640f53b8501f63ac04de4e3 commit 3a8101a26b19b4249640f53b8501f63ac04de4e3 Author: Bernard Spil AuthorDate: 2022-12-17 11:55:37 +0000 Commit: Bernard Spil CommitDate: 2022-12-17 11:55:37 +0000 databases/mariadb105-server: Update to 10.5.18 --- databases/mariadb105-server/Makefile | 4 ++-- databases/mariadb105-server/distinfo | 6 +++--- databases/mariadb105-server/files/patch-include_ssl__compat.h | 11 +++++++++++ databases/mariadb105-server/pkg-plist | 1 + 4 files changed, 17 insertions(+), 5 deletions(-) diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index c185136b13fa..f6a38e088a1d 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mariadb -PORTVERSION= 10.5.17 -PORTREVISION?= 1 +PORTVERSION= 10.5.18 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= \ https://mirror.nodesdirect.com/${SITESDIR}/ \ diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index ae6c33cf791f..70ecba3444f4 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1662321331 -SHA256 (mariadb-10.5.17.tar.gz) = 849c840b76f4856503b43ef3a841fc971e8b5188c8df3690913bf5699691b761 -SIZE (mariadb-10.5.17.tar.gz) = 113314849 +TIMESTAMP = 1669559294 +SHA256 (mariadb-10.5.18.tar.gz) = 3593b0dcc0f2e80e98177019f5dcfa5cc8c14172ce161a6fa50f8084f2cef749 +SIZE (mariadb-10.5.18.tar.gz) = 111568643 diff --git a/databases/mariadb105-server/files/patch-include_ssl__compat.h b/databases/mariadb105-server/files/patch-include_ssl__compat.h new file mode 100644 index 000000000000..c1c686112c18 --- /dev/null +++ b/databases/mariadb105-server/files/patch-include_ssl__compat.h @@ -0,0 +1,11 @@ +--- include/ssl_compat.h.orig 2022-11-02 12:37:17 UTC ++++ include/ssl_compat.h +@@ -19,7 +19,7 @@ + /* OpenSSL version specific definitions */ + #if defined(OPENSSL_VERSION_NUMBER) + +-#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !defined(LIBRESSL_VERSION_NUMBER) ++#if OPENSSL_VERSION_NUMBER >= 0x10100000L && !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000L) + #define HAVE_OPENSSL11 1 + #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) + #define ERR_remove_state(X) ERR_clear_error() diff --git a/databases/mariadb105-server/pkg-plist b/databases/mariadb105-server/pkg-plist index 05d4618eb252..802e44db8a50 100644 --- a/databases/mariadb105-server/pkg-plist +++ b/databases/mariadb105-server/pkg-plist @@ -181,6 +181,7 @@ lib/mysql/plugin/auth_pam_tool_dir/auth_pam_tool lib/mysql/plugin/auth_pam_v1.so @comment lib/mysql/plugin/caching_sha2_password.so lib/mysql/plugin/debug_key_management.so +lib/mysql/plugin/disks.so lib/mysql/plugin/file_key_management.so lib/mysql/plugin/func_test.so lib/mysql/plugin/ha_archive.so