From e6df5e1557dd99d08bfe232fc52fa0c5c159021d Mon Sep 17 00:00:00 2001
From: Aleksandr Proklov <a.proklov@rosalinux.ru>
Date: Tue, 14 Nov 2023 13:46:00 +0900
Subject: [PATCH] Update version to 10.5.23

---
 ...l-db.patch => mariadb-10.5.23-fix-install-db.patch | 11 +++++------
 mariadb.spec                                          |  6 ++++--
 2 files changed, 9 insertions(+), 8 deletions(-)
 rename mariadb-10.4.12-fix-install-db.patch => mariadb-10.5.23-fix-install-db.patch (83%)

diff --git a/mariadb-10.4.12-fix-install-db.patch b/mariadb-10.5.23-fix-install-db.patch
similarity index 83%
rename from mariadb-10.4.12-fix-install-db.patch
rename to mariadb-10.5.23-fix-install-db.patch
index c32e74f..2cce94c 100644
--- a/mariadb-10.4.12-fix-install-db.patch
+++ b/mariadb-10.5.23-fix-install-db.patch
@@ -1,10 +1,9 @@
-diff --git a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
-index 579ed849..2a8c99d5 100644
---- a/scripts/mysql_install_db.sh
-+++ b/scripts/mysql_install_db.sh
-@@ -494,20 +494,22 @@ if test -n "$user"
+diff -ruN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh
+--- a/scripts/mysql_install_db.sh	2023-11-08 21:03:51.000000000 +0900
++++ b/scripts/mysql_install_db.sh	2023-11-14 13:01:26.107911606 +0900
+@@ -494,20 +494,22 @@
  then
-   if test -z "$srcdir" -a "$in_rpm" -eq 0
+   if test -z "$srcdir" -a "$in_rpm" -eq 0 -a -d "$pamtooldir/auth_pam_tool_dir"
    then
 -    chown 0 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool" && \
 -    chmod 04755 "$pamtooldir/auth_pam_tool_dir/auth_pam_tool"
diff --git a/mariadb.spec b/mariadb.spec
index 04d30af..f97fe0a 100644
--- a/mariadb.spec
+++ b/mariadb.spec
@@ -40,7 +40,7 @@
 %global __requires_exclude_from ^%{_datadir}/mysql-test
 
 Name:           mariadb
-Version:        10.5.20
+Version:        10.5.23
 Release:        1
 Summary:        Server part of MariaDB
 License:        SUSE-GPL-2.0-with-FLOSS-exception
@@ -62,8 +62,10 @@ Source51:       mariadb.rpmlintrc
 Patch1:         mariadb-10.2.4-logrotate.patch
 Patch4:         mariadb-10.2.4-fortify-and-O.patch
 Patch6:         mariadb-10.4.12-harden_setuid.patch
-Patch7:         mariadb-10.4.12-fix-install-db.patch
+Patch7:         mariadb-10.5.23-fix-install-db.patch
 Patch8:         mariadb-10.5.10-e2k.patch
+# CVE-2022-47015 fixed in 10.5.23 version
+
 # needed for bison SQL parser and wsrep API
 BuildRequires:  bison
 BuildRequires:  git