Revision: 9517
http://gar.svn.sourceforge.net/gar/?rev=9517&view=rev
Author: j_arndt
Date: 2010-04-02 14:21:25 +0000 (Fri, 02 Apr 2010)
Log Message:
-----------
nagios: update to version 3.2.1
Modified Paths:
--------------
csw/mgar/pkg/nagios/trunk/Makefile
csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall
csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype
Added Paths:
-----------
csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall
Modified: csw/mgar/pkg/nagios/trunk/Makefile
===================================================================
--- csw/mgar/pkg/nagios/trunk/Makefile 2010-04-02 08:21:43 UTC (rev 9516)
+++ csw/mgar/pkg/nagios/trunk/Makefile 2010-04-02 14:21:25 UTC (rev 9517)
@@ -1,5 +1,5 @@
GARNAME = nagios
-GARVERSION = 3.2.0
+GARVERSION = 3.2.1
CATEGORIES = apps
DESCRIPTION = nagios network monitoring base package (no plugins)
@@ -9,20 +9,21 @@
MASTER_SITES = $(SF_MIRRORS)
DISTFILES = $(GARNAME)-$(GARVERSION).tar.gz
-#DISTFILES += $(call admfiles,CSWnagios,checkinstall preinstall preremove
prototype )
-DISTFILES += CSWnagios.checkinstall CSWnagios.preinstall CSWnagios.preremove
CSWnagios.prototype
+DISTFILES += CSWnagios.checkinstall CSWnagios.preinstall CSWnagios.preremove
CSWnagios.prototype CSWnagios.postinstall
DISTFILES += cswnagios
PATCHFILES = patch.diff # cgi/cmd.c - GNU macro __attribute__ unknown
to compiler
#
http://article.gmane.org/gmane.network.nagios.devel/4726
# (Error 2)
-PATCHFILES += configure.diff # configure
PATCHFILES += install-opts.diff # sets in every Makefile.in
"INSTALL_OPT="" (empty)
# necessary, so ginstall doesn't get -o and -g
options
PACKAGES = CSWnagios
CATALOGNAME = nagios
+PACKAGING_PLATFORMS = solaris9-sparc
+PACKAGING_PLATFORMS += solaris9-i386
+
RUNTIME_DEP_PKGS_CSWnagios = CSWapache2 CSWgd CSWglib2 CSWiconv CSWjpeg
CSWlibtoolrt CSWggettextrt
RUNTIME_DEP_PKGS_CSWnagios += CSWosslrt CSWperl CSWpng CSWzlib CSWnagiosp
CSWap2modphp5 CSWcswclassutils
@@ -48,7 +49,6 @@
CONFIGURE_ARGS += --localstatedir=/var$(prefix)
EXTRA_LIB = $(BUILD_PREFIX)/lib
-EXTRA_INC = $(BUILD_PREFIX)/include
BUILD_ARGS = all
Added: csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall
(rev 0)
+++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.postinstall 2010-04-02
14:21:25 UTC (rev 9517)
@@ -0,0 +1,28 @@
+#
+# just print out the warning because of the new config directory
+#
+
+cat << EOF
+
+=======================================================================
+
+From Nagios 3.2.1 on the configuration and log files for this package
+are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/.
+
+The standard config files will be moved automatically to the new
+location. Files made by your own will remain in /opt/csw/nagios/etc/
+and have to be moved manually by you.
+
+Don't forget to change the pathes in your config files. Verify the
+new config with the following command:
+
+ /opt/csw/nagios/bin/nagios -v /etc/opt/csw/nagios/nagios.cfg
+
+You can find additional information at:
+
+ http://wiki.opencsw.org/nagios
+
+=======================================================================
+EOF
+
+
Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2010-04-02
08:21:43 UTC (rev 9516)
+++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.preinstall 2010-04-02
14:21:25 UTC (rev 9517)
@@ -11,17 +11,23 @@
=======================================================================
-From Nagios 3.2.0 on the configuration and log files for the OpenCSW
-package are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/.
+From Nagios 3.2.1 on the configuration and log files for this package
+are stored in /etc/opt/csw/nagios/ and /var/opt/csw/nagios/.
-Changes you made to your existing config will automatically
-moved to the new location.
+The standard config files will be moved automatically to the new
+location. Files made by your own will remain in /opt/csw/nagios/etc/
+and have to be moved manually by you.
+Don't forget to change the pathes in your config files. Verify the
+new config with the following command:
-Please be aware, that it's very likely that you have to change your
-nagios.cfg to that changes.
+ /opt/csw/nagios/bin/nagios -v /etc/opt/csw/nagios/nagios.cfg
- Installation will proceed in 30 seconds.
+You can find additional information at:
+
+ http://wiki.opencsw.org/nagios
+
+ The installation will proceed in 30 seconds.
Press CTRL+C if you want to stop now.
=======================================================================
Modified: csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype
===================================================================
--- csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2010-04-02 08:21:43 UTC
(rev 9516)
+++ csw/mgar/pkg/nagios/trunk/files/CSWnagios.prototype 2010-04-02 14:21:25 UTC
(rev 9517)
@@ -1,10 +1,7 @@
-d none /opt/csw/libexec 0755 root bin
-d none /opt/csw/libexec/nagios-plugins 0755 nagios nagios
-d none /opt/csw/nagios 0755 root bin
-d none /opt/csw/nagios/bin 0755 nagios nagios
-f none /opt/csw/nagios/bin/nagios 0754 nagios nagios
-f none /opt/csw/nagios/bin/nagiostats 0754 nagios nagios
-f none /opt/csw/nagios/bin/p1.pl 0754 nagios nagios
+d none /etc/init.d 0755 nagios nagios
+f none /etc/init.d/nagios 0755 nagios nagios
+d none /etc/opt/csw/init.d 0755 nagios nagios
+f cswinitsmf /etc/opt/csw/init.d/cswnagios 0755 root bin
d none /etc/opt/csw/nagios 0755 nagios nagios
f cswpreserveconf /etc/opt/csw/nagios/cgi.cfg.CSW 0644 nagios nagios
f none /etc/opt/csw/nagios/httpd-nagios.conf 0644 nagios nagios
@@ -19,6 +16,13 @@
f cswpreserveconf /etc/opt/csw/nagios/objects/timeperiods.cfg.CSW 0644 nagios
nagios
f cswpreserveconf /etc/opt/csw/nagios/objects/windows.cfg.CSW 0644 nagios
nagios
f cswpreserveconf /etc/opt/csw/nagios/resource.cfg.CSW 0640 nagios nagios
+d none /opt/csw/libexec 0755 root bin
+d none /opt/csw/libexec/nagios-plugins 0755 root bin
+d none /opt/csw/nagios 0755 nagios nagios
+d none /opt/csw/nagios/bin 0755 nagios nagios
+f none /opt/csw/nagios/bin/nagios 0754 nagios nagios
+f none /opt/csw/nagios/bin/nagiostats 0754 nagios nagios
+f none /opt/csw/nagios/bin/p1.pl 0644 nagios nagios
d none /opt/csw/nagios/sbin 0755 nagios nagios
f none /opt/csw/nagios/sbin/avail.cgi 0755 nagios nagios
f none /opt/csw/nagios/sbin/cmd.cgi 0755 nagios nagios
@@ -384,15 +388,14 @@
f none /opt/csw/nagios/share/stylesheets/summary.css 0644 nagios nagios
f none /opt/csw/nagios/share/stylesheets/tac.css 0644 nagios nagios
f none /opt/csw/nagios/share/stylesheets/trends.css 0644 nagios nagios
-d none /var/opt/csw/nagios 0755 nagios nagios
-d none /var/opt/csw/nagios/archives 0755 nagios nagios
-d none /var/opt/csw/nagios/rw 0755 nagios nagios
-d none /var/opt/csw/nagios/spool 0755 nagios nagios
-d none /var/opt/csw/nagios/spool/checkresults 0755 nagios nagios
d none /opt/csw/share/doc/nagios 0755 root bin
f none /opt/csw/share/doc/nagios/Changelog 0644 root bin
f none /opt/csw/share/doc/nagios/INSTALLING 0644 root bin
f none /opt/csw/share/doc/nagios/LICENSE 0644 root bin
f none /opt/csw/share/doc/nagios/README 0644 root bin
f none /opt/csw/share/doc/nagios/UPGRADING 0644 root bin
-f cswinitsmf /etc/opt/csw/init.d/cswnagios 0755 root bin
+d none /var/opt/csw/nagios 0755 nagios nagios
+d none /var/opt/csw/nagios/archives 0755 nagios nagios
+d none /var/opt/csw/nagios/rw 0755 nagios nagios
+d none /var/opt/csw/nagios/spool 0755 nagios nagios
+d none /var/opt/csw/nagios/spool/checkresults 0755 nagios nagios
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
