From nobody Wed May 31 12:03:10 2023 X-Original-To: dev-commits-ports-all@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 4QWSZl2Gh0z4Yb8V; Wed, 31 May 2023 12:03:11 +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 4QWSZl1Dkpz3xP4; Wed, 31 May 2023 12:03:11 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685534591; 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=V188A+LaOvLUhTyDGUKgaOUP9/GYPZQADwRQ6M63oaA=; b=b+lMSGKx+RR96mwHaFDPGsfN2MBaTx4pHQ00TIrrKaqKuRWcptAW9sKa/hvZGEVAAhdreX FI1BjaxNjknDIL23SUQzh9fqfw4xbZ4v2yV5/PKPhIrti+9kTSGfGKrKuUaGujlgBaN+Yh OgCdd53lBcTNPGVJF1ULBZVJif80p0ClRLaOAyPJA83vvWFRbgtAOFDrjRwhd5gdYV88kL b8RIaMKcPGtssYFFrNQg1qpTD0OhVV92mTetpOWXCqmcCU+NDw/Kn9XgYejeRmPUJ2qjdI 7WRtDMVJhj4mVP8Tvmvo2Zujj6O8ALe3dfO5JBde4zyN6Slg7yd7/45CqfGHAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685534591; 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=V188A+LaOvLUhTyDGUKgaOUP9/GYPZQADwRQ6M63oaA=; b=KqBllLMIO2XwcjkRd5xPmRkkZ038WKZTeFjBo+7XPVoZPiiigFD1ycUdSfQh6k34m5fiy6 enx4xCOkzUBgGg3G4+TajItwSVUxhThkWkWsc2W9q7sVo9MkmoUSrXjSabGh/hX/Z2zLrw st9B8DJbpkU0JYml4o5jRh6pMDnEP6AwWT/dkzHW/IsoEttIMTYvaDxx12RCVX/zXwdcO5 9jlV5N3fj5FvbT3ojb5BgkG6HMN+PH9VDOMFgR5cP+LeoC5cPcnHh/oOuWlFFdicTRW7Xj tP/AzLoc4P3/V5+u+RDixFC/NSHZpbzleYihdnLoMsFL4DAm+br2hYvbEj/PFA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685534591; a=rsa-sha256; cv=none; b=GlkRraqon+e+G1vvbzCSFRscXCfcqCLoac6Fk1YQVpKVp/G5GZqkx7D8Q7aCXMJ9ERdUh7 N/1zkoYWFlmFfdOO5IkBIp5zj4C+CbX8xgY6x+cOiEf9umNfuUphLIOOVX2PrI1BL2fHAJ TwxvtaOo1A+dWBeFrB+VhpGUBN35E1dX3cbuUybJO9Q5m31DINiNRVzlgDRi2JQwodb3Tt j7YzYE3biANl51hw+vGSMfEieFVJYChQLCuKDEMEpGFp5xtoXwEjchvyysToAqmaFfwu7+ YCANRoa+kNMR8mXfSaKELUBVaRPZn6IRZqkxORyZZiauA5u+hfGZDb0q/hHi+A== 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 4QWSZl06hvzZ51; Wed, 31 May 2023 12:03:11 +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 34VC3AfW094033; Wed, 31 May 2023 12:03:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34VC3Ae1094032; Wed, 31 May 2023 12:03:10 GMT (envelope-from git) Date: Wed, 31 May 2023 12:03:10 GMT Message-Id: <202305311203.34VC3Ae1094032@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Bernard Spil Subject: git: 59398624c8d4 - 2023Q2 - databases/mariadb106-server: Update to 10.6.13 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@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/2023Q2 X-Git-Reftype: branch X-Git-Commit: 59398624c8d46d62884d13b8035605b9b4b555a4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=59398624c8d46d62884d13b8035605b9b4b555a4 commit 59398624c8d46d62884d13b8035605b9b4b555a4 Author: Bernard Spil AuthorDate: 2023-05-28 18:53:06 +0000 Commit: Bernard Spil CommitDate: 2023-05-31 12:03:00 +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 (cherry picked from commit 0cc2151714f7a11a1367a5b2d4bc2cd18bc26dbd) --- 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