databases/mariadb105-server: Update to 10.5.20

Security:	5d1b1a0a-fd36-11ed-a0d1-84a93843eb75
MFH:		2023Q2
This commit is contained in:
Bernard Spil 2023-05-28 20:56:29 +02:00
parent 74d87a9712
commit 02fa442ca9
5 changed files with 8 additions and 16 deletions

View File

@ -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

View File

@ -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

View File

@ -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

View File

@ -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()

View File

@ -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