diff --git a/percona-toolkit-2.2.7.tar.gz b/percona-toolkit-2.2.7.tar.gz deleted file mode 100644 index de6a1bc..0000000 --- a/percona-toolkit-2.2.7.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:49ed1fa6d46b8211ba82355ec3c9dd0614c3b29fd31993123f2041e85a38891e -size 1451687 diff --git a/percona-toolkit-2.2.8.tar.gz b/percona-toolkit-2.2.8.tar.gz new file mode 100644 index 0000000..7e1dca0 --- /dev/null +++ b/percona-toolkit-2.2.8.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:fc59247e88e39c2362ce769acf537b3e3a7980f613dadf72fb1abaa080547ce4 +size 1387723 diff --git a/percona-toolkit-2.2.x-disable-default-version-check.patch b/percona-toolkit-2.2.x-disable-default-version-check.patch index f94369e..9eed2e2 100644 --- a/percona-toolkit-2.2.x-disable-default-version-check.patch +++ b/percona-toolkit-2.2.x-disable-default-version-check.patch @@ -40,10 +40,10 @@ tools actually support the version check and would throw warnings. bin/pt-variable-advisor | 2 -- 18 files changed, 36 deletions(-) -Index: percona-toolkit-2.2.7/bin/pt-archiver +Index: percona-toolkit-2.2.8/bin/pt-archiver =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-archiver 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-archiver 2014-02-24 19:09:48.000000000 +0000 +--- percona-toolkit-2.2.8.orig/bin/pt-archiver 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-archiver 2014-06-05 21:41:11.000000000 +0100 @@ -7465,8 +7465,6 @@ Show version and exit. =item --[no]version-check @@ -53,10 +53,10 @@ Index: percona-toolkit-2.2.7/bin/pt-archiver Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-config-diff +Index: percona-toolkit-2.2.8/bin/pt-config-diff =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-config-diff 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-config-diff 2014-02-24 19:09:48.000000000 +0000 +--- percona-toolkit-2.2.8.orig/bin/pt-config-diff 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-config-diff 2014-06-05 21:41:11.000000000 +0100 @@ -5563,8 +5563,6 @@ Show version and exit. =item --[no]version-check @@ -66,11 +66,11 @@ Index: percona-toolkit-2.2.7/bin/pt-config-diff Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-deadlock-logger +Index: percona-toolkit-2.2.8/bin/pt-deadlock-logger =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-deadlock-logger 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-deadlock-logger 2014-02-24 19:09:48.000000000 +0000 -@@ -5332,8 +5332,6 @@ Show version and exit. +--- percona-toolkit-2.2.8.orig/bin/pt-deadlock-logger 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-deadlock-logger 2014-06-05 21:41:11.000000000 +0100 +@@ -5347,8 +5347,6 @@ Show version and exit. =item --[no]version-check @@ -79,10 +79,10 @@ Index: percona-toolkit-2.2.7/bin/pt-deadlock-logger Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-diskstats +Index: percona-toolkit-2.2.8/bin/pt-diskstats =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-diskstats 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-diskstats 2014-02-24 19:09:48.000000000 +0000 +--- percona-toolkit-2.2.8.orig/bin/pt-diskstats 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-diskstats 2014-06-05 21:41:11.000000000 +0100 @@ -5468,8 +5468,6 @@ Show version and exit. =item --[no]version-check @@ -92,11 +92,11 @@ Index: percona-toolkit-2.2.7/bin/pt-diskstats Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-duplicate-key-checker +Index: percona-toolkit-2.2.8/bin/pt-duplicate-key-checker =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-duplicate-key-checker 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-duplicate-key-checker 2014-02-24 19:09:48.000000000 +0000 -@@ -5430,8 +5430,6 @@ Show version and exit. +--- percona-toolkit-2.2.8.orig/bin/pt-duplicate-key-checker 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-duplicate-key-checker 2014-06-05 21:41:11.000000000 +0100 +@@ -5429,8 +5429,6 @@ Show version and exit. =item --[no]version-check @@ -105,10 +105,10 @@ Index: percona-toolkit-2.2.7/bin/pt-duplicate-key-checker Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-find +Index: percona-toolkit-2.2.8/bin/pt-find =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-find 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-find 2014-02-24 19:09:48.000000000 +0000 +--- percona-toolkit-2.2.8.orig/bin/pt-find 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-find 2014-06-05 21:41:11.000000000 +0100 @@ -4440,8 +4440,6 @@ Show version and exit. =item --[no]version-check @@ -118,10 +118,10 @@ Index: percona-toolkit-2.2.7/bin/pt-find Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-fk-error-logger +Index: percona-toolkit-2.2.8/bin/pt-fk-error-logger =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-fk-error-logger 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-fk-error-logger 2014-02-24 19:09:48.000000000 +0000 +--- percona-toolkit-2.2.8.orig/bin/pt-fk-error-logger 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-fk-error-logger 2014-06-05 21:41:11.000000000 +0100 @@ -4335,8 +4335,6 @@ Show version and exit. =item --[no]version-check @@ -131,10 +131,10 @@ Index: percona-toolkit-2.2.7/bin/pt-fk-error-logger Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-heartbeat +Index: percona-toolkit-2.2.8/bin/pt-heartbeat =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-heartbeat 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-heartbeat 2014-02-24 19:09:48.000000000 +0000 +--- percona-toolkit-2.2.8.orig/bin/pt-heartbeat 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-heartbeat 2014-06-05 21:41:11.000000000 +0100 @@ -6019,8 +6019,6 @@ Show version and exit. =item --[no]version-check @@ -144,11 +144,11 @@ Index: percona-toolkit-2.2.7/bin/pt-heartbeat Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-index-usage +Index: percona-toolkit-2.2.8/bin/pt-index-usage =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-index-usage 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-index-usage 2014-02-24 19:09:48.000000000 +0000 -@@ -7348,8 +7348,6 @@ Show version and exit. +--- percona-toolkit-2.2.8.orig/bin/pt-index-usage 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-index-usage 2014-06-05 21:41:11.000000000 +0100 +@@ -7361,8 +7361,6 @@ Show version and exit. =item --[no]version-check @@ -157,11 +157,11 @@ Index: percona-toolkit-2.2.7/bin/pt-index-usage Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-kill +Index: percona-toolkit-2.2.8/bin/pt-kill =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-kill 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-kill 2014-02-24 19:09:48.000000000 +0000 -@@ -7626,8 +7626,6 @@ Show version and exit. +--- percona-toolkit-2.2.8.orig/bin/pt-kill 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-kill 2014-06-05 21:41:11.000000000 +0100 +@@ -7640,8 +7640,6 @@ Show version and exit. =item --[no]version-check @@ -170,11 +170,11 @@ Index: percona-toolkit-2.2.7/bin/pt-kill Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-online-schema-change +Index: percona-toolkit-2.2.8/bin/pt-online-schema-change =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-online-schema-change 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-online-schema-change 2014-02-24 19:09:48.000000000 +0000 -@@ -11298,8 +11298,6 @@ Show version and exit. +--- percona-toolkit-2.2.8.orig/bin/pt-online-schema-change 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-online-schema-change 2014-06-05 21:41:11.000000000 +0100 +@@ -11306,8 +11306,6 @@ Show version and exit. =item --[no]version-check @@ -183,11 +183,11 @@ Index: percona-toolkit-2.2.7/bin/pt-online-schema-change Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-query-digest +Index: percona-toolkit-2.2.8/bin/pt-query-digest =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-query-digest 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-query-digest 2014-02-24 19:09:48.000000000 +0000 -@@ -16265,8 +16265,6 @@ Show version and exit. +--- percona-toolkit-2.2.8.orig/bin/pt-query-digest 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-query-digest 2014-06-05 21:41:11.000000000 +0100 +@@ -16267,8 +16267,6 @@ Show version and exit. =item --[no]version-check @@ -196,10 +196,10 @@ Index: percona-toolkit-2.2.7/bin/pt-query-digest Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-slave-delay +Index: percona-toolkit-2.2.8/bin/pt-slave-delay =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-slave-delay 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-slave-delay 2014-02-24 19:09:48.000000000 +0000 +--- percona-toolkit-2.2.8.orig/bin/pt-slave-delay 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-slave-delay 2014-06-05 21:41:11.000000000 +0100 @@ -4698,8 +4698,6 @@ Show version and exit. =item --[no]version-check @@ -209,11 +209,11 @@ Index: percona-toolkit-2.2.7/bin/pt-slave-delay Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-slave-restart +Index: percona-toolkit-2.2.8/bin/pt-slave-restart =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-slave-restart 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-slave-restart 2014-02-24 19:09:48.000000000 +0000 -@@ -5638,8 +5638,6 @@ Show version and exit. +--- percona-toolkit-2.2.8.orig/bin/pt-slave-restart 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-slave-restart 2014-06-05 21:41:11.000000000 +0100 +@@ -5764,8 +5764,6 @@ Show version and exit. =item --[no]version-check @@ -222,11 +222,11 @@ Index: percona-toolkit-2.2.7/bin/pt-slave-restart Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-table-checksum +Index: percona-toolkit-2.2.8/bin/pt-table-checksum =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-table-checksum 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-table-checksum 2014-02-24 19:09:48.000000000 +0000 -@@ -12314,8 +12314,6 @@ Show version and exit. +--- percona-toolkit-2.2.8.orig/bin/pt-table-checksum 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-table-checksum 2014-06-05 21:41:11.000000000 +0100 +@@ -12391,8 +12391,6 @@ Show version and exit. =item --[no]version-check @@ -235,11 +235,11 @@ Index: percona-toolkit-2.2.7/bin/pt-table-checksum Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-table-sync +Index: percona-toolkit-2.2.8/bin/pt-table-sync =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-table-sync 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-table-sync 2014-02-24 19:09:48.000000000 +0000 -@@ -12501,8 +12501,6 @@ Show version and exit. +--- percona-toolkit-2.2.8.orig/bin/pt-table-sync 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-table-sync 2014-06-05 21:41:11.000000000 +0100 +@@ -12500,8 +12500,6 @@ Show version and exit. =item --[no]version-check @@ -248,11 +248,11 @@ Index: percona-toolkit-2.2.7/bin/pt-table-sync Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-upgrade +Index: percona-toolkit-2.2.8/bin/pt-upgrade =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-upgrade 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-upgrade 2014-02-24 19:09:48.000000000 +0000 -@@ -11003,8 +11003,6 @@ Show version and exit. +--- percona-toolkit-2.2.8.orig/bin/pt-upgrade 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-upgrade 2014-06-05 21:41:11.000000000 +0100 +@@ -11017,8 +11017,6 @@ Show version and exit. =item --[no]version-check @@ -261,10 +261,10 @@ Index: percona-toolkit-2.2.7/bin/pt-upgrade Check for the latest version of Percona Toolkit, MySQL, and other programs. This is a standard "check for updates automatically" feature, with two -Index: percona-toolkit-2.2.7/bin/pt-variable-advisor +Index: percona-toolkit-2.2.8/bin/pt-variable-advisor =================================================================== ---- percona-toolkit-2.2.7.orig/bin/pt-variable-advisor 2014-02-20 07:20:28.000000000 +0000 -+++ percona-toolkit-2.2.7/bin/pt-variable-advisor 2014-02-24 19:09:48.000000000 +0000 +--- percona-toolkit-2.2.8.orig/bin/pt-variable-advisor 2014-05-30 17:18:02.000000000 +0100 ++++ percona-toolkit-2.2.8/bin/pt-variable-advisor 2014-06-05 21:41:11.000000000 +0100 @@ -5968,8 +5968,6 @@ Show version and exit. =item --[no]version-check diff --git a/percona-toolkit.changes b/percona-toolkit.changes index f736bd0..6d609d8 100644 --- a/percona-toolkit.changes +++ b/percona-toolkit.changes @@ -1,3 +1,22 @@ +------------------------------------------------------------------- +Thu Jun 5 20:44:03 UTC 2014 - andreas.stieger@gmx.de + +- Percona Toolkit 2.2.8 + * Removed pt-agent + * Added pt-slave-restart GTID support + * Added pt-table-checksum --plugin + * Fixed bug: --ignore-tables does not work correctly + * Fixed bug: pt-deadlock-logger logs incorrect ts + * Fixed bug: pt-mysql-summary blank InnoDB section for 5.6 + * Fixed bug: pt-online-schema-change requests password twice + * Fixed bug: pt-query-digest dosn't fingerprint true/false + literals correctly + * Fixed bug: pt-show-grant --ask-pass prints "Enter password" to + STDOUT +- some spec cleanup +- refresh percona-toolkit-2.2.x-disable-default-version-check.patch + to not fail %check + ------------------------------------------------------------------- Mon Feb 24 19:29:34 UTC 2014 - andreas.stieger@gmx.de diff --git a/percona-toolkit.spec b/percona-toolkit.spec index 0d5794f..4f43d7a 100644 --- a/percona-toolkit.spec +++ b/percona-toolkit.spec @@ -17,21 +17,15 @@ Name: percona-toolkit +Version: 2.2.8 +Release: 0 Summary: Advanced MySQL and system command-line tools License: GPL-2.0 Group: Productivity/Databases/Tools -Version: 2.2.7 -Release: 0 Url: https://www.percona.com/software/percona-toolkit/ Source: https://www.percona.com/redir/downloads/%{name}/%{version}/%{name}-%{version}.tar.gz -Source2: %name.conf +Source2: %{name}.conf Patch0: percona-toolkit-2.2.x-disable-default-version-check.patch -BuildRoot: %{_tmppath}/%{name}-%{version}-build -%if 0%{?suse_version} < 1140 -Requires: perl = %{perl_version} -%else -%{perl_requires} -%endif Requires: perl(DBD::mysql) >= 1.0 Requires: perl(DBI) >= 1.13 Requires: perl(IO::Socket::SSL) @@ -39,7 +33,13 @@ Requires: perl(Term::ReadKey) >= 2.10 Requires: perl(Time::HiRes) Provides: maatkit = 7410.%{version} Obsoletes: maatkit < 7410 +BuildRoot: %{_tmppath}/%{name}-%{version}-build BuildArch: noarch +%if 0%{?suse_version} < 1140 +Requires: perl = %{perl_version} +%else +%{perl_requires} +%endif %description Percona Toolkit is a collection of advanced command-line tools used by @@ -49,7 +49,7 @@ MySQL and system tasks that are too difficult or complex to perform manually. These tools are ideal alternatives to private or "one-off" scripts because they are professionally developed, formally tested, and fully documented. They are also fully self-contained, so installation is quick and easy and -no libraries are installed. +no libraries are installed. Percona Toolkit is developed and supported by Percona Inc. For more information and other free, open-source software developed by Percona, @@ -62,23 +62,23 @@ This collection was formerly known as Maatkit. %patch0 -p1 %build -%{__perl} Makefile.PL INSTALLDIRS=vendor < /dev/null +perl Makefile.PL INSTALLDIRS=vendor < /dev/null make %{?_smp_mflags} %install %perl_make_install %perl_process_packlist %if 0%{?suse_version} < 1130 -%__rm -rf %buildroot/%perl_vendorarch/auto/%{name} -%__rm -rf %buildroot/var/adm/perl-modules/%{name} +rm -rf %{buildroot}/%{perl_vendorarch}/auto/%{name} +rm -rf %{buildroot}%{_localstatedir}/adm/perl-modules/%{name} %endif # a blank configuration file -%__mkdir -p %buildroot/etc/%name -%__cp %{S:2} %buildroot/etc/%name/ +mkdir -p %{buildroot}%{_sysconfdir}/%{name} +cp %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/ %check # check that --version-check is off bnc#864194 -for PTCMD in %buildroot/%{_bindir}/pt-* +for PTCMD in %{buildroot}/%{_bindir}/pt-* do $PTCMD --help 2>&1 | grep "\--version-check" || continue # skip tools that don't support version checks @@ -89,9 +89,9 @@ done %files %defattr(-,root,root,-) %doc COPYING README Changelog -%dir /etc/%name +%dir %{_sysconfdir}/%{name} %{_bindir}/pt* %{_mandir}/man1/*.1* -%config /etc/%name/%name.conf +%config %{_sysconfdir}/%{name}/%{name}.conf %changelog