pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/nagios-base Import a fix for CVE-2013-7108 and CVE...
details: https://anonhg.NetBSD.org/pkgsrc/rev/4de243b71331
branches: trunk
changeset: 632628:4de243b71331
user: he <he%pkgsrc.org@localhost>
date: Wed Apr 02 10:22:37 2014 +0000
description:
Import a fix for CVE-2013-7108 and CVE-2013-7205, which is multiple
off-by-one errors causing information leakage and possibly DoS.
Restructure the patch files to follow the newer naming conventions.
Add the rc.d script to PLIST.
Bump PKGREVISION.
diffstat:
net/nagios-base/Makefile | 4 +-
net/nagios-base/PLIST | 3 +-
net/nagios-base/distinfo | 33 +-
net/nagios-base/patches/patch-Makefile.in | 184 ++++++++++++++
net/nagios-base/patches/patch-aa | 182 -------------
net/nagios-base/patches/patch-ab | 25 -
net/nagios-base/patches/patch-ac | 26 -
net/nagios-base/patches/patch-ad | 116 --------
net/nagios-base/patches/patch-ae | 13 -
net/nagios-base/patches/patch-af | 13 -
net/nagios-base/patches/patch-ag | 13 -
net/nagios-base/patches/patch-ah | 12 -
net/nagios-base/patches/patch-ai | 13 -
net/nagios-base/patches/patch-base_Makefile.in | 28 ++
net/nagios-base/patches/patch-cgi_Makefile.in | 27 ++
net/nagios-base/patches/patch-cgi_avail.c | 14 +
net/nagios-base/patches/patch-cgi_cmd.c | 14 +
net/nagios-base/patches/patch-cgi_config.c | 14 +
net/nagios-base/patches/patch-cgi_extinfo.c | 14 +
net/nagios-base/patches/patch-cgi_getcgi.c | 14 +
net/nagios-base/patches/patch-cgi_histogram.c | 14 +
net/nagios-base/patches/patch-cgi_notifications.c | 14 +
net/nagios-base/patches/patch-cgi_outages.c | 14 +
net/nagios-base/patches/patch-cgi_status.c | 14 +
net/nagios-base/patches/patch-cgi_statusmap.c | 14 +
net/nagios-base/patches/patch-cgi_statuswml.c | 21 +
net/nagios-base/patches/patch-cgi_summary.c | 14 +
net/nagios-base/patches/patch-cgi_trends.c | 14 +
net/nagios-base/patches/patch-common_Makefile.in | 15 +
net/nagios-base/patches/patch-configure | 15 +
net/nagios-base/patches/patch-contrib_daemonchk.c | 14 +
net/nagios-base/patches/patch-html_Makefile.in | 116 ++++++++
net/nagios-base/patches/patch-include_locations.h.in | 15 +
net/nagios-base/patches/patch-sample-config_nagios.cfg.in | 15 +
34 files changed, 645 insertions(+), 426 deletions(-)
diffs (truncated from 1231 to 300 lines):
diff -r ce4c7572e044 -r 4de243b71331 net/nagios-base/Makefile
--- a/net/nagios-base/Makefile Wed Apr 02 09:11:41 2014 +0000
+++ b/net/nagios-base/Makefile Wed Apr 02 10:22:37 2014 +0000
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.51 2014/03/13 11:08:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2014/04/02 10:22:37 he Exp $
#
DISTNAME= nagios-3.5.0
PKGNAME= ${DISTNAME:S/-/-base-/}
-PKGREVISION= 1
+PKGREVISION= 2
CATEGORIES= net sysutils
DISTFILES= ${DISTNAME}${EXTRACT_SUFX}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/}
diff -r ce4c7572e044 -r 4de243b71331 net/nagios-base/PLIST
--- a/net/nagios-base/PLIST Wed Apr 02 09:11:41 2014 +0000
+++ b/net/nagios-base/PLIST Wed Apr 02 10:22:37 2014 +0000
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2014/03/11 14:05:09 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.16 2014/04/02 10:22:37 he Exp $
bin/nagios
bin/nagiostats
bin/p1.pl
@@ -30,6 +30,7 @@
share/examples/nagios/objects/timeperiods.cfg-sample
share/examples/nagios/objects/windows.cfg-sample
share/examples/nagios/resource.cfg-sample
+share/examples/rc.d/nagios
share/nagios/config.inc.php
share/nagios/contexthelp/A1.html
share/nagios/contexthelp/A2.html
diff -r ce4c7572e044 -r 4de243b71331 net/nagios-base/distinfo
--- a/net/nagios-base/distinfo Wed Apr 02 09:11:41 2014 +0000
+++ b/net/nagios-base/distinfo Wed Apr 02 10:22:37 2014 +0000
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2013/08/05 11:22:29 obache Exp $
+$NetBSD: distinfo,v 1.19 2014/04/02 10:22:37 he Exp $
SHA1 (nagios-3.5.0.tar.gz) = 972e76c638b7d3f15d994eaa8fce0e4907d5d6e1
RMD160 (nagios-3.5.0.tar.gz) = d75a764486fd3dc0462fb49924698754852d39be
@@ -6,12 +6,25 @@
SHA1 (nagios-netbsd40-icons.tar.gz) = 62919c22c5d5dc3f603c3320578431e93dfdd9fe
RMD160 (nagios-netbsd40-icons.tar.gz) = 96ad67a107dad095213ddbf58debcfd5b46d6dee
Size (nagios-netbsd40-icons.tar.gz) = 5659 bytes
-SHA1 (patch-aa) = 2e8c278785de40073d7d39d3dc94696268af28e9
-SHA1 (patch-ab) = d15eb8913b28ed12664ee224941270e75857ecc1
-SHA1 (patch-ac) = a948575bd26e3b0d835c62cb96cba2657b38ffee
-SHA1 (patch-ad) = a5e4956aab0f002ec9076f65da013e7fb094027d
-SHA1 (patch-ae) = 35418dbe26f2e7c14d6a98951e62247344ae80b0
-SHA1 (patch-af) = a91ab37f16e8adda3146a2dde7273ebf841ef9af
-SHA1 (patch-ag) = ae13cf98b7e2f68304406ebab80292c5c4c8ea30
-SHA1 (patch-ah) = 702571fe4a0073c1d1a9f7b166a85d4cf41f284c
-SHA1 (patch-ai) = 9212106c141be6faaf65e4e4909fcf92907c0e58
+SHA1 (patch-Makefile.in) = 6a02bb8a9e4f10ddf19458c8485ccda813057637
+SHA1 (patch-base_Makefile.in) = 4c56192ec7d4df0b162f1fe09018902a970dd5c7
+SHA1 (patch-cgi_Makefile.in) = d8e6bb1ca4039e1f613caae8537666738f61ce08
+SHA1 (patch-cgi_avail.c) = 1ca4bbc28496ba1a4f4034284d003b8bfaed5a82
+SHA1 (patch-cgi_cmd.c) = a62e800e500ded9f32441649a0474d644e837d9b
+SHA1 (patch-cgi_config.c) = 9eb7887ee774e312f9254e9db38a04e41614d5e8
+SHA1 (patch-cgi_extinfo.c) = 27fada8f82a42ff80933ed8bacf6e6263ea7f3c0
+SHA1 (patch-cgi_getcgi.c) = 3aa7223473c7a961645591ee9ad46120cd7231b3
+SHA1 (patch-cgi_histogram.c) = 1d24e481a34db0d469de81ef70f079a01b704314
+SHA1 (patch-cgi_notifications.c) = 414013df5a298efd37051273d4da9aee46516241
+SHA1 (patch-cgi_outages.c) = dec955b3468b052ec988b46abb9933ff65e44505
+SHA1 (patch-cgi_status.c) = 009da866967e992fdd8f11bd9e53dbc9cbffeace
+SHA1 (patch-cgi_statusmap.c) = 73be1d14a7daf327eee253cfe66f4ebb50ae4fca
+SHA1 (patch-cgi_statuswml.c) = 027d1f7d9e246374d84804a5a4472cc70ae2edf1
+SHA1 (patch-cgi_summary.c) = 0a8c903b5eb1a9abc33af5091e97e31682cf2cb5
+SHA1 (patch-cgi_trends.c) = 49dcdb16d150268352176360197b03cbaabcc357
+SHA1 (patch-common_Makefile.in) = 9531dcc15c3a4fa953070275065d50978aeef050
+SHA1 (patch-configure) = a62a51408ac2b09176dcfdea4efab02abe652c7f
+SHA1 (patch-contrib_daemonchk.c) = c95efd621e1496f508d5938acc8f354afbb99277
+SHA1 (patch-html_Makefile.in) = 70f48e5aefe914a2c58d82dd38ec16e8b4cd8b71
+SHA1 (patch-include_locations.h.in) = 17c721da9b5d44fe159d385f3c0da2157df14231
+SHA1 (patch-sample-config_nagios.cfg.in) = c8422814bad0b19dfefe116b6db961ac7213c92f
diff -r ce4c7572e044 -r 4de243b71331 net/nagios-base/patches/patch-Makefile.in
--- /dev/null Thu Jan 01 00:00:00 1970 +0000
+++ b/net/nagios-base/patches/patch-Makefile.in Wed Apr 02 10:22:37 2014 +0000
@@ -0,0 +1,184 @@
+$NetBSD: patch-Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
+
+--- Makefile.in.orig 2012-04-25 12:30:47.000000000 +0000
++++ Makefile.in
+@@ -24,17 +24,16 @@ prefix=@prefix@
+ exec_prefix=@exec_prefix@
+ LOGDIR=@localstatedir@
+ CHECKRESULTDIR=@CHECKRESULTDIR@
+-CFGDIR=@sysconfdir@
++SAMPDIR=@prefix@/share/examples/nagios
+ BINDIR=@bindir@
+-CGIDIR=@sbindir@
++CGIDIR=@libexecdir@
+ LIBEXECDIR=@libexecdir@
+ HTMLDIR=@datadir@
+ 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@
+
+@@ -72,74 +71,6 @@ all:
+ cd $(SRC_BASE) && $(MAKE)
+ cd $(SRC_CGI) && $(MAKE)
+ cd $(SRC_HTM) && $(MAKE)
+- if [ x$(USE_EVENTBROKER) = xyes ]; then \
+- cd $(SRC_MODULE) && $(MAKE); \
+- fi
+-
+- @echo ""
+- @echo "*** Compile finished ***"
+- @echo ""
+- @echo "If the main program and CGIs compiled without any errors, you"
+- @echo "can continue with installing Nagios as follows (type 'make'"
+- @echo "without any arguments for a list of all possible options):"
+- @echo ""
+- @echo " make install"
+- @echo " - This installs the main program, CGIs, and HTML files"
+- @echo ""
+- @echo " make install-init"
+- @echo " - This installs the init script in $(DESTDIR)$(INIT_DIR)"
+- @echo ""
+- @echo " make install-commandmode"
+- @echo " - This installs and configures permissions on the"
+- @echo " directory for holding the external command file"
+- @echo ""
+- @echo " make install-config"
+- @echo " - This installs *SAMPLE* config files in $(DESTDIR)$(CFGDIR)"
+- @echo " You'll have to modify these sample files before you can"
+- @echo " use Nagios. Read the HTML documentation for more info"
+- @echo " on doing this. Pay particular attention to the docs on"
+- @echo " object configuration files, as they determine what/how"
+- @echo " things get monitored!"
+- @echo ""
+- @echo " make install-webconf"
+- @echo " - This installs the Apache config file for the Nagios"
+- @echo " web interface"
+- @echo ""
+- @echo " make install-exfoliation"
+- @echo " - This installs the Exfoliation theme for the Nagios"
+- @echo " web interface"
+- @echo ""
+- @echo " make install-classicui"
+- @echo " - This installs the classic theme for the Nagios"
+- @echo " web interface"
+- @echo ""
+- @echo ""
+- @echo "*** Support Notes *******************************************"
+- @echo ""
+- @echo "If you have questions about configuring or running Nagios,"
+- @echo "please make sure that you:"
+- @echo ""
+- @echo " - Look at the sample config files"
+- @echo " - Read the documentation on the Nagios Library at:"
+- @echo " http://library.nagios.com";
+- @echo ""
+- @echo "before you post a question to one of the mailing lists."
+- @echo "Also make sure to include pertinent information that could"
+- @echo "help others help you. This might include:"
+- @echo ""
+- @echo " - What version of Nagios you are using"
+- @echo " - What version of the plugins you are using"
+- @echo " - Relevant snippets from your config files"
+- @echo " - Relevant error messages from the Nagios log file"
+- @echo ""
+- @echo "For more information on obtaining support for Nagios, visit:"
+- @echo ""
+- @echo " http://support.nagios.com";
+- @echo ""
+- @echo "*************************************************************"
+- @echo ""
+- @echo "Enjoy."
+- @echo ""
+
+ nagios:
+ cd $(SRC_BASE) && $(MAKE)
+@@ -234,14 +165,10 @@ install-unstripped:
+ $(MAKE) install-basic
+
+ install-basic:
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LIBEXECDIR)
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR)
+ if [ $(INSTALLPERLSTUFF) = yes ]; then \
+- $(INSTALL) -m 664 $(INSTALL_OPTS) p1.pl $(DESTDIR)$(BINDIR); \
++ $(BSD_INSTALL_SCRIPT) p1.pl $(DESTDIR)$(BINDIR); \
+ fi;
+-
++
+ @echo ""
+ @echo "*** Main program, CGIs and HTML files installed ***"
+ @echo ""
+@@ -261,20 +188,20 @@ install-basic:
+
+
+ install-config:
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)
+- $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR)/objects
+- $(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/templates.cfg $(DESTDIR)$(CFGDIR)/objects/templates.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/objects/commands.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/contacts.cfg $(DESTDIR)$(CFGDIR)/objects/contacts.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/timeperiods.cfg $(DESTDIR)$(CFGDIR)/objects/timeperiods.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/objects/localhost.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/windows.cfg $(DESTDIR)$(CFGDIR)/objects/windows.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/printer.cfg $(DESTDIR)$(CFGDIR)/objects/printer.cfg
+- $(INSTALL) -b -m 664 $(INSTALL_OPTS) sample-config/template-object/switch.cfg $(DESTDIR)$(CFGDIR)/objects/switch.cfg
+-
++ [ -d $(DESTDIR)$(SAMPDIR) ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)
++ [ -d $(DESTDIR)$(SAMPDIR)/objects ] || ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(SAMPDIR)/objects
++ ${BSD_INSTALL_DATA} -m 644 sample-config/nagios.cfg $(DESTDIR)$(SAMPDIR)/nagios.cfg-sample
++ ${BSD_INSTALL_DATA} -m 644 sample-config/cgi.cfg $(DESTDIR)$(SAMPDIR)/cgi.cfg-sample
++ ${BSD_INSTALL_DATA} -m 640 sample-config/resource.cfg $(DESTDIR)$(SAMPDIR)/resource.cfg-sample
++ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/templates.cfg $(DESTDIR)$(SAMPDIR)/objects/templates.cfg-sample
++ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/commands.cfg $(DESTDIR)$(SAMPDIR)/objects/commands.cfg-sample
++ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/contacts.cfg $(DESTDIR)$(SAMPDIR)/objects/contacts.cfg-sample
++ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/timeperiods.cfg $(DESTDIR)$(SAMPDIR)/objects/timeperiods.cfg-sample
++ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/localhost.cfg $(DESTDIR)$(SAMPDIR)/objects/localhost.cfg-sample
++ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/windows.cfg $(DESTDIR)$(SAMPDIR)/objects/windows.cfg-sample
++ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/printer.cfg $(DESTDIR)$(SAMPDIR)/objects/printer.cfg-sample
++ ${BSD_INSTALL_DATA} -m 644 sample-config/template-object/switch.cfg $(DESTDIR)$(SAMPDIR)/objects/switch.cfg-sample
++
+ @echo ""
+ @echo "*** Config files installed ***"
+ @echo ""
+@@ -291,8 +218,15 @@ install-webconf:
+ @echo ""
+
+ install-exfoliation:
+- cp -rf contrib/exfoliation/stylesheets/* $(DESTDIR)$(HTMLDIR)/stylesheets
+- cp -rf contrib/exfoliation/images/* $(DESTDIR)$(HTMLDIR)/images
++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/stylesheets
++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images
++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/images/logos
++ for file in contrib/exfoliation/stylesheets/* ; \
++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
++ for file in contrib/exfoliation/images/*.* ; \
++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
++ for file in contrib/exfoliation/images/logos/* ; \
++ do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
+
+ @echo ""
+ @echo "*** Exfoliation theme installed ***"
+@@ -320,7 +254,10 @@ install-daemoninit:
+
+
+ install-commandmode:
+- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(LOGDIR)/rw
++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/archives
++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(LOGDIR)/rw
++ ${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(CHECKRESULTDIR)
++ chmod g+s $(DESTDIR)$(LOGDIR)/archives
+ chmod g+s $(DESTDIR)$(LOGDIR)/rw
+
+ @echo ""
diff -r ce4c7572e044 -r 4de243b71331 net/nagios-base/patches/patch-aa
--- a/net/nagios-base/patches/patch-aa Wed Apr 02 09:11:41 2014 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,182 +0,0 @@
-$NetBSD: patch-aa,v 1.11 2013/08/05 11:22:29 obache Exp $
-
---- Makefile.in.orig 2012-04-25 12:30:47.000000000 +0000
-+++ Makefile.in
-@@ -24,17 +24,16 @@ prefix=@prefix@
- exec_prefix=@exec_prefix@
- LOGDIR=@localstatedir@
- CHECKRESULTDIR=@CHECKRESULTDIR@
--CFGDIR=@sysconfdir@
-+SAMPDIR=@prefix@/share/examples/nagios
- BINDIR=@bindir@
--CGIDIR=@sbindir@
-+CGIDIR=@libexecdir@
- LIBEXECDIR=@libexecdir@
- HTMLDIR=@datadir@
- 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@
-
-@@ -72,74 +71,6 @@ all:
- cd $(SRC_BASE) && $(MAKE)
- cd $(SRC_CGI) && $(MAKE)
- cd $(SRC_HTM) && $(MAKE)
-- if [ x$(USE_EVENTBROKER) = xyes ]; then \
-- cd $(SRC_MODULE) && $(MAKE); \
-- fi
Home |
Main Index |
Thread Index |
Old Index