gentoo resync : 29.05.2018

3 files changed, 97 insertions, 0 deletions

diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index e854974d2e87..03b301693ad6 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -2,6 +2,7 @@ AUX percona-toolkit-2.2.17-fix-package-name.patch 872 BLAKE2B b8ce39ac4db7a38111
 AUX percona-toolkit-2.2.19-fix-package-name.patch 334 BLAKE2B 3f9034f3c7e0b0783e19a2d8e94772b9c582f1198397e5f600bcdb424db337d5d8dd89d56424a310af2f9f30b9e6e292c40ce2591d3479de6dfcd3a43a7424d3 SHA512 6a9ffdcc98e65dfe3eb013170efb4c35ca53375aff4d816118908cb2de1e946591501a22a7ad2a64a19cdf0f68d17a4d2910d6a6fb814e8cb012d20e8d302164
 AUX percona-toolkit-2.2.20-fix-package-name.patch 334 BLAKE2B 3a36f40823194db89de326453d3a2b069edcd67fb50f1a65c27550002b0bf5f5c8631bf65fde8a4f83b7b90db434670c582a1a752b57ddb6c2acaecfc0ba8698 SHA512 eb87fa7d333160d0620ff56fb7e413024f573d05583b68a06aa0156f9a0332ce104ea38e9394d7a842bb5ab05349d77ec4ca3a5fdf28abd582241604f2337e09
 AUX percona-toolkit-2.2.7-no-versioncheck.patch 9310 BLAKE2B 8d102dcab97bc87ad1a98ffd7b600d7453eb449ba919908b5a5063b53a127562bbd419d19dd716a9b6c199a1a38055fd5593817ddfe5200892c4529146c6435b SHA512 6d571c017254e8ea37d128f1623cc4e813ebbfc611cbb84403540c786abc62ee9ba625ec914b101953e5d1d09431f9caa91e270684e00ec6e002b2777b105df9
+AUX percona-toolkit-3.0.10-slave-delay-fix.patch 1593 BLAKE2B 94bc49d581fbd453f650fe81b704ae042f3219495373c09bd750241cbdb3a1917e582927d3682072a1ac6369e2a564ee41bb16c25f662cab16748af1772c11b2 SHA512 40268aa6241416b80e6c076083a0ba2f75fb330529dc5de01438536cd6ce352b4dbee642cad1e1219441ababb054243731afdba0e4f8642dea20c0f1dada5646
 AUX percona-toolkit-3.0.7-fix-package-name.patch 320 BLAKE2B 174f7d5870ec75eb7b8b1282eac9bf4ad4f9834480c5ae5645c436ce8df1dfcb353aaab59eb98cbad9b44aff20f4b1aa09ea2de9fc5e25cf8c7fd1a728bdc72e SHA512 32a3de3fc1e845a26d7d1cad2071030d4376bd408b6b8dead781866bfb29abea754c353f30f3b52c72d2fdefc2ef8727f21c7ff891c1c33c766862c5e7865497
 AUX percona-toolkit-3.0.7-no-versioncheck.patch 5566 BLAKE2B 4def58c91dcdc35481c2ba89c78cb35db2a9121b86ba3a66896d0ef0175c9d6f47cf6eff0908847564ecc810243a3fdc0b893fbc3b2bd2131ec932f93a8694ad SHA512 a681b7f32f1acb509f01fe6c8e99106708729b8f8f5fe5fba0f2131b4380cfd22462f37bf0fbb95213b89d17375f0252b961d0257fb310295fe0e6e002b66e28
 DIST percona-toolkit-2.2.11.tar.gz 1389718 BLAKE2B 3d8c1207cda30aefc710ab5329aa94c76b3cd285a83f421b303e23e0544c4a51a0e8bf3ecdbb8532b67dcde808096bcb47c74ef63725b09ad59ca2b3f21e0fa5 SHA512 d5e34fce1b6b69dfc1a8ecd7bcbe84e586e950976553f4fd30afb887a850770c08990216e41fc194bdd0a5642034905ee2d69c2f8b3781503c9b4aab47017cdb
@@ -16,6 +17,7 @@ EBUILD percona-toolkit-2.2.11.ebuild 1262 BLAKE2B 8d33c609579606aac77a67c5d568a7
 EBUILD percona-toolkit-2.2.17.ebuild 1213 BLAKE2B 8602c2ac1859da4fbefa52c5714e07a9e44c3b148b35555e4977c1c4604fdf35de3a95a658065533e9f894f01a19f7b57b0eb2c537446622ab98ab59a7b13b6e SHA512 78b956efbe27586145cee31f784cb143cec4c40ef9f06efb315367178db085f2767f8b29180be0549ab407ad77ddc20527588102354eee23d3a328fc46f8a892
 EBUILD percona-toolkit-2.2.19.ebuild 1213 BLAKE2B 784c406e8b359b1c75c49725ee670c16d4e3ea91d845d83b9b5f032cbebcf455074fa7423f42102f257df571ad7b4cd9a21bbc318175c446867047c90d1cce95 SHA512 21caa33395129da3a11c2bd3bac9eff2a722bfc473d4e1065c9baa123542239531755b4b16965c5c470e7851027ce81b9a17b35bf6ba16cd922ca34a600f8fa2
 EBUILD percona-toolkit-2.2.20.ebuild 1213 BLAKE2B 2bcc433599d64b15225e508fa16c50634b34c9963c38fae7d8ac412e730c9566751bfa1c784254018e40b5a6d8fcb6b4e52c2f85df7362d43bcf153282f7766b SHA512 f1b0b8a48e99d616d9a54a5bf6c39a06ef5e6f48992fe3e0584d464d7ed1abc5f6f08a14488cbffd4fcf4d8afe8791112094438baf06a5a4b788a953d539288b
