Revision: 18782
http://gar.svn.sourceforge.net/gar/?rev=18782&view=rev
Author: j_arndt
Date: 2012-07-16 23:16:19 +0000 (Mon, 16 Jul 2012)
Log Message:
-----------
nagios_plugins/trunk: removing old patchfiles
Modified Paths:
--------------
csw/mgar/pkg/nagios_plugins/trunk/Makefile
Removed Paths:
-------------
csw/mgar/pkg/nagios_plugins/trunk/files/0004-Use-32-bit-pst3-on-Solaris.patch
csw/mgar/pkg/nagios_plugins/trunk/files/check_procs.c.diff
csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff
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 2012-07-16 23:08:20 UTC (rev
18781)
+++ csw/mgar/pkg/nagios_plugins/trunk/Makefile 2012-07-16 23:16:19 UTC (rev
18782)
@@ -1,11 +1,21 @@
# $Id$
#
-NAME = nagios-plugins
-VERSION = 1.4.16
-CATEGORIES = apps
-GARTYPE = v2
+NAME = nagios-plugins
+VERSION = 1.4.16
+CATEGORIES = apps
+GARTYPE = v2
-SPKG_DESC_CSWnagios-plugins = Plugins for nagios
+#
+# package definitions
+#
+
+PACKAGES = CSWnagios-plugins
+CATALOG_NAME_CSWnagios-plugins = nagios_plugins
+
+OBSOLETED_BY_CSWnagios-plugins = CSWnagiosp
+CATALOG_NAME_CSWnagiosp = nagiosp_stub
+
+SPKG_DESC_CSWnagios-plugins = Plugins for Nagios
define BLURB
Plugins for Nagios
endef
@@ -15,13 +25,6 @@
DISTFILES = $(NAME)-$(VERSION).tar.gz
DISTFILES += README.CSW
-PACKAGES = CSWnagios-plugins
-CATALOG_NAME_CSWnagios-plugins = nagios_plugins
-
-OBSOLETED_BY_CSWnagios-plugins = CSWnagiosp
-CATALOG_NAME_CSWnagiosp = nagiosp_stub
-
-#PATCHFILES += 0004-Use-32-bit-pst3-on-Solaris.patch
PATCHFILES += 0002-Use-32-bit-pst3-on-Solaris.patch
REINPLACE_USRLOCAL += contrib/*
Deleted:
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
2012-07-16 23:08:20 UTC (rev 18781)
+++
csw/mgar/pkg/nagios_plugins/trunk/files/0004-Use-32-bit-pst3-on-Solaris.patch
2012-07-16 23:16:19 UTC (rev 18782)
@@ -1,33 +0,0 @@
-From 4f4cfd00be92ec6ccd35ee3dab72d8c411ded55c Mon Sep 17 00:00:00 2001
-From: Juraj Lutter <wilb...@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/check_procs.c.diff
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/files/check_procs.c.diff 2012-07-16
23:08:20 UTC (rev 18781)
+++ csw/mgar/pkg/nagios_plugins/trunk/files/check_procs.c.diff 2012-07-16
23:16:19 UTC (rev 18782)
@@ -1,12 +0,0 @@
-diff --speed-large-files --minimal -Nru
nagios-plugins-1.4.13.orig/plugins/check_procs.c
nagios-plugins-1.4.13/plugins/check_procs.c
---- nagios-plugins-1.4.13.orig/plugins/check_procs.c 2008-07-08
11:31:04.000000000 +0200
-+++ nagios-plugins-1.4.13/plugins/check_procs.c 2009-03-26
20:30:33.322034506 +0100
-@@ -194,7 +194,7 @@
- strip (procargs);
-
- /* Some ps return full pathname for command. This
removes path */
-- strcpy(procprog, base_name(procprog));
-+ /* strcpy(procprog, base_name(procprog)); */
-
- /* we need to convert the elapsed time to seconds */
- procseconds = convert_to_seconds(procetime);
Deleted: csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff 2012-07-16 23:08:20 UTC
(rev 18781)
+++ csw/mgar/pkg/nagios_plugins/trunk/files/pst3.c.diff 2012-07-16 23:16:19 UTC
(rev 18782)
@@ -1,18 +0,0 @@
-diff --speed-large-files --minimal -Nru
nagios-plugins-1.4.14.orig/plugins-root/pst3.c
nagios-plugins-1.4.14/plugins-root/pst3.c
---- nagios-plugins-1.4.14.orig/plugins-root/pst3.c 2009-09-14
12:21:24.000000000 +0200
-+++ nagios-plugins-1.4.14/plugins-root/pst3.c 2009-10-14 22:02:53.643787730
+0200
-@@ -43,11 +43,11 @@
-
- #include <stdio.h>
- #include <stdlib.h>
--#include <string.h>
--#include <unistd.h>
-+#include "/usr/include/string.h"
-+#include "/usr/include/unistd.h"
- #include <dirent.h>
- #include <errno.h>
--#include <fcntl.h>
-+#include "/usr/include/fcntl.h"
- #include <procfs.h>
- #include <errno.h>
- #include <sys/types32.h>
Deleted: csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff
===================================================================
--- csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff 2012-07-16
23:08:20 UTC (rev 18781)
+++ csw/mgar/pkg/nagios_plugins/trunk/files/subst.in.diff 2012-07-16
23:16:19 UTC (rev 18782)
@@ -1,12 +0,0 @@
-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
