[csw-devel] SF.net SVN: gar:[18137] csw/mgar/pkg/nagios_plugins/trunk
wilbury at users.sourceforge.net
wilbury at users.sourceforge.net
Sun May 27 23:09:04 CEST 2012
Revision: 18137
http://gar.svn.sourceforge.net/gar/?rev=18137&view=rev
Author: wilbury
Date: 2012-05-27 21:09:04 +0000 (Sun, 27 May 2012)
Log Message:
-----------
nagios_plugins/trunk: Update to 1.4.15, adjust dependencies, link against OpenSSL 1.0
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/0004-Use-32-bit-pst3-on-Solaris.patch
Removed Paths:
-------------
csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.prototype
Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/Makefile 2012-05-27 20:48:06 UTC (rev 18136)
+++ csw/mgar/pkg/nagios_plugins/trunk/Makefile 2012-05-27 21:09:04 UTC (rev 18137)
@@ -1,5 +1,5 @@
NAME = nagios-plugins
-VERSION = 1.4.14
+VERSION = 1.4.15
CATEGORIES = apps
GARTYPE = v2
@@ -11,25 +11,32 @@
MASTER_SITES = http://surfnet.dl.sourceforge.net/sourceforge/nagiosplug/
DISTFILES = $(NAME)-$(VERSION).tar.gz
-DISTFILES += CSWnagiosp.prototype
-
PATCHFILES += check_procs.c.diff
PATCHFILES += subst.in.diff
PATCHFILES += pst3.c.diff
+PATCHFILES += 0004-Use-32-bit-pst3-on-Solaris.patch
PACKAGES = CSWnagiosp
CATALOGNAME_CSWnagiosp = nagios_plugins
-RUNTIME_DEP_PKGS_CSWnagiosp = CSWggettextrt CSWiconv CSWlibnet CSWlibpq
-RUNTIME_DEP_PKGS_CSWnagiosp += CSWmysql5rt CSWoldaprt CSWosslrt CSWsasl
-RUNTIME_DEP_PKGS_CSWnagiosp += CSWzlib CSWperl
+RUNTIME_DEP_PKGS_CSWnagiosp = CSWggettextrt CSWlibcharset1 CSWlibiconv2 CSWlibnet1 CSWlibpq5
+RUNTIME_DEP_PKGS_CSWnagiosp += CSWlibmysqlclient15 CSWoldaprt CSWlibssl1-0-0 CSWsasl
+RUNTIME_DEP_PKGS_CSWnagiosp += CSWlibz1 CSWperl
+BUILD_DEP_PKGS_CSWnagiosp += CSWmysql-dev
+BUILD_DEP_PKGS_CSWnagiosp += CSWpostgresql-dev
+BUILD_DEP_PKGS_CSWnagiosp += CSWlibz-dev
+BUILD_DEP_PKGS_CSWnagiosp += CSWlibnet-dev
+BUILD_DEP_PKGS_CSWnagiosp += CSWlibiconv-dev
+
NOISALIST = 1
CFLAGS += -I /opt/csw/postgresql/include/
CONFIGURE_ARGS = $(DIRPATHS)
-CONFIGURE_ARGS += --with-mysql-dir=/opt/csw/mysql5/bin
+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 += --disable-largefile
CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl
@@ -38,7 +45,6 @@
libexecdir ?= $(prefix)/libexec/nagios-plugins
# Extra libs
-EXTRA_LIB += /opt/csw/mysql5/lib/mysql
EXTRA_LIB += /opt/csw/postgresql/lib
# Extra includes
Modified: csw/mgar/pkg/nagios_plugins/trunk/checksums
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/checksums 2012-05-27 20:48:06 UTC (rev 18136)
+++ csw/mgar/pkg/nagios_plugins/trunk/checksums 2012-05-27 21:09:04 UTC (rev 18137)
@@ -1,5 +1 @@
-65bdf1c84228ccd98397837636004761 download/CSWnagiosp.prototype
-4e1d82a9b3b21ade03ad39652352857e download/check_procs.c.diff
-a1835a48a777863ed2583de3c82446a9 download/nagios-plugins-1.4.14.tar.gz
-91aaa11cae02b6855a2fdb055c27f767 download/pst3.c.diff
-54ff8a8e4484fd06f1edf9df4adefabf download/subst.in.diff
+56abd6ade8aa860b38c4ca4a6ac5ab0d nagios-plugins-1.4.15.tar.gz
Added: csw/mgar/pkg/nagios_plugins/trunk/files/0004-Use-32-bit-pst3-on-Solaris.patch
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/files/0004-Use-32-bit-pst3-on-Solaris.patch (rev 0)
+++ csw/mgar/pkg/nagios_plugins/trunk/files/0004-Use-32-bit-pst3-on-Solaris.patch 2012-05-27 21:09:04 UTC (rev 18137)
@@ -0,0 +1,33 @@
+From 4f4cfd00be92ec6ccd35ee3dab72d8c411ded55c Mon Sep 17 00:00:00 2001
+From: Juraj Lutter <wilbury at opencsw.org>
+Date: Sun, 27 May 2012 22:33:17 +0200
+Subject: [PATCH] Use 32-bit pst3 on Solaris.
+
+---
+ configure | 8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+diff --git a/configure b/configure
+index a93e57d..c1696e0 100755
+--- a/configure
++++ b/configure
+@@ -18068,14 +18068,8 @@ elif test "$ac_cv_uname_s" = "SunOS"; then
+ ac_cv_ps_cols=9
+ { echo "$as_me:$LINENO: result: using nagios-plugins internal ps command (pst3) for solaris" >&5
+ echo "${ECHO_T}using nagios-plugins internal ps command (pst3) for solaris" >&6; }
+- if test `isainfo -b` = 64 ; then
+- pst3_use_64bit=1
+- { echo "$as_me:$LINENO: using 64bit pst3" >&5
+-echo "$as_me: using 64bit pst3" >&6;}
+- else
+- { echo "$as_me:$LINENO: using 32bit pst3" >&5
++pst3_use_64bit=0
+- echo "$as_me: using 32bit pst3" >&6;}
++ echo "$as_me: using 32bit pst3" >&6;
+- fi
+ EXTRAS_ROOT="$EXTRAS_ROOT pst3"
+
+ if test "$pst3_use_64bit" = 1; then
+--
+1.7.10
+
Deleted: csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.prototype
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.prototype 2012-05-27 20:48:06 UTC (rev 18136)
+++ csw/mgar/pkg/nagios_plugins/trunk/files/CSWnagiosp.prototype 2012-05-27 21:09:04 UTC (rev 18137)
@@ -1,81 +0,0 @@
-1 d none /opt/csw/lib 0755 root bin
-1 d none /opt/csw/share/doc/nagios-plugins 0755 root bin
-1 d none /opt/csw/libexec/nagios-plugins 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_apt 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_breeze 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_by_ssh 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_clamd=check_tcp
-1 f none /opt/csw/libexec/nagios-plugins/check_cluster 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_dhcp 4555 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_disk 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_disk_smb 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_dns 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_dummy 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_file_age 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_flexlm 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_fping 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_ftp=check_tcp
-1 f none /opt/csw/libexec/nagios-plugins/check_hpjd 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_http 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_icmp 4555 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_ifoperstatus 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_ifstatus 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_imap=check_tcp
-1 f none /opt/csw/libexec/nagios-plugins/check_ircd 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_jabber=check_tcp
-1 f none /opt/csw/libexec/nagios-plugins/check_ldap 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_ldaps=check_ldap
-1 f none /opt/csw/libexec/nagios-plugins/check_load 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_log 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_mailq 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_mrtg 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_mrtgtraf 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_mysql 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_mysql_query 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_nagios 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_nntp=check_tcp
-1 s none /opt/csw/libexec/nagios-plugins/check_nntps=check_tcp
-1 f none /opt/csw/libexec/nagios-plugins/check_nt 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_ntp 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_ntp_peer 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_ntp_time 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_nwstat 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_oracle 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_overcr 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_pgsql 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_ping 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_pop=check_tcp
-1 f none /opt/csw/libexec/nagios-plugins/check_procs 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_real 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_rpc 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_sensors 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_simap=check_tcp
-1 f none /opt/csw/libexec/nagios-plugins/check_smtp 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_snmp 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_spop=check_tcp
-1 f none /opt/csw/libexec/nagios-plugins/check_ssh 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_ssmtp=check_tcp
-1 f none /opt/csw/libexec/nagios-plugins/check_swap 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_tcp 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_time 0755 root bin
-1 s none /opt/csw/libexec/nagios-plugins/check_udp=check_tcp
-1 f none /opt/csw/libexec/nagios-plugins/check_ups 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_users 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/check_wave 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/negate 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/pst3 4555 root bin
-1 f none /opt/csw/libexec/nagios-plugins/urlize 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/utils.pm 0755 root bin
-1 f none /opt/csw/libexec/nagios-plugins/utils.sh 0755 root bin
-1 f none /opt/csw/share/doc/nagios-plugins/BUGS 0644 root bin
-1 f none /opt/csw/share/doc/nagios-plugins/ChangeLog 0644 root bin
-1 f none /opt/csw/share/doc/nagios-plugins/FAQ 0644 root bin
-1 f none /opt/csw/share/doc/nagios-plugins/README 0644 root bin
-1 f none /opt/csw/share/doc/nagios-plugins/REQUIREMENTS 0644 root bin
-1 f none /opt/csw/share/doc/nagios-plugins/SUPPORT 0644 root bin
-1 f none /opt/csw/share/doc/nagios-plugins/COPYING 0644 root bin
-1 f none /opt/csw/share/doc/nagios-plugins/contrib.tar 0644 root bin
-1 d none /opt/csw/share/locale/de/LC_MESSAGES 0755 root bin
-1 f none /opt/csw/share/locale/de/LC_MESSAGES/nagios-plugins.mo 0644 root bin
-1 d none /opt/csw/share/locale/fr/LC_MESSAGES 0755 root bin
-1 f none /opt/csw/share/locale/fr/LC_MESSAGES/nagios-plugins.mo 0644 root bin
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
More information about the devel
mailing list