pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/nagios-base Upgrade nagios to 2.12. Changes are mo...
details: https://anonhg.NetBSD.org/pkgsrc/rev/2df1c0bacf10
branches: trunk
changeset: 543614:2df1c0bacf10
user: tonnerre <tonnerre%pkgsrc.org@localhost>
date: Sat Jun 21 14:35:49 2008 +0000
description:
Upgrade nagios to 2.12. Changes are mostly bugfixes since this is the legacy
branch.
Changes since old version 2.5:
* Fix for unscheduled triggered downtime entries.
* Fix for embedded audio in tac and status CGIs.
* Fixed bug in nagiostats utility when reporting host/service check latency.
* Misc code cleanups for compiler warnings.
* Fixed error when reading empty (zero byte) config files.
* Default is now to check for orphaned service checks.
* Fixed bug with non-standard CGI config file location in status data.
* Fixed bugs and simplified examples in sample config files.
* Fix for leading whitespace before comments in object config files.
* Fix for scheduling immediate service check through WAP interface.
* Fix for segfault during expiration or deletion of scheduled downtime.
* Minor documentation updates.
* Minor patches to availability and status CGIs.
* Updated nagiostats with new MRTG vars for tracking buffer usage.
* p1.pl now sets environment var (NAGIOS_PLUGIN) to indicate patch of
plugin being executed.
* Added error messages for passive service checks that don't correspond to
a defined service.
* Fix for handling signals under NPTL.
* Fix for missing check timeout in event broker calls.
* Possible segfault fix during restarts when daemon was performing host
checks.
* Bug fix for bad date format submission in command CGI.
* Bug fix for using servicegroups in service dependency definitions.
* Bug fix for calculating notification interval with service escalations.
* Program version is now displayed in CGIs.
* Fix for keeping service checks in the event queue when active service
checks are disabled globally.
* Bug fix with attempting to access an uninitalized mutex if external
commands are disabled.
* Fix for incorrect latency calculation for passive service checks.
* Fix for a segfault when processing passive host check results with empty
output/perfdata.
* Minor bug fixes in CGIs.
* Fix for not logging passive host check results.
* Minor fix for notification timeout log messages.
* Fix for SIGTERMs being seen as SIGEXITs, non-logging of SIGTERMs/shutdowns.
* Patch to allow non-ASCII characters in notifications, etc.
* Fix for flap detection information not be retained across restarts.
* Fix for cfg_dir directive not working on Solaris.
* Fix for segfault in event broker module code.
* Fix for a possible memory leak in situations where overflow occurs in
check result buffer.
* Fix for a bug with processing service dependency templates with null
master host(group) names.
* Better error logging when failing to rename/move files.
* Minor bug fixes in CGIs to ensure extra host/servicegroup url strings
are terminated properly.
* Patches for possible XSS vulnerability in CGIs (CVE-2007-5803).
Please note that this now needs PTHREAD_DIAGASSERT=A to run properly under
NetBSD-4.0 without the fixsa patch.
diffstat:
net/nagios-base/Makefile | 9 ++---
net/nagios-base/PLIST | 8 ++---
net/nagios-base/distinfo | 26 ++++-------------
net/nagios-base/patches/patch-aa | 40 ++++++++++++--------------
net/nagios-base/patches/patch-ac | 10 ++++--
net/nagios-base/patches/patch-ag | 36 ------------------------
net/nagios-base/patches/patch-ai | 52 ----------------------------------
net/nagios-base/patches/patch-aj | 60 ----------------------------------------
net/nagios-base/patches/patch-ak | 20 -------------
net/nagios-base/patches/patch-al | 29 -------------------
net/nagios-base/patches/patch-am | 46 ------------------------------
net/nagios-base/patches/patch-an | 13 --------
net/nagios-base/patches/patch-ao | 54 ------------------------------------
net/nagios-base/patches/patch-ap | 20 -------------
net/nagios-base/patches/patch-aq | 44 -----------------------------
net/nagios-base/patches/patch-ar | 12 --------
net/nagios-base/patches/patch-as | 28 ------------------
net/nagios-base/patches/patch-at | 20 -------------
net/nagios-base/patches/patch-au | 33 ----------------------
19 files changed, 37 insertions(+), 523 deletions(-)
diffs (truncated from 720 to 300 lines):
diff -r 19966f01c07f -r 2df1c0bacf10 net/nagios-base/Makefile
--- a/net/nagios-base/Makefile Sat Jun 21 14:33:48 2008 +0000
+++ b/net/nagios-base/Makefile Sat Jun 21 14:35:49 2008 +0000
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.19 2008/06/20 15:28:11 gdt Exp $
+# $NetBSD: Makefile,v 1.20 2008/06/21 14:35:49 tonnerre Exp $
#
-DISTNAME= nagios-2.5
+DISTNAME= nagios-2.12
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 7
CATEGORIES= net sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
@@ -53,8 +52,8 @@
MESSAGE_SUBST+= NAGIOSCMD_GROUP=${NAGIOSCMD_GROUP}
EGDIR= ${PREFIX}/share/examples/nagios
-EGFILES= cgi.cfg checkcommands.cfg minimal.cfg
-EGFILES+= misccommands.cfg nagios.cfg resource.cfg
+EGFILES= cgi.cfg commands.cfg localhost.cfg
+EGFILES+= nagios.cfg resource.cfg
.for files in ${EGFILES}
CONF_FILES+= ${EGDIR}/${files}-sample ${PKG_SYSCONFDIR}/${files}
diff -r 19966f01c07f -r 2df1c0bacf10 net/nagios-base/PLIST
--- a/net/nagios-base/PLIST Sat Jun 21 14:33:48 2008 +0000
+++ b/net/nagios-base/PLIST Sat Jun 21 14:35:49 2008 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2007/11/26 22:14:13 seb Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/06/21 14:35:49 tonnerre Exp $
bin/nagios
bin/nagiostats
bin/p1.pl
@@ -18,11 +18,9 @@
libexec/nagios/cgi-bin/summary.cgi
libexec/nagios/cgi-bin/tac.cgi
libexec/nagios/cgi-bin/trends.cgi
-share/examples/nagios/bigger.cfg-sample
share/examples/nagios/cgi.cfg-sample
-share/examples/nagios/checkcommands.cfg-sample
-share/examples/nagios/minimal.cfg-sample
-share/examples/nagios/misccommands.cfg-sample
+share/examples/nagios/commands.cfg-sample
+share/examples/nagios/localhost.cfg-sample
share/examples/nagios/nagios.cfg-sample
share/examples/nagios/nagios.conf
share/examples/nagios/resource.cfg-sample
diff -r 19966f01c07f -r 2df1c0bacf10 net/nagios-base/distinfo
--- a/net/nagios-base/distinfo Sat Jun 21 14:33:48 2008 +0000
+++ b/net/nagios-base/distinfo Sat Jun 21 14:35:49 2008 +0000
@@ -1,26 +1,12 @@
-$NetBSD: distinfo,v 1.7 2008/03/18 21:53:41 tonnerre Exp $
+$NetBSD: distinfo,v 1.8 2008/06/21 14:35:49 tonnerre Exp $
-SHA1 (nagios-2.5.tar.gz) = 00e6bc45c5634649b6a1be2758ec181197d38f76
-RMD160 (nagios-2.5.tar.gz) = a0f1890ed546ce026cf784ae3ca83119275bd529
-Size (nagios-2.5.tar.gz) = 1736167 bytes
-SHA1 (patch-aa) = 7d13c606bf9c17850bdc49b07bf31b00a9d10f05
+SHA1 (nagios-2.12.tar.gz) = d3e8e3419f751c66a29775bb5280cec662d26a29
+RMD160 (nagios-2.12.tar.gz) = b44e49166441735473450ba555137c695cc50920
+Size (nagios-2.12.tar.gz) = 1742179 bytes
+SHA1 (patch-aa) = c8a270a81ab482a0a138c6b66185ffe44bfe9e50
SHA1 (patch-ab) = 5b33da97bc1339d9c7507cf7ed706ee27ae7c68a
-SHA1 (patch-ac) = b72c80203f7c1c88f851a13c9031bc5a4febf512
+SHA1 (patch-ac) = 268393f07960bda7f60b4ac01e87c462c3e3147c
SHA1 (patch-ad) = 2d7c6620ed08a64c8df2d26083fa327899305004
SHA1 (patch-ae) = 088bddbbd8d6a9f6b7aff89f238d510959a7220b
SHA1 (patch-af) = a1b2c3a51b0ed72ff0f507bacc44a0d0c5924d60
-SHA1 (patch-ag) = 81c7bd5b4bbec8a5135b96d9b2d47a11f7e21953
SHA1 (patch-ah) = 88122296f9d74648c3dadbd7f6e12e7ef1f32081
-SHA1 (patch-ai) = 01af7bb4fd0bf3e341535e072384630f859b1338
-SHA1 (patch-aj) = 4655da482dced332a870feaeddc729c0c7efd841
-SHA1 (patch-ak) = ecdfe1bc8b219324780d0d86ce7c5dcc7c51c241
-SHA1 (patch-al) = 59763ce59854012ca94e5adb4d53ac5c46532309
-SHA1 (patch-am) = f839f730c11907a36df1ed0e01290caa667be655
-SHA1 (patch-an) = d1110a33f26ff3807982385d8e706436214dac3f
-SHA1 (patch-ao) = ed9bff0519efeb531a4fa40170ce69dc8082139e
-SHA1 (patch-ap) = a82898a22eb0e0938bffd0a2490a8fe306f07e65
-SHA1 (patch-aq) = 7403d4192c59e522e94f221d06a1ecec5aba9118
-SHA1 (patch-ar) = a496fbee60e35a5287bd646573ecdb007033f6cf
-SHA1 (patch-as) = cd9c5454f4b6a9f8ccf496398b3413b85a7e0d99
-SHA1 (patch-at) = 9862506f7b8e87525d7c0616703154c006e6dd27
-SHA1 (patch-au) = bde2db89a81d3e41fd90556e6f0d20d3ce1d3bbc
diff -r 19966f01c07f -r 2df1c0bacf10 net/nagios-base/patches/patch-aa
--- a/net/nagios-base/patches/patch-aa Sat Jun 21 14:33:48 2008 +0000
+++ b/net/nagios-base/patches/patch-aa Sat Jun 21 14:35:49 2008 +0000
@@ -1,8 +1,8 @@
-$NetBSD: patch-aa,v 1.4 2007/11/26 22:14:14 seb Exp $
+$NetBSD: patch-aa,v 1.5 2008/06/21 14:35:49 tonnerre Exp $
---- Makefile.in.orig 2006-05-30 16:31:44.000000000 +0000
+--- Makefile.in.orig 2007-04-23 17:44:25.000000000 +0200
+++ Makefile.in
-@@ -22,15 +22,16 @@ LDFLAGS=@LDFLAGS@ @LIBS@
+@@ -22,16 +22,16 @@ LDFLAGS=@LDFLAGS@ @LIBS@
prefix=@prefix@
exec_prefix=@exec_prefix@
LOGDIR=@localstatedir@
@@ -15,13 +15,14 @@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@
COMMAND_OPTS=@COMMAND_OPTS@
+-HTTPD_CONF=@HTTPD_CONF@
INIT_DIR=@init_dir@
-INIT_OPTS=-o root -g root
+INIT_OPTS=-o root -g wheel
CGICFGDIR=$(CGIDIR)
PERLDIR=@PERLDIR@
-@@ -57,61 +58,7 @@ all:
+@@ -58,60 +58,7 @@ all:
cd $(SRC_BASE) && $(MAKE)
cd $(SRC_CGI) && $(MAKE)
cd $(SRC_HTM) && $(MAKE)
@@ -71,10 +72,9 @@
- @echo " - Relevant snippets from your config files"
- @echo " - Relevant error messages from the Nagios log file"
- @echo ""
-- @echo "For those of you who are interested in contract support or"
-- @echo "consulting services for Nagios, please visit:"
+- @echo "For more information on obtaining support for Nagios, visit:"
- @echo ""
-- @echo " http://www.nagios.org/contractsupport";
+- @echo " http://www.nagios.org/support/";
- @echo ""
- @echo "*************************************************************"
- @echo ""
@@ -99,26 +99,22 @@
@echo ""
@echo "*** Main program, CGIs and HTML files installed ***"
@echo ""
-@@ -213,14 +159,14 @@ install-basic:
+@@ -213,12 +159,12 @@ install-basic:
install-config:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample
-- $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample
-- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg
+- $(INSTALL) -b -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg
+ [ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample
-+ $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(SAMPDIR)/bigger.cfg-sample
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(SAMPDIR)/minimal.cfg-sample
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(SAMPDIR)/checkcommands.cfg-sample
-+ $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(SAMPDIR)/misccommands.cfg-sample
++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample
++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample
++ $(INSTALL) -m 640 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample
++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/localhost.cfg-sample
++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/commands.cfg-sample
@echo ""
@echo "*** Sample config file installed ***"
diff -r 19966f01c07f -r 2df1c0bacf10 net/nagios-base/patches/patch-ac
--- a/net/nagios-base/patches/patch-ac Sat Jun 21 14:33:48 2008 +0000
+++ b/net/nagios-base/patches/patch-ac Sat Jun 21 14:35:49 2008 +0000
@@ -1,6 +1,6 @@
-$NetBSD: patch-ac,v 1.3 2007/11/26 22:14:14 seb Exp $
+$NetBSD: patch-ac,v 1.4 2008/06/21 14:35:49 tonnerre Exp $
---- base/Makefile.in.orig 2006-05-30 16:31:44.000000000 +0000
+--- base/Makefile.in.orig 2006-05-30 18:31:44.000000000 +0200
+++ base/Makefile.in
@@ -29,7 +29,7 @@ exec_prefix=@exec_prefix@
LOGDIR=@localstatedir@
@@ -11,13 +11,15 @@
HTMLDIR=@datadir@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@
-@@ -188,8 +188,7 @@ install-unstripped:
+@@ -188,9 +188,8 @@ install-unstripped:
$(MAKE) install-basic
install-basic:
- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR)
+- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
+ ${BSD_INSTALL_PROGRAM} @nagios_name@ $(DESTDIR)$(BINDIR)
- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
++ $(INSTALL) -m 550 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR)
strip-post-install:
+ $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@
diff -r 19966f01c07f -r 2df1c0bacf10 net/nagios-base/patches/patch-ag
--- a/net/nagios-base/patches/patch-ag Sat Jun 21 14:33:48 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,36 +0,0 @@
-$NetBSD: patch-ag,v 1.3 2008/03/18 21:53:41 tonnerre Exp $
-
---- cgi/avail.c.orig 2006-04-06 00:33:32.000000000 +0200
-+++ cgi/avail.c
-@@ -1157,6 +1157,7 @@ int process_cgivars(void){
- hostgroup_name="";
- else
- strcpy(hostgroup_name,variables[x]);
-+ strip_html_brackets(hostgroup_name);
- display_type=DISPLAY_HOSTGROUP_AVAIL;
- show_all_hostgroups=(strcmp(hostgroup_name,"all"))?FALSE:TRUE;
- }
-@@ -1174,6 +1175,7 @@ int process_cgivars(void){
- servicegroup_name="";
- else
- strcpy(servicegroup_name,variables[x]);
-+ strip_html_brackets(servicegroup_name);
- display_type=DISPLAY_SERVICEGROUP_AVAIL;
- show_all_servicegroups=(strcmp(servicegroup_name,"all"))?FALSE:TRUE;
- }
-@@ -1191,6 +1193,7 @@ int process_cgivars(void){
- host_name="";
- else
- strcpy(host_name,variables[x]);
-+ strip_html_brackets(host_name);
- display_type=DISPLAY_HOST_AVAIL;
- show_all_hosts=(strcmp(host_name,"all"))?FALSE:TRUE;
- }
-@@ -1208,6 +1211,7 @@ int process_cgivars(void){
- svc_description="";
- else
- strcpy(svc_description,variables[x]);
-+ strip_html_brackets(svc_description);
- display_type=DISPLAY_SERVICE_AVAIL;
- show_all_services=(strcmp(svc_description,"all"))?FALSE:TRUE;
- }
diff -r 19966f01c07f -r 2df1c0bacf10 net/nagios-base/patches/patch-ai
--- a/net/nagios-base/patches/patch-ai Sat Jun 21 14:33:48 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,52 +0,0 @@
-$NetBSD: patch-ai,v 1.1 2008/03/18 21:53:41 tonnerre Exp $
-
---- cgi/cmd.c.orig 2006-05-19 16:25:03.000000000 +0200
-+++ cgi/cmd.c
-@@ -380,6 +380,7 @@ int process_cgivars(void){
- comment_author="";
- else
- strcpy(comment_author,variables[x]);
-+ strip_html_brackets(comment_author);
- }
-
- /* we found the comment data */
-@@ -395,6 +396,7 @@ int process_cgivars(void){
- comment_data="";
- else
- strcpy(comment_data,variables[x]);
-+ strip_html_brackets(comment_data);
- }
-
- /* we found the host name */
-@@ -410,6 +412,7 @@ int process_cgivars(void){
- host_name="";
- else
- strcpy(host_name,variables[x]);
-+ strip_html_brackets(host_name);
- }
-
- /* we found the hostgroup name */
-@@ -425,6 +428,7 @@ int process_cgivars(void){
- hostgroup_name="";
- else
- strcpy(hostgroup_name,variables[x]);
-+ strip_html_brackets(hostgroup_name);
- }
-
- /* we found the service name */
-@@ -440,6 +444,7 @@ int process_cgivars(void){
- service_desc="";
- else
- strcpy(service_desc,variables[x]);
-+ strip_html_brackets(service_desc);
- }
-
- /* we found the servicegroup name */
-@@ -455,6 +460,7 @@ int process_cgivars(void){
- servicegroup_name="";
- else
- strcpy(servicegroup_name,variables[x]);
-+ strip_html_brackets(servicegroup_name);
- }
-
- /* we got the persistence option for a comment */
diff -r 19966f01c07f -r 2df1c0bacf10 net/nagios-base/patches/patch-aj
--- a/net/nagios-base/patches/patch-aj Sat Jun 21 14:33:48 2008 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,60 +0,0 @@
-$NetBSD: patch-aj,v 1.1 2008/03/18 21:53:41 tonnerre Exp $
-
---- cgi/extinfo.c.orig 2006-03-21 22:31:46.000000000 +0100
Home |
Main Index |
Thread Index |
Old Index