git: 2c7624081fe7 - 2025Q1 - databases/mariadb114-server: Security update to 11.4.5
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sat, 15 Feb 2025 10:59:13 UTC
The branch 2025Q1 has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=2c7624081fe7ad02418a7504c0056cca0648e40f commit 2c7624081fe7ad02418a7504c0056cca0648e40f Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2025-02-07 15:08:47 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2025-02-15 10:59:05 +0000 databases/mariadb114-server: Security update to 11.4.5 PCRE2 detection failed due to a call that's only used in already broken columnstore option. Security: 7bcfca95-e563-11ef-873e-8447094a420f (cherry picked from commit bc5ec4375fa9f098632f45e7c11e5de534c11d4c) --- databases/mariadb114-server/Makefile | 1 + databases/mariadb114-server/distinfo | 6 ++--- .../files/patch-mysys__ssl_openssl.c | 29 ---------------------- 3 files changed, 4 insertions(+), 32 deletions(-) diff --git a/databases/mariadb114-server/Makefile b/databases/mariadb114-server/Makefile index 6a1728dcfc5c..b4dda4b97bd0 100644 --- a/databases/mariadb114-server/Makefile +++ b/databases/mariadb114-server/Makefile @@ -110,6 +110,7 @@ CMAKE_ARGS+= -DCMAKE_PREFIX_PATH=${PREFIX} \ -DINSTALL_UNIX_ADDRDIR="${MARIADB_RUNDIR}/${MARIADB_SOCK}" \ -DWITH_PCRE=system \ -DPCRE_LIBRARY_DIRS=${PREFIX}/lib \ + -DPCRE_FOUND=true \ -DWITH_LIBFMT=system \ -DLIBFMT_INCLUDE_DIR=${PREFIX}/include \ -DHAVE_SYSTEM_LIBFMT=yes \ diff --git a/databases/mariadb114-server/distinfo b/databases/mariadb114-server/distinfo index 8efd0268c31e..3f2dcdebeade 100644 --- a/databases/mariadb114-server/distinfo +++ b/databases/mariadb114-server/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1731170702 -SHA256 (mariadb-11.4.4.tar.gz) = 96fbd2e6e93fb7e8b373eea75d85b6fea57c0e111a02090cbbefed52599dc77b -SIZE (mariadb-11.4.4.tar.gz) = 111017581 +TIMESTAMP = 1738940618 +SHA256 (mariadb-11.4.5.tar.gz) = ff6595f8c482f9921e39b97fa1122377a69f0dcbd92553c6b9032cbf0e9b5354 +SIZE (mariadb-11.4.5.tar.gz) = 112382453 diff --git a/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c deleted file mode 100644 index 8a141435bd67..000000000000 --- a/databases/mariadb114-server/files/patch-mysys__ssl_openssl.c +++ /dev/null @@ -1,29 +0,0 @@ ---- mysys_ssl/openssl.c.orig 2024-02-01 17:44:37 UTC -+++ mysys_ssl/openssl.c -@@ -30,6 +30,11 @@ int check_openssl_compatibility() - { - return 0; - } -+#elif defined(LIBRESSL_VERSION_NUMBER) -+int check_openssl_compatibility() -+{ -+ return 0; -+} - #else - #include <openssl/evp.h> - -@@ -36,8 +36,12 @@ - static uint testing; - static size_t alloc_size, alloc_count; - --static void *coc_malloc(size_t size, const char *f __attribute__((unused)), -- int l __attribute__((unused))) -+static void *coc_malloc(size_t size -+#if !(defined(LIBRESSL_VERSION_NUMBER) && LIBRESSL_VERSION_NUMBER >= 0x30500000L) -+ , const char *f __attribute__((unused)), -+ int l __attribute__((unused)) -+#endif -+) - { - if (unlikely(testing)) - {