mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
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
This commit is contained in:
parent
785522bfad
commit
bc5ec4375f
3 changed files with 5 additions and 33 deletions
|
@ -1,5 +1,5 @@
|
|||
PORTNAME?= mariadb
|
||||
PORTVERSION= 11.4.4
|
||||
PORTVERSION= 11.4.5
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \
|
||||
https://mirror.one.com/${SITESDIR}/ \
|
||||
|
@ -109,6 +109,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 \
|
||||
|
|
|
@ -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
|
||||
|
|
|
@ -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))
|
||||
{
|
Loading…
Add table
Reference in a new issue