Version bump, also fixes CVE-2014-2029 / bug 501904

Package-Manager: portage-2.2.8-r1/cvs/Linux x86_64
Manifest-Sign-Key: 0xB427ABC8

5 files changed, 246 insertions, 56 deletions

diff --git a/dev-db/percona-toolkit/ChangeLog b/dev-db/percona-toolkit/ChangeLog
index 37e1361306c2..0278aed5b372 100644
--- a/dev-db/percona-toolkit/ChangeLog
+++ b/dev-db/percona-toolkit/ChangeLog
@@ -1,6 +1,14 @@
 # ChangeLog for dev-db/percona-toolkit
-# Copyright 1999-2013 Gentoo Foundation; Distributed under the GPL v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-toolkit/ChangeLog,v 1.7 2013/10/17 18:45:08 idl0r Exp $
+# Copyright 1999-2014 Gentoo Foundation; Distributed under the GPL v2
+# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-toolkit/ChangeLog,v 1.8 2014/02/21 20:38:07 idl0r Exp $
+
+*percona-toolkit-2.2.6 (21 Feb 2014)
+
+  21 Feb 2014; Christian Ruppert <idl0r@gentoo.org>
+  -percona-toolkit-2.1.7-r1.ebuild, -percona-toolkit-2.2.4.ebuild,
+  +percona-toolkit-2.2.6.ebuild,
+  +files/percona-toolkit-2.2.6-no-versioncheck.patch:
+  Version bump, also fixes CVE-2014-2029 / bug 501904
 
   17 Oct 2013; Christian Ruppert <idl0r@gentoo.org> metadata.xml:
   Add myself as maintainer
diff --git a/dev-db/percona-toolkit/Manifest b/dev-db/percona-toolkit/Manifest
index dfd3608bd016..abd305edfb1b 100644
--- a/dev-db/percona-toolkit/Manifest
+++ b/dev-db/percona-toolkit/Manifest
@@ -1,20 +1,19 @@
 -----BEGIN PGP SIGNED MESSAGE-----
 Hash: SHA256
 
