diff options
Diffstat (limited to 'net')
27 files changed, 168 insertions, 335 deletions
diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile index cd535db69ce..c0155f79e37 100644 --- a/net/nagios-base/Makefile +++ b/net/nagios-base/Makefile @@ -1,9 +1,8 @@ -# $NetBSD: Makefile,v 1.55 2014/05/29 23:37:04 wiz Exp $ +# $NetBSD: Makefile,v 1.56 2015/04/03 17:06:08 rodent Exp $ # -DISTNAME= nagios-3.5.1 +DISTNAME= nagios-4.0.8 PKGNAME= ${DISTNAME:S/-/-base-/} -PKGREVISION= 2 CATEGORIES= net sysutils DISTFILES= ${DISTNAME}${EXTRACT_SUFX} MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=nagios/} @@ -82,9 +81,6 @@ SUBST_FILES.files= nagios.conf.dist SUBST_SED.files= -e "s|@PREFIX@|${PREFIX}|g" SUBST_MESSAGE.files= Fixing configuration files. -post-extract: - ${MV} ${WRKDIR}/nagios ${WRKSRC} - pre-build: ${CP} ${FILESDIR}/nagios.conf.dist ${WRKSRC}/nagios.conf.dist @@ -99,6 +95,8 @@ post-install: ${INSTALL_DATA} ${WRKDIR}/netbsd40.png \ ${DESTDIR}/${PREFIX}/share/nagios/images/logos/ +.include "../../mk/dlopen.buildlink3.mk" +.include "../../devel/libltdl/buildlink3.mk" .include "../../graphics/gd/buildlink3.mk" .include "../../lang/php/phpversion.mk" .include "${PHPPKGSRCDIR}/buildlink3.mk" diff --git a/net/nagios-base/PLIST b/net/nagios-base/PLIST index d0daf3b7124..a8a2ef25a45 100644 --- a/net/nagios-base/PLIST +++ b/net/nagios-base/PLIST @@ -1,7 +1,7 @@ -@comment $NetBSD: PLIST,v 1.17 2014/04/02 13:32:18 he Exp $ +@comment $NetBSD: PLIST,v 1.18 2015/04/03 17:06:08 rodent Exp $ bin/nagios bin/nagiostats -bin/p1.pl +libexec/nagios/cgi-bin/archivejson.cgi libexec/nagios/cgi-bin/avail.cgi libexec/nagios/cgi-bin/cmd.cgi libexec/nagios/cgi-bin/config.cgi @@ -9,9 +9,11 @@ libexec/nagios/cgi-bin/extinfo.cgi libexec/nagios/cgi-bin/histogram.cgi libexec/nagios/cgi-bin/history.cgi libexec/nagios/cgi-bin/notifications.cgi +libexec/nagios/cgi-bin/objectjson.cgi libexec/nagios/cgi-bin/outages.cgi libexec/nagios/cgi-bin/showlog.cgi libexec/nagios/cgi-bin/status.cgi +libexec/nagios/cgi-bin/statusjson.cgi libexec/nagios/cgi-bin/statusmap.cgi libexec/nagios/cgi-bin/statuswml.cgi libexec/nagios/cgi-bin/statuswrl.cgi @@ -359,9 +361,14 @@ share/nagios/includes/rss/rss_utils.inc share/nagios/includes/utils.inc.php share/nagios/index.php share/nagios/js/jquery-1.7.1.min.js +share/nagios/js/jsonquery.js +share/nagios/jsonquery.html share/nagios/main.php share/nagios/robots.txt +share/nagios/rss-corebanner.php +share/nagios/rss-corefeed.html share/nagios/rss-corefeed.php +share/nagios/rss-newsfeed.html share/nagios/rss-newsfeed.php share/nagios/side.php share/nagios/stylesheets/avail.css @@ -372,6 +379,7 @@ share/nagios/stylesheets/config.css share/nagios/stylesheets/extinfo.css share/nagios/stylesheets/histogram.css share/nagios/stylesheets/history.css +share/nagios/stylesheets/jsonquery.css share/nagios/stylesheets/ministatus.css share/nagios/stylesheets/notifications.css share/nagios/stylesheets/outages.css diff --git a/net/nagios-base/distinfo b/net/nagios-base/distinfo index b038f60874e..c619e3a5b98 100644 --- a/net/nagios-base/distinfo +++ b/net/nagios-base/distinfo @@ -1,30 +1,19 @@ -$NetBSD: distinfo,v 1.21 2014/04/15 10:16:47 obache Exp $ +$NetBSD: distinfo,v 1.22 2015/04/03 17:06:08 rodent Exp $ -SHA1 (nagios-3.5.1.tar.gz) = 486fd6c75db47000b96d6eebb1654c30d5e9bc72 -RMD160 (nagios-3.5.1.tar.gz) = 0ce5693a745f617c9fbf627f18af27b793de884d -Size (nagios-3.5.1.tar.gz) = 1763584 bytes +SHA1 (nagios-4.0.8.tar.gz) = d49586db6905a8e58a082251d8f89ef5c2cab872 +RMD160 (nagios-4.0.8.tar.gz) = b53631755e0a23aba918a99f58b7bea237fdd799 +Size (nagios-4.0.8.tar.gz) = 1805059 bytes SHA1 (nagios-netbsd40-icons.tar.gz) = 62919c22c5d5dc3f603c3320578431e93dfdd9fe RMD160 (nagios-netbsd40-icons.tar.gz) = 96ad67a107dad095213ddbf58debcfd5b46d6dee Size (nagios-netbsd40-icons.tar.gz) = 5659 bytes -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) = 69b34e73dc54f99335626058e53d4e1f65313f72 -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 +SHA1 (patch-Makefile.in) = 953eea6b276beba75ab5c64c14d10cdcf1ca2188 +SHA1 (patch-base_Makefile.in) = 2b0162bb4d395b1d529f5fc1fdf9eab3ddaeb161 +SHA1 (patch-cgi_Makefile.in) = 25c22914986c0b781f5dd665a7a53778e1031a63 +SHA1 (patch-cgi_getcgi.c) = 3af474de4f4281f18a306f7d618ff532d0a9ca9e +SHA1 (patch-common_Makefile.in) = 7fa093a6109dfa03f9b97e4312d3a09e3235f00f +SHA1 (patch-configure) = f57db3a43c1abc1aa0d6fe007308089c620624a4 +SHA1 (patch-daemon-init.in) = 1e50bb84fde9780d5b13edb4e232c0e3a90ac3f4 +SHA1 (patch-html_Makefile.in) = 4fc1745c7bffef11f63ea32c4e9a3fbb3dcaaadf +SHA1 (patch-include_locations.h.in) = 0ee376f6737b24f0d4ea8b37781aca70147c5e70 +SHA1 (patch-lib_runcmd.c) = fb34fe5cdc39aca973c1a6e125b125867e6ed262 +SHA1 (patch-sample-config_nagios.cfg.in) = 4ad00840ad66d2e01b19c6db76c810fc3fb80795 diff --git a/net/nagios-base/patches/patch-Makefile.in b/net/nagios-base/patches/patch-Makefile.in index 8a5eca0a40d..c61aa7f4da5 100644 --- a/net/nagios-base/patches/patch-Makefile.in +++ b/net/nagios-base/patches/patch-Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $ +$NetBSD: patch-Makefile.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ Adjustments to build procedure. ---- Makefile.in.orig 2012-04-25 12:30:47.000000000 +0000 +--- Makefile.in.orig 2014-08-12 15:00:01.000000000 +0000 +++ Makefile.in -@@ -24,17 +24,16 @@ prefix=@prefix@ +@@ -25,9 +25,9 @@ prefix=@prefix@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ CHECKRESULTDIR=@CHECKRESULTDIR@ @@ -14,7 +14,9 @@ Adjustments to build procedure. -CGIDIR=@sbindir@ +CGIDIR=@libexecdir@ LIBEXECDIR=@libexecdir@ - HTMLDIR=@datadir@ + LIBDIR=@libdir@ + INCLUDEDIR=@includedir@/nagios +@@ -36,9 +36,8 @@ datarootdir=@datarootdir@ INSTALL=@INSTALL@ INSTALL_OPTS=@INSTALL_OPTS@ COMMAND_OPTS=@COMMAND_OPTS@ @@ -23,15 +25,16 @@ Adjustments to build procedure. -INIT_OPTS=-o root -g root +INIT_OPTS=-o root -g wheel CGICFGDIR=$(CGIDIR) - PERLDIR=@PERLDIR@ -@@ -72,74 +71,6 @@ all: + USE_EVENTBROKER=@USE_EVENTBROKER@ +@@ -71,75 +70,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 +- cd $(SRC_WORKERS) && $(MAKE) $@ - - @echo "" - @echo "*** Compile finished ***" @@ -98,26 +101,21 @@ Adjustments to build procedure. - @echo "Enjoy." - @echo "" - nagios: - cd $(SRC_BASE) && $(MAKE) -@@ -234,14 +165,10 @@ install-unstripped: + $(SRC_LIB)/libnagios.a: + cd $(SRC_LIB) && $(MAKE) +@@ -245,11 +175,6 @@ 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; -- -+ +- $(INSTALL) -m 775 $(COMMAND_OPTS) -d $(DESTDIR)$(CHECKRESULTDIR) +- chmod g+s $(DESTDIR)$(CHECKRESULTDIR) + @echo "" @echo "*** Main program, CGIs and HTML files installed ***" - @echo "" -@@ -261,20 +188,20 @@ install-basic: +@@ -270,20 +195,20 @@ install-basic: install-config: @@ -152,7 +150,7 @@ Adjustments to build procedure. @echo "" @echo "*** Config files installed ***" @echo "" -@@ -291,8 +218,15 @@ install-webconf: +@@ -300,8 +225,15 @@ install-webconf: @echo "" install-exfoliation: @@ -170,7 +168,7 @@ Adjustments to build procedure. @echo "" @echo "*** Exfoliation theme installed ***" -@@ -320,7 +254,10 @@ install-daemoninit: +@@ -329,7 +261,10 @@ install-daemoninit: install-commandmode: diff --git a/net/nagios-base/patches/patch-base_Makefile.in b/net/nagios-base/patches/patch-base_Makefile.in index f6fbf1e6711..58165a7928b 100644 --- a/net/nagios-base/patches/patch-base_Makefile.in +++ b/net/nagios-base/patches/patch-base_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-base_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $ +$NetBSD: patch-base_Makefile.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ Adjustments to build procedure. ---- base/Makefile.in.orig 2010-10-23 10:00:59.000000000 +0000 +--- base/Makefile.in.orig 2014-08-12 15:00:01.000000000 +0000 +++ base/Makefile.in @@ -36,7 +36,7 @@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ @@ -13,7 +13,7 @@ Adjustments to build procedure. HTMLDIR=@datarootdir@ INSTALL=@INSTALL@ INSTALL_OPTS=@INSTALL_OPTS@ -@@ -204,9 +204,9 @@ install-unstripped: +@@ -180,9 +180,9 @@ install-unstripped: $(MAKE) install-basic install-basic: diff --git a/net/nagios-base/patches/patch-cgi_Makefile.in b/net/nagios-base/patches/patch-cgi_Makefile.in index d4e88a750f7..5b151bd185a 100644 --- a/net/nagios-base/patches/patch-cgi_Makefile.in +++ b/net/nagios-base/patches/patch-cgi_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-cgi_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $ +$NetBSD: patch-cgi_Makefile.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ Adjustments to build procedure. ---- cgi/Makefile.in.orig 2010-10-23 10:00:59.000000000 +0000 +--- cgi/Makefile.in.orig 2014-08-12 15:00:01.000000000 +0000 +++ cgi/Makefile.in @@ -15,7 +15,7 @@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ diff --git a/net/nagios-base/patches/patch-cgi_avail.c b/net/nagios-base/patches/patch-cgi_avail.c deleted file mode 100644 index a85a421b817..00000000000 --- a/net/nagios-base/patches/patch-cgi_avail.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cgi_avail.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/avail.c.orig 2012-02-03 15:23:14.000000000 +0000 -+++ cgi/avail.c -@@ -1141,7 +1141,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - diff --git a/net/nagios-base/patches/patch-cgi_cmd.c b/net/nagios-base/patches/patch-cgi_cmd.c deleted file mode 100644 index 712677fd79e..00000000000 --- a/net/nagios-base/patches/patch-cgi_cmd.c +++ /dev/null @@ -1,32 +0,0 @@ -$NetBSD: patch-cgi_cmd.c,v 1.2 2014/04/15 10:16:47 obache Exp $ - -* Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ -* Fix CVE-2014-1878 - ---- cgi/cmd.c.orig 2013-08-30 17:46:14.000000000 +0000 -+++ cgi/cmd.c -@@ -321,7 +321,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - -@@ -1923,14 +1922,14 @@ static int cmd_submitf(int id, const cha - return ERROR; - - len = snprintf(cmd, sizeof(cmd) - 1, "[%lu] %s;", time(NULL), command); -- if(len < 0) -+ if(len < 0 || len >= sizeof(cmd)) - return ERROR; - - if(fmt) { - va_start(ap, fmt); - len2 = vsnprintf(&cmd[len], sizeof(cmd) - len - 1, fmt, ap); - va_end(ap); -- if(len2 < 0) -+ if(len2 < 0 || len2 >= sizeof(cmd) - len) - return ERROR; - } - diff --git a/net/nagios-base/patches/patch-cgi_config.c b/net/nagios-base/patches/patch-cgi_config.c deleted file mode 100644 index 3432691035d..00000000000 --- a/net/nagios-base/patches/patch-cgi_config.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cgi_config.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/config.c.orig 2013-02-27 01:37:32.000000000 +0000 -+++ cgi/config.c -@@ -386,7 +386,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - diff --git a/net/nagios-base/patches/patch-cgi_extinfo.c b/net/nagios-base/patches/patch-cgi_extinfo.c deleted file mode 100644 index dedd14f107c..00000000000 --- a/net/nagios-base/patches/patch-cgi_extinfo.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cgi_extinfo.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/extinfo.c.orig 2011-08-17 07:36:27.000000000 +0000 -+++ cgi/extinfo.c -@@ -651,7 +651,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - diff --git a/net/nagios-base/patches/patch-cgi_getcgi.c b/net/nagios-base/patches/patch-cgi_getcgi.c index da91f2c8420..d23b85653f2 100644 --- a/net/nagios-base/patches/patch-cgi_getcgi.c +++ b/net/nagios-base/patches/patch-cgi_getcgi.c @@ -1,10 +1,10 @@ -$NetBSD: patch-cgi_getcgi.c,v 1.1 2014/04/02 10:22:37 he Exp $ +$NetBSD: patch-cgi_getcgi.c,v 1.2 2015/04/03 17:06:08 rodent Exp $ Also include limits.h. ---- cgi/getcgi.c.orig 2012-10-04 18:31:47.000000000 +0200 -+++ cgi/getcgi.c 2012-10-04 18:31:57.000000000 +0200 -@@ -10,6 +10,7 @@ +--- cgi/getcgi.c.orig 2014-08-12 15:00:01.000000000 +0000 ++++ cgi/getcgi.c +@@ -9,6 +9,7 @@ #include "../include/getcgi.h" #include <stdio.h> #include <stdlib.h> diff --git a/net/nagios-base/patches/patch-cgi_histogram.c b/net/nagios-base/patches/patch-cgi_histogram.c deleted file mode 100644 index d568b6a7e44..00000000000 --- a/net/nagios-base/patches/patch-cgi_histogram.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cgi_histogram.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/histogram.c.orig 2011-11-21 20:51:52.000000000 +0000 -+++ cgi/histogram.c -@@ -1069,7 +1069,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - diff --git a/net/nagios-base/patches/patch-cgi_notifications.c b/net/nagios-base/patches/patch-cgi_notifications.c deleted file mode 100644 index 9700411d949..00000000000 --- a/net/nagios-base/patches/patch-cgi_notifications.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cgi_notifications.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/notifications.c.orig 2012-02-03 15:22:56.000000000 +0000 -+++ cgi/notifications.c -@@ -358,7 +358,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - diff --git a/net/nagios-base/patches/patch-cgi_outages.c b/net/nagios-base/patches/patch-cgi_outages.c deleted file mode 100644 index f30cdb9bc00..00000000000 --- a/net/nagios-base/patches/patch-cgi_outages.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cgi_outages.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/outages.c.orig 2011-08-17 07:36:27.000000000 +0000 -+++ cgi/outages.c -@@ -269,7 +269,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - diff --git a/net/nagios-base/patches/patch-cgi_status.c b/net/nagios-base/patches/patch-cgi_status.c deleted file mode 100644 index 6d377bc7c15..00000000000 --- a/net/nagios-base/patches/patch-cgi_status.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cgi_status.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/status.c.orig 2013-03-09 21:46:35.000000000 +0000 -+++ cgi/status.c -@@ -600,7 +600,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - diff --git a/net/nagios-base/patches/patch-cgi_statusmap.c b/net/nagios-base/patches/patch-cgi_statusmap.c deleted file mode 100644 index c9d71e3660d..00000000000 --- a/net/nagios-base/patches/patch-cgi_statusmap.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cgi_statusmap.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/statusmap.c.orig 2011-08-17 07:36:27.000000000 +0000 -+++ cgi/statusmap.c -@@ -407,7 +407,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - diff --git a/net/nagios-base/patches/patch-cgi_statuswml.c b/net/nagios-base/patches/patch-cgi_statuswml.c deleted file mode 100644 index 6599f29552f..00000000000 --- a/net/nagios-base/patches/patch-cgi_statuswml.c +++ /dev/null @@ -1,21 +0,0 @@ -$NetBSD: patch-cgi_statuswml.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/statuswml.c.orig 2011-08-17 07:36:27.000000000 +0000 -+++ cgi/statuswml.c -@@ -235,8 +235,13 @@ int process_cgivars(void) { - - for(x = 0; variables[x] != NULL; x++) { - -+ /* do some basic length checking on the variable identifier to prevent buffer overflows */ -+ if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -+ continue; -+ } -+ - /* we found the hostgroup argument */ -- if(!strcmp(variables[x], "hostgroup")) { -+ else if(!strcmp(variables[x], "hostgroup")) { - display_type = DISPLAY_HOSTGROUP; - x++; - if(variables[x] == NULL) { diff --git a/net/nagios-base/patches/patch-cgi_summary.c b/net/nagios-base/patches/patch-cgi_summary.c deleted file mode 100644 index d544b3e3812..00000000000 --- a/net/nagios-base/patches/patch-cgi_summary.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cgi_summary.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/summary.c.orig 2011-08-17 07:36:27.000000000 +0000 -+++ cgi/summary.c -@@ -761,7 +761,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - diff --git a/net/nagios-base/patches/patch-cgi_trends.c b/net/nagios-base/patches/patch-cgi_trends.c deleted file mode 100644 index 0797ab9b171..00000000000 --- a/net/nagios-base/patches/patch-cgi_trends.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-cgi_trends.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- cgi/trends.c.orig 2011-08-17 07:36:27.000000000 +0000 -+++ cgi/trends.c -@@ -1271,7 +1271,6 @@ int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - diff --git a/net/nagios-base/patches/patch-common_Makefile.in b/net/nagios-base/patches/patch-common_Makefile.in index 41da57b2662..8e8171bf908 100644 --- a/net/nagios-base/patches/patch-common_Makefile.in +++ b/net/nagios-base/patches/patch-common_Makefile.in @@ -1,10 +1,10 @@ -$NetBSD: patch-common_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $ +$NetBSD: patch-common_Makefile.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ Adjustments to build procedure. ---- common/Makefile.in.orig 2009-06-17 03:57:21.000000000 +0000 +--- common/Makefile.in.orig 2014-08-12 15:00:01.000000000 +0000 +++ common/Makefile.in -@@ -17,7 +17,7 @@ exec_prefix=@exec_prefix@ +@@ -16,7 +16,7 @@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ CFGDIR=@sysconfdir@ BINDIR=@bindir@ diff --git a/net/nagios-base/patches/patch-configure b/net/nagios-base/patches/patch-configure index 672918bb075..e935016e4c7 100644 --- a/net/nagios-base/patches/patch-configure +++ b/net/nagios-base/patches/patch-configure @@ -1,12 +1,12 @@ -$NetBSD: patch-configure,v 1.1 2014/04/02 10:22:37 he Exp $ +$NetBSD: patch-configure,v 1.2 2015/04/03 17:06:08 rodent Exp $ Adjustments to build procedure. ---- configure.orig 2011-07-26 05:16:26.000000000 +0200 -+++ configure 2011-08-01 18:36:37.000000000 +0200 -@@ -5775,7 +5775,7 @@ - CHECKRESULTDIR=no - fi; +--- configure.orig 2014-08-12 15:00:01.000000000 +0000 ++++ configure +@@ -6129,7 +6129,7 @@ else + fi + if test x$CHECKRESULTDIR = xno; then - CHECKRESULTDIR="$localstatedir/spool/checkresults" + CHECKRESULTDIR="$localstatedir/checkresults" diff --git a/net/nagios-base/patches/patch-contrib_daemonchk.c b/net/nagios-base/patches/patch-contrib_daemonchk.c deleted file mode 100644 index d446c890df4..00000000000 --- a/net/nagios-base/patches/patch-contrib_daemonchk.c +++ /dev/null @@ -1,14 +0,0 @@ -$NetBSD: patch-contrib_daemonchk.c,v 1.1 2014/04/02 10:22:37 he Exp $ - -Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/ - ---- contrib/daemonchk.c.orig 2011-08-17 07:36:27.000000000 +0000 -+++ contrib/daemonchk.c -@@ -174,7 +174,6 @@ static int process_cgivars(void) { - - /* do some basic length checking on the variable identifier to prevent buffer overflows */ - if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) { -- x++; - continue; - } - } diff --git a/net/nagios-base/patches/patch-daemon-init.in b/net/nagios-base/patches/patch-daemon-init.in new file mode 100644 index 00000000000..9a678975949 --- /dev/null +++ b/net/nagios-base/patches/patch-daemon-init.in @@ -0,0 +1,15 @@ +$NetBSD: patch-daemon-init.in,v 1.1 2015/04/03 17:06:08 rodent Exp $ + +Fix portability failure. + +--- daemon-init.in.orig 2014-08-12 15:00:01.000000000 +0000 ++++ daemon-init.in +@@ -73,7 +73,7 @@ fi + USE_RAMDISK=${USE_RAMDISK:-0} + if test "$USE_RAMDISK" -ne 0 && test "$RAMDISK_SIZE"X != "X"; then + ramdisk=`mount |grep "${RAMDISK_DIR} type tmpfs"` +- if [ "$ramdisk"X == "X" ]; then ++ if [ "$ramdisk"X = "X" ]; then + mkdir -p -m 0755 ${RAMDISK_DIR} + mount -t tmpfs -o size=${RAMDISK_SIZE}m tmpfs ${RAMDISK_DIR} + mkdir -p -m 0755 ${RAMDISK_DIR}/checkresults diff --git a/net/nagios-base/patches/patch-html_Makefile.in b/net/nagios-base/patches/patch-html_Makefile.in index c57ab310ce9..b9d2fd9d493 100644 --- a/net/nagios-base/patches/patch-html_Makefile.in +++ b/net/nagios-base/patches/patch-html_Makefile.in @@ -1,8 +1,8 @@ -$NetBSD: patch-html_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $ +$NetBSD: patch-html_Makefile.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ Adjustments to build procedure. ---- html/Makefile.in.orig 2012-02-13 20:40:42.000000000 +0000 +--- html/Makefile.in.orig 2014-08-12 15:00:01.000000000 +0000 +++ html/Makefile.in @@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@ LOGDIR=@localstatedir@ @@ -11,9 +11,9 @@ Adjustments to build procedure. -CGIDIR=@sbindir@ +CGIDIR=@libexecdir@ HTMLDIR=@datadir@ + datarootdir=@datarootdir@ INSTALL=@INSTALL@ - INSTALL_OPTS=@INSTALL_OPTS@ -@@ -34,55 +34,55 @@ distclean: clean +@@ -35,21 +35,22 @@ distclean: clean devclean: distclean install: @@ -32,6 +32,7 @@ Adjustments to build procedure. - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/ssi - $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR) -# $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs ++ $(BSD_INSTALL_DATA_DIR) + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR) + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media + $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/stylesheets @@ -50,67 +51,54 @@ Adjustments to build procedure. # 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; \ +@@ -58,35 +59,35 @@ install: + $(INSTALL) -m 664 $(INSTALL_OPTS) rss-corefeed.html $(DESTDIR)$(HTMLDIR) + $(INSTALL) -m 664 $(INSTALL_OPTS) rss-newsfeed.html $(DESTDIR)$(HTMLDIR) + for file in *.php; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done --# for file in media/*.wav; \ ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR); done + # for file in media/*.wav; \ -# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done -- for file in stylesheets/*.css; \ ++# do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/media; done + for file in stylesheets/*.css; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done -- for file in contexthelp/*.html; \ ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done + for file in contexthelp/*.html; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done -- for file in js/*.js; \ ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done + for file in js/*.js; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done --# for file in docs/*.html; \ ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/js; done + # for file in docs/*.html; \ -# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done --# for file in docs/images/*.*; \ ++# do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs; done + # for file in docs/images/*.*; \ -# do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done -- for file in images/*.gif; \ ++# do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done + for file in images/*.gif; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -- for file in images/*.jpg; \ ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/*.jpg; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -- for file in images/*.png; \ ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/*.png; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -- for file in images/*.ico; \ ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/*.ico; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done -- for file in images/logos/*.*; \ ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done + for file in images/logos/*.*; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done -- for file in includes/*.*; \ ++ do $(BSD_INSTALL_DATA) $$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/*.*; \ ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes; done + for file in includes/rss/*.*; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done -- for file in includes/rss/extlib/*.*; \ ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done + for file in includes/rss/extlib/*.*; \ - do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done -+ for file in *.php; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR); done -+# for file in media/*.wav; do \ -+# $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/media; done -+ for file in stylesheets/*.css; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done -+ for file in contexthelp/*.html; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done -+ for file in js/*.js; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/js; done -+# for file in docs/*.html; do \ -+# $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs; done -+# for file in docs/images/*.*; do \ -+# $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done -+ for file in images/*.gif; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ for file in images/*.jpg; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ for file in images/*.png; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ for file in images/*.ico; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done -+ for file in images/logos/*.*; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done -+ for file in includes/*.*; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes; done -+ for file in includes/rss/*.*; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done -+ for file in includes/rss/extlib/*.*; do \ -+ $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done ++ do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done install-unstripped: $(MAKE) install diff --git a/net/nagios-base/patches/patch-include_locations.h.in b/net/nagios-base/patches/patch-include_locations.h.in index f20c80277ab..ed21f6e91cc 100644 --- a/net/nagios-base/patches/patch-include_locations.h.in +++ b/net/nagios-base/patches/patch-include_locations.h.in @@ -1,10 +1,10 @@ -$NetBSD: patch-include_locations.h.in,v 1.1 2014/04/02 10:22:37 he Exp $ +$NetBSD: patch-include_locations.h.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ Adjustments to build procedure. ---- include/locations.h.in.orig 2008-11-30 17:22:59.000000000 +0000 +--- include/locations.h.in.orig 2014-08-12 15:00:01.000000000 +0000 +++ include/locations.h.in -@@ -20,7 +20,7 @@ +@@ -19,7 +19,7 @@ #define DEFAULT_TEMP_FILE "@localstatedir@/tempfile" #define DEFAULT_TEMP_PATH "/tmp" diff --git a/net/nagios-base/patches/patch-lib_runcmd.c b/net/nagios-base/patches/patch-lib_runcmd.c new file mode 100644 index 00000000000..49eceba4ce9 --- /dev/null +++ b/net/nagios-base/patches/patch-lib_runcmd.c @@ -0,0 +1,44 @@ +$NetBSD: patch-lib_runcmd.c,v 1.1 2015/04/03 17:06:08 rodent Exp $ + +Include config.h generated during configure. +setenv(3) was tested there. No need to check for it here. +Can't assign a value to a constant. Ensure we don't do that. + +--- lib/runcmd.c.orig 2014-08-12 15:00:01.000000000 +0000 ++++ lib/runcmd.c +@@ -15,6 +15,7 @@ + #define NAGIOSPLUG_API_C 1 + + /* includes **/ ++#include "../include/config.h" + #include <stdlib.h> + #include <unistd.h> + #include <string.h> +@@ -35,11 +36,6 @@ + # define WIFEXITED(stat_val) (((stat_val) & 255) == 0) + #endif + +-/* Determine whether we have setenv()/unsetenv() (see setenv(3) on Linux) */ +-#if _BSD_SOURCE || _POSIX_C_SOURCE >= 200112L || _XOPEN_SOURCE >= 600 +-# define HAVE_SETENV +-#endif +- + /* + * This variable must be global, since there's no way the caller + * can forcibly slay a dead or ungainly running program otherwise. +@@ -304,13 +300,13 @@ int runcmd_cmd2strv(const char *str, int + * through this API and thus achieve async-safeness throughout the API. */ + void runcmd_init(void) + { +-#if defined(RLIMIT_NOFILE) ++#if defined(RLIMIT_NOFILE) && !defined(maxfd) + if (!maxfd) { + struct rlimit rlim; + getrlimit(RLIMIT_NOFILE, &rlim); + maxfd = rlim.rlim_cur; + } +-#elif !defined(OPEN_MAX) && !defined(IOV_MAX) && defined(_SC_OPEN_MAX) ++#elif !defined(OPEN_MAX) && !defined(IOV_MAX) && defined(_SC_OPEN_MAX) && !defined(maxfd) + if(!maxfd) { + if((maxfd = sysconf(_SC_OPEN_MAX)) < 0) { + /* possibly log or emit a warning here, since there's no diff --git a/net/nagios-base/patches/patch-sample-config_nagios.cfg.in b/net/nagios-base/patches/patch-sample-config_nagios.cfg.in index 51c4fa64dfb..8f98f0bec6a 100644 --- a/net/nagios-base/patches/patch-sample-config_nagios.cfg.in +++ b/net/nagios-base/patches/patch-sample-config_nagios.cfg.in @@ -1,10 +1,10 @@ -$NetBSD: patch-sample-config_nagios.cfg.in,v 1.1 2014/04/02 10:22:37 he Exp $ +$NetBSD: patch-sample-config_nagios.cfg.in,v 1.2 2015/04/03 17:06:08 rodent Exp $ Fix placement of temporary file. ---- sample-config/nagios.cfg.in.orig 2010-10-04 02:27:55.000000000 +0000 +--- sample-config/nagios.cfg.in.orig 2014-08-12 15:00:01.000000000 +0000 +++ sample-config/nagios.cfg.in -@@ -198,7 +198,7 @@ lock_file=@lockfile@ +@@ -176,7 +176,7 @@ lock_file=@lockfile@ # is created, used, and deleted throughout the time that Nagios is # running. |