From nobody Sun May 28 18:56:02 2023 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 4QTntW0blwz4XlRk; Sun, 28 May 2023 18:56:03 +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 4QTntV5vnpz3vVy; Sun, 28 May 2023 18:56:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685300162; 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=PhT2KX9hylWknixLH4n0HKrxw41naA0fqxAWn1VOAOk=; b=qPzEDwg+ZXqyzjU+hA7DyQlEJsDbirJZZ6pmYh6uyIMP7QALZ28p8UYvFOag/oSsZzZC3F D9JqQfgwt2+w+3JNNxGguKdwHJ5XIv4lzjd3keO7/JKnhNUYcU4X5JB2+Q2X3d/OT/kfJl aMxxhwP4Z0DIDR24ozsXbOBB0i1mTtDZ9sekAyNWcggw33v4ZGa8loHZyASf7kTiDiSR2u d9MiVDLf4U0q9hHdnZU1/dshGvkeZ3uktghbR4dt9gbilPp/5ytifhZLELhTITWU2nRB7m P4WIKL4J6gtE1R8aO6KZocebq9EzXoRYdB9/zEsTCvtl9u4F6GOhzk21nVbGrA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685300162; 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=PhT2KX9hylWknixLH4n0HKrxw41naA0fqxAWn1VOAOk=; b=xePeL5Z3rewSSSXiYK2Tir6eQqIHP5K/A4TghWCgdcWlIiDUJF4Uv9Yst0rqpUlhMn58Dv J/l5irh3lUeAsVP1TzpZX4fiuqS923bfYrXY+f8na8KleEE6NKSssZG4D4eF5eirnC7ceZ flo4zWzPtTpO4mOsHqtkVGBum4EGw95iy4X+iiXN5JZAmw/cASkDgytfaKCzjfje1voenV NAcdpslkMKxr3e3sUY6GWbUfA861hFb6Opf+sGci91e4Fd7Vh70oLK4nxwyuEqZTYx8b1I ZPhGDjgVhy2E+Jqn/PHFcrwYHHddWO/faEpCWqW2zBIdtgR11L7AhWepGH4yEg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685300162; a=rsa-sha256; cv=none; b=UAxFhlJtnanJONTsQFynIC6Qlj4Yf/XlvBbYvWhSuYv4V3SmNvgeOdpeXDBXq2JvR1n8Tr 9dz8YS1WM/j7UUe/nSJwDQYZnSjBf7m2urZpwGJaYPtHktGDI5usvhys2X2mI5s5B8FjYS 7/00+Fs9E4peLtBjDjrfjGvRCJIfUVnodboIdWA0X74uF5/RiPZUQU83RINNNfy2AEeFCI ICga3FvKHK8TbaJvraSUFTs1eDPtkfPRQSGAHtBhjFdMU8NJPxzljGDaAXHy7jwAZ6Pb5I JGUz0VjO7DVYMo9/zQ5pe6vJkXmIyADNjT4TumYlZp9RLChqSjuolOPcoFe3fA== 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 4QTntV50fJzgxP; Sun, 28 May 2023 18:56:02 +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 34SIu2Im046618; Sun, 28 May 2023 18:56:02 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SIu2nZ046617; Sun, 28 May 2023 18:56:02 GMT (envelope-from git) Date: Sun, 28 May 2023 18:56:02 GMT Message-Id: <202305281856.34SIu2nZ046617@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: 0cc2151714f7 - main - databases/mariadb106-server: Update to 10.6.13 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: 0cc2151714f7a11a1367a5b2d4bc2cd18bc26dbd Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=0cc2151714f7a11a1367a5b2d4bc2cd18bc26dbd commit 0cc2151714f7a11a1367a5b2d4bc2cd18bc26dbd Author: Bernard Spil AuthorDate: 2023-05-28 18:53:06 +0000 Commit: Bernard Spil CommitDate: 2023-05-28 18:53:06 +0000 databases/mariadb106-server: Update to 10.6.13 PR: 271549 Reported by: Miroslav Lachman <000.fbsd@quip.cz> Security: 5d1b1a0a-fd36-11ed-a0d1-84a93843eb75 MFH: 2023Q2 --- databases/mariadb106-client/pkg-plist | 2 ++ databases/mariadb106-server/Makefile | 4 ++-- databases/mariadb106-server/distinfo | 6 +++--- .../files/patch-include_ssl__compat.h | 22 ---------------------- databases/mariadb106-server/pkg-plist | 1 + 5 files changed, 8 insertions(+), 27 deletions(-) diff --git a/databases/mariadb106-client/pkg-plist b/databases/mariadb106-client/pkg-plist index 099f7d22ac24..2e475e5b99df 100644 --- a/databases/mariadb106-client/pkg-plist +++ b/databases/mariadb106-client/pkg-plist @@ -55,6 +55,7 @@ include/mysql/mariadb_dyncol.h include/mysql/mariadb_rpl.h include/mysql/mariadb_stmt.h include/mysql/mariadb_version.h +include/mysql/my_alloca.h include/mysql/my_config.h include/mysql/my_global.h include/mysql/my_sys.h @@ -81,6 +82,7 @@ lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/sha256_password.so +@comment lib/mysql/plugin/zstd.so libdata/pkgconfig/libmariadb.pc share/man/man1/mariadb.1.gz share/man/man1/mariadb-access.1.gz diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 83fffd842974..271d2dcee432 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 10.6.12 +PORTVERSION= 10.6.13 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ @@ -164,7 +164,7 @@ ${ENGINE}_CMAKE_OFF= -DPLUGIN_${ENGINE}=NO ${ENGINE}_CMAKE_ON= -DPLUGIN_${ENGINE}=DYNAMIC .endfor INNOBASE_VARS_OFF= disabled_plugins+=INNOBASE -#COLUMNSTORE_BROKEN= fatal error: 'sys/sysinfo.h' file not found +COLUMNSTORE_BROKEN= error: __float128 is not supported on this target CONNECT_EXTRA_LIB_DEPENDS= libodbc.so:databases/unixODBC CONNECT_EXTRA_USE= gnome=libxml2 CONNECT_EXTRA_USES= gnome diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo index e96a17eea53d..3077cde22cd3 100644 --- a/databases/mariadb106-server/distinfo +++ b/databases/mariadb106-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1675594941 -SHA256 (mariadb-10.6.12.tar.gz) = 3ed2eb7429c2fae5423ca55c661742d107e35246f1ab0c107096f0c4b839463a -SIZE (mariadb-10.6.12.tar.gz) = 95085449 +TIMESTAMP = 1685278588 +SHA256 (mariadb-10.6.13.tar.gz) = f085f379cf59ed2d365644fc5cd8558f882a886ec964070d65a28530ddbb75ba +SIZE (mariadb-10.6.13.tar.gz) = 95285355 diff --git a/databases/mariadb106-server/files/patch-include_ssl__compat.h b/databases/mariadb106-server/files/patch-include_ssl__compat.h deleted file mode 100644 index 132f629cf2eb..000000000000 --- a/databases/mariadb106-server/files/patch-include_ssl__compat.h +++ /dev/null @@ -1,22 +0,0 @@ ---- include/ssl_compat.h.orig 2022-02-10 20:17:08 UTC -+++ include/ssl_compat.h -@@ -19,7 +19,8 @@ - /* 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 < 0x30500000) - #define HAVE_OPENSSL11 1 - #define SSL_LIBRARY OpenSSL_version(OPENSSL_VERSION) - #define ERR_remove_state(X) ERR_clear_error() -@@ -73,7 +74,8 @@ - #define EVP_MD_CTX_SIZE sizeof(EVP_MD_CTX) - #endif - --#ifndef DH_set0_pqg -+#if !defined(DH_set0_pqg) && \ -+ (defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER < 0x30500000) - #define DH_set0_pqg(D,P,Q,G) ((D)->p= (P), (D)->g= (G)) - #endif - diff --git a/databases/mariadb106-server/pkg-plist b/databases/mariadb106-server/pkg-plist index 9867f566ebf2..d22fb2eed2f9 100644 --- a/databases/mariadb106-server/pkg-plist +++ b/databases/mariadb106-server/pkg-plist @@ -81,6 +81,7 @@ include/mysql/server/m_string.h include/mysql/server/ma_dyncol.h include/mysql/server/mariadb_capi_rename.h include/mysql/server/my_alloc.h +include/mysql/server/my_alloca.h include/mysql/server/my_attribute.h include/mysql/server/my_byteorder.h include/mysql/server/my_compiler.h