-DIST percona-toolkit-2.1.7.tar.gz 1468872 SHA256 9b8be47ad4470ae2af684c0014b6cef8df4868457c73e924bb89bfca5a600479 SHA512 1a228ef7de4129079de35dca032a020887cd692a9d04d61c3317f8636c5e90ac671bd943c2e8cefa101748daa2891f022ce5031920030d605a83bbeb19c9bb8a WHIRLPOOL f28e58f432207ae09652ef49baece5eada40b7be9d9a38b1a52115c65c13e9857e925b1c7fdba9eec0bc7f8e1960ad5a46de00703f59ce25b2aaff0a7ee5435b
-DIST percona-toolkit-2.2.4.tar.gz 1442080 SHA256 7e9b26046e7bce0eca9e3598f9c05435b75960d7d81e0dba5e65b00587514ee9 SHA512 f6edba6bc34fb8d86b146a4f15760a684416e57626bc10abd791eaa6ceca526af6d9e4b78408fe7827ac8df664888efe6e11d36af44ee3248a17bd72e04038c3 WHIRLPOOL c3dd711adb06415fe6c5fbe3bd5e8f24385a8118c47bb7111c9699ec7a639d17d3b7664e9db02c05f5201ee3f187f6e173a943ab732a2d08bb8499c795506140
-EBUILD percona-toolkit-2.1.7-r1.ebuild 1156 SHA256 10997823d90d520bf753ac9ef7343b9a590e4d6e205d33ad5d6cfac36d21d6e0 SHA512 15ce7fa56121ac412defb6d2b79eb8517164993bd0aff7d43a66c7910177039a463644020fa95cdf70a721216b90590a08ec185ee9125eb61c370c16d2cbf817 WHIRLPOOL d6141bf88b06c68cb4bc0dd1308de83fbc9279b3841d5daa00741d55101af40a476b9ae107bfa7247ca5de81fa5dfe009c7dd7d200c383b4bec540b5bc5f38b6
-EBUILD percona-toolkit-2.2.4.ebuild 1191 SHA256 9359737a1bfaa9e3108e89c571ada9a07e80345106b820eaae401cb02ba67721 SHA512 4b557f9ab471081361e6e9b710fe58ae2996de9a8b387fcc6fdb0fc1895697a2cac75e8b531e441bcb9fc14b6b51b478238549ee95c5de44048819bdd7b243d4 WHIRLPOOL 30848e5f8ca22da6f7a3feff715307105e23bcc14235a25442c1047c23843065c1ad3a40498d10720942c738e5e0a2ade9a0213b1cf1e11fc683869b825701c8
-MISC ChangeLog 1391 SHA256 0c4758a1653319afedfcd9db13973b2e604047cdafa004540656433fba1897e0 SHA512 b7e2915b70c52f5d5ce06cf944e3db914998796168c7ec22023ab9740064179b1dd750a0191a1d1ccb66b7f96921437560e98f35c87a966494e2d76b864b6658 WHIRLPOOL 81dadfb1c9705f986c5c994462dafc6659b9321ba55ce790d99f6482ff08a59bef8e6f08c2b1f4fa67de574e0bf9ab8d3ac84e1fb83e447ff191d0f2b132b550
+AUX percona-toolkit-2.2.6-no-versioncheck.patch 5530 SHA256 55d3f1779c7ee939c62e1deeac099799b595812149df46cc71631160771d3167 SHA512 beb41886d1da03f3a5c52d2f15886a546a3d7dc938df489d26fa79bb9321c0a0375bc94ae80d321e543927869b6c237fac15a3253852cdf73c8aa0c353fb140d WHIRLPOOL 95cf99856cf8ac7d737bb3170514af8fe8193d93d31236a07d93104a0222eaa7286addf1360728afcdc2e93bb88d60547bce4b4ffdf2af7a20fc31835621246e
+DIST percona-toolkit-2.2.6.tar.gz 1453461 SHA256 24cd6924080ef235b770b3d6ab7f0ec4a023ceee1a9c7a50f983fdc6fc2787c8 SHA512 3e28aa1473a4db4874e9fa27f49cff9cc26be9a0ad8850b3c1f339cb1f4933d9173739cbeddcfef482a8e18d4256463f31207461908eab61b1152ca309aecc2a WHIRLPOOL 2a5b8d39f3e729753ddd403d1da68f0c62e504f997e75ed5aaf69858677ef6035ef8ad3a7d4770b2d7b32690750098e5e55daa248c5fe96aab09665fe24eed9f
+EBUILD percona-toolkit-2.2.6.ebuild 1382 SHA256 0b1024e3e6adfa26696f03b800308be2db4688d15f18c97b9398195e5debbae7 SHA512 11dcada84a69ca817f68cf6261a966f8f62d3bc6c034d23f88e00820e22cd1aaf8ea1b92739c68e68184d20b6d178350b84c9f0206201bcd15a475f3d5cc9639 WHIRLPOOL 4e0641245425d40bc10583423f19ad0c0b978aecb3276b0d8d1af47cfd6b6d1ea7d0c7477511c0ce6b81c5da1bdcff42033bc6bf8db7c0782e50c7aec0c29ee1
+MISC ChangeLog 1690 SHA256 359f3d078760892e274aa8fca59bb6fbff86075aebedabaf71d9dc68a2976aeb SHA512 6a7b8221910a183828251223224acb0ce30eff475d655a8c2d234ce371711b7efc2582e8221b1fc00178f9a28a7e9a7e4c2041ea85601bcff7a71af60455fbac WHIRLPOOL 4954e818607ffdfeab5d5a6b7cc5e86d7052dffa3ce134e6bf7d91928bb9137053ac7a2649532bf69e3d3af93bb6604a84868b7b93adf34ae04cc9925de4954a
 MISC metadata.xml 735 SHA256 694b00cf458e6c6c4f9f5789a9286065780ca13d57b48aa654ef04c2641f5ce5 SHA512 14f7ce3a1eb2482bd1698ecc41f2afb0685659b280caef753a0ff1317310efd052e989cc3bd4d36d33b65cb567297e015987f65fa1c769d299c9914deb83c8a7 WHIRLPOOL 1732fa2baa88e34c7987ee7b3cad5f0a3c63dbe8247fc4de6bc6fdc6eb15316bbee1c71b7b6044cb5c35f49d25eeb5aad241ca69cebbf539baa9a7bdd9aba324
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v2.0.22 (GNU/Linux)
 
