kpriv/pkgsrc
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Update nagios-base to 3.1.2, fixing CVE-2009-2288.

Browse source 
Changes since 3.1.0:
    * Fix for CPU hogging in service and host check scheduling logic
    * New "important check command" flag for use in service templates,
      to aid configuration in distributed environments
    * Fix for nagios validation error when no services defined
    * Fix for stylesheet link
    * Fix for extinfo.cgi error message when cgi.cfg doesn't exist
    * Fix for notifications.cgi where Update button on right didn't retain
      host information wh en no host= was in query parameters
    * Fix for potential bug where a contactgroup with no members could cause
      parsing errors
    * Fix for W3 validation for history.cgi
    * Fix for W3 validation for extinfo.cgi
    * Fix for nagiostats to return non-zero with failures in MRTG mode
    * Added t/ directory for tests. Use make test to run. Requires perl on
      development server
    * Fix for duplicate event_id attributes in status and retention data
    * Fix for duplicate unlink() during check processing
    * Added missing check period column to host config display (CGI)
    * Fix for embedded Perl initialization under FreeBSD
    * Fix for incorrect re-initialization of mutext after program restart
    * Fix for incorrect weighting in host flap detection logic
    * Added libtap to distribution. Use ./configure --enable-libtap to compile
    * nagios.log permissions are now kept after log rotation
    * Fix for "Max concurrent service checks (X) has been reached" messages -
      will now push se rvices 5 + random(10) seconds ahead for retry
    * Fix for incorrect service history link text in CGIs
    * Fix for useless code loop in netutils.c
    * Fix for potential divide by zero in event scheduling code
    * Fix for trailing backslash in plugin output causing memory corruption
      in CGIs
    * Fix for bug that could affect host/service scheduling during clock time
      skew or changes to timeperod definitions between restarts
    * Leading whitespace from continuation lines in configuration files is
      now stripped out
    * Fix for bug where pipe (used by IPC) file descriptors get inherited by
      child processed ( e.g. event handlers) (bug #0000026)
    * Fix for failure to daemonize - Nagios now bails (bug #0000011)
    * Fix for notifications about flapping starting not processed properly by
      retention data
    * Patch to add transparency to statusmap icons for truecolor images
    * Patch to add read-only permissions to extinfo CGI
    * Security fix for statuswml.cgi where arbitrary shell injection was
      possible
This commit is contained in:
bouyer 2009-12-15 18:56:01 +00:00
parent 2a0b237193
commit 5c705ac37c
11 changed files with 65 additions and 61 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
net/nagios-base/Makefile
View file

@ -1,9 +1,8 @@
# $NetBSD: Makefile,v 1.25 2009/08/26 19:58:11 sno Exp $
# $NetBSD: Makefile,v 1.26 2009/12/15 18:56:01 bouyer Exp $
#
DISTNAME= nagios-3.1.0
DISTNAME= nagios-3.1.2
PKGNAME= ${DISTNAME:S/-/-base-/}
PKGREVISION= 1
CATEGORIES= net sysutils
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}

5
net/nagios-base/Makefile.common
View file

@ -1,4 +1,4 @@
# $NetBSD: Makefile.common,v 1.8 2008/07/21 00:35:42 tonnerre Exp $
# $NetBSD: Makefile.common,v 1.9 2009/12/15 18:56:01 bouyer Exp $
#
# used by net/nagios-base/Makefile
@ -13,7 +13,8 @@ PKG_SYSCONFSUBDIR= nagios
PERL5_REQD= 5.6
CONFIGURE_ARGS+= --libexecdir=${PREFIX}/libexec/nagios
CONFIGURE_ARGS+= --datadir=${PREFIX}/share/nagios
CONFIGURE_ARGS+= --datarootdir=${PREFIX}/share/nagios
CONFIGURE_ARGS+= --datadir=${PREFIX}/share
CONFIGURE_ARGS+= --sysconfdir=${PKG_SYSCONFDIR}
CONFIGURE_ARGS+= --localstatedir=${NAGIOSDIR}

4
net/nagios-base/PLIST
View file

@ -1,4 +1,4 @@
@comment $NetBSD: PLIST,v 1.7 2009/06/14 21:00:04 joerg Exp $
@comment $NetBSD: PLIST,v 1.8 2009/12/15 18:56:01 bouyer Exp $
bin/nagios
bin/nagiostats
bin/p1.pl
@ -190,6 +190,8 @@ share/nagios/docs/images/mrtg-servicestatechange.png
share/nagios/docs/images/multiple-templates1.png
share/nagios/docs/images/multiple-templates2.png
share/nagios/docs/images/nagios.jpg
share/nagios/docs/images/nagiosexchange.png
share/nagios/docs/images/nagiossupport.png
share/nagios/docs/images/ndoutils.png
share/nagios/docs/images/network-outage1.png
share/nagios/docs/images/network-outage2.png

22
net/nagios-base/distinfo
View file

@ -1,14 +1,14 @@
$NetBSD: distinfo,v 1.10 2009/03/24 19:28:26 bouyer Exp $
$NetBSD: distinfo,v 1.11 2009/12/15 18:56:01 bouyer Exp $
SHA1 (nagios-3.1.0.tar.gz) = 0bf1cc2fbca92dfa82b11592d3d5adc6ac3983db
RMD160 (nagios-3.1.0.tar.gz) = adae68a67f74e87fb1e6d0d49743704d55eee648
Size (nagios-3.1.0.tar.gz) = 2724545 bytes
SHA1 (patch-aa) = 0945f27a7f18553644682f1d9ad0f37b962d2a36
SHA1 (patch-ab) = e633139ab3e3ee0b9b4d34b8fb5c7d8cb1ecac76
SHA1 (patch-ac) = 779a29237981e1a664192d8a653552c1b7606184
SHA1 (patch-ad) = 4eda7b7488aa3627e2da35bc260593a30e82df06
SHA1 (patch-ae) = 088bddbbd8d6a9f6b7aff89f238d510959a7220b
SHA1 (patch-af) = a1b2c3a51b0ed72ff0f507bacc44a0d0c5924d60
SHA1 (patch-ag) = da6af670c5d8788c1c46653b73f044cbfead64b1
SHA1 (nagios-3.1.2.tar.gz) = 91d6e0dc19b4f09d1c0c7d4220bc69df8af07b1b
RMD160 (nagios-3.1.2.tar.gz) = cb633f316cc6108a9b4fe387b3e8097a2e8546a9
Size (nagios-3.1.2.tar.gz) = 3172982 bytes
SHA1 (patch-aa) = 1079c24f0d42b69522ca04ab91e77cf53065e63d
SHA1 (patch-ab) = 0f5b7ab0d13be9eca22ffed921ee8e22e3f8fa1b
SHA1 (patch-ac) = ac60819f5c4f9b385637a6c8d0b5dd62622c2622
SHA1 (patch-ad) = 72565abe365a4488d519169822bfcad7a6cc2eba
SHA1 (patch-ae) = e1f80e7b0496d19545321f9d05306cfcd0f9af31
SHA1 (patch-af) = 8041ca50021a41bdd7897363f6ea68afdddaab28
SHA1 (patch-ag) = 9904acb53998a9efeecf37efe722e61a3edf2053
SHA1 (patch-ah) = 88122296f9d74648c3dadbd7f6e12e7ef1f32081
SHA1 (patch-ai) = 738039e46af95a035bf0220eaa5c621938b651fd

18
net/nagios-base/patches/patch-aa
View file

@ -1,8 +1,8 @@
$NetBSD: patch-aa,v 1.6 2008/07/21 00:35:42 tonnerre Exp $
$NetBSD: patch-aa,v 1.7 2009/12/15 18:56:02 bouyer Exp $
--- Makefile.in.orig 2008-04-13 20:34:26.000000000 +0200
+++ Makefile.in
@@ -23,17 +23,16 @@ prefix=@prefix@
--- Makefile.in.orig 2009-06-17 05:57:21.000000000 +0200
+++ Makefile.in 2009-12-15 16:53:59.000000000 +0100
@@ -24,17 +24,16 @@
exec_prefix=@exec_prefix@
LOGDIR=@localstatedir@
CHECKRESULTDIR=@CHECKRESULTDIR@
@ -12,7 +12,7 @@ $NetBSD: patch-aa,v 1.6 2008/07/21 00:35:42 tonnerre Exp $
-CGIDIR=@sbindir@
+CGIDIR=@libexecdir@
LIBEXECDIR=@libexecdir@
HTMLDIR=@datadir@
HTMLDIR=@datarootdir@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@
COMMAND_OPTS=@COMMAND_OPTS@
@ -23,7 +23,7 @@ $NetBSD: patch-aa,v 1.6 2008/07/21 00:35:42 tonnerre Exp $
CGICFGDIR=$(CGIDIR)
PERLDIR=@PERLDIR@
@@ -62,66 +61,6 @@ all:
@@ -64,66 +63,6 @@
cd $(SRC_BASE) && $(MAKE)
cd $(SRC_CGI) && $(MAKE)
cd $(SRC_HTM) && $(MAKE)
@ -90,7 +90,7 @@ $NetBSD: patch-aa,v 1.6 2008/07/21 00:35:42 tonnerre Exp $
nagios:
cd $(SRC_BASE) && $(MAKE)
@@ -193,14 +132,10 @@ install-unstripped:
@@ -214,14 +153,10 @@
$(MAKE) install-basic
install-basic:
@ -107,7 +107,7 @@ $NetBSD: patch-aa,v 1.6 2008/07/21 00:35:42 tonnerre Exp $
@echo ""
@echo "*** Main program, CGIs and HTML files installed ***"
@echo ""
@@ -220,20 +155,20 @@ install-basic:
@@ -241,20 +176,20 @@
install-config:
@ -142,7 +142,7 @@ $NetBSD: patch-aa,v 1.6 2008/07/21 00:35:42 tonnerre Exp $
@echo ""
@echo "*** Config files installed ***"
@echo ""
@@ -261,7 +196,10 @@ install-daemoninit:
@@ -282,7 +217,10 @@
install-commandmode:

12
net/nagios-base/patches/patch-ab
View file

@ -1,17 +1,17 @@
$NetBSD: patch-ab,v 1.4 2008/07/21 00:35:42 tonnerre Exp $
$NetBSD: patch-ab,v 1.5 2009/12/15 18:56:02 bouyer Exp $
--- cgi/Makefile.in.orig 2008-02-28 20:26:36.000000000 +0100
+++ cgi/Makefile.in
@@ -15,7 +15,7 @@ exec_prefix=@exec_prefix@
--- cgi/Makefile.in.orig 2009-06-17 05:57:21.000000000 +0200
+++ cgi/Makefile.in 2009-12-15 16:54:45.000000000 +0100
@@ -15,7 +15,7 @@
LOGDIR=@localstatedir@
CFGDIR=@sysconfdir@
BINDIR=@bindir@
-CGIDIR=@sbindir@
+CGIDIR=@libexecdir@/cgi-bin
HTMLDIR=@datadir@
HTMLDIR=@datarootdir@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@
@@ -196,9 +196,9 @@ install-unstripped:
@@ -196,9 +196,9 @@
$(MAKE) install-basic
install-basic:

12
net/nagios-base/patches/patch-ac
View file

@ -1,17 +1,17 @@
$NetBSD: patch-ac,v 1.5 2008/07/21 00:35:42 tonnerre Exp $
$NetBSD: patch-ac,v 1.6 2009/12/15 18:56:02 bouyer Exp $
--- base/Makefile.in.orig 2008-02-28 20:25:45.000000000 +0100
+++ base/Makefile.in
@@ -36,7 +36,7 @@ exec_prefix=@exec_prefix@
--- base/Makefile.in.orig 2009-06-17 05:57:21.000000000 +0200
+++ base/Makefile.in 2009-12-15 16:55:30.000000000 +0100
@@ -36,7 +36,7 @@
LOGDIR=@localstatedir@
CFGDIR=@sysconfdir@
BINDIR=@bindir@
-CGIDIR=@sbindir@
+CGIDIR=@libexecdir@
HTMLDIR=@datadir@
HTMLDIR=@datarootdir@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@
@@ -202,9 +202,8 @@ install-unstripped:
@@ -202,9 +202,8 @@
$(MAKE) install-basic
install-basic:

18
net/nagios-base/patches/patch-ad
View file

@ -1,17 +1,17 @@
$NetBSD: patch-ad,v 1.5 2009/03/24 19:28:26 bouyer Exp $
$NetBSD: patch-ad,v 1.6 2009/12/15 18:56:02 bouyer Exp $
--- html/Makefile.in.orig 2008-12-14 19:00:46.000000000 +0100
+++ html/Makefile.in 2009-03-23 11:56:48.000000000 +0100
--- html/Makefile.in.orig 2009-06-17 05:57:21.000000000 +0200
+++ html/Makefile.in 2009-12-15 17:01:07.000000000 +0100
@@ -7,7 +7,7 @@
LOGDIR=@localstatedir@
CFGDIR=@sysconfdir@
BINDIR=@bindir@
-CGIDIR=@sbindir@
+CGIDIR=@libexecdir@
HTMLDIR=@datadir@
HTMLDIR=@datarootdir@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@
@@ -33,42 +33,42 @@
@@ -33,46 +33,45 @@
devclean: distclean
install:
@ -28,7 +28,6 @@ $NetBSD: patch-ad,v 1.5 2009/03/24 19:28:26 bouyer Exp $
- $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
- $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
+ [ -d $(DESTDIR)$(HTMLDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)
+ [ -d $(DESTDIR)$(HTMLDIR)/media ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/media
+ [ -d $(DESTDIR)$(HTMLDIR)/stylesheets ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
+ [ -d $(DESTDIR)$(HTMLDIR)/contexthelp ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/contexthelp
+ [ -d $(DESTDIR)$(HTMLDIR)/docs ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs
@ -39,12 +38,15 @@ $NetBSD: patch-ad,v 1.5 2009/03/24 19:28:26 bouyer Exp $
+ [ -d $(DESTDIR)$(HTMLDIR)/ssi ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/ssi
+ ${BSD_INSTALL_DATA} robots.txt $(DESTDIR)$(HTMLDIR)
+ ${BSD_INSTALL_DATA} docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
# Remove old HTML files (PHP files are used now)
rm -f $(DESTDIR)$(HTMLDIR)/index.html
rm -f $(DESTDIR)$(HTMLDIR)/main.html
rm -f $(DESTDIR)$(HTMLDIR)/side.html
for file in *.php; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR); done
# for file in media/*.wav; \
-# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+# do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/media; done
# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
for file in stylesheets/*.css; \
- do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
+ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done

10
net/nagios-base/patches/patch-ae
View file

@ -1,13 +1,13 @@
$NetBSD: patch-ae,v 1.2 2007/11/26 22:14:14 seb Exp $
$NetBSD: patch-ae,v 1.3 2009/12/15 18:56:02 bouyer Exp $
--- common/Makefile.in.orig 2003-04-10 03:46:01.000000000 +0000
+++ common/Makefile.in
@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@
--- common/Makefile.in.orig 2009-06-17 05:57:21.000000000 +0200
+++ common/Makefile.in 2009-12-15 17:01:52.000000000 +0100
@@ -17,7 +17,7 @@
LOGDIR=@localstatedir@
CFGDIR=@sysconfdir@
BINDIR=@bindir@
-CGIDIR=@sbindir@
+CGIDIR=@libexecdir@
HTMLDIR=@datadir@
HTMLDIR=@datarootdir@
INSTALL=@INSTALL@
INSTALL_OPTS=@INSTALL_OPTS@

8
net/nagios-base/patches/patch-af
View file

@ -1,8 +1,8 @@
$NetBSD: patch-af,v 1.2 2007/11/26 22:14:14 seb Exp $
$NetBSD: patch-af,v 1.3 2009/12/15 18:56:02 bouyer Exp $
--- sample-config/nagios.cfg.in.orig 2005-11-23 22:28:03.000000000 +0000
+++ sample-config/nagios.cfg.in
@@ -193,7 +193,7 @@ lock_file=@lockfile@
--- sample-config/nagios.cfg.in.orig 2008-12-14 15:52:23.000000000 +0100
+++ sample-config/nagios.cfg.in 2009-12-15 17:02:13.000000000 +0100
@@ -198,7 +198,7 @@
# is created, used, and deleted throughout the time that Nagios is
# running.

12
net/nagios-base/patches/patch-ag
View file

@ -1,10 +1,10 @@
$NetBSD: patch-ag,v 1.5 2008/07/21 00:36:11 tonnerre Exp $
$NetBSD: patch-ag,v 1.6 2009/12/15 18:56:02 bouyer Exp $
--- configure.orig 2008-06-25 20:16:28.000000000 +0200
+++ configure
@@ -5509,7 +5509,7 @@ else
CHECKRESULTDIR=no
fi;
--- configure.orig 2009-06-23 19:40:46.000000000 +0200
+++ configure 2009-12-15 17:03:08.000000000 +0100
@@ -6061,7 +6061,7 @@
fi
if test x$CHECKRESULTDIR = xno; then
- CHECKRESULTDIR="$localstatedir/spool/checkresults"
+ CHECKRESULTDIR="$localstatedir/checkresults"