From owner-svn-ports-all@FreeBSD.ORG Wed Dec 10 13:32:32 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 00CD354A; Wed, 10 Dec 2014 13:32:31 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id D6B5816B; Wed, 10 Dec 2014 13:32:31 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.9/8.14.9) with ESMTP id sBADWVcS086584; Wed, 10 Dec 2014 13:32:31 GMT (envelope-from rodrigo@FreeBSD.org) Received: (from rodrigo@localhost) by svn.freebsd.org (8.14.9/8.14.9/Submit) id sBADWUbY086577; Wed, 10 Dec 2014 13:32:30 GMT (envelope-from rodrigo@FreeBSD.org) Message-Id: <201412101332.sBADWUbY086577@svn.freebsd.org> X-Authentication-Warning: svn.freebsd.org: rodrigo set sender to rodrigo@FreeBSD.org using -f From: Rodrigo Osorio Date: Wed, 10 Dec 2014 13:32:30 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374455 - in head/net-mgmt/check_mysql_health: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 10 Dec 2014 13:32:32 -0000 Author: rodrigo Date: Wed Dec 10 13:32:30 2014 New Revision: 374455 URL: https://svnweb.freebsd.org/changeset/ports/374455 QAT: https://qat.redports.org/buildarchive/r374455/ Log: Fix warnings when run check_mysql_health with perl >= 5.16 Remove unnecessary dirs from plist PR: ports/189370 Submitted by: rodrigo Added: head/net-mgmt/check_mysql_health/files/ head/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Cluster.pm (contents, props changed) head/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Server.pm (contents, props changed) head/net-mgmt/check_mysql_health/files/patch-plugins-scripts_check_mysql_health.pl (contents, props changed) Modified: head/net-mgmt/check_mysql_health/Makefile Modified: head/net-mgmt/check_mysql_health/Makefile ============================================================================== --- head/net-mgmt/check_mysql_health/Makefile Wed Dec 10 13:03:03 2014 (r374454) +++ head/net-mgmt/check_mysql_health/Makefile Wed Dec 10 13:32:30 2014 (r374455) @@ -2,16 +2,17 @@ PORTNAME= check_mysql_health PORTVERSION= 2.1.5.1 +PORTREVISION= 1 CATEGORIES= net-mgmt MASTER_SITES= http://labs.consol.de/wp-content/uploads/2011/04/ MAINTAINER= ssanders@taximagic.com COMMENT= Nagios plugin to check various parameters of a MySQL database -RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql - LICENSE= GPLv2 +RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql + GNU_CONFIGURE= yes CONFIGURE_ARGS= --with-statefiles-dir=${NAGIOSDIR} \ --with-nagios-user=${NAGIOSUSER} \ @@ -28,6 +29,5 @@ NAGIOSGROUP?= nagios NAGIOSDIR?= /var/spool/nagios PLIST_FILES= libexec/nagios/check_mysql_health -PLIST_DIRS= libexec/nagios .include Added: head/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Cluster.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Cluster.pm Wed Dec 10 13:32:30 2014 (r374455) @@ -0,0 +1,11 @@ +--- plugins-scripts/Nagios/DBD/MySQL/Cluster.pm.orig 2014-12-07 18:40:22.318185465 +0000 ++++ plugins-scripts/Nagios/DBD/MySQL/Cluster.pm 2014-12-07 18:41:15.780179599 +0000 +@@ -192,7 +192,7 @@ + my $message = shift; + push(@{$self->{nagios}->{messages}->{$level}}, $message); + # recalc current level +- foreach my $llevel qw(CRITICAL WARNING UNKNOWN OK) { ++ foreach my $llevel (qw(CRITICAL WARNING UNKNOWN OK)) { + if (scalar(@{$self->{nagios}->{messages}->{$ERRORS{$llevel}}})) { + $self->{nagios_level} = $ERRORS{$llevel}; + } Added: head/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Server.pm ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/check_mysql_health/files/patch-plugins-scripts_Nagios_DBD_MySQL_Server.pm Wed Dec 10 13:32:30 2014 (r374455) @@ -0,0 +1,11 @@ +--- plugins-scripts/Nagios/DBD/MySQL/Server.pm.orig 2014-12-07 18:56:47.435107795 +0000 ++++ plugins-scripts/Nagios/DBD/MySQL/Server.pm 2014-12-07 18:57:22.394116542 +0000 +@@ -310,7 +310,7 @@ + my $message = shift; + push(@{$self->{nagios}->{messages}->{$level}}, $message); + # recalc current level +- foreach my $llevel qw(CRITICAL WARNING UNKNOWN OK) { ++ foreach my $llevel (qw(CRITICAL WARNING UNKNOWN OK)) { + if (scalar(@{$self->{nagios}->{messages}->{$ERRORS{$llevel}}})) { + $self->{nagios_level} = $ERRORS{$llevel}; + } Added: head/net-mgmt/check_mysql_health/files/patch-plugins-scripts_check_mysql_health.pl ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/net-mgmt/check_mysql_health/files/patch-plugins-scripts_check_mysql_health.pl Wed Dec 10 13:32:30 2014 (r374455) @@ -0,0 +1,13 @@ +--- plugins-scripts/check_mysql_health.pl.orig 2014-12-07 18:44:47.220159275 +0000 ++++ plugins-scripts/check_mysql_health.pl 2014-12-07 18:51:34.356136684 +0000 +@@ -353,8 +353,8 @@ + $needs_restart = 1; + # if the calling script has a path for shared libs and there is no --environment + # parameter then the called script surely needs the variable too. +- foreach my $important_env qw(LD_LIBRARY_PATH SHLIB_PATH +- ORACLE_HOME TNS_ADMIN ORA_NLS ORA_NLS33 ORA_NLS10) { ++ foreach my $important_env (qw(LD_LIBRARY_PATH SHLIB_PATH ++ ORACLE_HOME TNS_ADMIN ORA_NLS ORA_NLS33 ORA_NLS10)) { + if ($ENV{$important_env} && ! scalar(grep { /^$important_env=/ } + keys %{$commandline{environment}})) { + $commandline{environment}->{$important_env} = $ENV{$important_env};