mirrors/aports
2
0
Fork 0
mirror of https://gitlab.alpinelinux.org/alpine/aports.git synced 2024-09-20 11:23:16 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

main/mariadb: upgrade to 11.4.3

Browse source
This commit is contained in:
Andy Postnikov 2024-08-16 15:20:30 +02:00 committed by J0WI
parent 570244f53e
commit f9b61dab42
2 changed files with 3 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
main/mariadb/APKBUILD
View file

@ -7,8 +7,8 @@
# Contributor: Jake Buchholz <tomalok@gmail.com>
# Maintainer: Natanael Copa <ncopa@alpinelinux.org>
pkgname=mariadb
pkgver=11.4.2
pkgrel=1
pkgver=11.4.3
pkgrel=0
pkgdesc="A fast SQL database server"
url="https://www.mariadb.org/"
pkgusers="mysql"
@ -93,7 +93,6 @@ source="https://rsync.osuosl.org/pub/mariadb/mariadb-$pkgver/source/mariadb-$pkg
ppc-remove-glibc-dep.patch
disable-failing-test.patch
have_stacktrace.patch
fmt11.patch
"
# secfixes:
@ -554,12 +553,11 @@ _plugin_rocksdb() {
}
sha512sums="
02db06115e1f1f7c8a872b5cae4e299011813bc9f097e9d77756dfd68d4cb7fc91d6b94380d70910cb6994c0f71d60400a58c226fbce08dd9efc337ab028f6a6 mariadb-11.4.2.tar.gz
0aef97265a48fdbeee3b802b52854c8ca2b34cd13c4ed33ded9e68e38ff132e8ae14254dda836a4e3804d6ae8810866e0af1c9c968cca0902f6d85742315fb34 mariadb-11.4.3.tar.gz
c352969f6665b0ffa387f7b185a5dea7751f4b16c12c809627857b27321efa09159369d7dd5c852d6159a9f173cb895fb601f0c52a1fa6e3527899520030964c mariadb.initd
ec9068ee1da8276f04ac3654640cb6149e0f0a21ee77b133d7e5b82fa2ab2fd7971bce6ea3c5a5e094d8c6e2571f4ce43d7014b2767bb27e0a335005ced81968 gcc13.patch
cccaa99917913f5f08204464e7fb9865e30760a1933ff240c0035271f831058d2ea4ada867da164309bfc91f6b564ec13bb290900d90c3697866971c7666f91b lfs64.patch
20331e52e3dc419b4833e3c16bbb9828b9591f8aa3b6fce93c592161f3cae403c4a5d073369b2383d7d2325a2c9394d178866ac3e069fd8b6c50be00155ba942 ppc-remove-glibc-dep.patch
c0955a5d3fecafd0fc602df7dd06f75056a1b114771189db42e5aa0f6f877047831caba3e7629edb3c54bdfb75e337b6d281adfde279ce86db9e9561e8f73ad9 disable-failing-test.patch
4965275371e6d5e08e32a16fcfff2e68dfdcf6f4c30e5beffe18dcf56b503cbf373feeda814694e048964b16165ad65156c32fe27e974bed47201e8cf60736c6 have_stacktrace.patch
b5f14622e4150f25a2ef4434039638afc1b14718169067b14c339f4fb5e2bd18df72917fdeb7dce1993fb63ce9b68b81914f5459d87c0256f0be7258f155c3de fmt11.patch
"

27
main/mariadb/fmt11.patch
View file

@ -1,27 +0,0 @@
From 5ece30a9fac3ff4cba26435c7d559458aebeae48 Mon Sep 17 00:00:00 2001
From: Daniel Black <daniel@mariadb.org>
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.
---
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 19e011d54f8be..28d7ee7145360 100644
--- a/sql/item_strfunc.cc
+++ b/sql/item_strfunc.cc
@@ -1382,7 +1382,7 @@ bool Item_func_sformat::fix_length_and_dec(THD *thd)
namespace fmt {
template <> struct formatter<String>: formatter<string_view> {
template <typename FormatContext>
- 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<string_view>::format(name, ctx);
};