-iQEcBAEBCAAGBQJSYDA4AAoJEMOx0zmdw4Z1NQQH/A1FjqMVsHKXLeghBWnBkEv6
-JhGiSWEdEN3z9rnNODvvl3WBXbIazfEJ+3b/am3x/VMedcJ+RKGu7P+R0OK7UXuu
-5ZdD8qBnUZDPZ131zHMk8KEA7V5ausFlCbHqFLraHOPIWRN7llMwrC2f5GG7F8De
-Y2OcjK8Lyw2H7Uq1w5C2Qluljaqzyj90Ts7rFn4oKU3RTxV+ZDL1BVC+fc0uhFZ7
-sLb8EY2Bgz2deMkqtr8S6PCFeFfcaw0P6pYF+5JI1/+0Y3/0ch4osIoeEd2NFITJ
-OJLLJ7r9kv6N1RtISKdwdixj5q0v3p9hEuzXOmq3cASLjecinof9/Ezn1WkhMdQ=
-=5l+V
+iQEcBAEBCAAGBQJTB7kzAAoJEMOx0zmdw4Z1P28IAIZfCL9YwjRMY8CU+TyPZvuK
+xNscmQIyzuIch5iJg9WftKmrL912RCRqdLPeXf3MD5GmJV/W7LgAP7WOhxFREkxv
+a9I4KebfbTfbExcR4PxSZk+aSI1FGpvaZLDCCiB9Vp2Mr0bKCr4+wIBiCrBS79e/
+C62kvg5gr367PB09m+47iMKYsafJ1K4diXgZYERJwvGNciX4n8gVGn/3Y6GQaGZF
+ctW3fhnAYzruVMde9LAVAk29BJiihZsAMBS2MEBsR8dAwlR5gDt3uXJcCUstYYqt
+nJJ+bmhy1lIImG+o0jWwbgmVTrRUVacZm9QeoaTd+S5lBYb20aEp30b3GsjV9z4=
+=Nj13
 -----END PGP SIGNATURE-----
