[AUTOPATCHER-CORE] Upgrade mariadb to 10.6.20 none (#10927)

Author: CBL-Mariner-Bot

SPECS/mariadb/CVE-2022-47015.patch

@@ -1,5 +1,5 @@
 {
- "Signatures": {
-  "mariadb-10.6.9.tar.gz": "2ebcd66bc18211db9bdb4beb3445852d1ee2f212bc4d7de55a40907542c1b3c1"
- }
-}
+  "Signatures": {
+    "mariadb-10.6.20.tar.gz": "b0f37fac388df74a2a4cfbf1d53cadc4a4361ed1928bda1a627f03a6a60e745d"
+  }
+}

SPECS/mariadb/mariadb.signatures.json

@@ -1,7 +1,7 @@
 Summary:        Database servers made by the original developers of MySQL.
 Name:           mariadb
-Version:        10.6.9
-Release:        6%{?dist}
+Version:        10.6.20
+Release:        1%{?dist}
 License:        GPLv2 WITH exceptions AND LGPLv2 AND BSD
 Vendor:         Microsoft Corporation
 Distribution:   Mariner
@@ -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-2022-47015.patch
 Patch1:         fix_symlink_location_db_install.patch
 BuildRequires:  cmake
 BuildRequires:  curl-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
@@ -360,6 +359,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
@@ -465,6 +465,9 @@ fi
 %{_datadir}/mysql/hindi/errmsg.sys
 
 %changelog
+* Mon Nov 04 2024 CBL-Mariner Servicing Account <cblmargh@microsoft.com> - 10.6.20-1
+- Auto-upgrade to 10.6.20 - address CVE-2024-21096
+
 * Thu Jan 18 2024 Andy Zaugg <azaugg@linkedin.com> - 10.6.9-6
 - Fix post scripts for rpm install, missing setup(mysql_install_db) script.
 

SPECS/mariadb/mariadb.spec

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