mirror of
https://git.freebsd.org/ports.git
synced 2025-04-28 01:26:39 -04:00
databases/mariadb1011-server: Security update to 10.11.11
Security: 7bcfca95-e563-11ef-873e-8447094a420f MFH: 2025Q1
This commit is contained in:
parent
fb798e0c7a
commit
ed65809ab4
6 changed files with 7 additions and 68 deletions
|
@ -1,6 +1,6 @@
|
|||
PORTNAME?= mariadb
|
||||
PORTVERSION= 10.11.10
|
||||
PORTREVISION?= 1
|
||||
PORTVERSION= 10.11.11
|
||||
PORTREVISION?= 0
|
||||
CATEGORIES= databases
|
||||
MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \
|
||||
https://mirror.one.com/${SITESDIR}/ \
|
||||
|
|
|
@ -1,3 +1,3 @@
|
|||
TIMESTAMP = 1731237806
|
||||
SHA256 (mariadb-10.11.10.tar.gz) = b06a74650b83a16aa9ab098984482b028e75b000674b11ff288772c619a6f022
|
||||
SIZE (mariadb-10.11.10.tar.gz) = 104463642
|
||||
TIMESTAMP = 1738941371
|
||||
SHA256 (mariadb-10.11.11.tar.gz) = 6f29d4d7e40fc49af4a0fe608984509ef2d153df3cd8afe4359dce3ca0e27890
|
||||
SIZE (mariadb-10.11.11.tar.gz) = 105754084
|
||||
|
|
|
@ -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))
|
||||
{
|
|
@ -1,10 +0,0 @@
|
|||
--- scripts/mysql_config.sh.orig 2021-07-07 20:25:20 UTC
|
||||
+++ scripts/mysql_config.sh
|
||||
@@ -88,6 +88,7 @@ fi
|
||||
# Create options
|
||||
libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
|
||||
embedded_libs="-L$pkglibdir @RPATH_OPTION@ @EMB_LIBS_FOR_CLIENTS@"
|
||||
+embedded_libs="$embedded_libs -%%LOCALBASE%%/lib "
|
||||
|
||||
include="-I$pkgincludedir"
|
||||
if [ "$basedir" != "/usr" ]; then
|
|
@ -1,24 +0,0 @@
|
|||
--- storage/columnstore/columnstore/utils/common/threadnaming.cpp.orig 2022-05-18 08:34:17 UTC
|
||||
+++ storage/columnstore/columnstore/utils/common/threadnaming.cpp
|
||||
@@ -22,13 +22,21 @@ namespace utils
|
||||
{
|
||||
void setThreadName(const char* threadName)
|
||||
{
|
||||
+#ifdef __FreeBSD__
|
||||
+ pthread_set_name_np(pthread_self(), threadName);
|
||||
+#else
|
||||
prctl(PR_SET_NAME, threadName, 0, 0, 0);
|
||||
+#endif
|
||||
}
|
||||
|
||||
std::string getThreadName()
|
||||
{
|
||||
char buf[32];
|
||||
+#ifdef __FreeBSD__
|
||||
+ pthread_get_name_np(pthread_self(), buf, sizeof(buf));
|
||||
+#else
|
||||
prctl(PR_GET_NAME, buf, 0, 0, 0);
|
||||
+#endif
|
||||
return std::string(buf);
|
||||
}
|
||||
} // namespace utils
|
|
@ -90,6 +90,7 @@ 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_cmp.h
|
||||
include/mysql/server/my_compiler.h
|
||||
include/mysql/server/my_config.h
|
||||
include/mysql/server/my_dbug.h
|
||||
|
@ -139,6 +140,7 @@ include/mysql/server/mysql/service_encryption.h
|
|||
include/mysql/server/mysql/service_encryption_scheme.h
|
||||
include/mysql/server/mysql/service_json.h
|
||||
include/mysql/server/mysql/service_kill_statement.h
|
||||
include/mysql/server/mysql/service_log_warnings.h
|
||||
include/mysql/server/mysql/service_logger.h
|
||||
include/mysql/server/mysql/service_md5.h
|
||||
include/mysql/server/mysql/service_my_crypt.h
|
||||
|
|
Loading…
Add table
Reference in a new issue