Revision: 6613 http://gar.svn.sourceforge.net/gar/?rev=6613&view=rev Author: j_arndt Date: 2009-09-29 20:35:00 +0000 (Tue, 29 Sep 2009)
Log Message: ----------- nagios_plugins: fixed issue #3927, perl scripts now use util.pm in /opt/csw/libexec/nagios-plugins 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/subst.in.diff Modified: csw/mgar/pkg/nagios_plugins/trunk/Makefile =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/Makefile 2009-09-29 15:47:36 UTC (rev 6612) +++ csw/mgar/pkg/nagios_plugins/trunk/Makefile 2009-09-29 20:35:00 UTC (rev 6613) @@ -12,6 +12,7 @@ DISTFILES += $(call admfiles,CSWnagiosp,prototype ) PATCHFILES += check_procs.c.diff +PATCHFILES += subst.in.diff REQUIRED_PKGS_CSWnagiosp = CSWggettextrt CSWiconv CSWlibnet CSWlibpq REQUIRED_PKGS_CSWnagiosp += CSWmysql5rt CSWoldaprt CSWosslrt CSWsasl @@ -25,6 +26,8 @@ CONFIGURE_ARGS += --with-mysql-dir=/opt/csw/mysql5/bin CONFIGURE_ARGS += --with-pg-dir=/opt/csw/postgresql/include/ CONFIGURE_ARGS += --disable-largefile +CONFIGURE_ARGS += --with-perl=/opt/csw/bin/perl +CONFIGURE_ARGS += --libexecdir=$(prefix)/libexec/nagios-plugins libexecdir ?= $(prefix)/libexec/nagios-plugins Modified: csw/mgar/pkg/nagios_plugins/trunk/checksums =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-09-29 15:47:36 UTC (rev 6612) +++ csw/mgar/pkg/nagios_plugins/trunk/checksums 2009-09-29 20:35:00 UTC (rev 6613) @@ -1,4 +1,5 @@ -be6cc7699fff3ee29d1fd4d562377386 download/nagios-plugins-1.4.13.tar.gz 61f490e92b603ac8628fb0c6cebb39ce download/CSWnagiosp.gspec 65bdf1c84228ccd98397837636004761 download/CSWnagiosp.prototype 4e1d82a9b3b21ade03ad39652352857e download/check_procs.c.diff +be6cc7699fff3ee29d1fd4d562377386 download/nagios-plugins-1.4.13.tar.gz +54ff8a8e4484fd06f1edf9df4adefabf download/subst.in.diff Added: csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff =================================================================== --- csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff (rev 0) +++ csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff 2009-09-29 20:35:00 UTC (rev 6613) @@ -0,0 +1,12 @@ +diff --speed-large-files --minimal -Nru nagios-plugins-1.4.13.orig/plugins-scripts/subst.in nagios-plugins-1.4.13/plugins-scripts/subst.in +--- nagios-plugins-1.4.13.orig/plugins-scripts/subst.in 2005-08-31 00:11:42.000000000 +0200 ++++ nagios-plugins-1.4.13/plugins-scripts/subst.in 2009-09-29 22:00:50.232667015 +0200 +@@ -62,7 +62,7 @@ + # subst will replace the fully qualified command with whatever is + # returned from the which subroutine + # +-/^[^#]/ && /(\/.*)?\/(bin|sbin|lib|libexec)\// { ++/^[^#]/ && /(\/.*)?\/(bin|sbin|lib)\// { + match($0,/(\/.*)?\/(bin|sbin|lib|libexec)\/[-_a-zA-Z0-9]+/); + c=substr($0,RSTART,RLENGTH); + sub(c,which(c,path)); This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. _______________________________________________ devel mailing list devel@lists.opencsw.org https://lists.opencsw.org/mailman/listinfo/devel