libmariadb: update to 3.4.8

This release is needed in order to build against the 6.18 kernel.

Removed upstreamed: 020-gcc15.patch

Signed-off-by: John Audia <redacted>

diff --git a/libs/libmariadb/Makefile b/libs/libmariadb/Makefile
index 3c1ff66336e9896ef0dc6dabbd31d6b9f74503fe..c1ac1e7e510c39a105a27319bbf8317abc35813e 100644 (file)
--- a/libs/libmariadb/Makefile
+++ b/libs/libmariadb/Makefile
@@ -6,7 +6,7 @@
 include $(TOPDIR)/rules.mk
 
 PKG_NAME:=libmariadb
-PKG_VERSION:=3.4.5
+PKG_VERSION:=3.4.8
 PKG_RELEASE:=1
 
 PKG_SOURCE:=mariadb-connector-c-$(PKG_VERSION)-src.tar.gz
@@ -14,7 +14,7 @@ PKG_SOURCE_URL:=\
        https://mirror.netcologne.de/mariadb/connector-c-$(PKG_VERSION) \
        https://ftp.yz.yamagata-u.ac.jp/pub/dbms/mariadb/connector-c-$(PKG_VERSION) \
        https://dlm.mariadb.com/3907132/Connectors/c/connector-c-$(PKG_VERSION)
-PKG_HASH:=b17e193816cb25c3364c2cc92a0ad3f1d0ad9f0f484dc76b8e7bdb5b50eac1a3
+PKG_HASH:=156aed3b49f857d0ac74fb76f1982968bcbfd8382da3f5b6ae71f616729920d7
 PKG_BUILD_DIR:=$(BUILD_DIR)/mariadb-connector-c-$(PKG_VERSION)-src
 
 PKG_MAINTAINER:=Michal Hrusecky <Michal@Hrusecky.net>

diff --git a/libs/libmariadb/patches/010-link-to-libucontext.patch b/libs/libmariadb/patches/010-link-to-libucontext.patch
index 736a373f7eedbdede71d1056cfb613a3db21599f..3a64c003d47fb89672b94239c9aa7e0b43d78257 100644 (file)
--- a/libs/libmariadb/patches/010-link-to-libucontext.patch
+++ b/libs/libmariadb/patches/010-link-to-libucontext.patch
@@ -12,7 +12,7 @@ providing these system calls on platforms not supporting them out of
 the box - like musl based platforms.
 --- a/CMakeLists.txt
 +++ b/CMakeLists.txt
-@@ -263,11 +263,19 @@ IF(UNIX)
+@@ -264,11 +264,19 @@ IF(UNIX)
    SEARCH_LIBRARY(LIBPTHREAD pthread_getspecific "pthread;pthreads")
    SEARCH_LIBRARY(LIBNSL gethostbyname_r "nsl_r;nsl")
    SEARCH_LIBRARY(LIBSOCKET setsockopt socket)

diff --git a/libs/libmariadb/patches/020-gcc15.patch b/libs/libmariadb/patches/020-gcc15.patch
deleted file mode 100644 (file)
index 8580b31..0000000
--- a/libs/libmariadb/patches/020-gcc15.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From b10b76e5a2b983d86bd487873608abce8e0d507b Mon Sep 17 00:00:00 2001
-From: Michal Schorm <mschorm@redhat.com>
-Date: Wed, 12 Feb 2025 15:17:39 +0100
-Subject: [PATCH] Fix compilation with GCC 15
-MIME-Version: 1.0
-Content-Type: text/plain; charset=UTF-8
-Content-Transfer-Encoding: 8bit
-
-| In file included from /builddir/build/BUILD/mariadb-connector-c-3.4.3-build/mariadb-connector-c-3.4.3-src/plugins/auth/dialog.c:23:
-| /builddir/build/BUILD/mariadb-connector-c-3.4.3-build/mariadb-connector-c-3.4.3-src/include/ma_global.h:687:25: error: ‘bool’ cannot be defined via ‘typedef’
-|   687 | typedef char            bool;   /* Ordinary boolean values 0 1 */
-|       |                         ^~~~
-| /builddir/build/BUILD/mariadb-connector-c-3.4.3-build/mariadb-connector-c-3.4.3-src/include/ma_global.h:687:25: note: ‘bool’ is a keyword with ‘-std=c23’ onwards
----
- include/ma_global.h | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
---- a/include/ma_global.h
-+++ b/include/ma_global.h
-@@ -683,7 +683,7 @@ typedef unsigned long      size_s; /* Size of
- typedef int           myf;    /* Type of MyFlags in my_funcs */
- typedef char          my_bool; /* Small bool */
- typedef unsigned long long my_ulonglong;
--#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus))
-+#if !defined(bool) && !defined(bool_defined) && (!defined(HAVE_BOOL) || !defined(__cplusplus)) && (__STDC_VERSION__ < 202300L)
- typedef char          bool;   /* Ordinary boolean values 0 1 */
- #endif
-       /* Macros for converting *constants* to the right type */