Merge branch 'master' into storageareas

distros/redhat/zoneminder.el7.spec

@@ -69,7 +69,7 @@ too much degradation of performance.
 
 %build
 %cmake \
-	-DZM_TARGET_DISTRO="el7" \
+	-DZM_TARGET_DISTRO="el%{rhel}" \
 	.
 
 make %{?_smp_mflags}

scripts/zmaudit.pl.in

@@ -312,7 +312,7 @@ MAIN: while( $loop ) {
       aud_print( "Filesystem monitor link '$link' does not point to valid monitor directory" );
       if ( confirm() ) {
         ( $link ) = ( $link =~ /^(.*)$/ ); # De-taint
-          my $command = "rm $link";
+        my $command = qq`rm "$link"`;
         executeShellCommand( $command );
         $cleaned = 1;
       }