aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernard Spil <brnrd@FreeBSD.org>2024-05-25 12:23:48 +0000
committerBernard Spil <brnrd@FreeBSD.org>2024-05-25 12:23:48 +0000
commit7100a4eb05e7b5dd46a96cd11d5694079bb512f5 (patch)
tree577e14ba77fdb15827544e1cbb9aaef3bfb25c7a
parent837762c9def70a962dde63866a95fcb6795fdc23 (diff)
downloadports-7100a4eb05e7b5dd46a96cd11d5694079bb512f5.tar.gz
ports-7100a4eb05e7b5dd46a96cd11d5694079bb512f5.zip
databases/mariadb105-server: Update to 10.5.24
-rw-r--r--databases/mariadb105-server/Makefile2
-rw-r--r--databases/mariadb105-server/distinfo6
-rw-r--r--databases/mariadb105-server/files/patch-mysys__ssl_openssl.c17
-rw-r--r--databases/mariadb105-server/pkg-plist1
4 files changed, 22 insertions, 4 deletions
diff --git a/databases/mariadb105-server/Makefile b/databases/mariadb105-server/Makefile
index 4b8151e1bc2e..3995de986165 100644
--- a/databases/mariadb105-server/Makefile
+++ b/databases/mariadb105-server/Makefile
@@ -1,5 +1,5 @@
PORTNAME?= mariadb
-PORTVERSION= 10.5.23
+PORTVERSION= 10.5.24
PORTREVISION?= 0
CATEGORIES= databases
MASTER_SITES= \
diff --git a/databases/mariadb105-server/distinfo b/databases/mariadb105-server/distinfo
index bf0621f94dcc..b66aff230b2d 100644
--- a/databases/mariadb105-server/distinfo
+++ b/databases/mariadb105-server/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1701021292
-SHA256 (mariadb-10.5.23.tar.gz) = 3f7c33b208cb799db014a874f56718eadff22ee95781fa360aa6bc696109acfe
-SIZE (mariadb-10.5.23.tar.gz) = 114829503
+TIMESTAMP = 1716634619
+SHA256 (mariadb-10.5.24.tar.gz) = f677c5edf82aeb394cc41937aea33a3d3cc64ea2ed786adaf162b32f203d14a5
+SIZE (mariadb-10.5.24.tar.gz) = 115706805
diff --git a/databases/mariadb105-server/files/patch-mysys__ssl_openssl.c b/databases/mariadb105-server/files/patch-mysys__ssl_openssl.c
new file mode 100644
index 000000000000..5f809d5ae662
--- /dev/null
+++ b/databases/mariadb105-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/mariadb105-server/pkg-plist b/databases/mariadb105-server/pkg-plist
index 330ed11f7de8..c51e558c158a 100644
--- a/databases/mariadb105-server/pkg-plist
+++ b/databases/mariadb105-server/pkg-plist
@@ -143,6 +143,7 @@ include/mysql/server/mysql/service_my_snprintf.h
include/mysql/server/mysql/service_progress_report.h
include/mysql/server/mysql/service_sha1.h
include/mysql/server/mysql/service_sha2.h
+include/mysql/server/mysql/service_sql.h
include/mysql/server/mysql/service_thd_alloc.h
include/mysql/server/mysql/service_thd_autoinc.h
include/mysql/server/mysql/service_thd_error_context.h