[csw-devel] SF.net SVN: gar:[17080] csw/mgar/pkg/nagios/trunk
j_arndt at users.sourceforge.net
j_arndt at users.sourceforge.net
Sat Feb 18 17:38:06 CET 2012
Revision: 17080
http://gar.svn.sourceforge.net/gar/?rev=17080&view=rev
Author: j_arndt
Date: 2012-02-18 16:38:05 +0000 (Sat, 18 Feb 2012)
Log Message:
-----------
nagios: update to 3.3.1
Modified Paths:
--------------
csw/mgar/pkg/nagios/trunk/Makefile
csw/mgar/pkg/nagios/trunk/checksums
Added Paths:
-----------
csw/mgar/pkg/nagios/trunk/files/0001-Removed-gcc-macro.patch
csw/mgar/pkg/nagios/trunk/files/0001-changed-install-and-command-options-in-configure.patch
csw/mgar/pkg/nagios/trunk/files/0003-changed-syntax-of-define-statement.patch
csw/mgar/pkg/nagios/trunk/files/0005-Adjusted-CFLAGS-to-solaris-compiler.patch
csw/mgar/pkg/nagios/trunk/files/0005-changed-object-files-to-executables.patch
csw/mgar/pkg/nagios/trunk/files/0006-path-to-csw-perl.patch
csw/mgar/pkg/nagios/trunk/files/0007-nagios-bug-244.patch
csw/mgar/pkg/nagios/trunk/files/0008-changed-paths-to-match-csw-standards.patch
Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile 2012-02-18 04:29:24 UTC (rev 17079)
+++ csw/mgar/pkg/nagios/trunk/Makefile 2012-02-18 16:38:05 UTC (rev 17080)
@@ -1,5 +1,5 @@
NAME = nagios
-VERSION = 3.2.3
+VERSION = 3.3.1
CATEGORIES = apps
GARTYPE = v2
@@ -9,6 +9,7 @@
endef
MASTER_SITES = $(SF_MIRRORS)
+DISTNAME = nagios
DISTFILES = $(NAME)-$(VERSION).tar.gz
DISTFILES += CSWnagios.preinstall
DISTFILES += CSWnagios.postinstall
@@ -16,24 +17,23 @@
DISTFILES += cswusergroup
DISTFILES += README.CSW
-PATCHFILES = patch.diff # cgi/cmd.c - GNU macro __attribute__ unknown to compiler
- # http://article.gmane.org/gmane.network.nagios.devel/4726
- # (Error 2)
-PATCHFILES += 0002-changed-options-for-ginstall.patch
+PATCHFILES += 0001-Removed-gcc-macro.patch
+PATCHFILES += 0001-changed-install-and-command-options-in-configure.patch
+PATCHFILES += 0003-changed-syntax-of-define-statement.patch
+PATCHFILES += 0005-changed-object-files-to-executables.patch
+PATCHFILES += 0005-Adjusted-CFLAGS-to-solaris-compiler.patch
+PATCHFILES += 0006-path-to-csw-perl.patch
+PATCHFILES += 0007-nagios-bug-244.patch
+PATCHFILES += 0008-changed-paths-to-match-csw-standards.patch
-PACKAGES = CSWnagios
-CATALOGNAME = nagios
-
-PACKAGING_PLATFORMS = solaris9-sparc
-PACKAGING_PLATFORMS += solaris9-i386
-
RUNTIME_DEP_PKGS_CSWnagios = CSWapache2 CSWgd CSWglib2 CSWjpeg CSWlibtoolrt CSWggettextrt
-RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWnagiosp CSWap2modphp5 CSWbdb
-RUNTIME_DEP_PKGS_CSWnagios += CSWcswclassutils
+RUNTIME_DEP_PKGS_CSWnagios += CSWperl CSWnagiosp CSWap2-modphp5
RUNTIME_DEP_PKGS_CSWnagios += CSWlibgd2
RUNTIME_DEP_PKGS_CSWnagios += CSWlibiconv2
RUNTIME_DEP_PKGS_CSWnagios += CSWlibpng12-0
RUNTIME_DEP_PKGS_CSWnagios += CSWlibz1
+RUNTIME_DEP_PKGS_CSWnagios += CSWlibjpeg7
+RUNTIME_DEP_PKGS_CSWnagios += CSWfreetype
LICENSE = LICENSE
@@ -48,12 +48,7 @@
$$$$3 ~ /\/var\/opt\/csw\/nagios\/rw/ { $$$$2 = "cswcptemplates" ; $$$$4 = "2755" ; $$$$5 = "nagios" ; $$$$6 = "nagioscm" } \
{ print }'
-#
-# CSW class action utilities
-#
-SPKG_CLASSES = none cswusergroup ugfiles cswmigrateconf cswcptemplates cswinitsmf cswpostmsg
-
INITSMF = /etc/opt/csw/init.d/cswnagios
USERGROUP = /etc/opt/csw/pkg/CSWnagios/cswusergroup
POSTMSG = /opt/csw/share/doc/nagios/README.CSW
@@ -78,12 +73,17 @@
CONFIGURE_ARGS += --with-checkresult-dir=/var/opt/csw/nagios/spool/checkresults
CONFIGURE_ARGS += --with-lockfile=/var/opt/csw/nagios/nagios.lock
CONFIGURE_ARGS += --localstatedir=/var$(prefix)
-CONFIGURE_ENV += install_user=$(USER) install_group=csw # see PATCHFILES
+CONFIGURE_ENV += install_user=$(USER) install_grp=csw # see PATCHFILES
+CONFIGURE_ENV += PATH=/usr/bin:/usr/ccs/bin:/opt/csw/bin:/opt/csw/bin/
+CONFIGURE_ENV += CC=/opt/SUNWspro/bin/cc
+CONFIGURE_ENV += PERL=/opt/csw/bin/perl
#
# build
#
+BUILD_ENV_PATH = $(bindir):$(PATH)
+
EXTRA_LIB = $(BUILD_PREFIX)/lib
LD_OPTIONS += -R/opt/csw/lib
@@ -93,56 +93,21 @@
# ENABLE_CHECK = 0
-TEST_TARGET = none
+#TEST_TARGET = none
+TEST_SCRIPTS =
#
# install
+# Nagios Makefile calls install-basic by default
#
-#INSTALL_ARGS += install-init
-#INSTALL_ARGS += install-config
INSTALL_ARGS += install-commandmode
#
# override chkpkg
-# (in all html and cfg files the string /usr/local appears, which is uncritical.
-# the string appears in /opt/csw/nagios/bin/nagios and opt/csw/nagios/bin/p1.pl too, where it is a comment)
+# (in all html and cfg files the string /usr/local appears, which is uncritical.)
#
-CHECKPKG_OVERRIDES_CSWnagios += action-class-only-in-pkginfo|ugfiles
-CHECKPKG_OVERRIDES_CSWnagios += action-class-only-in-pkginfo|cswmigrateconf
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/bin/nagios
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/bin/p1.pl
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgisecurity.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-windows.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/volatileservices.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/faststartup.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/freshness.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/macros.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/config.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/upgrading.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-opensuse.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/notifications.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/verifyconfig.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/redundancy.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/perfdata.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configmain.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-printers.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-ubuntu.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/security.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/eventhandlers.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/startstop.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgiincludes.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configcgi.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/distributed.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/int-tcpwrappers.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/cgiauth.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/objectdefinitions.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/monitoring-routers.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/clusters.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/nagiostats.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/quickstart-fedora.html
-CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/nagios/share/docs/configobject.html
CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/nagios.cfg
CHECKPKG_OVERRIDES_CSWnagios += file-with-bad-content|/usr/local|root/opt/csw/etc/templates/CSWnagios/etc/opt/csw/nagios/cgi.cfg
@@ -150,16 +115,16 @@
# yes, we need this dependencies
#
-CHECKPKG_OVERRIDES_CSWnagios += obsolete-dependency|CSWcswclassutils
CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWgd
CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWglib2
CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWnagiosp
CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWlibtoolrt
-CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWap2modphp5
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWap2-modphp5
CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWggettextrt
-CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWbdb
-CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWosslrt
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWlibiconv2
+CHECKPKG_OVERRIDES_CSWnagios += surplus-dependency|CSWjpeg
+
include gar/category.mk
DOCS = Changelog INSTALLING README UPGRADING
@@ -205,21 +170,6 @@
@ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/printer.cfg
@ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(TEMPLATEDIR)/objects/switch.cfg
@#
- @#ginstall -m 775 -d $(DESTDIR)$(TEMPLATEDIR)
- @#ginstall -m 775 -d $(DESTDIR)$(TEMPLATEDIR)/objects
- @#ginstall -b -m 664 $(WORKSRC)/sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg.CSW
- @#ginstall -b -m 664 $(WORKSRC)/sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg.CSW
- @#ginstall -b -m 660 $(WORKSRC)/sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg.CSW
- @#ginstall -b -m 644 $(WORKSRC)/sample-config/httpd.conf $(DESTDIR)$(CFGDIR)/httpd-nagios.conf.CSW
- @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg.CSW
- @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg.CSW
- @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg.CSW
- @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.CSW
- @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg.CSW
- @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg.CSW
- @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg.CSW
- @#ginstall -b -m 664 $(WORKSRC)/sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg.CSW
- @#
@# create user and group -> cswusergroup
@#
@ginstall -m 755 -d $(DESTDIR)/etc/opt/csw/pkg/CSWnagios
Modified: csw/mgar/pkg/nagios/trunk/checksums
===================================================================
--- csw/mgar/pkg/nagios/trunk/checksums 2012-02-18 04:29:24 UTC (rev 17079)
+++ csw/mgar/pkg/nagios/trunk/checksums 2012-02-18 16:38:05 UTC (rev 17080)
@@ -1 +1 @@
-fe1be46e6976a52acdb021a782b5d04b nagios-3.2.3.tar.gz
+d03a52e1f24ee582cf05fde4d15ff30b nagios-3.3.1.tar.gz
Added: csw/mgar/pkg/nagios/trunk/files/0001-Removed-gcc-macro.patch
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/0001-Removed-gcc-macro.patch (rev 0)
+++ csw/mgar/pkg/nagios/trunk/files/0001-Removed-gcc-macro.patch 2012-02-18 16:38:05 UTC (rev 17080)
@@ -0,0 +1,25 @@
+From 3546f5148c875d715698f904f50f65b348afb15e Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sat, 11 Feb 2012 18:45:15 +0100
+Subject: [PATCH] Removed gcc macro
+
+---
+ cgi/cmd.c | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/cgi/cmd.c b/cgi/cmd.c
+index 2adc06d..6671af5 100755
+--- a/cgi/cmd.c
++++ b/cgi/cmd.c
+@@ -1891,7 +1891,7 @@ void commit_command_data(int cmd) {
+ return;
+ }
+
+-__attribute__((format(printf, 2, 3)))
++/* __attribute__((format(printf, 2, 3))) */
+ static int cmd_submitf(int id, const char *fmt, ...) {
+ char cmd[MAX_EXTERNAL_COMMAND_LENGTH];
+ const char *command;
+--
+1.7.8.3
+
Added: csw/mgar/pkg/nagios/trunk/files/0001-changed-install-and-command-options-in-configure.patch
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/0001-changed-install-and-command-options-in-configure.patch (rev 0)
+++ csw/mgar/pkg/nagios/trunk/files/0001-changed-install-and-command-options-in-configure.patch 2012-02-18 16:38:05 UTC (rev 17080)
@@ -0,0 +1,34 @@
+From cb2ee195ba14e16060115e90d41d8744cff31b29 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sat, 11 Feb 2012 19:11:07 +0100
+Subject: [PATCH] changed install and command options in configure
+
+---
+ configure | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/configure b/configure
+index bb7b3bf..bf774a8 100755
+--- a/configure
++++ b/configure
+@@ -5664,7 +5664,7 @@ cat >>confdefs.h <<_ACEOF
+ #define DEFAULT_NAGIOS_GROUP "$nagios_grp"
+ _ACEOF
+
+-INSTALL_OPTS="-o $nagios_user -g $nagios_grp"
++INSTALL_OPTS="-o $install_user -g $install_grp"
+
+
+
+@@ -5685,7 +5685,7 @@ else
+ fi;
+
+
+-COMMAND_OPTS="-o $command_user -g $command_grp"
++COMMAND_OPTS="-o $install_user -g $install_grp"
+
+
+ MAIL_PROG=no
+--
+1.7.8.3
+
Added: csw/mgar/pkg/nagios/trunk/files/0003-changed-syntax-of-define-statement.patch
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/0003-changed-syntax-of-define-statement.patch (rev 0)
+++ csw/mgar/pkg/nagios/trunk/files/0003-changed-syntax-of-define-statement.patch 2012-02-18 16:38:05 UTC (rev 17080)
@@ -0,0 +1,25 @@
+From 3eac415f8cf5068c253b909e2bce23daf8df7af4 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sat, 11 Feb 2012 18:48:33 +0100
+Subject: [PATCH 3/3] changed syntax of define statement
+
+---
+ include/nebmodules.h | 2 +-
+ 1 files changed, 1 insertions(+), 1 deletions(-)
+
+diff --git a/include/nebmodules.h b/include/nebmodules.h
+index a3992f4..17c456b 100755
+--- a/include/nebmodules.h
++++ b/include/nebmodules.h
+@@ -31,7 +31,7 @@ extern "C" {
+
+ /***** MODULE VERSION INFORMATION *****/
+
+-#define NEB_API_VERSION(x) int __neb_api_version = x;
++#define NEB_API_VERSION(x) int __neb_api_version = x
+ #define CURRENT_NEB_API_VERSION 3
+
+
+--
+1.7.8.3
+
Added: csw/mgar/pkg/nagios/trunk/files/0005-Adjusted-CFLAGS-to-solaris-compiler.patch
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/0005-Adjusted-CFLAGS-to-solaris-compiler.patch (rev 0)
+++ csw/mgar/pkg/nagios/trunk/files/0005-Adjusted-CFLAGS-to-solaris-compiler.patch 2012-02-18 16:38:05 UTC (rev 17080)
@@ -0,0 +1,39 @@
+From 928321930443886384a517e4ed976cc38bac1f6e Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sat, 11 Feb 2012 22:13:43 +0100
+Subject: [PATCH] Adjusted CFLAGS to solaris compiler
+
+---
+ base/Makefile.in | 2 +-
+ cgi/Makefile.in | 2 +-
+ 2 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/base/Makefile.in b/base/Makefile.in
+index 868e1d1..e82524a 100755
+--- a/base/Makefile.in
++++ b/base/Makefile.in
+@@ -11,7 +11,7 @@ SRC_INCLUDE=../include
+ SRC_XDATA=../xdata
+
+ CC=@CC@
+-CFLAGS=-Wall @CFLAGS@ @DEFS@ -DNSCORE
++CFLAGS=@CFLAGS@ @DEFS@ -DNSCORE
+
+ # Compiler flags for use with gprof
+ #CFLAGS=-pg -DHAVE_CONFIG_H -DNSCORE
+diff --git a/cgi/Makefile.in b/cgi/Makefile.in
+index e45b126..59ac0a8 100755
+--- a/cgi/Makefile.in
++++ b/cgi/Makefile.in
+@@ -26,7 +26,7 @@ CGIEXTRAS=@CGIEXTRAS@
+
+ CP=@CP@
+ CC=@CC@
+-CFLAGS=-Wall @CFLAGS@ @DEFS@ -DNSCGI
++CFLAGS=@CFLAGS@ @DEFS@ -DNSCGI
+
+ # Compiler flags for optimization (overrides default)
+ #CFLAGS=-O3 -Wall -Wshadow -Wpointer-arith -Wcast-qual -Wcast-align -Wstrict-prototypes -Wmissing-prototypes -Wnested-externs -DHAVE_CONFIG_H -DNSCGI
+--
+1.7.8.3
+
Added: csw/mgar/pkg/nagios/trunk/files/0005-changed-object-files-to-executables.patch
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/0005-changed-object-files-to-executables.patch (rev 0)
+++ csw/mgar/pkg/nagios/trunk/files/0005-changed-object-files-to-executables.patch 2012-02-18 16:38:05 UTC (rev 17080)
@@ -0,0 +1,34 @@
+From ff6ff7c6d8ad5a08cbf13c722f5d058e99663ebb Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sat, 11 Feb 2012 18:53:35 +0100
+Subject: [PATCH 5/5] changed object files to executables
+
+---
+ module/Makefile.in | 8 ++++----
+ 1 files changed, 4 insertions(+), 4 deletions(-)
+
+diff --git a/module/Makefile.in b/module/Makefile.in
+index a0eb7c5..2184405 100755
+--- a/module/Makefile.in
++++ b/module/Makefile.in
+@@ -25,13 +25,13 @@ STRIP=@STRIP@
+
+ CP=@CP@
+
+-all: helloworld.o
++all: helloworld
+
+-helloworld.o: helloworld.c
+- $(CC) $(MOD_CFLAGS) $(CFLAGS) -o helloworld.o helloworld.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS)
++helloworld: helloworld.c
++ $(CC) $(MOD_CFLAGS) $(CFLAGS) -o helloworld helloworld.c $(MOD_LDFLAGS) $(LDFLAGS) $(LIBS)
+
+ clean:
+- rm -f helloworld.o
++ rm -f helloworld
+ rm -f core *.o
+ rm -f *~ *.*~
+
+--
+1.7.8.3
+
Added: csw/mgar/pkg/nagios/trunk/files/0006-path-to-csw-perl.patch
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/0006-path-to-csw-perl.patch (rev 0)
+++ csw/mgar/pkg/nagios/trunk/files/0006-path-to-csw-perl.patch 2012-02-18 16:38:05 UTC (rev 17080)
@@ -0,0 +1,91 @@
+From 6702010ea490949aeeeec4ce83cf775319092adc Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Tue, 14 Feb 2012 20:46:54 +0100
+Subject: [PATCH] path to csw perl
+
+---
+ configure | 44 ++++++++++++++++++++++----------------------
+ 1 files changed, 22 insertions(+), 22 deletions(-)
+
+diff --git a/configure b/configure
+index bf774a8..20c39a4 100755
+--- a/configure
++++ b/configure
+@@ -7184,15 +7184,15 @@ cat >>confdefs.h <<_ACEOF
+ #define EMBEDDEDPERL
+ _ACEOF
+
+- PERLLIBS="`perl -MExtUtils::Embed -e ldopts`"
+- PERLDIR="`perl -MConfig -e 'print $Config{installsitearch}'`"
+- CFLAGS="${CFLAGS} `perl -MExtUtils::Embed -e ccopts`"
++ PERLLIBS="`/opt/csw/bin/perl -MExtUtils::Embed -e ldopts`"
++ PERLDIR="`/opt/csw/bin/perl -MConfig -e 'print $Config{installsitearch}'`"
++ CFLAGS="${CFLAGS} `/opt/csw/bin/perl -MExtUtils::Embed -e ccopts`"
+ USEPERL=yes
+ INSTALLPERLSTUFF=yes;
+ PERLXSI_O=perlxsi.o
+ OBJS="${OBJS} ${PERLXSI_O}"
+ echo "creating base/perlxsi.c"
+- perl -MExtUtils::Embed -e xsinit -- -o base/perlxsi.c
++ /opt/csw/bin/perl -MExtUtils::Embed -e xsinit -- -o base/perlxsi.c
+
+ echo "Embedded Perl interpreter will be compiled in..."
+
+@@ -7215,7 +7215,7 @@ _ACEOF
+ fi
+
+ if test x$USEPERL = xyes; then
+- if (perl -e 'use Config;exit -1 unless ($Config{'usethreads'});'); then
++ if (/opt/csw/bin/perl -e 'use Config;exit -1 unless ($Config{'usethreads'});'); then
+ echo "Using threaded perl"
+
+ cat >>confdefs.h <<_ACEOF
+@@ -8761,28 +8761,28 @@ fi
+
+
+
+-perl subst include/locations.h
+-perl subst html/config.inc.php
++/opt/csw/bin/perl subst include/locations.h
++/opt/csw/bin/perl subst html/config.inc.php
+
+
+ echo ""
+ echo "Creating sample config files in sample-config/ ..."
+
+-perl subst sample-config/nagios.cfg
+-perl subst sample-config/cgi.cfg
+-perl subst sample-config/resource.cfg
+-perl subst sample-config/httpd.conf
+-perl subst sample-config/mrtg.cfg
+-
+-perl subst sample-config/template-object/templates.cfg
+-perl subst sample-config/template-object/commands.cfg
+-perl subst sample-config/template-object/timeperiods.cfg
+-perl subst sample-config/template-object/contacts.cfg
+-
+-perl subst sample-config/template-object/localhost.cfg
+-perl subst sample-config/template-object/windows.cfg
+-perl subst sample-config/template-object/printer.cfg
+-perl subst sample-config/template-object/switch.cfg
++/opt/csw/bin/perl subst sample-config/nagios.cfg
++/opt/csw/bin/perl subst sample-config/cgi.cfg
++/opt/csw/bin/perl subst sample-config/resource.cfg
++/opt/csw/bin/perl subst sample-config/httpd.conf
++/opt/csw/bin/perl subst sample-config/mrtg.cfg
++
++/opt/csw/bin/perl subst sample-config/template-object/templates.cfg
++/opt/csw/bin/perl subst sample-config/template-object/commands.cfg
++/opt/csw/bin/perl subst sample-config/template-object/timeperiods.cfg
++/opt/csw/bin/perl subst sample-config/template-object/contacts.cfg
++
++/opt/csw/bin/perl subst sample-config/template-object/localhost.cfg
++/opt/csw/bin/perl subst sample-config/template-object/windows.cfg
++/opt/csw/bin/perl subst sample-config/template-object/printer.cfg
++/opt/csw/bin/perl subst sample-config/template-object/switch.cfg
+
+
+
+--
+1.7.9
+
Added: csw/mgar/pkg/nagios/trunk/files/0007-nagios-bug-244.patch
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/0007-nagios-bug-244.patch (rev 0)
+++ csw/mgar/pkg/nagios/trunk/files/0007-nagios-bug-244.patch 2012-02-18 16:38:05 UTC (rev 17080)
@@ -0,0 +1,28 @@
+From 8099eab91753c9a721edc68da1f72c42f89ca83e Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Fri, 17 Feb 2012 20:52:05 +0100
+Subject: [PATCH] nagios bug 244
+
+---
+ html/Makefile.in | 4 ++--
+ 1 files changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/html/Makefile.in b/html/Makefile.in
+index c89d72f..4c9c019 100755
+--- a/html/Makefile.in
++++ b/html/Makefile.in
+@@ -75,9 +75,9 @@ install:
+ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+ for file in includes/*.*; \
+ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
+- for file in includes/rss/*; \
++ for file in includes/rss/*.*; \
+ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
+- for file in includes/rss/extlib/*; \
++ for file in includes/rss/extlib/*.*; \
+ do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
+
+ install-unstripped:
+--
+1.7.9
+
Added: csw/mgar/pkg/nagios/trunk/files/0008-changed-paths-to-match-csw-standards.patch
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/0008-changed-paths-to-match-csw-standards.patch (rev 0)
+++ csw/mgar/pkg/nagios/trunk/files/0008-changed-paths-to-match-csw-standards.patch 2012-02-18 16:38:05 UTC (rev 17080)
@@ -0,0 +1,132 @@
+From 7ec21d10956ef667f76c3d1008c4215082ebe094 Mon Sep 17 00:00:00 2001
+From: Juergen Arndt <ja at opencsw.org>
+Date: Sat, 18 Feb 2012 13:56:45 +0100
+Subject: [PATCH] changed paths to match csw standards
+
+---
+ base/nagios.c | 2 +-
+ p1.pl | 56 ++++++++++++++++++++++++++++----------------------------
+ 2 files changed, 29 insertions(+), 29 deletions(-)
+
+diff --git a/base/nagios.c b/base/nagios.c
+index 1f0b17a..db0a164 100755
+--- a/base/nagios.c
++++ b/base/nagios.c
+@@ -510,7 +510,7 @@ int main(int argc, char **argv, char **env) {
+ printf("\n");
+ printf(" Make sure you are specifying the name of the MAIN configuration file on\n");
+ printf(" the command line and not the name of another configuration file. The\n");
+- printf(" main configuration file is typically '/usr/local/nagios/etc/nagios.cfg'\n");
++ printf(" main configuration file is typically '/etc/opt/csw/nagios/nagios.cfg'\n");
+ }
+
+ printf("\n***> One or more problems was encountered while processing the config files...\n");
+diff --git a/p1.pl b/p1.pl
+index 0e95291..4e48cb1 100755
+--- a/p1.pl
++++ b/p1.pl
+@@ -16,7 +16,7 @@ use constant DEBUG_LEVEL => 0 ;
+ # use constant DEBUG_LEVEL => LEAVE_MSG | CACHE_DUMP ;
+ # use constant DEBUG_LEVEL => LEAVE_MSG | CACHE_DUMP | PLUGIN_DUMP ;
+
+-use constant DEBUG_LOG_PATH => '/usr/local/nagios/var/' ;
++use constant DEBUG_LOG_PATH => '/var/opt/csw/nagios' ;
+ # use constant DEBUG_LOG_PATH => './' ;
+ use constant LEAVE_MSG_STREAM => DEBUG_LOG_PATH . 'epn_leave-msgs.log' ;
+ use constant CACHE_DUMP_STREAM => DEBUG_LOG_PATH . 'epn_cache-dump.log' ;
+@@ -425,49 +425,49 @@ B<2> logs messages describing the success or otherwise of the plugin compilation
+
+ An example of such messages are
+
+- Fri Apr 22 11:54:21 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_bass ".
+- Fri Apr 22 11:54:21 2005 run_package: "/usr/local/nagios/libexec/check_bass " returning ("0", "BASS Transaction completed Ok.
++ Fri Apr 22 11:54:21 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_bass ".
++ Fri Apr 22 11:54:21 2005 run_package: "/opt/csw/nagios/libexec/check_bass " returning ("0", "BASS Transaction completed Ok.
+ ").
+- Fri Apr 22 11:55:02 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_ad -D production.prod -S".
+- Fri Apr 22 11:55:02 2005 run_package: "/usr/local/nagios/libexec/check_ad -D foo.dom -S" returning ("0", "Ok. Expected 2 domain controllers [foo1 foo2] for "foo.dom.prod" domain from "1.1.2.3" DNS, found 8 [foo1 foo2 ..]
++ Fri Apr 22 11:55:02 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_ad -D production.prod -S".
++ Fri Apr 22 11:55:02 2005 run_package: "/opt/csw/nagios/libexec/check_ad -D foo.dom -S" returning ("0", "Ok. Expected 2 domain controllers [foo1 foo2] for "foo.dom.prod" domain from "1.1.2.3" DNS, found 8 [foo1 foo2 ..]
+ ").
+- Fri Apr 22 11:55:19 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_ldap adonis".
+- Fri Apr 22 11:55:19 2005 run_package: "/usr/local/nagios/libexec/check_ldap adonis" returning ("0", "Ok. Schema query response DN: dc=ipaustralia,dc=gov,dc=au aci: (target="ldap:///dc=ipaustralia,dc=gov,dc=au")(targetattr!="userPassword")(targetfi
++ Fri Apr 22 11:55:19 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_ldap adonis".
++ Fri Apr 22 11:55:19 2005 run_package: "/opt/csw/nagios/libexec/check_ldap adonis" returning ("0", "Ok. Schema query response DN: dc=ipaustralia,dc=gov,dc=au aci: (target="ldap:///dc=ipaustralia,dc=gov,dc=au")(targetattr!="userPassword")(targetfi
+ ").
+- Fri Apr 22 11:55:29 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_scheduler -H aphrodite -p 7003".
+- Fri Apr 22 11:55:30 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_pams -H aphrodite -p 7003 -R".
+- Fri Apr 22 11:55:29 2005 run_package: "/usr/local/nagios/libexec/check_scheduler -H aphrodite -p 7003" returning ("0", "Ok. COMSQ last ran 31 seconds ago. System: 0.02s Number of jobs waiting 0 "Detail" system sch_V2_6 14/01/2005 12:22:53 aimali Jobs: COMSQ/PollerManager Fri Apr 22 11:55:00, adhoc pause Fri Apr 22 09:00:00, PAMS/SchedExamDocCheck Thu Apr 21 23:00:00, CFX Cl"
++ Fri Apr 22 11:55:29 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_scheduler -H aphrodite -p 7003".
++ Fri Apr 22 11:55:30 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_pams -H aphrodite -p 7003 -R".
++ Fri Apr 22 11:55:29 2005 run_package: "/opt/csw/nagios/libexec/check_scheduler -H aphrodite -p 7003" returning ("0", "Ok. COMSQ last ran 31 seconds ago. System: 0.02s Number of jobs waiting 0 "Detail" system sch_V2_6 14/01/2005 12:22:53 aimali Jobs: COMSQ/PollerManager Fri Apr 22 11:55:00, adhoc pause Fri Apr 22 09:00:00, PAMS/SchedExamDocCheck Thu Apr 21 23:00:00, CFX Cl"
+ ).
+- Fri Apr 22 11:55:30 2005 run_package: "/usr/local/nagios/libexec/check_pams -H aphrodite -p 7003 -R" returning ("0", "OK PAMS Worst: Test Time 2.61 Failure Ratio 0 [0:5] Statii: BASE OK Oracle (direct) OK COMS Processor OK CCS Name Search (direct) OK Correspondence Manager OK PAMS Tier OK CASEWORK OK Objective (direct) OK Customer Manager OK
++ Fri Apr 22 11:55:30 2005 run_package: "/opt/csw/nagios/libexec/check_pams -H aphrodite -p 7003 -R" returning ("0", "OK PAMS Worst: Test Time 2.61 Failure Ratio 0 [0:5] Statii: BASE OK Oracle (direct) OK COMS Processor OK CCS Name Search (direct) OK Correspondence Manager OK PAMS Tier OK CASEWORK OK Objective (direct) OK Customer Manager OK
+ ").
+- Fri Apr 22 11:55:45 2005 eval_file: successfully compiled "/usr/local/nagios/libexec/check_coms ".
+- Fri Apr 22 11:55:45 2005 run_package: "/usr/local/nagios/libexec/check_coms " returning ("0", "COMS Ok. 11 successes 20 minutes ago. 55 minute deltas: (0 0 0 11 0 1 3 4 0 6) or <a href='http://tsitc/cgi-bin/coms_graph_deltas?INT=-2h'>graph</a>
++ Fri Apr 22 11:55:45 2005 eval_file: successfully compiled "/opt/csw/nagios/libexec/check_coms ".
++ Fri Apr 22 11:55:45 2005 run_package: "/opt/csw/nagios/libexec/check_coms " returning ("0", "COMS Ok. 11 successes 20 minutes ago. 55 minute deltas: (0 0 0 11 0 1 3 4 0 6) or <a href='http://tsitc/cgi-bin/coms_graph_deltas?INT=-2h'>graph</a>
+ )
+
+ .. after all the plugins are compiled, the 'successfully compiled mesages' are replaced by 'skipping compilation'
+
+- Fri Apr 22 12:05:10 2005 eval_file: /usr/local/nagios/libexec/check_adds already successfully compiled and file has not changed; skipping compilation.
+- Fri Apr 22 12:05:11 2005 eval_file: /usr/local/nagios/libexec/check_aub already successfully compiled and file has not changed; skipping compilation
++ Fri Apr 22 12:05:10 2005 eval_file: /opt/csw/nagios/libexec/check_adds already successfully compiled and file has not changed; skipping compilation.
++ Fri Apr 22 12:05:11 2005 eval_file: /opt/csw/nagios/libexec/check_aub already successfully compiled and file has not changed; skipping compilation
+ .
+- Fri Apr 22 12:05:10 2005 run_package: "/usr/local/nagios/libexec/check_adds " returning ("0", "ADDS Transaction completed Ok.
++ Fri Apr 22 12:05:10 2005 run_package: "/opt/csw/nagios/libexec/check_adds " returning ("0", "ADDS Transaction completed Ok.
+ ").
+- Fri Apr 22 12:05:13 2005 eval_file: /usr/local/nagios/libexec/check_eForm already successfully compiled and file has not changed; skipping compilation.
+- Fri Apr 22 12:05:13 2005 run_package: "/usr/local/nagios/libexec/check_eForm " returning ("0", "eForm Transaction completed Ok.
++ Fri Apr 22 12:05:13 2005 eval_file: /opt/csw/nagios/libexec/check_eForm already successfully compiled and file has not changed; skipping compilation.
++ Fri Apr 22 12:05:13 2005 run_package: "/opt/csw/nagios/libexec/check_eForm " returning ("0", "eForm Transaction completed Ok.
+ ").
+- Fri Apr 22 12:05:15 2005 eval_file: /usr/local/nagios/libexec/check_cfx_log already successfully compiled and file has not changed; skipping compilation.
+- Fri Apr 22 12:05:15 2005 run_package: "/usr/local/nagios/libexec/check_cfx_log -H faxgw1" returning ("0", "Ok. Last write of "//faxgw1/Faxloader$/cfxFaxLoaderClient.log" 0.0 minutes ago. File info (create, access, modify, write times): "Wed Mar 26 17:19:42 2003 Fri Apr 22 12:05:13 2005 Fri Apr 22 12:05:13 2005 Fri Apr 22 12:05:13 2005".
++ Fri Apr 22 12:05:15 2005 eval_file: /opt/csw/nagios/libexec/check_cfx_log already successfully compiled and file has not changed; skipping compilation.
++ Fri Apr 22 12:05:15 2005 run_package: "/opt/csw/nagios/libexec/check_cfx_log -H faxgw1" returning ("0", "Ok. Last write of "//faxgw1/Faxloader$/cfxFaxLoaderClient.log" 0.0 minutes ago. File info (create, access, modify, write times): "Wed Mar 26 17:19:42 2003 Fri Apr 22 12:05:13 2005 Fri Apr 22 12:05:13 2005 Fri Apr 22 12:05:13 2005".
+ ").
+- Fri Apr 22 12:05:16 2005 eval_file: /usr/local/nagios/libexec/check_cfx_log already successfully compiled and file has not changed; skipping compilation.
+- Fri Apr 22 12:05:16 2005 run_package: "/usr/local/nagios/libexec/check_cfx_log -H faxgw2" returning ("0", "Ok. Last write of "//faxgw2/Faxloader$/cfxFaxLoaderClient.log" 0.3 minutes ago. File info (create, access, modify, write times): "Wed Mar 26 17:27:24 2003 Fri Apr 22 12:04:55 2005 Fri Apr 22 12:04:55 2005 Fri Apr 22 12:04:55 2005".
++ Fri Apr 22 12:05:16 2005 eval_file: /opt/csw/nagios/libexec/check_cfx_log already successfully compiled and file has not changed; skipping compilation.
++ Fri Apr 22 12:05:16 2005 run_package: "/opt/csw/nagios/libexec/check_cfx_log -H faxgw2" returning ("0", "Ok. Last write of "//faxgw2/Faxloader$/cfxFaxLoaderClient.log" 0.3 minutes ago. File info (create, access, modify, write times): "Wed Mar 26 17:27:24 2003 Fri Apr 22 12:04:55 2005 Fri Apr 22 12:04:55 2005 Fri Apr 22 12:04:55 2005".
+ ").
+- Fri Apr 22 12:05:17 2005 eval_file: /usr/local/nagios/libexec/check_apps_asearch already successfully compiled and file has not changed; skipping compilation.
+- Fri Apr 22 12:05:18 2005 eval_file: /usr/local/nagios/libexec/check_aurioness already successfully compiled and file has not changed; skipping compi lation.
+- Fri Apr 22 12:05:11 2005 run_package: "/usr/local/nagios/libexec/check_aub " returning ("0", "AU-B Transaction completed Ok.
++ Fri Apr 22 12:05:17 2005 eval_file: /opt/csw/nagios/libexec/check_apps_asearch already successfully compiled and file has not changed; skipping compilation.
++ Fri Apr 22 12:05:18 2005 eval_file: /opt/csw/nagios/libexec/check_aurioness already successfully compiled and file has not changed; skipping compi lation.
++ Fri Apr 22 12:05:11 2005 run_package: "/opt/csw/nagios/libexec/check_aub " returning ("0", "AU-B Transaction completed Ok.
+ ").
+
+ If you are lucky enough to have plugins with errors in them,
+
+- Fri Apr 22 12:16:01 2005 run_package: "//usr/local/nagios/libexec/eventhandlers/restart_coldfusion OK SOFT" returning ("3", "**ePN "//usr/local/nagios/libexec/eventhandlers/restart_coldfusion": "Can't use string ("") as a subroutine ref while "strict refs" in use at /usr/local/nagios/bin/p1.pl line 291, <DATA> line 218".
++ Fri Apr 22 12:16:01 2005 run_package: "//opt/csw/nagios/libexec/eventhandlers/restart_coldfusion OK SOFT" returning ("3", "**ePN "//opt/csw/nagios/libexec/eventhandlers/restart_coldfusion": "Can't use string ("") as a subroutine ref while "strict refs" in use at /opt/csw/nagios/bin/p1.pl line 291, <DATA> line 218".
+
+
+ B<PLUGIN_DUMP>
+@@ -522,7 +522,7 @@ arguments (if non null), the last compilation error, and a code ref to the Perl
+
+ Sat Apr 23 19:24:59 2005 eval_file: after 5 compilations %Cache =>
+ %Cache = (
+- '/usr/local/nagios/libexec/check_adds' => [
++ '/opt/csw/nagios/libexec/check_adds' => [
+ '100.230810185185',
+ undef,
+ '',
+@@ -540,7 +540,7 @@ arguments (if non null), the last compilation error, and a code ref to the Perl
+ '',
+ sub { "DUMMY" }
+ ],
+- '/usr/local/nagios/libexec/check_pams' => [
++ '/opt/csw/nagios/libexec/check_pams' => [
+ '1.90859953703704',
+ {
+ '-R -I -H asterix -p 7003' => [
+--
+1.7.9
+
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