From 08782399012215eddd70c01ac33c0d14edeebcd00dcdbb750e7dcb1f09f919d1 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 17 Aug 2018 11:59:57 +0000 Subject: [PATCH 1/4] Accepting request 629919 from home:moozaad:branches:server:database - Percona Toolkit 3.0.11 * see https://www.percona.com/doc/percona-toolkit/3.0/release_notes.html#v3-0-11-released-2018-07-06 for complete changelog * Removed check version patches (fixed 2.2.7) OBS-URL: https://build.opensuse.org/request/show/629919 OBS-URL: https://build.opensuse.org/package/show/server:database/percona-toolkit?expand=0&rev=58 --- percona-toolkit-2.2.20.tar.gz | 3 - ...-2.2.x-disable-default-version-check.patch | 276 ------------------ percona-toolkit-3.0.11.tar.gz | 3 + percona-toolkit.changes | 9 + percona-toolkit.spec | 21 +- 5 files changed, 18 insertions(+), 294 deletions(-) delete mode 100644 percona-toolkit-2.2.20.tar.gz delete mode 100644 percona-toolkit-2.2.x-disable-default-version-check.patch create mode 100644 percona-toolkit-3.0.11.tar.gz diff --git a/percona-toolkit-2.2.20.tar.gz b/percona-toolkit-2.2.20.tar.gz deleted file mode 100644 index 9ad16a3..0000000 --- a/percona-toolkit-2.2.20.tar.gz +++ /dev/null @@ -1,3 +0,0 @@ -version https://git-lfs.github.com/spec/v1 -oid sha256:8439be616ee43b22ba7526135719ef6f40af6621327acc30b84be5f18cd426b1 -size 1431840 diff --git a/percona-toolkit-2.2.x-disable-default-version-check.patch b/percona-toolkit-2.2.x-disable-default-version-check.patch deleted file mode 100644 index 0509d6f..0000000 --- a/percona-toolkit-2.2.x-disable-default-version-check.patch +++ /dev/null @@ -1,276 +0,0 @@ -From: Andreas Stieger -Date: Mon, 17 Feb 2014 00:15:35 +0000 -Subject: disable automatic version check for all tools -References: https://bugzilla.novell.com/show_bug.cgi?id=864194 https://bugs.launchpad.net/percona-toolkit/+bug/1279502 -Upstream: no - -Prevents transmission of version information to an external host -in the default configuration. -Can be used by owner of a Percona Server (or an attacker who can -control this destination for the client) to collect arbitrary -MySQL configuration parameters and execute commands (with -v). -Now the version check needs to be requested via command line or -global/tool specific/user configuration. (--version-check) - -Note that the doc is parsed into a Perl Getopt::Long spec at runtime. -Setting "default: no" does not work, "default: 0" would work. -The spec file contains a %check section that tests this. -Patching the source was chosen over supplying default configuration -files in /etc/percona-toolkit/percona-toolkit.conf because not all -tools actually support the version check and would throw warnings. - ---- - bin/pt-archiver | 2 -- - bin/pt-config-diff | 2 -- - bin/pt-deadlock-logger | 2 -- - bin/pt-diskstats | 2 -- - bin/pt-duplicate-key-checker | 2 -- - bin/pt-find | 2 -- - bin/pt-fk-error-logger | 2 -- - bin/pt-heartbeat | 2 -- - bin/pt-index-usage | 2 -- - bin/pt-kill | 2 -- - bin/pt-online-schema-change | 2 -- - bin/pt-query-digest | 2 -- - bin/pt-slave-delay | 2 -- - bin/pt-slave-restart | 2 -- - bin/pt-table-checksum | 2 -- - bin/pt-table-sync | 2 -- - bin/pt-upgrade | 2 -- - bin/pt-variable-advisor | 2 -- - 18 files changed, 36 deletions(-) - -Index: percona-toolkit-2.2.20/bin/pt-archiver -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-archiver 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-archiver 2016-12-11 14:19:59.000000000 +0100 -@@ -7990,8 +7990,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-config-diff -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-config-diff 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-config-diff 2016-12-11 14:19:59.000000000 +0100 -@@ -5646,8 +5646,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-deadlock-logger -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-deadlock-logger 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-deadlock-logger 2016-12-11 14:19:59.000000000 +0100 -@@ -5432,8 +5432,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-diskstats -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-diskstats 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-diskstats 2016-12-11 14:19:59.000000000 +0100 -@@ -5508,8 +5508,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-duplicate-key-checker -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-duplicate-key-checker 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-duplicate-key-checker 2016-12-11 14:19:59.000000000 +0100 -@@ -5490,8 +5490,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-find -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-find 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-find 2016-12-11 14:19:59.000000000 +0100 -@@ -4484,8 +4484,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-fk-error-logger -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-fk-error-logger 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-fk-error-logger 2016-12-11 14:19:59.000000000 +0100 -@@ -4419,8 +4419,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-heartbeat -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-heartbeat 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-heartbeat 2016-12-11 14:19:59.000000000 +0100 -@@ -7009,8 +7009,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-index-usage -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-index-usage 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-index-usage 2016-12-11 14:19:59.000000000 +0100 -@@ -7420,8 +7420,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-kill -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-kill 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-kill 2016-12-11 14:19:59.000000000 +0100 -@@ -7790,8 +7790,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-online-schema-change -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-online-schema-change 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-online-schema-change 2016-12-11 14:19:59.000000000 +0100 -@@ -12011,8 +12011,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-query-digest -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-query-digest 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-query-digest 2016-12-11 14:19:59.000000000 +0100 -@@ -16393,8 +16393,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-slave-delay -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-slave-delay 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-slave-delay 2016-12-11 14:19:59.000000000 +0100 -@@ -4739,8 +4739,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-slave-restart -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-slave-restart 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-slave-restart 2016-12-11 14:19:59.000000000 +0100 -@@ -5838,8 +5838,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-table-checksum -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-table-checksum 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-table-checksum 2016-12-11 14:19:59.000000000 +0100 -@@ -12758,8 +12758,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-table-sync -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-table-sync 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-table-sync 2016-12-11 14:19:59.000000000 +0100 -@@ -12600,8 +12600,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-upgrade -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-upgrade 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-upgrade 2016-12-11 14:19:59.000000000 +0100 -@@ -11128,8 +11128,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - 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.20/bin/pt-variable-advisor -=================================================================== ---- percona-toolkit-2.2.20.orig/bin/pt-variable-advisor 2016-12-06 23:01:51.000000000 +0100 -+++ percona-toolkit-2.2.20/bin/pt-variable-advisor 2016-12-11 14:19:59.000000000 +0100 -@@ -6009,8 +6009,6 @@ Show version and exit. - - =item --[no]version-check - --default: yes -- - Check for the latest version of Percona Toolkit, MySQL, and other programs. - - This is a standard "check for updates automatically" feature, with two diff --git a/percona-toolkit-3.0.11.tar.gz b/percona-toolkit-3.0.11.tar.gz new file mode 100644 index 0000000..16d1d79 --- /dev/null +++ b/percona-toolkit-3.0.11.tar.gz @@ -0,0 +1,3 @@ +version https://git-lfs.github.com/spec/v1 +oid sha256:7bbb39b1e25548043d3e2dedfba99aa771d6cbd4c0e57fde08cdc3cb53c1c7ef +size 21364128 diff --git a/percona-toolkit.changes b/percona-toolkit.changes index ed83744..f829ed3 100644 --- a/percona-toolkit.changes +++ b/percona-toolkit.changes @@ -1,3 +1,12 @@ +------------------------------------------------------------------- +Tue Aug 14 13:18:02 UTC 2018 - jon@moozaad.co.uk + +- Percona Toolkit 3.0.11 + + * see https://www.percona.com/doc/percona-toolkit/3.0/release_notes.html#v3-0-11-released-2018-07-06 + for complete changelog + * Removed check version patches (fixed 2.2.7) + ------------------------------------------------------------------- Sun Dec 11 13:20:39 UTC 2016 - astieger@suse.com diff --git a/percona-toolkit.spec b/percona-toolkit.spec index 6bfe599..3af5264 100644 --- a/percona-toolkit.spec +++ b/percona-toolkit.spec @@ -17,7 +17,7 @@ Name: percona-toolkit -Version: 2.2.20 +Version: 3.0.11 Release: 0 Summary: Advanced MySQL and system command-line tools License: GPL-2.0 @@ -25,7 +25,6 @@ Group: Productivity/Databases/Tools Url: https://www.percona.com/software/percona-toolkit/ Source: https://www.percona.com/downloads/%{name}/%{version}/tarball/%{name}-%{version}.tar.gz Source2: %{name}.conf -Patch0: percona-toolkit-2.2.x-disable-default-version-check.patch Requires: perl(DBD::mysql) >= 1.0 Requires: perl(DBI) >= 1.13 Requires: perl(IO::Socket::SSL) @@ -59,15 +58,17 @@ This collection was formerly known as Maatkit. %prep %setup -q -%patch0 -p1 %build perl Makefile.PL INSTALLDIRS=vendor < /dev/null make %{?_smp_mflags} %install + %perl_make_install %perl_process_packlist +rm -rf %{buildroot}/usr/lib +rm -rf %{buildroot}/lib %if 0%{?suse_version} < 1130 rm -rf %{buildroot}/%{perl_vendorarch}/auto/%{name} rm -rf %{buildroot}%{_localstatedir}/adm/perl-modules/%{name} @@ -76,21 +77,11 @@ rm -rf %{buildroot}%{_localstatedir}/adm/perl-modules/%{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-* -do - $PTCMD --help 2>&1 | - grep "\--version-check" || continue # skip tools that don't support version checks - $PTCMD --help 2>&1 | - grep "\--version-check.*FALSE" # fail those that don't have it disabled -done - %files %defattr(-,root,root,-) -%doc COPYING README Changelog +%doc COPYING README.md Changelog %dir %{_sysconfdir}/%{name} -%{_bindir}/pt* +%{_bindir}/* %{_mandir}/man1/*.1* %config %{_sysconfdir}/%{name}/%{name}.conf From 8df6fe3dd1bf5998abdcac21beec9b160d5bd60971b2b23050bb7b22d2639d39 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 17 Aug 2018 12:01:30 +0000 Subject: [PATCH 2/4] OBS-URL: https://build.opensuse.org/package/show/server:database/percona-toolkit?expand=0&rev=59 --- percona-toolkit.changes | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/percona-toolkit.changes b/percona-toolkit.changes index f829ed3..492b6ad 100644 --- a/percona-toolkit.changes +++ b/percona-toolkit.changes @@ -1,11 +1,10 @@ ------------------------------------------------------------------- Tue Aug 14 13:18:02 UTC 2018 - jon@moozaad.co.uk -- Percona Toolkit 3.0.11 - - * see https://www.percona.com/doc/percona-toolkit/3.0/release_notes.html#v3-0-11-released-2018-07-06 - for complete changelog - * Removed check version patches (fixed 2.2.7) +- update to Percona Toolkit 3.0.11: + * 3.x add tools for MongoDB + * Removed check version patches fixed 2.2.7, + drop percona-toolkit-2.2.x-disable-default-version-check.patch ------------------------------------------------------------------- Sun Dec 11 13:20:39 UTC 2016 - astieger@suse.com From 5ec421ec4ae27d70daf6cc2f7ed9055bb6015020eec0ae7f8eab0720ddf08b16 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 17 Aug 2018 12:03:23 +0000 Subject: [PATCH 3/4] clean OBS-URL: https://build.opensuse.org/package/show/server:database/percona-toolkit?expand=0&rev=60 --- percona-toolkit.spec | 15 +++++++-------- 1 file changed, 7 insertions(+), 8 deletions(-) diff --git a/percona-toolkit.spec b/percona-toolkit.spec index 3af5264..3524fad 100644 --- a/percona-toolkit.spec +++ b/percona-toolkit.spec @@ -1,7 +1,7 @@ # # spec file for package percona-toolkit # -# Copyright (c) 2016 SUSE LINUX GmbH, Nuernberg, Germany. +# Copyright (c) 2018 SUSE LINUX GmbH, Nuernberg, Germany. # # All modifications and additions to the file contributed by third parties # remain the property of their copyright owners, unless otherwise agreed @@ -20,9 +20,9 @@ Name: percona-toolkit Version: 3.0.11 Release: 0 Summary: Advanced MySQL and system command-line tools -License: GPL-2.0 +License: GPL-2.0-only Group: Productivity/Databases/Tools -Url: https://www.percona.com/software/percona-toolkit/ +URL: https://www.percona.com/software/percona-toolkit/ Source: https://www.percona.com/downloads/%{name}/%{version}/tarball/%{name}-%{version}.tar.gz Source2: %{name}.conf Requires: perl(DBD::mysql) >= 1.0 @@ -32,7 +32,6 @@ 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} @@ -67,7 +66,7 @@ make %{?_smp_mflags} %perl_make_install %perl_process_packlist -rm -rf %{buildroot}/usr/lib +rm -rf %{buildroot}%{_libexecdir} rm -rf %{buildroot}/lib %if 0%{?suse_version} < 1130 rm -rf %{buildroot}/%{perl_vendorarch}/auto/%{name} @@ -78,11 +77,11 @@ mkdir -p %{buildroot}%{_sysconfdir}/%{name} cp %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/ %files -%defattr(-,root,root,-) -%doc COPYING README.md Changelog +%license COPYING +%doc README.md Changelog %dir %{_sysconfdir}/%{name} %{_bindir}/* -%{_mandir}/man1/*.1* +%{_mandir}/man1/*.1%{?ext_man} %config %{_sysconfdir}/%{name}/%{name}.conf %changelog From a12612ab5fe7f97ae3ac7da8cf77d3e2ac0096267d894afb1ab6fd6328416f76 Mon Sep 17 00:00:00 2001 From: Andreas Stieger Date: Fri, 17 Aug 2018 12:13:03 +0000 Subject: [PATCH 4/4] fix URLs OBS-URL: https://build.opensuse.org/package/show/server:database/percona-toolkit?expand=0&rev=61 --- percona-toolkit-3.0.11.tar.gz | 4 ++-- percona-toolkit.changes | 2 +- percona-toolkit.spec | 4 ++-- 3 files changed, 5 insertions(+), 5 deletions(-) diff --git a/percona-toolkit-3.0.11.tar.gz b/percona-toolkit-3.0.11.tar.gz index 16d1d79..141043d 100644 --- a/percona-toolkit-3.0.11.tar.gz +++ b/percona-toolkit-3.0.11.tar.gz @@ -1,3 +1,3 @@ version https://git-lfs.github.com/spec/v1 -oid sha256:7bbb39b1e25548043d3e2dedfba99aa771d6cbd4c0e57fde08cdc3cb53c1c7ef -size 21364128 +oid sha256:934500d0fdd5fdb94885ca5d8e96cf386ccec279536eea84b242c5db83023cd6 +size 18254993 diff --git a/percona-toolkit.changes b/percona-toolkit.changes index 492b6ad..de3f04c 100644 --- a/percona-toolkit.changes +++ b/percona-toolkit.changes @@ -2,7 +2,7 @@ Tue Aug 14 13:18:02 UTC 2018 - jon@moozaad.co.uk - update to Percona Toolkit 3.0.11: - * 3.x add tools for MongoDB + * 3.x adds tools for MongoDB * Removed check version patches fixed 2.2.7, drop percona-toolkit-2.2.x-disable-default-version-check.patch diff --git a/percona-toolkit.spec b/percona-toolkit.spec index 3524fad..76e2fc2 100644 --- a/percona-toolkit.spec +++ b/percona-toolkit.spec @@ -23,7 +23,7 @@ Summary: Advanced MySQL and system command-line tools License: GPL-2.0-only Group: Productivity/Databases/Tools URL: https://www.percona.com/software/percona-toolkit/ -Source: https://www.percona.com/downloads/%{name}/%{version}/tarball/%{name}-%{version}.tar.gz +Source: https://www.percona.com/downloads/%{name}/%{version}/source/tarball/%{name}-%{version}.tar.gz Source2: %{name}.conf Requires: perl(DBD::mysql) >= 1.0 Requires: perl(DBI) >= 1.13 @@ -81,7 +81,7 @@ cp %{SOURCE2} %{buildroot}%{_sysconfdir}/%{name}/ %doc README.md Changelog %dir %{_sysconfdir}/%{name} %{_bindir}/* -%{_mandir}/man1/*.1%{?ext_man} +%{_mandir}/man1/*.1* %config %{_sysconfdir}/%{name}/%{name}.conf %changelog