From nobody Sun May 28 12:55:01 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 4QTdsx5F2Nz4XM21; Sun, 28 May 2023 12:55:01 +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 4QTdsx4m55z44wB; Sun, 28 May 2023 12:55:01 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685278501; 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=Ob93Yd8XlZPfkA0I2jZcVrKvO1vwWb4i+e2jDnOoFlA=; b=V0K8RVd+5ZtG7C/Cc+HSSarvsiORRWp1EtGoVlHIxGy8HYfeVkDjwlbiNhRInTxvrJsFeB br/8Bv6WtRRQqCI+EW9PytmYoTGBLOdqKe2Kz2JUmsmeBPwDiJQ1LpQpqJjTTHJx29hhO0 BTNnigwdwVpq2GlIWhwtULwe9y51kNTyqAGBO08hjFbKP2+pajkJvpTHyW8MVv8YuRP39f cvCweZfhpZ34z9/LIwdyA9pVl29mltLSMv70lHv2bB+LFlrHYRetAKvwlhvt0zs+kO2vwZ CRv33p7QjnScOEQgodyQIVYPf2vZrgJS3+xbMSehCHYKwC3El+1qgaBhJqrPAA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685278501; 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=Ob93Yd8XlZPfkA0I2jZcVrKvO1vwWb4i+e2jDnOoFlA=; b=K5Er4GzCyLu4QGrfk3ayxGu6WJ89ZohwktM7EE7mw0NCaIMLZUUA4DCNo0UEO/RU0ZTerU H2Z1j12TTA1gzs1sK2aQ6fxxHrr1u3X+0a1O9T8uE0KfGiBRkitX/LycsKPF0oTays0c0+ EhFXMtUbTtigF03+IrSvCde/6x0Jx+YUTPSTugIFH7gkGPcn1zBwCF6saZa7hLweLvUruI JwImUWjXhKXwof8GudLuMza5iBXgMW20KkKPNLDJDe18RvvBDQGWTynCVVvxP2XNMsPoN4 y50L846ldLvYz+AXSQO0U/XTgSnGTZ8FvWAD9qjxfgO+KYWNkmGzyNbhCGDZ9g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685278501; a=rsa-sha256; cv=none; b=o75mVpRXgFl0N7lVuAUGqKoASPeeB/6KVAtNTq6hdvaDifyk41Z6Rjheze+tMXyRLxI/oR mT8GgBdzCfWQGSTP2vhNOLKKGovFLLai3YTlOZXZxz0jZIuPF2k4osrMrxUEckTMhmVX12 0PyDIkuiyHtD5kDerJv/B3lZm6/lD77hRfhKqnOcSw9VPzLtD+Svkr5cU3cNtWxkrpbOQ+ Q/CtT3ZL4gamK5HEd3GDk4B71+jMbODkFztytt4orEhXa2S+J969pOYbTR4qvKY/9f0COk +UeZ+2XcZcMHeGVRUiUdMytyIGZeFDoWKzOLnRGyHqt6fkXqgXAssnOKfk/PdQ== 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 4QTdsx3sJ2zWPp; Sun, 28 May 2023 12:55:01 +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 34SCt1u1050866; Sun, 28 May 2023 12:55:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SCt1dd050865; Sun, 28 May 2023 12:55:01 GMT (envelope-from git) Date: Sun, 28 May 2023 12:55:01 GMT Message-Id: <202305281255.34SCt1dd050865@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: a970b387a5de - main - databases/mariadb1011-server: Update to 10.11.3 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/main X-Git-Reftype: branch X-Git-Commit: a970b387a5de6686bc098de0cd9037fc82ebc10a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a970b387a5de6686bc098de0cd9037fc82ebc10a commit a970b387a5de6686bc098de0cd9037fc82ebc10a Author: Bernard Spil AuthorDate: 2023-05-28 12:53:59 +0000 Commit: Bernard Spil CommitDate: 2023-05-28 12:53:59 +0000 databases/mariadb1011-server: Update to 10.11.3 Security: 5d1b1a0a-fd36-11ed-a0d1-84a93843eb75 MFH: 2023Q2 --- databases/mariadb1011-client/pkg-plist | 1 + databases/mariadb1011-server/Makefile | 5 ++--- databases/mariadb1011-server/distinfo | 6 +++--- .../files/patch-include_ssl__compat.h | 22 ---------------------- databases/mariadb1011-server/pkg-plist | 2 ++ 5 files changed, 8 insertions(+), 28 deletions(-) diff --git a/databases/mariadb1011-client/pkg-plist b/databases/mariadb1011-client/pkg-plist index aec947b4a18c..98ad22c80283 100644 --- a/databases/mariadb1011-client/pkg-plist +++ b/databases/mariadb1011-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 diff --git a/databases/mariadb1011-server/Makefile b/databases/mariadb1011-server/Makefile index 156aa8f13355..844a6fa97ee2 100644 --- a/databases/mariadb1011-server/Makefile +++ b/databases/mariadb1011-server/Makefile @@ -1,6 +1,6 @@ PORTNAME?= mariadb -PORTVERSION= 10.11.2 -PORTREVISION?= 1 +PORTVERSION= 10.11.3 +PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \ https://mirror.one.com/${SITESDIR}/ \ @@ -185,7 +185,6 @@ MROONGA_IMPLIES= LZ4 MSGPACK_LIB_DEPENDS= libmsgpackc.so:devel/msgpack-c OQGRAPH_LIB_DEPENDS= libboost_system.so:devel/boost-libs \ libJudy.so:devel/judy -ROCKSDB_BROKEN= RocksDB engine build failure "incompatible pointer to integer conversion" ROCKSDB_USES= python ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} -DWITH_ROCKSDB_zstd=ON S3_LIB_DEPENDS= libcurl.so:ftp/curl diff --git a/databases/mariadb1011-server/distinfo b/databases/mariadb1011-server/distinfo index d8cfc6d9e0fa..b5cf0c8e1009 100644 --- a/databases/mariadb1011-server/distinfo +++ b/databases/mariadb1011-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1680376412 -SHA256 (mariadb-10.11.2.tar.gz) = 1c89dee0caed0f68bc2a1d203eb98a123150e6a179f6ee0f1fc0ba3f08dc71dc -SIZE (mariadb-10.11.2.tar.gz) = 96372411 +TIMESTAMP = 1684491760 +SHA256 (mariadb-10.11.3.tar.gz) = b065b0f32a6e9fd479e566fd6671450379886d8dda2d9a7ef930af1e5c26c0c7 +SIZE (mariadb-10.11.3.tar.gz) = 96761750 diff --git a/databases/mariadb1011-server/files/patch-include_ssl__compat.h b/databases/mariadb1011-server/files/patch-include_ssl__compat.h deleted file mode 100644 index 132f629cf2eb..000000000000 --- a/databases/mariadb1011-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/mariadb1011-server/pkg-plist b/databases/mariadb1011-server/pkg-plist index 9847a6db2bfb..f898d75f085b 100644 --- a/databases/mariadb1011-server/pkg-plist +++ b/databases/mariadb1011-server/pkg-plist @@ -87,6 +87,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 @@ -494,6 +495,7 @@ share/aclocal/mysql.m4 %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys +%%DATADIR%%/georgian/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hindi/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys