mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-12-26 05:02:18 +00:00
Code Issues Releases Activity

databases/mariadb106-server: Update to 10.6.19

Browse Source 
* Fix a ports LibreSSL issue [1]

PR:		274494 [1]
Reported by:	Ivan Rozhuk <rozhuk im gmail com>
This commit is contained in:
Bernard Spil 2024-08-18 14:21:26 +02:00
parent 3e1b380366
commit a34cf9c2db
6 changed files with 60 additions and 57 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/mariadb106-server/Makefile
View File

@ -1,6 +1,6 @@
PORTNAME?= mariadb
PORTVERSION= 10.6.18
PORTREVISION?= 1
PORTVERSION= 10.6.19
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= https://mirror.nodesdirect.com/${SITESDIR}/ \
https://mirror.one.com/${SITESDIR}/ \

6
databases/mariadb106-server/distinfo
View File

@ -1,3 +1,3 @@
TIMESTAMP = 1716446883
SHA256 (mariadb-10.6.18.tar.gz) = 6898a1111f47130709e28ba2c7bd1a57e4bb57101f6e109e597d51e6d385cf18
SIZE (mariadb-10.6.18.tar.gz) = 99344652
TIMESTAMP = 1723490771
SHA256 (mariadb-10.6.19.tar.gz) = bcecb0ff7b79a41344736fa994710787c15516d51eb7715f278c3f0fcb7e8703
SIZE (mariadb-10.6.19.tar.gz) = 99979223

52
databases/mariadb106-server/files/patch-MDEV-34254
View File

@ -1,52 +0,0 @@
From 90d376e01710fbc6f7e9eeef3f8c4653d5d4d82e Mon Sep 17 00:00:00 2001
From: Dave Gosselin <dave.gosselin@mariadb.com>
Date: Mon, 13 May 2024 10:36:11 -0400
Subject: [PATCH] MDEV-34129 mariadb-install-db appears to hang on macOS
Immediately close down the signal handler loop when we decide to
break connections as it's the start of process termination
anyway, and there's no need to wait once we've invoked break_connections.
---
sql/mysqld.cc | 15 +++++++++++----
1 file changed, 11 insertions(+), 4 deletions(-)
diff --git a/sql/mysqld.cc b/sql/mysqld.cc
index cfc16209251c2..a9960400c17cd 100644
--- sql/mysqld.cc.orig
+++ sql/mysqld.cc
@@ -2953,6 +2953,15 @@ static void start_signal_handler(void)
DBUG_VOID_RETURN;
}
+/** Called only from signal_hand function. */
+static void* exit_signal_handler()
+{
+ my_thread_end();
+ signal_thread_in_use= 0;
+ pthread_exit(0); // Safety
+ return nullptr; // Avoid compiler warnings
+}
+
/** This threads handles all signals and alarms. */
/* ARGSUSED */
@@ -3013,10 +3022,7 @@ pthread_handler_t signal_hand(void *arg __attribute__((unused)))
if (abort_loop)
{
DBUG_PRINT("quit",("signal_handler: calling my_thread_end()"));
- my_thread_end();
- signal_thread_in_use= 0;
- pthread_exit(0); // Safety
- return 0; // Avoid compiler warnings
+ return exit_signal_handler();
}
switch (sig) {
case SIGTERM:
@@ -3035,6 +3041,7 @@ pthread_handler_t signal_hand(void *arg __attribute__((unused)))
PSI_CALL_delete_current_thread();
my_sigset(sig, SIG_IGN);
break_connect_loop(); // MIT THREAD has a alarm thread
+ return exit_signal_handler();
}
break;
case SIGHUP:

15
databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
View File

@ -12,3 +12,18 @@
#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))
{

23
databases/mariadb106-server/patch Normal file
View File

@ -0,0 +1,23 @@
diff --git a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
new file mode 100644
index 000000000000..5f809d5ae662
--- /dev/null
+++ b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c
@@ -0,0 +1,17 @@
+--- mysys_ssl/openssl.c
++++ mysys_ssl/openssl.c
+@@ -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))
+ {

17
databases/mariadb106-server/patch-mysys__ssl_openssl.c Normal file
View File

@ -0,0 +1,17 @@
--- mysys_ssl/openssl.c
+++ mysys_ssl/openssl.c
@@ -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))
{