Date: Sun, 28 May 2023 12:55:01 GMT From: Bernard Spil <brnrd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a970b387a5de - main - databases/mariadb1011-server: Update to 10.11.3 Message-ID: <202305281255.34SCt1dd050865@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a970b387a5de6686bc098de0cd9037fc82ebc10a commit a970b387a5de6686bc098de0cd9037fc82ebc10a Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2023-05-28 12:53:59 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202305281255.34SCt1dd050865>