diff --git a/mysql-mmm-add-notify-cmd.patch b/mysql-mmm-add-notify-cmd.patch deleted file mode 100644 index a3f8437..0000000 --- a/mysql-mmm-add-notify-cmd.patch +++ /dev/null @@ -1,50 +0,0 @@ -diff --git a/lib/Agent/Agent.pm b/lib/Agent/Agent.pm -index 2e2480b..c98f39a 100644 ---- a/lib/Agent/Agent.pm -+++ b/lib/Agent/Agent.pm -@@ -37,6 +37,7 @@ struct 'MMM::Agent::Agent' => { - mysql_password => '$', - writer_role => '$', - bin_path => '$', -+ notify_cmd => '$', - - active_master => '$', - state => '$', -@@ -50,6 +51,8 @@ sub main($) { - $self->roles([]); - $self->active_master(''); - -+ if ($self->notify_cmd) { system($self->notify_cmd); } -+ - while (!$main::shutdown) { - - DEBUG 'Listener: Waiting for connection...'; -@@ -236,6 +239,8 @@ sub cmd_set_status($$) { - foreach my $role (@added_roles) { $role->add(); } - - $self->roles(\@new_roles); -+ -+ if ($self->notify_cmd) { system($self->notify_cmd); } - } - - # Process state change -@@ -272,6 +277,7 @@ sub from_config($%) { - $self->mysql_password ($host->{agent_password}); - $self->writer_role ($config->{active_master_role}); - $self->bin_path ($host->{bin_path}); -+ $self->notify_cmd ($host->{notify_cmd}); - } - - 1; -diff --git a/lib/Common/Config.pm b/lib/Common/Config.pm -index 1870d5e..6c0af28 100644 ---- a/lib/Common/Config.pm -+++ b/lib/Common/Config.pm -@@ -99,6 +99,7 @@ our $RULESET = { - 'lvm_volume_group' => { 'required' => ['TOOLS'] }, - 'lvm_mount_dir' => { 'required' => ['TOOLS'] }, - 'lvm_mount_opts' => { 'required' => ['TOOLS'] }, -+ 'notify_cmd' => { 'default' => '' }, - } - }, - 'check' => { 'create_if_empty' => ['MONITOR'], 'multiple' => 1, 'template' => 'default', 'values' => ['ping', 'mysql', 'rep_backlog', 'rep_threads'], 'section' => { diff --git a/mysql-mmm-agent.service b/mysql-mmm-agent.service index 3447f29..a4a0a97 100644 --- a/mysql-mmm-agent.service +++ b/mysql-mmm-agent.service @@ -5,7 +5,7 @@ After=network.target mysqld.service [Service] Type=forking PIDFile=/run/mysql-mmm-agent.pid -ExecStart=/usr/bin/mmm_agentd +ExecStart=/usr/sbin/mmm_agentd PrivateTmp=true [Install] diff --git a/mysql-mmm-monitor.service b/mysql-mmm-monitor.service index 748a621..5086fc4 100644 --- a/mysql-mmm-monitor.service +++ b/mysql-mmm-monitor.service @@ -5,7 +5,7 @@ After=network.target mysqld.service [Service] Type=forking PIDFile=/run/mysql-mmm-monitor.pid -ExecStart=/usr/bin/mmm_mond +ExecStart=/usr/sbin/mmm_mond PrivateTmp=true [Install] diff --git a/mysql-mmm-suppress-uninitialized-warning.patch b/mysql-mmm-suppress-uninitialized-warning.patch deleted file mode 100644 index 7906911..0000000 --- a/mysql-mmm-suppress-uninitialized-warning.patch +++ /dev/null @@ -1,564 +0,0 @@ -diff --git a/bin/agent/check_ip b/bin/agent/check_ip -index 8a91cf3..cbcdc32 100755 ---- a/bin/agent/check_ip -+++ b/bin/agent/check_ip -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Agent::Helpers::Actions; - - # Check arguments -diff --git a/bin/agent/clear_ip b/bin/agent/clear_ip -index e5cb697..c31d200 100755 ---- a/bin/agent/clear_ip -+++ b/bin/agent/clear_ip -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Agent::Helpers::Actions; - - # Check arguments -diff --git a/bin/agent/configure_ip b/bin/agent/configure_ip -index f8d2aab..9017020 100755 ---- a/bin/agent/configure_ip -+++ b/bin/agent/configure_ip -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Agent::Helpers::Actions; - - # Check arguments -diff --git a/bin/agent/mysql_allow_write b/bin/agent/mysql_allow_write -index 9383b69..d33bb7b 100755 ---- a/bin/agent/mysql_allow_write -+++ b/bin/agent/mysql_allow_write -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Common::Config; - use MMM::Agent::Helpers::Actions; - -diff --git a/bin/agent/mysql_deny_write b/bin/agent/mysql_deny_write -index d9692d2..ad73cf0 100755 ---- a/bin/agent/mysql_deny_write -+++ b/bin/agent/mysql_deny_write -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Common::Config; - use MMM::Agent::Helpers::Actions; - -diff --git a/bin/agent/mysql_may_write b/bin/agent/mysql_may_write -index 417742b..e3f9043 100755 ---- a/bin/agent/mysql_may_write -+++ b/bin/agent/mysql_may_write -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Common::Config; - use MMM::Agent::Helpers::Actions; - -diff --git a/bin/agent/set_active_master b/bin/agent/set_active_master -index 9cd306e..df985d1 100755 ---- a/bin/agent/set_active_master -+++ b/bin/agent/set_active_master -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Common::Config; - use MMM::Agent::Helpers::Actions; - -diff --git a/bin/agent/sync_with_master b/bin/agent/sync_with_master -index cc52712..06ebb5f 100755 ---- a/bin/agent/sync_with_master -+++ b/bin/agent/sync_with_master -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Common::Config; - use MMM::Agent::Helpers::Actions; - -diff --git a/bin/agent/turn_off_slave b/bin/agent/turn_off_slave -index 0a468d3..b7b4214 100755 ---- a/bin/agent/turn_off_slave -+++ b/bin/agent/turn_off_slave -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Common::Config; - use MMM::Agent::Helpers::Actions; - -diff --git a/bin/agent/turn_on_slave b/bin/agent/turn_on_slave -index d6ac262..3b2fb47 100755 ---- a/bin/agent/turn_on_slave -+++ b/bin/agent/turn_on_slave -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Common::Config; - use MMM::Agent::Helpers::Actions; - -diff --git a/bin/monitor/checker b/bin/monitor/checker -index 345abf6..e7e30d7 100755 ---- a/bin/monitor/checker -+++ b/bin/monitor/checker -@@ -3,6 +3,7 @@ - # Use mandatory external modules - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( OUTPUT_AUTOFLUSH ); - use Log::Log4perl qw(:easy); - -diff --git a/bin/tools/create_snapshot b/bin/tools/create_snapshot -index 7538789..fe19ebd 100755 ---- a/bin/tools/create_snapshot -+++ b/bin/tools/create_snapshot -@@ -2,6 +2,7 @@ - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use DBI; - use MMM::Common::Config; - use MMM::Tools::Snapshot::LVM; -diff --git a/bin/tools/remove_snapshot b/bin/tools/remove_snapshot -index 59f8d91..db24c3e 100755 ---- a/bin/tools/remove_snapshot -+++ b/bin/tools/remove_snapshot -@@ -2,6 +2,7 @@ - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Common::Config; - use MMM::Tools::Snapshot::LVM; - -diff --git a/lib/Agent/Agent.pm b/lib/Agent/Agent.pm -index c98f39a..31fa22c 100644 ---- a/lib/Agent/Agent.pm -+++ b/lib/Agent/Agent.pm -@@ -2,6 +2,7 @@ package MMM::Agent::Agent; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw(EVAL_ERROR); - use Algorithm::Diff; - use DBI; -diff --git a/lib/Agent/Helpers.pm b/lib/Agent/Helpers.pm -index c0155e4..33f3b91 100644 ---- a/lib/Agent/Helpers.pm -+++ b/lib/Agent/Helpers.pm -@@ -2,6 +2,7 @@ package MMM::Agent::Helpers; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - - our $VERSION = '0.01'; -diff --git a/lib/Agent/Helpers/Actions.pm b/lib/Agent/Helpers/Actions.pm -index c39b674..33e2102 100644 ---- a/lib/Agent/Helpers/Actions.pm -+++ b/lib/Agent/Helpers/Actions.pm -@@ -2,6 +2,7 @@ package MMM::Agent::Helpers::Actions; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Agent::Helpers::Network; - - our $VERSION = '0.01'; -diff --git a/lib/Agent/Helpers/Network.pm b/lib/Agent/Helpers/Network.pm -index b0d5a8b..38619bf 100644 ---- a/lib/Agent/Helpers/Network.pm -+++ b/lib/Agent/Helpers/Network.pm -@@ -2,6 +2,7 @@ package MMM::Agent::Helpers::Network; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( OSNAME ); - - our $VERSION = '0.01'; -diff --git a/lib/Agent/Role.pm b/lib/Agent/Role.pm -index b9723c2..a4e69cd 100644 ---- a/lib/Agent/Role.pm -+++ b/lib/Agent/Role.pm -@@ -3,6 +3,7 @@ use base 'MMM::Common::Role'; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use MMM::Agent::Helpers; - -diff --git a/lib/Common/Angel.pm b/lib/Common/Angel.pm -index 7ad7e88..ac49309 100644 ---- a/lib/Common/Angel.pm -+++ b/lib/Common/Angel.pm -@@ -2,6 +2,7 @@ package MMM::Common::Angel; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( CHILD_ERROR ERRNO ); - use Log::Log4perl qw(:easy); - use Errno qw( EINTR ); -diff --git a/lib/Common/Config.pm b/lib/Common/Config.pm -index 6c0af28..948a728 100644 ---- a/lib/Common/Config.pm -+++ b/lib/Common/Config.pm -@@ -2,6 +2,7 @@ package MMM::Common::Config; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( NR ); - use Log::Log4perl qw(:easy); - -diff --git a/lib/Common/Log.pm b/lib/Common/Log.pm -index ae3910b..3b527e5 100644 ---- a/lib/Common/Log.pm -+++ b/lib/Common/Log.pm -@@ -2,6 +2,7 @@ package MMM::Common::Log; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use English qw( PROGRAM_NAME ); - -diff --git a/lib/Common/PidFile.pm b/lib/Common/PidFile.pm -index 2de55eb..70b39b6 100644 ---- a/lib/Common/PidFile.pm -+++ b/lib/Common/PidFile.pm -@@ -2,6 +2,7 @@ package MMM::Common::PidFile; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( PROCESS_ID ); - use Log::Log4perl qw(:easy); - -diff --git a/lib/Common/Role.pm b/lib/Common/Role.pm -index 211ab5f..4f48172 100644 ---- a/lib/Common/Role.pm -+++ b/lib/Common/Role.pm -@@ -2,6 +2,7 @@ package MMM::Common::Role; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - - our $VERSION = '0.01'; - -diff --git a/lib/Common/Socket.pm b/lib/Common/Socket.pm -index 38e1f7b..a072ca9 100644 ---- a/lib/Common/Socket.pm -+++ b/lib/Common/Socket.pm -@@ -2,6 +2,7 @@ package MMM::Common::Socket; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use IO::Socket::INET; - -diff --git a/lib/Common/Uptime.pm b/lib/Common/Uptime.pm -index 4b7c71c..c8e0c55 100644 ---- a/lib/Common/Uptime.pm -+++ b/lib/Common/Uptime.pm -@@ -2,6 +2,7 @@ package MMM::Common::Uptime; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( OSNAME ); - use Log::Log4perl qw(:easy); - -diff --git a/lib/Monitor/Agent.pm b/lib/Monitor/Agent.pm -index a72c98c..f12a93a 100644 ---- a/lib/Monitor/Agent.pm -+++ b/lib/Monitor/Agent.pm -@@ -2,6 +2,7 @@ package MMM::Monitor::Agent; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use MMM::Common::Socket; - use MMM::Monitor::ChecksStatus; -diff --git a/lib/Monitor/Agents.pm b/lib/Monitor/Agents.pm -index d1ba80a..12f3f99 100644 ---- a/lib/Monitor/Agents.pm -+++ b/lib/Monitor/Agents.pm -@@ -3,6 +3,7 @@ use base 'Class::Singleton'; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use IO::Handle; - use File::Temp; -diff --git a/lib/Monitor/CheckResult.pm b/lib/Monitor/CheckResult.pm -index cde4184..ec42a02 100644 ---- a/lib/Monitor/CheckResult.pm -+++ b/lib/Monitor/CheckResult.pm -@@ -2,6 +2,7 @@ package MMM::Monitor::CheckResult; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use threads; - use threads::shared; -diff --git a/lib/Monitor/Checker.pm b/lib/Monitor/Checker.pm -index a4f2ea7..1a5fe52 100644 ---- a/lib/Monitor/Checker.pm -+++ b/lib/Monitor/Checker.pm -@@ -2,6 +2,7 @@ package MMM::Monitor::Checker; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use IPC::Open2; - use MMM::Monitor::CheckResult; -diff --git a/lib/Monitor/Checker/Checks.pm b/lib/Monitor/Checker/Checks.pm -index 6e200b6..2eeeae3 100644 ---- a/lib/Monitor/Checker/Checks.pm -+++ b/lib/Monitor/Checker/Checks.pm -@@ -2,6 +2,7 @@ package MMM::Monitor::Checker::Checks; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw(OSNAME EFFECTIVE_USER_ID); - use DBI; - use Net::Ping; -diff --git a/lib/Monitor/ChecksStatus.pm b/lib/Monitor/ChecksStatus.pm -index a68e159..6b1a9ca 100644 ---- a/lib/Monitor/ChecksStatus.pm -+++ b/lib/Monitor/ChecksStatus.pm -@@ -3,6 +3,7 @@ use base 'Class::Singleton'; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use MMM::Monitor::Checker - -diff --git a/lib/Monitor/Commands.pm b/lib/Monitor/Commands.pm -index 9503c8d..972fdac 100644 ---- a/lib/Monitor/Commands.pm -+++ b/lib/Monitor/Commands.pm -@@ -2,6 +2,7 @@ package MMM::Monitor::Commands; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use List::Util qw(max); - use threads; -diff --git a/lib/Monitor/Monitor.pm b/lib/Monitor/Monitor.pm -index 7cf7dbf..f96503b 100644 ---- a/lib/Monitor/Monitor.pm -+++ b/lib/Monitor/Monitor.pm -@@ -2,6 +2,7 @@ package MMM::Monitor::Monitor; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use threads; - use threads::shared; - use Algorithm::Diff; -diff --git a/lib/Monitor/NetworkChecker.pm b/lib/Monitor/NetworkChecker.pm -index 8529d11..1a6d2e2 100644 ---- a/lib/Monitor/NetworkChecker.pm -+++ b/lib/Monitor/NetworkChecker.pm -@@ -2,6 +2,7 @@ package MMM::Monitor::NetworkChecker; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use MMM::Monitor::Checker; - -diff --git a/lib/Monitor/Role.pm b/lib/Monitor/Role.pm -index ec1ce46..725cce3 100644 ---- a/lib/Monitor/Role.pm -+++ b/lib/Monitor/Role.pm -@@ -2,6 +2,7 @@ package MMM::Monitor::Role; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use MMM::Common::Role; - - our $VERSION = '0.01'; -diff --git a/lib/Monitor/Roles.pm b/lib/Monitor/Roles.pm -index c5fcda8..68b3d44 100644 ---- a/lib/Monitor/Roles.pm -+++ b/lib/Monitor/Roles.pm -@@ -3,6 +3,7 @@ use base 'Class::Singleton'; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - use MMM::Monitor::Agents; - use MMM::Monitor::Role; -diff --git a/lib/Monitor/StartupStatus.pm b/lib/Monitor/StartupStatus.pm -index b4ab43e..0051a03 100644 ---- a/lib/Monitor/StartupStatus.pm -+++ b/lib/Monitor/StartupStatus.pm -@@ -2,6 +2,7 @@ package MMM::Monitor::StartupStatus; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use List::Util qw(max); - use Log::Log4perl qw(:easy); - use MMM::Common::Role; -diff --git a/lib/Tools/MySQL.pm b/lib/Tools/MySQL.pm -index 505c162..4c2e81a 100644 ---- a/lib/Tools/MySQL.pm -+++ b/lib/Tools/MySQL.pm -@@ -2,6 +2,7 @@ package MMM::Tools::MySQL; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use DBI; - use Log::Log4perl qw(:easy); - -diff --git a/lib/Tools/Snapshot/LVM.pm b/lib/Tools/Snapshot/LVM.pm -index 8cad596..e9408e2 100644 ---- a/lib/Tools/Snapshot/LVM.pm -+++ b/lib/Tools/Snapshot/LVM.pm -@@ -2,6 +2,7 @@ package MMM::Tools::Snapshot::LVM; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Log::Log4perl qw(:easy); - - -diff --git a/lib/Tools/Snapshot/MySQL.pm b/lib/Tools/Snapshot/MySQL.pm -index 85300c0..510b916 100644 ---- a/lib/Tools/Snapshot/MySQL.pm -+++ b/lib/Tools/Snapshot/MySQL.pm -@@ -2,6 +2,7 @@ package MMM::Tools::Snapshot::MySQL; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use Data::Dumper; - use DBI; - use Log::Log4perl qw(:easy); -diff --git a/lib/Tools/Tools.pm b/lib/Tools/Tools.pm -index 5820cb9..b7f350c 100644 ---- a/lib/Tools/Tools.pm -+++ b/lib/Tools/Tools.pm -@@ -2,6 +2,7 @@ package MMM::Tools::Tools; - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw(FORMAT_NAME); - use Path::Class qw(dir); - use Log::Log4perl qw(:easy); -diff --git a/sbin/mmm_agentd b/sbin/mmm_agentd -index 343f5c1..af6a6b9 100755 ---- a/sbin/mmm_agentd -+++ b/sbin/mmm_agentd -@@ -2,6 +2,7 @@ - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( PROGRAM_NAME ); - use File::Basename; - use Proc::Daemon; -diff --git a/sbin/mmm_backup b/sbin/mmm_backup -index fc7ae50..a105648 100755 ---- a/sbin/mmm_backup -+++ b/sbin/mmm_backup -@@ -2,6 +2,7 @@ - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( PROGRAM_NAME ); - use File::Basename; - use Log::Log4perl qw(:easy); -diff --git a/sbin/mmm_clone b/sbin/mmm_clone -index 5217314..73c1ea8 100755 ---- a/sbin/mmm_clone -+++ b/sbin/mmm_clone -@@ -2,6 +2,7 @@ - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( PROGRAM_NAME ); - use File::Basename; - use Log::Log4perl qw(:easy); -diff --git a/sbin/mmm_control b/sbin/mmm_control -index 597b9a1..95a2264 100755 ---- a/sbin/mmm_control -+++ b/sbin/mmm_control -@@ -2,6 +2,7 @@ - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( PROGRAM_NAME ); - use File::Basename; - use Log::Log4perl qw(:easy); -diff --git a/sbin/mmm_mond b/sbin/mmm_mond -index 6f9643b..9ed50c2 100755 ---- a/sbin/mmm_mond -+++ b/sbin/mmm_mond -@@ -2,6 +2,7 @@ - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use threads; - use threads::shared; - use Config; -diff --git a/sbin/mmm_restore b/sbin/mmm_restore -index 6dc9248..d80adaf 100755 ---- a/sbin/mmm_restore -+++ b/sbin/mmm_restore -@@ -2,6 +2,7 @@ - - use strict; - use warnings FATAL => 'all'; -+no warnings 'uninitialized'; - use English qw( PROGRAM_NAME FORMAT_NAME ); - use File::Basename; - use Log::Log4perl qw(:easy); diff --git a/mysql-mmm.spec b/mysql-mmm.spec index 46230de..db99707 100644 --- a/mysql-mmm.spec +++ b/mysql-mmm.spec @@ -2,7 +2,7 @@ Name: mysql-mmm Version: 2.2.1 -Release: 40%{?dist} +Release: 35%{?dist} Summary: Multi-Master Replication Manager for MySQL # Automatically converted from old format: GPLv2 - review is highly recommended. License: GPL-2.0-only @@ -29,8 +29,6 @@ Provides: mysql-master-master = %{version}-%{release} Patch0: mysql-mmm-2.1.0-paths.patch Patch1: mysql-mmm-fix-bug-with-newer-net-arp.patch Patch2: mysql-mmm-fix-cve-remote-command-injection.patch -Patch3: mysql-mmm-add-notify-cmd.patch -Patch4: mysql-mmm-suppress-uninitialized-warning.patch %description MMM (MySQL Master-Master Replication Manager) is a set of flexible scripts @@ -93,11 +91,9 @@ Full documentation can be found at: EOF -%patch -P 0 -p1 -%patch -P 1 -p1 -%patch -P 2 -p1 -%patch -P 3 -p1 -%patch -P 4 -p1 +%patch -P0 -p1 +%patch -P1 -p1 +%patch -P2 -p1 find . -type f -name "*.orig" -print0 | xargs -0r rm %build @@ -106,9 +102,6 @@ find . -type f -name "*.orig" -print0 | xargs -0r rm %install make install DESTDIR=%{buildroot} -mkdir -p %{buildroot}%{_bindir} -mv %{buildroot}/usr/sbin/mmm_* %{buildroot}%{_bindir} - %{__install} -D -p -m 0644 %SOURCE1 %{buildroot}%{_sysconfdir}/logrotate.d/mysql-mmm %{__install} -d -m 0755 %{buildroot}%{_localstatedir}/lib/%{name} @@ -157,16 +150,16 @@ mv %{buildroot}/usr/sbin/mmm_* %{buildroot}%{_bindir} %config(noreplace) %attr(644,root,root) %{_sysconfdir}/mysql-mmm/mmm_tools.conf %{perl_vendorlib}/MMM/Tools %{_libexecdir}/mysql-mmm/tools/ -%{_bindir}/mmm_backup -%{_bindir}/mmm_clone -%{_bindir}/mmm_restore +%{_sbindir}/mmm_backup +%{_sbindir}/mmm_clone +%{_sbindir}/mmm_restore %files agent %doc README %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_agent.conf %{perl_vendorlib}/MMM/Agent %{_libexecdir}/mysql-mmm/agent/ -%{_bindir}/mmm_agentd +%{_sbindir}/mmm_agentd %{_unitdir}/mysql-mmm-agent.service %files monitor @@ -175,29 +168,12 @@ mv %{buildroot}/usr/sbin/mmm_* %{buildroot}%{_bindir} %config(noreplace) %attr(640,root,root) %{_sysconfdir}/mysql-mmm/mmm_mon_log.conf %{perl_vendorlib}/MMM/Monitor %{_libexecdir}/mysql-mmm/monitor/ -%{_bindir}/mmm_mond -%{_bindir}/mmm_control +%{_sbindir}/mmm_mond +%{_sbindir}/mmm_control %{_unitdir}/mysql-mmm-monitor.service %changelog -* Thu Jul 24 2025 Fedora Release Engineering - 2.2.1-40 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_43_Mass_Rebuild - -* Sat Apr 05 2025 avid Beveridge 2.2.1-39 -- add feature notify_cmd -- suppress fatal escalation of uninitialized variables warning -- modify systemd unit files to refer to /usr/bin instead of /usr/sbin - -* Wed Mar 26 2025 David Beveridge 2.2.1-38 -- Unify bin and sbin - -* Sun Feb 02 2025 David Beveridge 2.2.1-37 -- fix patchN deprecated - -* Fri Jan 17 2025 Fedora Release Engineering - 2.2.1-36 -- Rebuilt for https://fedoraproject.org/wiki/Fedora_42_Mass_Rebuild - * Mon Jul 29 2024 Miroslav Suchý - 2.2.1-35 - convert license to SPDX