From d42200bec37eef2a7478d88988ff00addd0a9202 Mon Sep 17 00:00:00 2001 From: V3n3RiX Date: Sat, 25 Jan 2020 11:50:47 +0000 Subject: gentoo resync : 25.01.2020 --- dev-db/percona-toolkit/Manifest | 3 +- ...oolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch | 33 ++++++++++++++ .../percona-toolkit-3.1.0-r1.ebuild | 52 ++++++++++++++++++++++ .../percona-toolkit/percona-toolkit-3.1.0.ebuild | 51 --------------------- 4 files changed, 87 insertions(+), 52 deletions(-) create mode 100644 dev-db/percona-toolkit/files/percona-toolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch create mode 100644 dev-db/percona-toolkit/percona-toolkit-3.1.0-r1.ebuild delete mode 100644 dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild (limited to 'dev-db/percona-toolkit') diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest index daae9e477d6b..3f0a2e6119de 100644 --- a/dev-db/percona-toolkit/Manifest +++ b/dev-db/percona-toolkit/Manifest @@ -2,6 +2,7 @@ AUX percona-toolkit-2.2.20-fix-package-name.patch 334 BLAKE2B 3a36f40823194db89d 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-no-versioncheck.patch 5566 BLAKE2B 4def58c91dcdc35481c2ba89c78cb35db2a9121b86ba3a66896d0ef0175c9d6f47cf6eff0908847564ecc810243a3fdc0b893fbc3b2bd2131ec932f93a8694ad SHA512 a681b7f32f1acb509f01fe6c8e99106708729b8f8f5fe5fba0f2131b4380cfd22462f37bf0fbb95213b89d17375f0252b961d0257fb310295fe0e6e002b66e28 +AUX percona-toolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch 1430 BLAKE2B b874324b2970b28e781343ace4415399e041b188da5aae6909bb8121d32bfdd28202eb4039b7b70541346caa3f958a5bbaf0841f2a4d3d5a3c7503059c4e26ee SHA512 31b637c6dfae567e2b0dd41a50a535db57bdca04e606a8147aaf13724779ec8a5fdda350ed0bebe27b1ffe53b784e7bc5a231cb4f66dc6fd33b089bdd87aa7ff DIST percona-toolkit-2.2.20.tar.gz 1431840 BLAKE2B 76565662b4037010f7e8de98316f568c2994f55d042ae3a21b80dc3b839444a11014b61db675cc21c149f26c3b7df52013d7b06c9c1127ec325dae2942a4e4c0 SHA512 f7a5f47e9ca05c43dcb80866a1eacd13066e1f036f4f58d51145fc6354ddc86dd6515a9aa33c8f736029800bf4c80f7ba5fcb9f1e6ac41653b3351597885f679 DIST percona-toolkit-3.0.13.tar.gz 10855538 BLAKE2B 30dfbd3c56da64de10ce5d960a9b35b5729c7ea07ec8a40b97f2707af935e57d2291201926dae8794e623a2f60095502a5b97709d3343bd95318ab832f3a5ca5 SHA512 4f8050f3f3a43363c9ee1b15c161d60deafd443a0e057b7960881870d10d1fe0214b885e77b404f03081eb27adfa337e3adea26ca238efac753fb949272f36d3 DIST percona-toolkit-3.0.9.tar.gz 15197340 BLAKE2B 095d8c0b26853caa6d2515de1d8fb8ff13b3084caa46498c8c789cd4e7b18473d41992701e393ad91cd7fdda8b3e56a099600285aeb4ba788110d36a028f76b6 SHA512 56a8732cfdbd58d0602e482d7bf049d2049104b7ae203d756db81a052cd837f16d2a35f75def4f23748534d0d2eb6441cb9fe49175a931fbcdbb6adeb42f1c53 @@ -9,5 +10,5 @@ DIST percona-toolkit-3.1.0.tar.gz 18106856 BLAKE2B 4a08e70a03d80e86e2fd7ba4ac77b EBUILD percona-toolkit-2.2.20.ebuild 1213 BLAKE2B 2bcc433599d64b15225e508fa16c50634b34c9963c38fae7d8ac412e730c9566751bfa1c784254018e40b5a6d8fcb6b4e52c2f85df7362d43bcf153282f7766b SHA512 f1b0b8a48e99d616d9a54a5bf6c39a06ef5e6f48992fe3e0584d464d7ed1abc5f6f08a14488cbffd4fcf4d8afe8791112094438baf06a5a4b788a953d539288b EBUILD percona-toolkit-3.0.13.ebuild 1325 BLAKE2B c8dc51ce757c3165957190266fa484bf74451644cdc62a464d8276fd6d3523a2b2864caa27b766c7e90b1c02c81d940ebd706e876922020c0feb878eb3083d26 SHA512 152841e2bd6be6e7015be3c929e1ecef678bf4456b9beba1ace9dac5f129e02d7373b460bb445ab0c69e10c351602907d33dcddb14faf624013790f9cfe54753 EBUILD percona-toolkit-3.0.9.ebuild 1249 BLAKE2B bd743a722e60cade6307bd04c774a77d0e01b2272e82974be486b47d0462120910c1182ba6fc3f7cf268f4ebfa04d432e456f62079010621aeaf6b325c743b54 SHA512 988d423c3125592608caa659543b508dcea2048b0c905a24c924e75894ca7c93924908e49f5c6c2c5d660a7b90a242e558e874849f0793d58a82abec1ad38982 -EBUILD percona-toolkit-3.1.0.ebuild 1327 BLAKE2B f4b989014ab9f1d1b3915df600dec265a93db09857bc4f86a31fb2e454735d8a4b281d763e20d445d9ba5e74634f99f1923ce9951c2025e28ca6c5af1f5eb3af SHA512 5ecef35b561bf7d3fc3288e77c9eda32c3cebdd7a72228ccd606d4f573559cd711260691f1d211b5dc2af23778b2538d270ce50dd4a1c8844603547d2440c15e +EBUILD percona-toolkit-3.1.0-r1.ebuild 1389 BLAKE2B 43f48d8cbaa1bebcef5c8d9100f2d270931ee2ac0d5649b1aa66bd2f0fb6c56238d5eb30b5a3d1b2bbe4915470976af3e80f04aa97e173a5214f182d41772953 SHA512 fb554bae9ebc93863faf381a59ab0ce64f41c0374061c34d5b6c34e8728ee771a2c90ea852adb8857211adf52cdfd9e48072fcf079a68c20f3554788775bdffd MISC metadata.xml 723 BLAKE2B f5150e42397c47b3815de1c9ff8414e12f517501e7075c5fddf3ac800a2c0a654db5d2fccef57609629017713f3a80a81164886b82d16df282601452e1bd5705 SHA512 b0e9ddbbd1834f5867600530e946ce30786ea83e779f62bf894facc0bb3f0fd5a58f6095f0e006d565e04370c89ae4101d9cfb9b7243704118eb7629ae0e0f9e diff --git a/dev-db/percona-toolkit/files/percona-toolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch b/dev-db/percona-toolkit/files/percona-toolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch new file mode 100644 index 000000000000..0596365423f9 --- /dev/null +++ b/dev-db/percona-toolkit/files/percona-toolkit-3.1.0-drop-swap-gentoo-mariadb-fix.patch @@ -0,0 +1,33 @@ +diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change +index 7ecec11..afdd7dd 100755 +--- a/bin/pt-online-schema-change ++++ b/bin/pt-online-schema-change +@@ -8948,15 +8948,6 @@ sub main { + Quoter => $q, + ); + +- my $vp = VersionParser->new($cxn->dbh()); +- if ($vp->cmp('8.0.14') > -1 && $vp->flavor() !~ m/maria/i) { +- my $msg = "There is an error in MySQL that makes the server to die when trying to ". +- "rename a table with FKs. See https://bugs.mysql.com/bug.php?id=96145\n". +- "Since pt-online-schema change needs to rename the old <-> new tables as the final " . +- "step, and the requested table has FKs, it cannot be executed under the current MySQL version"; +- _die($msg, NO_MINIMUM_REQUIREMENTS); +- } +- + if ( ($alter_fk_method || '') eq 'none' ) { + print "Not updating foreign keys because " + . "--alter-foreign-keys-method=none. Foreign keys " +@@ -9872,12 +9863,6 @@ sub main { + } + } + +- if ($vp->cmp('8.0') > -1 && $vp->flavor() !~ m/maria/i && $alter_fk_method eq 'drop_swap') { +- my $msg = "--alter-foreign-keys-method=drop_swap doesn't work with MySQL 8.0+\n". +- "See https://bugs.mysql.com/bug.php?id=89441"; +- _die($msg, INVALID_PARAMETERS); +- } +- + # --plugin hook + if ( $plugin && $plugin->can('after_copy_rows') ) { + $plugin->after_copy_rows(); diff --git a/dev-db/percona-toolkit/percona-toolkit-3.1.0-r1.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.1.0-r1.ebuild new file mode 100644 index 000000000000..bc039dc30467 --- /dev/null +++ b/dev-db/percona-toolkit/percona-toolkit-3.1.0-r1.ebuild @@ -0,0 +1,52 @@ +# Copyright 1999-2020 Gentoo Authors +# Distributed under the terms of the GNU General Public License v2 + +EAPI="7" + +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 + "${FILESDIR}"/${PN}-3.1.0-drop-swap-gentoo-mariadb-fix.patch +) + +src_prepare() { + default + + sed -i \ + -e "s/=> 'percona-toolkit',/=> 'Percona::Toolkit',/g" \ + Makefile.PL || die +} diff --git a/dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild b/dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild deleted file mode 100644 index 700a8fd29578..000000000000 --- a/dev-db/percona-toolkit/percona-toolkit-3.1.0.ebuild +++ /dev/null @@ -1,51 +0,0 @@ -# Copyright 1999-2019 Gentoo Authors -# Distributed under the terms of the GNU General Public License v2 - -EAPI="7" - -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 -} -- cgit v1.2.3