Date: Sun, 18 Aug 2024 12:23:24 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: a34cf9c2dbf5 - main - databases/mariadb106-server: Update to 10.6.19 Message-ID: <202408181223.47ICNOog036917@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=a34cf9c2dbf503c8248371ba3bab24f34d2d045d commit a34cf9c2dbf503c8248371ba3bab24f34d2d045d Author: Bernard Spil <brnrd@FreeBSD.org> AuthorDate: 2024-08-18 12:21:26 +0000 Commit: Bernard Spil <brnrd@FreeBSD.org> CommitDate: 2024-08-18 12:23:18 +0000 databases/mariadb106-server: Update to 10.6.19 * Fix a ports LibreSSL issue [1] PR: 274494 [1] Reported by: Ivan Rozhuk <rozhuk im gmail com> --- databases/mariadb106-server/Makefile | 4 +- databases/mariadb106-server/distinfo | 6 +-- databases/mariadb106-server/files/patch-MDEV-34254 | 52 ---------------------- .../files/patch-mysys__ssl_openssl.c | 15 +++++++ databases/mariadb106-server/patch | 23 ++++++++++ .../mariadb106-server/patch-mysys__ssl_openssl.c | 17 +++++++ 6 files changed, 60 insertions(+), 57 deletions(-) diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 1523df03e7f1..504fbdf51fd5 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -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}/ \ diff --git a/databases/mariadb106-server/distinfo b/databases/mariadb106-server/distinfo index 8d8248c62249..d5fe50bd36d4 100644 --- a/databases/mariadb106-server/distinfo +++ b/databases/mariadb106-server/distinfo @@ -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 diff --git a/databases/mariadb106-server/files/patch-MDEV-34254 b/databases/mariadb106-server/files/patch-MDEV-34254 deleted file mode 100644 index 68210424694c..000000000000 --- a/databases/mariadb106-server/files/patch-MDEV-34254 +++ /dev/null @@ -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: diff --git a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c index dd66a716fa84..8a141435bd67 100644 --- a/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c +++ b/databases/mariadb106-server/files/patch-mysys__ssl_openssl.c @@ -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)) + { diff --git a/databases/mariadb106-server/patch b/databases/mariadb106-server/patch new file mode 100644 index 000000000000..78c70e302f6a --- /dev/null +++ b/databases/mariadb106-server/patch @@ -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)) ++ { diff --git a/databases/mariadb106-server/patch-mysys__ssl_openssl.c b/databases/mariadb106-server/patch-mysys__ssl_openssl.c new file mode 100644 index 000000000000..5f809d5ae662 --- /dev/null +++ b/databases/mariadb106-server/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)) + {
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408181223.47ICNOog036917>