!60 Bump to 10.5.15

From: @bzhaoop 
Reviewed-by: @zhengzhenyu 
Signed-off-by: @zhengzhenyu

mariadb.spec

@@ -2,7 +2,7 @@
 %global pkgnamepatch mariadb
 %{!?runselftest:%global runselftest 0}
 %global ignore_testsuite_result 0
-%global last_tested_version 10.5.10
+%global last_tested_version 10.5.15
 %global force_run_testsuite 0
 %global require_mysql_selinux 1
 
@@ -73,8 +73,8 @@
 %global sameevr   %{epoch}:%{version}-%{release}
 
 Name:             mariadb
-Version:          10.5.10
+Version:          10.5.15
-Release:          3
+Release:          1
 Epoch:            4
 
 Summary:          A very fast and robust SQL database server
@@ -100,19 +100,6 @@ Source70:         clustercheck.sh
 Source71:         LICENSE.clustercheck
 
 Source72:         mariadb-server-galera.te
-#   Patch4: yum distributions specific logrotate fix
-#   it would be big unexpected change, if we start shipping it now. Better wait for MariaDB 10.2
-Patch4:           %{pkgnamepatch}-logrotate.patch
-#   Patch7: add to the CMake file all files where we want macros to be expanded
-Patch7:           %{pkgnamepatch}-scripts.patch
-#   Patch9: pre-configure to comply with guidelines
-Patch9:           %{pkgnamepatch}-ownsetup.patch
-#   Patch10: Fix cipher name in the SSL Cipher name test
-Patch10:          %{pkgnamepatch}-ssl-cipher-tests.patch
-#   Patch11: Use PCDIR CMake option, if configured
-Patch11:          %{pkgnamepatch}-pcdir.patch
-#   Patch15:  Add option to edit groonga's and groonga-normalizer-mysql install path
-Patch15:          %{pkgnamepatch}-groonga.patch
 
 BuildRequires:    make
 BuildRequires:    cmake gcc-c++
@@ -627,13 +614,6 @@ rm -rf libmariadb/unittest
 rm -r storage/rocksdb/
 %endif
 
-%patch4 -p1
-%patch7 -p1
-%patch9 -p1
-%patch10 -p1
-%patch11 -p1
-%patch15 -p1
-
 # generate a list of tests that fail, but are not disabled by upstream
 cat %{SOURCE50} | tee -a mysql-test/unstable-tests
 
@@ -794,7 +774,7 @@ ln -s mysql_config.1.gz %{buildroot}%{_mandir}/man1/mariadb_config.1.gz
 if [ %multilib_capable ]
 then
 mv %{buildroot}%{_bindir}/mysql_config %{buildroot}%{_bindir}/mysql_config-%{__isa_bits}
-install -p -m 0755 %{_builddir}/mariadb-%{version}/scripts/mysql_config_multilib %{buildroot}%{_bindir}/mysql_config
+install -p -m 0755 %{_builddir}/mariadb-%{version}/scripts/mysql_config_multilib.sh %{buildroot}%{_bindir}/mysql_config
 # Copy manual page for multilib mysql_config; https://jira.mariadb.org/browse/MDEV-11961
 ln -s mysql_config.1 %{buildroot}%{_mandir}/man1/mysql_config-%{__isa_bits}.1
 fi
@@ -822,9 +802,9 @@ mkdir -p %{buildroot}%{pidfiledir}
 install -p -m 0755 -d %{buildroot}%{dbdatadir}
 
 %if %{with config}
-install -D -p -m 0644 %{_builddir}/mariadb-%{version}/scripts/my.cnf %{buildroot}%{_sysconfdir}/my.cnf
+install -D -p -m 0644 %{_builddir}/mariadb-%{version}/scripts/my.cnf.in %{buildroot}%{_sysconfdir}/my.cnf
 %else
-rm %{_builddir}/mariadb-%{version}/scripts/my.cnf
+rm %{_builddir}/mariadb-%{version}/scripts/my.cnf.in
 %endif
 
 # use different config file name for each variant of server (mariadb / mysql)
@@ -839,17 +819,17 @@ rm -r %{buildroot}%{_datadir}/%{pkg_name}/systemd
 rm %{buildroot}%{_unitdir}/{mysql,mysqld}.service
 
 # install systemd unit files and scripts for handling server startup
