diff --git a/package/mariadb/0002-MDEV-34206-compile-failure-fmt-use-incompatible-with.patch b/package/mariadb/0002-MDEV-34206-compile-failure-fmt-use-incompatible-with.patch deleted file mode 100644 index b6c8807f44..0000000000 --- a/package/mariadb/0002-MDEV-34206-compile-failure-fmt-use-incompatible-with.patch +++ /dev/null @@ -1,35 +0,0 @@ -From 69935c10b95fc7f7a2e1c3ed02831958e1a9b6a4 Mon Sep 17 00:00:00 2001 -From: Daniel Black -Date: Wed, 22 May 2024 17:43:17 +1000 -Subject: [PATCH] MDEV-34206 compile failure: fmt use incompatible with - libfmt-10.2.[2]+ - -Upstream libfmt commit https://github.com/fmtlib/fmt/commit/d70729215fba1d54862e407b626abf86ddf409bf -now requires the format function to be const. - -Adjust the function prototype so it is const and can compile.a - -Signed-off-by: Daniel Black -[Julien: add SoB line with the original patch author name] -Upstream: https://github.com/MariaDB/server/commit/4375245d5d9f01cabb6e3fd6c637535e724eae38 -Signed-off-by: Julien Olivain ---- - sql/item_strfunc.cc | 2 +- - 1 file changed, 1 insertion(+), 1 deletion(-) - -diff --git a/sql/item_strfunc.cc b/sql/item_strfunc.cc -index 4bbf36ec1cf..2ad8a9b3ce5 100644 ---- a/sql/item_strfunc.cc -+++ b/sql/item_strfunc.cc -@@ -1392,7 +1392,7 @@ bool Item_func_sformat::fix_length_and_dec(THD *thd) - namespace fmt { - template <> struct formatter: formatter { - template -- auto format(String c, FormatContext& ctx) -> decltype(ctx.out()) { -+ auto format(String c, FormatContext& ctx) const -> decltype(ctx.out()) { - string_view name = { c.ptr(), c.length() }; - return formatter::format(name, ctx); - }; --- -2.46.0 - diff --git a/package/mariadb/mariadb.hash b/package/mariadb/mariadb.hash index fd73cca4f3..05340c1faa 100644 --- a/package/mariadb/mariadb.hash +++ b/package/mariadb/mariadb.hash @@ -1,6 +1,6 @@ -# From https://downloads.mariadb.org/mariadb/10.11.6 -sha512 3d77f7be4a26d5a36af56150a5f8ed5e21adeed9bc8ea1bd694e47a25a571bd73468eada7c96e0dfe5a6c81bef625abf71a56d228cf43a738e555e3c0d824a6a mariadb-10.11.6.tar.gz +# From https://downloads.mariadb.org/mariadb/10.11.11 +sha512 d9c154207a9f435ce08d5fbfe31814a739e577c656ef9996cf7e60c2cad8b4c07e2de8d94b6191fefa2b5cbde56437b586f85f144d3b4fcec8533449ed8411ac mariadb-10.11.11.tar.gz # Hash for license files -sha256 2b278a3a2f20696113a7c57c4f3e6a5cdb9a25f2a827e72e0c089a2f805ff91a README.md +sha256 ff437f42ea15b42f3d9617e691b9f159f38a0b1b0748e482304857a5026ede90 README.md sha256 240a15a1d0f34d3abca462cdb7e5fb89470967563f16b0e71169e51c1e74cf2b COPYING diff --git a/package/mariadb/mariadb.mk b/package/mariadb/mariadb.mk index 1dcf6568da..0d872442f2 100644 --- a/package/mariadb/mariadb.mk +++ b/package/mariadb/mariadb.mk @@ -4,7 +4,7 @@ # ################################################################################ -MARIADB_VERSION = 10.11.6 +MARIADB_VERSION = 10.11.11 MARIADB_SITE = https://downloads.mariadb.org/interstitial/mariadb-$(MARIADB_VERSION)/source MARIADB_LICENSE = GPL-2.0 (server), GPL-2.0 with FLOSS exception (GPL client library), LGPL-2.0 (LGPL client library) # Tarball no longer contains LGPL license text @@ -27,7 +27,8 @@ MARIADB_DEPENDENCIES = \ MARIADB_CONF_OPTS += \ -DWITH_LIBFMT=system \ - -DWITH_PCRE=system + -DWITH_PCRE=system \ + -DHAVE_SYSTEM_LIBFMT_EXITCODE=0 # use bundled GPL-2.0+ licensed readline as package/readline is GPL-3.0+ MARIADB_CONF_OPTS += -DWITH_READLINE=ON