Date: Wed, 31 May 2023 12:06:55 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 4a4f7cdf003b - 2023Q2 - databases/mariadb105-server: Update to 10.5.20 Message-ID: <202305311206.34VC6t5G094708@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q2 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=4a4f7cdf003b976c5f6c6e9f5aae6541270d906a commit 4a4f7cdf003b976c5f6c6e9f5aae6541270d906a Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2023-05-28 18:56:29 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2023-05-31 12:04:17 +0000 databases/mariadb105-server: Update to 10.5.20 Security: 5d1b1a0a-fd36-11ed-a0d1-84a93843eb75 MFH: 2023Q2 (cherry picked from commit 02fa442ca97d9f251b0b54376e01e0be08159ab4) --- 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305311206.34VC6t5G094708>