[packages/percona-monitoring-plugins] fix perl fatal warning
glen
glen at pld-linux.org
Thu Mar 15 11:57:27 CET 2018
commit 31f2783484ef2814f052ddb3fcb2032c1d9d1346
Author: Elan Ruusamäe <glen at pld-linux.org>
Date: Thu Mar 15 12:56:55 2018 +0200
fix perl fatal warning
percona-monitoring-plugins.spec | 2 ++
perl.patch | 14 ++++++++++++++
2 files changed, 16 insertions(+)
---
diff --git a/percona-monitoring-plugins.spec b/percona-monitoring-plugins.spec
index eaa2a63..c32f293 100644
--- a/percona-monitoring-plugins.spec
+++ b/percona-monitoring-plugins.spec
@@ -20,6 +20,7 @@ Source1: config.php
Source2: ssh_config.php
Patch0: config.patch
Patch1: paths.patch
+Patch2: perl.patch
URL: https://www.percona.com/software/database-tools/percona-monitoring-plugins
BuildRequires: rpmbuild(macros) >= 1.630
BuildRequires: sed >= 4.0
@@ -91,6 +92,7 @@ This is a set of templates for monitoring Redis servers with Cacti.
%setup -q
%patch0 -p1
%patch1 -p1
+%patch2 -p1
%{__sed} -i -e '1i#!/usr/bin/php' cacti/scripts/*.php
chmod a+rx cacti/scripts/*.php
diff --git a/perl.patch b/perl.patch
new file mode 100644
index 0000000..1a73721
--- /dev/null
+++ b/perl.patch
@@ -0,0 +1,14 @@
+$ bin/pmp-cacti-template --script scripts/ss_get_mysql_stats.php definitions/mysql.def --mpds port
+Redundant argument in sprintf at bin/pmp-cacti-template line 25.
+
+--- percona-monitoring-plugins-1.1.8/cacti/bin/pmp-cacti-template~ 2018-03-15 12:49:29.000000000 +0200
++++ percona-monitoring-plugins-1.1.8/cacti/bin/pmp-cacti-template 2018-03-15 12:49:32.988292145 +0200
+@@ -22,7 +22,7 @@
+
+ our $VERSION = '@VERSION@';
+ our $DISTRIB = '@DISTRIB@';
+-our $SVN_REV = sprintf("%d", map { $_ || 0 } q$Revision: 555 $ =~ m/(\d*)/g);
++our $SVN_REV = sprintf("%d", map { $_ || 0 } q$Revision: 555 $ =~ m/(\d+)/g);
+
+ # ###########################################################################
+ # OptionParser package 1844
================================================================
---- gitweb:
http://git.pld-linux.org/gitweb.cgi/packages/percona-monitoring-plugins.git/commitdiff/31f2783484ef2814f052ddb3fcb2032c1d9d1346
More information about the pld-cvs-commit
mailing list