gentoo resync : 02.08.2019

3 files changed, 53 insertions, 0 deletions

diff --git a/dev-db/mysqltuner/Manifest b/dev-db/mysqltuner/Manifest
index c80e9a592efc..c6efefbe3164 100644
--- a/dev-db/mysqltuner/Manifest
+++ b/dev-db/mysqltuner/Manifest
@@ -1,5 +1,8 @@
+AUX mysqltuner-1.7.15-password.patch 470 BLAKE2B effac147bcb0b471267659236035017a0dd7f92a268dabcc09b71f415b9d41086ad46393798c88925f4d2b51d148e860769911bf1553b5b4f3031ff4fe42d4b5 SHA512 e71c559d3d3d62e85d7b101bb9f70ed9f66875259f82f6333ace67658d680fc7c3779a6bfacb55aab2beca161409219fb2bc7cca1fe36f05643887027c1aa9ac
 DIST mysqltuner-1.6.18.tar.gz 169074 BLAKE2B e138e29db2f0b1abf88b2d8268732fd9f05043abf320d8d97493d6abb3880e5664eaea39392406297e3125789ffc172f6347922ba14a00af16beb3f6f8080802 SHA512 8067b7ac4a4fe7398ee2cdc463a30042f46972f97680b49912dca46fd1d835989aa4115568dbe5473ff28c4d956bf0ad70537318db788dd56bc93ad220e6bcb6
 DIST mysqltuner-1.7.13.tar.gz 26721104 BLAKE2B 76a51c5e3ff897feed6bb6348fb5b09ab3fce0eae403880a3be96203522c9006980dbf6966e8c7e7784168c71e149cc57941ffbadba049b68b30993ed4d519d1 SHA512 88842bef1968f3150be49a5e82cdd0349bf0975f6ff0d8188117240ed2161ae1e44722077ff661ce31b55d0d4fc90fa4bb1972d96405113d82255718cebe0d53
+DIST mysqltuner-1.7.15.tar.gz 212839 BLAKE2B cd90091063e6ae7737cb79f6936d14577352c5b6c016e0efcf82cfcabcbc1acf9f646258bebc835ede368d5ea5594e269d165cb01ab8c980e5fdc68f3c605747 SHA512 b1ea9c91df3fb68d7ae9e54014b4d9095122f10750f7807e0c72d9bbbb859db9a60bc8698d337f4dda6e1bd89ce4ff97fa4299f5dbf650f6fa03012c309e761f
 EBUILD mysqltuner-1.6.18.ebuild 819 BLAKE2B 28fbddde037358d38eac70b778e77e255c3a2fcc812652ed42bd3482bca055c81beabd4bdb879d08b05cb15c6b9a5d036a2db0ecdc032fefbfcca8d5b7de1a48 SHA512 097e8b3cecb29cfc084d73befee963c656b017202f048fcd04d8b2a7880218500fd8f52a7b72edbf5f4fa8f8d3780924d8fe954a254c048d6b4f8264f9107dea
 EBUILD mysqltuner-1.7.13.ebuild 825 BLAKE2B 0a4c896905040f43d559161fece619065e9da1392a9cc9814743cf6170a0d279a781a224174f9621884c52db36345766b62826442268af3f06ac5dc085fe7d36 SHA512 3496115cd682c512e34d46fd5f5db623a78618737b5c23e400e7dedd0f96b6ab1b641abf6fbd394e7d283f00025971f58e9fe3a6c8b371d92824076a3cb4bc17
+EBUILD mysqltuner-1.7.15.ebuild 954 BLAKE2B c769e561ab9abbcb314394bca95314e8f1c41464187c8b77952cec9e4e13c20f47f03b0feecc360a6b6a235576fc4b498c05fadfdb0f87eff0e705205fe0347a SHA512 cf78ab7498b00bf8a696b589e22d624fcfb72a1354637e01e36506b54d386abb79e66971ba8c69d3517b7dd699934a9292ee84bcfc10d6bb946391f6196868b5
 MISC metadata.xml 373 BLAKE2B 475b09852e48dea8abbad16dfe918d7cef776bbabe51814dcc4bb82d074480cd3cfd463fd23057c403464bdae86b6f411e1fad098888e29621eaf0da72f0d246 SHA512 68d62e37a26c89ab68afd24c6832553150b21ef6a2abe911f5de8169c52daf10e6e5ffd201e0124b4a5069b123aad0dbc7669420b8d1823423d98553c1a36e4d
diff --git a/dev-db/mysqltuner/files/mysqltuner-1.7.15-password.patch b/dev-db/mysqltuner/files/mysqltuner-1.7.15-password.patch
new file mode 100644
index 000000000000..3c61c1ed3933
--- /dev/null
+++ b/dev-db/mysqltuner/files/mysqltuner-1.7.15-password.patch
@@ -0,0 +1,11 @@
+--- a/mysqltuner.pl	2019-05-21 21:04:53.000000000 +0300
++++ b/mysqltuner.pl	2019-07-28 22:14:09.888967978 +0300
+@@ -1739,7 +1739,7 @@
+     my $PASS_COLUMN_NAME = 'password';
+     if ( $myvar{'version'} =~ /5\.7|10\..*MariaDB*/ ) {
+         $PASS_COLUMN_NAME =
+-"IF(plugin='mysql_native_password', authentication_string, password)";
++"IF(plugin='mysql_native_password', authentication_string, 'password')";
+     }
+     debugprint "Password column = $PASS_COLUMN_NAME";
+ 
diff --git a/dev-db/mysqltuner/mysqltuner-1.7.15.ebuild b/dev-db/mysqltuner/mysqltuner-1.7.15.ebuild
new file mode 100644
index 000000000000..4d6ffb075a99
--- /dev/null
+++ b/dev-db/mysqltuner/mysqltuner-1.7.15.ebuild
@@ -0,0 +1,39 @@
+# Copyright 1999-2019 Gentoo Authors
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI=7
+
+MY_PN=MySQLTuner-perl
+
+DESCRIPTION="MySQLTuner is a high-performance MySQL tuning script"
+HOMEPAGE="https://github.com/major/MySQLTuner-perl"
+SRC_URI="https://github.com/major/${MY_PN}/archive/${PV}.tar.gz -> ${P}.tar.gz"
+
+LICENSE="GPL-3+"
+SLOT="0"
+KEYWORDS="~amd64 ~x86"
+
+RDEPEND="
+	dev-lang/perl
+	virtual/mysql
+	virtual/perl-Getopt-Long"
+
+DEPEND="${RDEPEND}"
+
+PATCHES=(
+	# Fix password detecting under MySQL 5.7 upstream #442 #427 #441
+	"${FILESDIR}/${P}-password.patch" )
+
+S="${WORKDIR}/${MY_PN}-${PV}"
+
+DOCS=( USAGE.md CONTRIBUTING.md INTERNALS.md basic_passwords.txt vulnerabilities.csv )
+
+src_install() {
+	einstalldocs
+
+	newbin "${PN}.pl" "${PN}"
+
+	# Passwords and vulnerabilities are meant to be fed
+	# to the script uncompressed.
+	docompress -x "/usr/share/doc/${PF}/basic_passwords.txt" "/usr/share/doc/${PF}/vulnerabilities.csv"
+}