-install -D -p -m 644 %{_builddir}/mariadb-%{version}/scripts/mysql.service %{buildroot}%{_unitdir}/%{daemon_name}.service
+install -D -p -m 644 %{_builddir}/mariadb-%{version}/scripts/mysql.service.in %{buildroot}%{_unitdir}/%{daemon_name}.service
-install -D -p -m 644 %{_builddir}/mariadb-%{version}/scripts/mysql@.service %{buildroot}%{_unitdir}/%{daemon_name}@.service
+install -D -p -m 644 %{_builddir}/mariadb-%{version}/scripts/mysql@.service.in %{buildroot}%{_unitdir}/%{daemon_name}@.service
 
 # helper scripts for service starting
-install -p -m 755 %{_builddir}/mariadb-%{version}/scripts/mariadb-prepare-db-dir %{buildroot}%{_libexecdir}/mariadb-prepare-db-dir
+install -p -m 755 %{_builddir}/mariadb-%{version}/scripts/mariadb-prepare-db-dir.sh %{buildroot}%{_libexecdir}/mariadb-prepare-db-dir
-install -p -m 755 %{_builddir}/mariadb-%{version}/scripts/mariadb-check-socket %{buildroot}%{_libexecdir}/mariadb-check-socket
+install -p -m 755 %{_builddir}/mariadb-%{version}/scripts/mariadb-check-socket.sh %{buildroot}%{_libexecdir}/mariadb-check-socket
-install -p -m 755 %{_builddir}/mariadb-%{version}/scripts/mariadb-check-upgrade %{buildroot}%{_libexecdir}/mariadb-check-upgrade
+install -p -m 755 %{_builddir}/mariadb-%{version}/scripts/mariadb-check-upgrade.sh %{buildroot}%{_libexecdir}/mariadb-check-upgrade
-install -p -m 644 %{_builddir}/mariadb-%{version}/scripts/mariadb-scripts-common %{buildroot}%{_libexecdir}/mariadb-scripts-common
+install -p -m 644 %{_builddir}/mariadb-%{version}/scripts/mariadb-scripts-common.sh %{buildroot}%{_libexecdir}/mariadb-scripts-common
 
 # Install downstream version of tmpfiles
-install -D -p -m 0644 %{_builddir}/mariadb-%{version}/scripts/mariadb.tmpfiles.d %{buildroot}%{_tmpfilesdir}/%{name}.conf
+install -D -p -m 0644 %{_builddir}/mariadb-%{version}/scripts/mariadb.tmpfiles.d.in %{buildroot}%{_tmpfilesdir}/%{name}.conf
 %if 0%{?mysqld_pid_dir:1}
 echo "d %{pidfiledir} 0755 mysql mysql -" >>%{buildroot}%{_tmpfilesdir}/%{name}.conf
 %endif
@@ -910,7 +890,7 @@ install -p -m 0644 %{_builddir}/mariadb-%{version}/support-files/wsrep.cnf %{bui
 # install the clustercheck script
 mkdir -p %{buildroot}%{_sysconfdir}/sysconfig
 touch %{buildroot}%{_sysconfdir}/sysconfig/clustercheck
-install -p -m 0755 %{_builddir}/mariadb-%{version}/scripts/clustercheck %{buildroot}%{_bindir}/clustercheck
+install -p -m 0755 %{_builddir}/mariadb-%{version}/scripts/clustercheck.sh %{buildroot}%{_bindir}/clustercheck
 
 # remove duplicate logrotate script
 rm %{buildroot}%{logrotateddir}/mysql
@@ -1473,6 +1453,16 @@ fi
 %endif
 
 %changelog
+* Thur Mar 17 2022 bzhaoop<bzhaojyathousandy@gmail.com> -4:10.5.15-1
+- Bump to 10.5.15
+- For resolving CVEs:
+- CVE-2022-24048
+- CVE-2022-24052
+- CVE-2022-24050
+- CVE-2022-24051
+- CVE-2021-46668
+- CVE-2021-46658
+
 * Mon Jul 26 2021 bzhaoop<bzhaojyathousandy@gmail.com> -4:10.5.10-3
 - Disable execute testing during rpm packaging for increasing performance.