From 6a716a7a98ae6fe077bca7b5e7f6716086301eec Mon Sep 17 00:00:00 2001 From: Brian Evans Date: Mon, 22 Jul 2019 15:20:20 -0400 Subject: Fix custom plugin location for MariaDB >=10.4 Bug: https://bugs.gentoo.org/show_bug.cgi?id=689412 Signed-off-by: Brian Evans --- 20018_all_mariadb-10.4.5-without-clientlibs-tools.patch | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/20018_all_mariadb-10.4.5-without-clientlibs-tools.patch b/20018_all_mariadb-10.4.5-without-clientlibs-tools.patch index 9cc11e7..e9ba8cf 100644 --- a/20018_all_mariadb-10.4.5-without-clientlibs-tools.patch +++ b/20018_all_mariadb-10.4.5-without-clientlibs-tools.patch @@ -194,6 +194,15 @@ diff -aurN a/scripts/mysql_install_db.sh b/scripts/mysql_install_db.sh exit 1 fi else +@@ -345,7 +345,7 @@ + cannot_find_file fill_help_tables.sql @pkgdata_locations@ + exit 1 + fi +- plugindir=`find_in_dirs --dir auth_pam.so $basedir/lib*/plugin $basedir/lib*/mysql/plugin` ++ plugindir="$basedir/@INSTALL_PLUGINDIR@" + 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" diff -aurN a/scripts/wsrep_sst_common.sh b/scripts/wsrep_sst_common.sh --- a/scripts/wsrep_sst_common.sh 2018-08-04 18:20:58.000000000 -0400 +++ b/scripts/wsrep_sst_common.sh 2018-08-09 12:30:24.976706933 -0400 -- cgit v1.2.3-65-gdbad