diff --git a/dev-db/percona-toolkit/files/percona-toolkit-2.2.6-no-versioncheck.patch b/dev-db/percona-toolkit/files/percona-toolkit-2.2.6-no-versioncheck.patch
new file mode 100644
index 000000000000..0bc7ea9ef035
--- /dev/null
+++ b/dev-db/percona-toolkit/files/percona-toolkit-2.2.6-no-versioncheck.patch
@@ -0,0 +1,216 @@
+diff --git a/bin/pt-archiver b/bin/pt-archiver
+index 73aa429..e9edddd 100755
+--- a/bin/pt-archiver
++++ b/bin/pt-archiver
+@@ -7482,7 +7482,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-config-diff b/bin/pt-config-diff
+index bc16421..e0bb3a2 100755
+--- a/bin/pt-config-diff
++++ b/bin/pt-config-diff
+@@ -5580,7 +5580,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-deadlock-logger b/bin/pt-deadlock-logger
+index e7ae5cc..fe21fcc 100755
+--- a/bin/pt-deadlock-logger
++++ b/bin/pt-deadlock-logger
+@@ -5349,7 +5349,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-diskstats b/bin/pt-diskstats
+index 96daf17..bc3ebe7 100755
+--- a/bin/pt-diskstats
++++ b/bin/pt-diskstats
+@@ -5485,7 +5485,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-duplicate-key-checker b/bin/pt-duplicate-key-checker
+index 6b2ac8a..fb404f3 100755
+--- a/bin/pt-duplicate-key-checker
++++ b/bin/pt-duplicate-key-checker
+@@ -5450,7 +5450,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-find b/bin/pt-find
+index a397d37..b19780f 100755
+--- a/bin/pt-find
++++ b/bin/pt-find
+@@ -4457,7 +4457,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-fk-error-logger b/bin/pt-fk-error-logger
+index 06d3cae..2fc700d 100755
+--- a/bin/pt-fk-error-logger
++++ b/bin/pt-fk-error-logger
+@@ -4352,7 +4352,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-heartbeat b/bin/pt-heartbeat
+index 6f4e5f9..71eb22b 100755
+--- a/bin/pt-heartbeat
++++ b/bin/pt-heartbeat
+@@ -6036,7 +6036,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-index-usage b/bin/pt-index-usage
+index 2aabfb2..06b736f 100755
+--- a/bin/pt-index-usage
++++ b/bin/pt-index-usage
+@@ -7365,7 +7365,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-kill b/bin/pt-kill
+index eb82a47..c0ff2c4 100755
+--- a/bin/pt-kill
++++ b/bin/pt-kill
+@@ -7643,7 +7643,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-online-schema-change b/bin/pt-online-schema-change
+index 4a6dade..b2d21dd 100755
+--- a/bin/pt-online-schema-change
++++ b/bin/pt-online-schema-change
+@@ -11315,7 +11315,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-query-digest b/bin/pt-query-digest
+index dda7196..4b2ba8e 100755
+--- a/bin/pt-query-digest
++++ b/bin/pt-query-digest
+@@ -16285,7 +16285,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-slave-delay b/bin/pt-slave-delay
+index 35f7baf..a702c62 100755
+--- a/bin/pt-slave-delay
++++ b/bin/pt-slave-delay
+@@ -4715,7 +4715,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-slave-restart b/bin/pt-slave-restart
+index fd0887e..feda0aa 100755
+--- a/bin/pt-slave-restart
++++ b/bin/pt-slave-restart
+@@ -5655,7 +5655,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-table-checksum b/bin/pt-table-checksum
+index 590ba87..f6653ec 100755
+--- a/bin/pt-table-checksum
++++ b/bin/pt-table-checksum
+@@ -12331,7 +12331,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-table-sync b/bin/pt-table-sync
+index 5eb3d8c..7d29957 100755
+--- a/bin/pt-table-sync
++++ b/bin/pt-table-sync
+@@ -12518,7 +12518,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-upgrade b/bin/pt-upgrade
+index c22a09b..e088e40 100755
+--- a/bin/pt-upgrade
++++ b/bin/pt-upgrade
+@@ -11020,7 +11020,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
+diff --git a/bin/pt-variable-advisor b/bin/pt-variable-advisor
+index 981788d..8fc9d08 100755
+--- a/bin/pt-variable-advisor
++++ b/bin/pt-variable-advisor
+@@ -5985,7 +5985,6 @@ Show version and exit.
+ 
+ =item --[no]version-check
+ 
+-default: yes
+ 
+ Check for the latest version of Percona Toolkit, MySQL, and other programs.
+ 
diff --git a/dev-db/percona-toolkit/percona-toolkit-2.1.7-r1.ebuild b/dev-db/percona-toolkit/percona-toolkit-2.1.7-r1.ebuild
deleted file mode 100644
index b0d45bdaf54c..000000000000
--- a/dev-db/percona-toolkit/percona-toolkit-2.1.7-r1.ebuild
+++ /dev/null
@@ -1,39 +0,0 @@
-# Copyright 1999-2013 Gentoo Foundation
-# Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-toolkit/percona-toolkit-2.1.7-r1.ebuild,v 1.1 2013/09/10 09:47:36 idella4 Exp $
-
-EAPI=5
-
-inherit perl-app perl-module toolchain-funcs
-
-DESCRIPTION="essential command-line utilities for MySQL"
-HOMEPAGE="http://www.percona.com/software/percona-toolkit/"
-SRC_URI="http://www.percona.com/downloads/${PN}/${PV}/${P}.tar.gz"
-
-LICENSE="|| ( GPL-2 Artistic )"
-SLOT="0"
-KEYWORDS="~amd64 ~ppc ~x86 ~amd64-linux ~x86-linux ~ppc-macos"
-# Package warrants IUSE doc
-IUSE=""
-
-COMMON_DEPEND="dev-perl/DBI
-	dev-perl/DBD-mysql
-	virtual/perl-Time-HiRes"
-RDEPEND="${COMMON_DEPEND}
-	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-Time-HiRes
-	virtual/perl-Scalar-List-Utils
-	dev-perl/TermReadKey"
-DEPEND="${COMMON_DEPEND}
-	virtual/perl-ExtUtils-MakeMaker"
-
-# Percona Toolkit does NOT contain the UDF code for Murmur/FNV any more.
-src_install() {
-	perl-module_src_install
-	dodoc docs/percona-toolkit.pod
-}
diff --git a/dev-db/percona-toolkit/percona-toolkit-2.2.4.ebuild b/dev-db/percona-toolkit/percona-toolkit-2.2.6.ebuild
index 1ed4e1901261..9905e301ebe6 100644
--- a/dev-db/percona-toolkit/percona-toolkit-2.2.4.ebuild
+++ b/dev-db/percona-toolkit/percona-toolkit-2.2.6.ebuild
@@ -1,10 +1,10 @@
-# Copyright 1999-2013 Gentoo Foundation
+# Copyright 1999-2014 Gentoo Foundation
 # Distributed under the terms of the GNU General Public License v2
-# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-toolkit/percona-toolkit-2.2.4.ebuild,v 1.1 2013/10/12 23:38:34 idl0r Exp $
+# $Header: /var/cvsroot/gentoo-x86/dev-db/percona-toolkit/percona-toolkit-2.2.6.ebuild,v 1.1 2014/02/21 20:38:07 idl0r Exp $
 
 EAPI=5
 
-inherit perl-app perl-module toolchain-funcs
+inherit eutils perl-app perl-module toolchain-funcs
 
 DESCRIPTION="essential command-line utilities for MySQL"
 HOMEPAGE="http://www.percona.com/software/percona-toolkit/"
@@ -35,6 +35,12 @@ RDEPEND="${COMMON_DEPEND}
 DEPEND="${COMMON_DEPEND}
 	virtual/perl-ExtUtils-MakeMaker"
 
+src_prepare() {
+	# bug 501904 - CVE-2014-2029
+	# sed -i -e '/^=item --\[no\]version-check/,/^default: yes/{/^default: yes/d}' bin/*
+	epatch "${FILESDIR}/${P}-no-versioncheck.patch"
+}
+
 # Percona Toolkit does NOT contain the UDF code for Murmur/FNV any more.
 src_install() {
 	perl-module_src_install