From nobody Sun May 28 18:58:03 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 4QTnwq6yqgz4XlkH; Sun, 28 May 2023 18:58: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 4QTnwq6SCYz3wpR; Sun, 28 May 2023 18:58:03 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685300283; 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=Z/xyiCnYHj1N9thbii9zZNG7VeRSPA8lZYa/Y7k0yr4=; b=koXfmKeWE395N1R1qDTVMm6FU3p0SlWvGfW74pfQhFipL6ohbdGzkQoQdJI9xKN0o1K+Ui GGWUXNQNZpbKVFnDogK8z5zpVLmDQ1cEYKr7+2Y7qdHCW2KPKyKdZpeR5fruLpyLzDRemX z90UQNECIygfq6M87udTe4xuAj/p/wU1UjnTdkJQX3mgzk+Ili69rGlqiRnFe1FdPHxL5t QViOXSzz+t5PPYhyFJ+q+x6aCHhSiboDpcTXlJsAsg9ThEUWjEmHIdnSH2mb/iKNIEEouv pdrpz4q6r6U02I6FxStRDkLTkbY0OiCUCpli3rBOPXMjbF6yNf7x+Hn24RQYtg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1685300283; 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=Z/xyiCnYHj1N9thbii9zZNG7VeRSPA8lZYa/Y7k0yr4=; b=t9+f7nyA+eXTOMv0BQklsYvJXoEl16MBMwq49On+u5qmvfomTvMHkSSi6v1psu6fDrMroI /X9LXUuGY9kSYPUPFGvMGbpcMs9xuLDiaP13gOevUCV304reRSWm/S5Td+MTYLOBihLoOx m/qNN4LbYdhz0kpMgDWQ2rFBL3GFpQhBjQJK9AH2wqzEWUMi9Qhw53C+j3HtFuRIngoSlY xMGlB3oLLn8SximaiTer1eXe4S471H+mfiTdU0cRge33Jf3aUpcZi9YlE5aEQv80YIB12m SyBPwrOF/Rg5oxrZ54sBAfezTHpnomFIVGHsl7Ts48vXA6DQJsKIT8QY5UCxxA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1685300283; a=rsa-sha256; cv=none; b=HQNmZgbosfQCqp2t5vNurVqrQeIvQ7QNG9uKQjfd0DCTQr0iEMpnHtOBB50KqxkUXztvUN IMZYrLJ16Y7f8HyjWu4RIYHlCqsPifBNSFrNzcxcF8uWZ25+AZLmLDyA4sir1rM5/9TSeX PKs5zGXgRvq9fbsUBjPqwar7L11bWSAz4m6LrB+Z5Vjrt6fr86TGXt0SeZ3BQzQKbmBDWT OZT74Wyp695nX7maRYfc1aY8tZ7zv1KJgpbBZsZjv0PqEyEm+rv56qeXVd+vjWh+ogE0+9 27UnyUfIYPPy0tVzR8WEok6YXOhT65oG4F/ZraarAoFwsuMPyoJ2Lxurp+iJdQ== 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 4QTnwq5NXHzhB4; Sun, 28 May 2023 18:58:03 +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 34SIw3Iw047599; Sun, 28 May 2023 18:58:03 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 34SIw3dN047598; Sun, 28 May 2023 18:58:03 GMT (envelope-from git) Date: Sun, 28 May 2023 18:58:03 GMT Message-Id: <202305281858.34SIw3dN047598@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: 02fa442ca97d - main - databases/mariadb105-server: Update to 10.5.20 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: 02fa442ca97d9f251b0b54376e01e0be08159ab4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=02fa442ca97d9f251b0b54376e01e0be08159ab4 commit 02fa442ca97d9f251b0b54376e01e0be08159ab4 Author: Bernard Spil AuthorDate: 2023-05-28 18:56:29 +0000 Commit: Bernard Spil CommitDate: 2023-05-28 18:57:57 +0000 databases/mariadb105-server: Update to 10.5.20 Security: 5d1b1a0a-fd36-11ed-a0d1-84a93843eb75 MFH: 2023Q2 --- databases/mariadb105-client/pkg-plist | 1 + 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 | 2 ++ 5 files changed, 8 insertions(+), 16 deletions(-) diff --git a/databases/mariadb105-client/pkg-plist b/databases/mariadb105-client/pkg-plist index 80bf6c7f182e..4ac9327ed063 100644 --- a/databases/mariadb105-client/pkg-plist +++ b/databases/mariadb105-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/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile index 8d08af95b62a..a631b4ba1022 100644 --- a/databases/mariadb105-server/Makefile +++ b/databases/mariadb105-server/Makefile @@ -1,5 +1,5 @@ PORTNAME?= mariadb -PORTVERSION= 10.5.19 +PORTVERSION= 10.5.20 PORTREVISION?= 0 CATEGORIES= databases MASTER_SITES= \ @@ -181,7 +181,7 @@ 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 build failure "incompatible pointer to integer conversion assigning to 'size_t'" +#ROCKSDB_BROKEN= RocksDB build failure "incompatible pointer to integer conversion assigning to 'size_t'" ROCKSDB_USES= python ROCKSDB_CMAKE_ON= -DPYTHON_SHEBANG=${PYTHON_CMD} SNAPPY_CMAKE_ON= -DWITH_INNODB_SNAPPY=ON -DWITH_ROCKSDB_snappy=ON diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo index 3cbb0d7aedd1..46802f8a1462 100644 --- a/databases/mariadb105-server/distinfo +++ b/databases/mariadb105-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1678032621 -SHA256 (mariadb-10.5.19.tar.gz) = 244c4a24249064106623cb84aa6de514ddf1787de86664075282bba8ec5757f4 -SIZE (mariadb-10.5.19.tar.gz) = 111958233 +TIMESTAMP = 1685280223 +SHA256 (mariadb-10.5.20.tar.gz) = b18f90f0d011ef87bbd559ad0432cde107ecdb58ea28271083b489bdfd1eefdb +SIZE (mariadb-10.5.20.tar.gz) = 112088768 diff --git a/databases/mariadb105-server/files/patch-include_ssl__compat.h b/databases/mariadb105-server/files/patch-include_ssl__compat.h deleted file mode 100644 index c1c686112c18..000000000000 --- a/databases/mariadb105-server/files/patch-include_ssl__compat.h +++ /dev/null @@ -1,11 +0,0 @@ ---- 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 6815b61c04d9..330ed11f7de8 100644 --- a/databases/mariadb105-server/pkg-plist +++ b/databases/mariadb105-server/pkg-plist @@ -66,6 +66,7 @@ bin/resolveip %%WSREP%%%%ETCDIR%%/conf.d/wsrep.cnf.sample @sample %%ETCDIR%%/user_map.conf.sample @comment data/test/db.opt +@comment include/mysql/my_alloca.h include/mysql/server/big_endian.h include/mysql/server/byte_order_generic.h include/mysql/server/byte_order_generic_x86.h @@ -82,6 +83,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