+EBUILD percona-toolkit-3.0.10-r1.ebuild 1331 BLAKE2B 88f2d518b7b4fbb1bc3376e845ac28372810b0cadd9032169b9be0372e719930ec3fa2545a1f74e26ca464f335822368abf66fb4ea907101de1b43c975dce50c SHA512 f7143bb35b8148be6be283a7ee076731b061e3072260008f709f087392d8301266bc56e3cad9e3dbf1bdf828e2db4a41a95f8ed3119700b6f478f9a8a8fa8027
 EBUILD percona-toolkit-3.0.10.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
 EBUILD percona-toolkit-3.0.7.ebuild 1167 BLAKE2B f61aaf597895efa1b68a04f889e93fef6207d4e2cc9f14e986aee81cccb6ca7888d7479bc01bf11bea554bb9f860615ebfb95111420c641ad7e8b16808121a24 SHA512 940474cb8cf56cff984dffc33c3848808d184c33f6d31a4bcafdc2ee16feecbe6f4084c80e243d18eb62c9f09759f274144aff2c3f45d465bc01c8f82d1e5ac1
 EBUILD percona-toolkit-3.0.8.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982
diff --git a/dev-db/percona-toolkit/files/percona-toolkit-3.0.10-slave-delay-fix.patch b/dev-db/percona-toolkit/files/percona-toolkit-3.0.10-slave-delay-fix.patch
new file mode 100644
index 000000000000..8b8e17d7bfd7
--- /dev/null
+++ b/dev-db/percona-toolkit/files/percona-toolkit-3.0.10-slave-delay-fix.patch
@@ -0,0 +1,44 @@
+https://bugs.launchpad.net/percona-toolkit/+bug/962330
+https://bugs.launchpad.net/percona-toolkit/+bug/1095476
+
+diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
+index 750b733..fca04e4 100755
+--- a/bin/pt-slave-delay
++++ b/bin/pt-slave-delay
+@@ -4244,6 +4244,7 @@ sub main {
+    my ( $TS, $FILE, $POS ) = ( 0, 1, 2 );
+    my @positions;
+    my $next_start = 0;
++   my $initial_delay = 0;
+    $now    = time();
+    my $end = $now + ( $o->get('run-time') || 0 );    # When we should exit
+ 
+@@ -4258,6 +4259,10 @@ sub main {
+       die "Slave SQL thread is not running";
+    }
+ 
++   if (defined $status->{seconds_behind_master} and $status->{seconds_behind_master} > 0) {
++      $initial_delay = $status->{seconds_behind_master};
++   }
++
+    my $master_dbh;
+    if ( $master_dsn ) {
+       PTDEBUG && _d('Connecting to master via DSN from cmd-line');
+@@ -4383,7 +4388,7 @@ sub main {
+             || $pos->[$POS] != $res->{position} )
+          {
+             push @positions,
+-               [ $now, $res->{file}, $res->{position} ];
++               [ $now - ( $initial_delay || 0 ), $res->{file}, $res->{position} ];
+          }
+       }
+       else {
+@@ -4403,7 +4408,7 @@ sub main {
+                 # That happened because for an already lagged slave, $now
+                 # isn't the correct time, but is actually
+                 # $now - $seconds_lagged.
+-                 $now - ( $status->{seconds_behind_master} || 0 ),
++                 $now - ( $initial_delay || 0 ),
+                  $status->{master_log_file},
+                  $status->{read_master_log_pos}
+             ];
diff --git a/dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild
new file mode 100644
index 000000000000..cef323f12f47
--- /dev/null
+++ b/dev-db/percona-toolkit/percona-toolkit-3.0.10-r1.ebuild
@@ -0,0 +1,51 @@
+# Copyright 1999-2018 Gentoo Foundation
+# Distributed under the terms of the GNU General Public License v2
+
+EAPI="6"
+
+inherit perl-module
+
+DESCRIPTION="Advanced command-line tools to perform a variety of MySQL and system tasks"
+HOMEPAGE="https://www.percona.com/software/mysql-tools/percona-toolkit"
+SRC_URI="https://www.percona.com/downloads/${PN}/${PV}/source/tarball/${P}.tar.gz"
+
+LICENSE="|| ( GPL-2 Artistic )"
+SLOT="0"
+KEYWORDS="~amd64 ~x86 ~amd64-linux ~x86-linux"
+# Package warrants IUSE doc
+IUSE=""
+
+COMMON_DEPEND="dev-perl/DBI
+	dev-perl/DBD-mysql
+	virtual/perl-Time-HiRes"
+RDEPEND="${COMMON_DEPEND}
+	dev-perl/JSON
+	dev-perl/libwww-perl
+	dev-perl/Role-Tiny
+	virtual/perl-File-Path
+	virtual/perl-Getopt-Long
+	virtual/perl-Time-Local
+	virtual/perl-Digest-MD5
+	virtual/perl-IO-Compress
+	virtual/perl-File-Temp
+	virtual/perl-File-Spec
+	virtual/perl-Scalar-List-Utils
+	dev-perl/TermReadKey"
+DEPEND="${COMMON_DEPEND}
+	virtual/perl-ExtUtils-MakeMaker"
+
+# Bug #501904 - CVE-2014-2029
+# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
+# ^ is *-no-versioncheck.patch
+PATCHES=(
+	"${FILESDIR}"/${PN}-3.0.7-no-versioncheck.patch 
+	"${FILESDIR}"/${PN}-3.0.10-slave-delay-fix.patch
+)
+
+src_prepare() {
+	default
+
+	sed -i \
+		-e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \
+		Makefile.PL || die
+}