From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from lists.gentoo.org (pigeon.gentoo.org [208.92.234.80]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by finch.gentoo.org (Postfix) with ESMTPS id 5B868138334 for ; Mon, 22 Jul 2019 19:21:22 +0000 (UTC) Received: from pigeon.gentoo.org (localhost [127.0.0.1]) by pigeon.gentoo.org (Postfix) with SMTP id 5000BE081B; Mon, 22 Jul 2019 19:21:21 +0000 (UTC) Received: from smtp.gentoo.org (dev.gentoo.org [IPv6:2001:470:ea4a:1:5054:ff:fec7:86e4]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by pigeon.gentoo.org (Postfix) with ESMTPS id 369A6E081B for ; Mon, 22 Jul 2019 19:21:21 +0000 (UTC) Received: from oystercatcher.gentoo.org (unknown [IPv6:2a01:4f8:202:4333:225:90ff:fed9:fc84]) (using TLSv1.2 with cipher ECDHE-RSA-AES128-GCM-SHA256 (128/128 bits)) (No client certificate requested) by smtp.gentoo.org (Postfix) with ESMTPS id 5D4993489E5 for ; Mon, 22 Jul 2019 19:21:19 +0000 (UTC) Received: from localhost.localdomain (localhost [IPv6:::1]) by oystercatcher.gentoo.org (Postfix) with ESMTP id B6F7B5DE for ; Mon, 22 Jul 2019 19:21:17 +0000 (UTC) From: "Brian Evans" To: gentoo-commits@lists.gentoo.org Content-Transfer-Encoding: 8bit Content-type: text/plain; charset=UTF-8 Reply-To: gentoo-dev@lists.gentoo.org, "Brian Evans" Message-ID: <1563823220.6a716a7a98ae6fe077bca7b5e7f6716086301eec.grknight@gentoo> Subject: [gentoo-commits] proj/mysql-extras:master commit in: / X-VCS-Repository: proj/mysql-extras X-VCS-Files: 20018_all_mariadb-10.4.5-without-clientlibs-tools.patch X-VCS-Directories: / X-VCS-Committer: grknight X-VCS-Committer-Name: Brian Evans X-VCS-Revision: 6a716a7a98ae6fe077bca7b5e7f6716086301eec X-VCS-Branch: master Date: Mon, 22 Jul 2019 19:21:17 +0000 (UTC) Precedence: bulk List-Post: List-Help: List-Unsubscribe: List-Subscribe: List-Id: Gentoo Linux mail X-BeenThere: gentoo-commits@lists.gentoo.org X-Auto-Response-Suppress: DR, RN, NRN, OOF, AutoReply X-Archives-Salt: d345ae83-10e7-4cdb-9299-f2477456269e X-Archives-Hash: 9835fc0dcca41e744c3d6225d0cbd074 commit: 6a716a7a98ae6fe077bca7b5e7f6716086301eec Author: Brian Evans gentoo org> AuthorDate: Mon Jul 22 19:20:20 2019 +0000 Commit: Brian Evans gentoo org> CommitDate: Mon Jul 22 19:20:20 2019 +0000 URL: https://gitweb.gentoo.org/proj/mysql-extras.git/commit/?id=6a716a7a Fix custom plugin location for MariaDB >=10.4 Bug: https://bugs.gentoo.org/show_bug.cgi?id=689412 Signed-off-by: Brian Evans gentoo.org> 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