mariadb: update to 10.9.8

[feed/packages.git] / utils / mariadb / patches / 180-relax-mysql_install-db-wrt-pam-tool.patch

diff --git a/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch b/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch
index 5a2c30dcf1f5eb45cb24608ab2ffdef68a09f0a6..7e99322fda0beb36e0597d917ae9df50fd89f1b0 100644 (file)
--- a/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch
+++ b/utils/mariadb/patches/180-relax-mysql_install-db-wrt-pam-tool.patch
@@ -1,6 +1,6 @@
 --- a/scripts/mysql_install_db.sh
 +++ b/scripts/mysql_install_db.sh
-@@ -358,6 +358,14 @@ then
+@@ -371,6 +371,14 @@ then
      exit 1
    fi
    plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin $basedir/lib/*/mariadb19/plugin`
@@ -14,8 +14,8 @@
 +  fi
    pamtooldir=$plugindir
  # relative from where the script was run for a relocatable install
- elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mysqld"
-@@ -477,7 +485,9 @@ do
+ elif test -n "$dirname0" -a -x "$rel_mysqld" -a ! "$rel_mysqld" -ef "@sbindir@/mariadbd"
+@@ -503,7 +511,9 @@ do
    fi
  done
  
@@ -26,7 +26,7 @@
  then
    if test -z "$srcdir" -a "$in_rpm" -eq 0
    then
-@@ -498,6 +508,10 @@ then
+@@ -524,6 +534,10 @@ then
          echo
      fi
    fi