[MySQL-zrm/el6] Update quiet patch to fix bug 759854 Restrict permissions on mysql-zrm.conf

[Orion Poplawski]

commit 13a53451069e129b307312f253af31206310006d
Author: Orion Poplawski <orion at cora.nwra.com>
Date:   Sun Dec 4 09:54:41 2011 -0700

    Update quiet patch to fix bug 759854
    Restrict permissions on mysql-zrm.conf

 MySQL-zrm-2.2.0-quiet.patch |   14 +++++++++-----
 MySQL-zrm.spec              |   13 +++++++++----
 2 files changed, 18 insertions(+), 9 deletions(-)
---
diff --git a/MySQL-zrm-2.2.0-quiet.patch b/MySQL-zrm-2.2.0-quiet.patch
index 6c8a9ec..e61d9fd 100644
--- a/MySQL-zrm-2.2.0-quiet.patch
+++ b/MySQL-zrm-2.2.0-quiet.patch
@@ -1,6 +1,6 @@
 diff -up MySQL-zrm-2.2.0/usr/bin/mysql-zrm-scheduler.quiet MySQL-zrm-2.2.0/usr/bin/mysql-zrm-scheduler
 --- MySQL-zrm-2.2.0/usr/bin/mysql-zrm-scheduler.quiet	2010-02-03 17:19:25.000000000 -0700
-+++ MySQL-zrm-2.2.0/usr/bin/mysql-zrm-scheduler	2010-09-22 10:33:40.557593095 -0600
++++ MySQL-zrm-2.2.0/usr/bin/mysql-zrm-scheduler	2011-12-04 08:37:28.283620846 -0700
 @@ -195,7 +195,12 @@ unless ( -d $logdir ) {
  }
  
@@ -36,7 +36,7 @@ diff -up MySQL-zrm-2.2.0/usr/bin/mysql-zrm-scheduler.quiet MySQL-zrm-2.2.0/usr/b
      }
 diff -up MySQL-zrm-2.2.0/usr/bin/zrm-pre-scheduler.quiet MySQL-zrm-2.2.0/usr/bin/zrm-pre-scheduler
 --- MySQL-zrm-2.2.0/usr/bin/zrm-pre-scheduler.quiet	2010-02-03 17:19:25.000000000 -0700
-+++ MySQL-zrm-2.2.0/usr/bin/zrm-pre-scheduler	2010-09-22 10:08:30.634655783 -0600
++++ MySQL-zrm-2.2.0/usr/bin/zrm-pre-scheduler	2011-12-04 08:44:42.905757064 -0700
 @@ -229,10 +229,6 @@ unless ( -d $logdir ) {
      die ("ERROR: mkdir $logdir failed: $!\n");
  }
@@ -64,18 +64,22 @@ diff -up MySQL-zrm-2.2.0/usr/bin/zrm-pre-scheduler.quiet MySQL-zrm-2.2.0/usr/bin
  
  
  my $interval    = $inputs{"interval"};
-@@ -290,7 +295,7 @@ if ( $skip ||
+@@ -290,7 +295,11 @@ if ( $skip ||
  if ( $no_plugin == 1 || $exit_value == 0 ||
       (($interval ne "daily") &&  ($delay + $exit_value) > 23 )) {
      # call mysql-zrm-scheduler --now
 -    system($zrm_scheduler, $now, "--backup-set", $backupset, "--interval", $interval, "--backup-level", $level);
-+    system($zrm_scheduler, $now, "--backup-set", $backupset, "--interval", $interval, "--backup-level", $level, $quiet);
++    if ($quiet ne "") {
++	system($zrm_scheduler, $now, "--backup-set", $backupset, "--interval", $interval, "--backup-level", $level, $quiet);
++    } else {
++	system($zrm_scheduler, $now, "--backup-set", $backupset, "--interval", $interval, "--backup-level", $level);
++    }
      &mprint("ERROR: $zrm_scheduler failed\n") if ( $? == 1 );
      &call_reporter($backupset);
  
 diff -up MySQL-zrm-2.2.0/usr/lib/mysql-zrm/ZRM/Common.pm.quiet MySQL-zrm-2.2.0/usr/lib/mysql-zrm/ZRM/Common.pm
 --- MySQL-zrm-2.2.0/usr/lib/mysql-zrm/ZRM/Common.pm.quiet	2010-02-03 17:19:25.000000000 -0700
-+++ MySQL-zrm-2.2.0/usr/lib/mysql-zrm/ZRM/Common.pm	2010-09-22 10:08:30.636591091 -0600
++++ MySQL-zrm-2.2.0/usr/lib/mysql-zrm/ZRM/Common.pm	2011-12-04 08:37:28.287620655 -0700
 @@ -1458,6 +1458,9 @@ sub verifySnapshotParams()
  	}
  	my $cmd = $inputs{"snapshot-plugin"};
diff --git a/MySQL-zrm.spec b/MySQL-zrm.spec
index e4a33fd..4397960 100644
--- a/MySQL-zrm.spec
+++ b/MySQL-zrm.spec
@@ -1,6 +1,6 @@
 Name:		MySQL-zrm
 Version:	2.2.0
-Release:	2%{?dist}
+Release:	3%{?dist}
 Summary:	MySQL backup manager
 
 Group:		Applications/System
@@ -67,13 +67,15 @@ cp -rp etc/xinetd.d/mysql-zrm-socket-server	%{buildroot}/%{_sysconfdir}/xinetd.d
 # name logrotate job as package name
 cp -rp etc/logrotate.d/mysql-zrm		%{buildroot}/%{_sysconfdir}/logrotate.d/%{name}
 
+# This will store passwords, restrict permissions
+chmod 640 %{buildroot}%{_sysconfdir}/mysql-zrm/mysql-zrm.conf
+
+
 %clean
 rm -rf %{buildroot}
 
 
 %files
-%defattr(0644,root,root,0755)
-
 %attr(-,mysql,mysql) %dir %{_var}/log/mysql-zrm
 %dir %{_sharedstatedir}/mysql-zrm
 %dir %{_sysconfdir}/mysql-zrm/
@@ -90,8 +92,11 @@ rm -rf %{buildroot}
 %config(noreplace) %{_sysconfdir}/logrotate.d/%{name}
 %config(noreplace) %{_sysconfdir}/mysql-zrm/*
 
-
 %changelog
+* Sun Dec 4 2011 Orion Poplawski <orion at cora.nwra.com> - 2.2.0-3
+- Update quiet patch to fix bug 759854
+- Restrict permissions on mysql-zrm.conf
+
 * Wed Nov 9 2011 Orion Poplawski <orion at cora.nwra.com> - 2.2.0-2
 - Add quiet patch to silence output with --quiet