[csw-devel] SF.net SVN: gar:[18781] csw/mgar/pkg/nagios_plugins/trunk

[j_arndt at users.sourceforge.net]

Revision: 18781
          http://gar.svn.sourceforge.net/gar/?rev=18781&view=rev
Author:   j_arndt
Date:     2012-07-16 23:08:20 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
nagios_plugins/trunk: update to 1.4.16

Modified Paths:
--------------
    csw/mgar/pkg/nagios_plugins/trunk/Makefile
    csw/mgar/pkg/nagios_plugins/trunk/checksums

Added Paths:
-----------
    csw/mgar/pkg/nagios_plugins/trunk/files/0002-Use-32-bit-pst3-on-Solaris.patch

Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/Makefile	2012-07-16 22:41:14 UTC (rev 18780)
+++ csw/mgar/pkg/nagios_plugins/trunk/Makefile	2012-07-16 23:08:20 UTC (rev 18781)
@@ -1,7 +1,7 @@
 # $Id$
 #
 NAME = nagios-plugins
-VERSION = 1.4.15
+VERSION = 1.4.16
 CATEGORIES = apps
 GARTYPE = v2
 
@@ -21,7 +21,8 @@
 OBSOLETED_BY_CSWnagios-plugins	= CSWnagiosp
 CATALOG_NAME_CSWnagiosp 	= nagiosp_stub
 
-PATCHFILES 	+= 0004-Use-32-bit-pst3-on-Solaris.patch
+#PATCHFILES 	+= 0004-Use-32-bit-pst3-on-Solaris.patch
+PATCHFILES	+= 0002-Use-32-bit-pst3-on-Solaris.patch
 
 REINPLACE_USRLOCAL += contrib/*
 REINPLACE_USRLOCAL += plugins/*
@@ -34,12 +35,14 @@
 CONFIGURE_ARGS = $(DIRPATHS)
 CONFIGURE_ARGS += --with-openssl=/opt/csw
 CONFIGURE_ARGS += --with-trusted-path=/bin:/sbin:/usr/bin:/usr/sbin:/opt/csw/bin:/opt/csw/sbin
-CONFIGURE_ARGS += --with-mysql-dir=/opt/csw
-CONFIGURE_ARGS += --with-pg-dir=/opt/csw/postgresql/include/
+CONFIGURE_ARGS += --with-mysql=/opt/csw
+CONFIGURE_ARGS += --with-pgsql=/opt/csw/postgresql
 CONFIGURE_ARGS += --disable-largefile
 CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/nagios-plugins
 CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl
 CONFIGURE_ARGS += --with-openssl=/opt/csw
+CONFIGURE_ARGS += --with-gnutls=/opt/csw
+CONFIGURE_ARGS += --with-fping-command=/opt/csw/sbin/fping
 CONFIGURE_ARGS += --with-trusted-path=/usr/bin:/usr/sbin:/opt/csw/bin:/opt/csw/sbin:$(prefix)/libexec/nagios-plugins
 CONFIGURE_ARGS += --with-ping6-command="/usr/sbin/ping -A inet6 -s %s 56 %d"
 CONFIGURE_ARGS += --with-snmpget-command=/opt/csw/bin/snmpget

Modified: csw/mgar/pkg/nagios_plugins/trunk/checksums
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/checksums	2012-07-16 22:41:14 UTC (rev 18780)
+++ csw/mgar/pkg/nagios_plugins/trunk/checksums	2012-07-16 23:08:20 UTC (rev 18781)
@@ -1 +1 @@
-56abd6ade8aa860b38c4ca4a6ac5ab0d  nagios-plugins-1.4.15.tar.gz
+862f5e44fb5bc65ce7e5d86d654d4da0  nagios-plugins-1.4.16.tar.gz

Added: csw/mgar/pkg/nagios_plugins/trunk/files/0002-Use-32-bit-pst3-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/files/0002-Use-32-bit-pst3-on-Solaris.patch	                        (rev 0)
+++ csw/mgar/pkg/nagios_plugins/trunk/files/0002-Use-32-bit-pst3-on-Solaris.patch	2012-07-16 23:08:20 UTC (rev 18781)
@@ -0,0 +1,32 @@
+From 389067c2d4689c08f289bb25febb25f097386c89 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Tue, 17 Jul 2012 00:37:48 +0200
+Subject: [PATCH] Use-32-bit-pst3-on-Solaris
+
+---
+ configure |    9 +--------
+ 1 file changed, 1 insertion(+), 8 deletions(-)
+
+diff --git a/configure b/configure
+index 1b92218..1a5ebba 100755
+--- a/configure
++++ b/configure
+@@ -14647,14 +14647,7 @@ elif test "$ac_cv_uname_s" = "SunOS"; then
+         ac_cv_ps_cols=9
+         { $as_echo "$as_me:${as_lineno-$LINENO}: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
+ $as_echo "using nagios-plugins internal ps command (pst3) for solaris" >&6; }
+-	if test `isainfo -b` = 64 ; then
+-		pst3_use_64bit=1
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: using 64bit pst3" >&5
+-$as_echo "$as_me: using 64bit pst3" >&6;}
+-	else
+-		{ $as_echo "$as_me:${as_lineno-$LINENO}: using 32bit pst3" >&5
+-$as_echo "$as_me: using 32bit pst3" >&6;}
+-	fi
++echo "$as_me: using 32bit pst3" >&6;
+         EXTRAS_ROOT="$EXTRAS_ROOT pst3"
+ 
+ 	if test "$pst3_use_64bit" = 1; then
+-- 
+1.7.10.3
+

This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.