[AUTOPATCHER-CORE] Upgrade mariadb to 10.11.10 none (#10934)

Author: CBL-Mariner-Bot

SPECS/fmt/address-libfmt-issue-with-mariadb.patch

@@ -0,0 +1,36 @@
+From ad9ba5aa82d2b1e232c71203de165fa61ce02d4c Mon Sep 17 00:00:00 2001
+From: Victor Zverovich <viz@meta.com>
+Date: Fri, 9 Feb 2024 15:58:56 -0800
+Subject: [PATCH] Fix handling of static separator
+
+---
+ include/fmt/format-inl.h | 7 +++++--
+ 1 file changed, 5 insertions(+), 2 deletions(-)
+
+diff --git a/include/fmt/format-inl.h b/include/fmt/format-inl.h
+index efac5d1f..78c52ce8 100644
+--- a/include/fmt/format-inl.h
++++ b/include/fmt/format-inl.h
+@@ -114,7 +114,11 @@ template <typename Char> FMT_FUNC Char decimal_point_impl(locale_ref) {
+ 
+ FMT_FUNC auto write_loc(appender out, loc_value value,
+                         const format_specs<>& specs, locale_ref loc) -> bool {
+-#ifndef FMT_STATIC_THOUSANDS_SEPARATOR
++#ifdef FMT_STATIC_THOUSANDS_SEPARATOR
++  value.visit(loc_writer<>{
++      out, specs, std::string(1, FMT_STATIC_THOUSANDS_SEPARATOR), "\3", "."});
++  return true;
++#else
+   auto locale = loc.get<std::locale>();
+   // We cannot use the num_put<char> facet because it may produce output in
+   // a wrong encoding.
+@@ -123,7 +127,6 @@ FMT_FUNC auto write_loc(appender out, loc_value value,
+     return std::use_facet<facet>(locale).put(out, value, specs);
+   return facet(locale).put(out, value, specs);
+ #endif
+-  return false;
+ }
+ }  // namespace detail
+ 
+-- 
+2.44.0

SPECS/fmt/fmt.spec

@@ -1,12 +1,13 @@
 Summary:        Small, safe and fast formatting library for C++
 Name:           fmt
 Version:        10.2.1
-Release:        1%{?dist}
+Release:        2%{?dist}
 License:        BSD
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
 URL:            https://github.com/fmtlib/%{name}
 Source0:        https://github.com/fmtlib/%{name}/archive/refs/tags/%{version}.tar.gz#/%{name}-%{version}.tar.gz
+Patch0:         address-libfmt-issue-with-mariadb.patch
 
 BuildRequires:  gcc
 BuildRequires:  gcc-c++
@@ -80,6 +81,9 @@ sed -i "s/'--clean-css',//" doc/build.py
 %{_libdir}/pkgconfig/%{name}.pc
 
 %changelog
+* Tue Nov 05 2024 Nicolas Guibourge <mwani@microsoft.com> - 10.2.1-2
+- Add patch needed to build mariadb
+
 * Fri Jan 05 2024 Muhammad Falak <mwani@microsoft.com> - 10.2.1-1
 - Bump version to 10.2.1
 

SPECS/mariadb/CVE-2024-0901.patch

@@ -1,5 +1,5 @@
 {
- "Signatures": {
-  "mariadb-10.11.6.tar.gz": "9938de4f4ad4f75ca15ff67b32421b611a0538faf5f71a084586c61384736b4a"
- }
+  "Signatures": {
+    "mariadb-10.11.10.tar.gz": "82905406675c7fa909ac9afda4c0a78a98523d44a0257afe00d19130119ca422"
+  }
 }

SPECS/mariadb/mariadb.signatures.json

@@ -1,7 +1,7 @@
 Summary:        Database servers made by the original developers of MySQL.
 Name:           mariadb
-Version:        10.11.6
-Release:        3%{?dist}
+Version:        10.11.10
+Release:        1%{?dist}
 License:        GPLv2 WITH exceptions AND LGPLv2 AND BSD
 Vendor:         Microsoft Corporation
 Distribution:   Azure Linux
@@ -11,7 +11,6 @@ Group:          Applications/Databases
 # To generate run CBL-Mariner/SPECS/mariadb/generate_source_tarball.sh script
 URL:            https://mariadb.org/
 Source0:        https://github.com/MariaDB/server/archive/mariadb-%{version}.tar.gz
-Patch0:         CVE-2024-0901.patch
 BuildRequires:  cmake
 BuildRequires:  curl-devel
 BuildRequires:  e2fsprogs-devel
@@ -127,7 +126,7 @@ rm %{buildroot}%{_libdir}/mysql/plugin/{auth_gssapi_client.so,caching_sha2_passw
 rm %{buildroot}%{_libdir}/pkgconfig/libmariadb.pc
 rm %{buildroot}%{_includedir}/mysql/{errmsg.h,ma_list.h,ma_pvio.h,ma_tls.h,mysql_version.h,mysqld_error.h,mariadb_com.h,mariadb_ctype.h,mariadb_dyncol.h,mariadb_rpl.h,mariadb_stmt.h,mariadb_version.h,mysql.h}
 rm %{buildroot}%{_includedir}/mysql/mariadb/ma_io.h
-rm %{buildroot}%{_includedir}/mysql/mysql/{client_plugin.h,plugin_auth.h,plugin_auth_common.h}
+rm %{buildroot}%{_includedir}/mysql/mysql/{client_plugin.h,plugin_auth.h}
 
 mv  %{buildroot}%{_datadir}/systemd/mariadb.service %{buildroot}/%{_libdir}/systemd/system/mariadb.service
 mv  %{buildroot}%{_datadir}/systemd/mariadb@.service %{buildroot}/%{_libdir}/systemd/system/mariadb@.service
@@ -363,6 +362,7 @@ fi
 %{_mandir}/man1/wsrep_sst_common.1.gz
 %{_mandir}/man1/wsrep_sst_mysqldump.1.gz
 %{_mandir}/man1/wsrep_sst_rsync.1.gz
+%{_mandir}/man1/wsrep_sst_backup.1.gz
 %{_mandir}/man1/mariabackup.1.gz
 %{_mandir}/man1/mbstream.1.gz
 %{_mandir}/man1/mysql_embedded.1.gz
@@ -469,6 +469,9 @@ fi
 %{_datadir}/mysql/hindi/errmsg.sys
 
 %changelog
+* Tue Nov 05 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 10.11.10-1
+- Auto-upgrade to 10.11.10 - to address CVE-2024-21096
+
 * Fri Jun 21 2024 Neha Agarwal <nehaagarwal@microsoft.com> - 10.11.6-3
 - Patch CVE-2024-0901
 

SPECS/mariadb/mariadb.spec

@@ -12721,8 +12721,8 @@
         "type": "other",
         "other": {
           "name": "mariadb",
-          "version": "10.11.6",
-          "downloadUrl": "https://github.com/MariaDB/server/archive/mariadb-10.11.6.tar.gz"
+          "version": "10.11.10",
+          "downloadUrl": "https://github.com/MariaDB/server/archive/mariadb-10.11.10.tar.gz"
         }
       }
     },