pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/net/nagios-base Update to nagios-4.0.8. Patches applie...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e363bb1718c9
branches: trunk
changeset: 649472:e363bb1718c9
user: rodent <rodent%pkgsrc.org@localhost>
date: Fri Apr 03 17:06:08 2015 +0000
description:
Update to nagios-4.0.8. Patches applied upstream were removed. Added two
patches. From: http://nagios.sourceforge.net/docs/nagioscore/4/en/whatsnew.html
Changes and New Features
Performance Improvements:
The performance improvements in Nagios Core 4 come primarily from the following areas:
Core Workers - Core workers are lightweight processes whose only job is to perform checks. Because they are smaller they spawn much more quickly than the the old process which forked the full
Nagios Core. In addition, they communicate with the main Nagios Core process using in-memory techniques, eliminating the disk I/O latencies that could previously slow things down, especially in large
installations.
Configuration Verification - Configuration verification has been improved so that each configuration item is verified only once. Previously configuration verification was an O(n2) operation.
Event Queue - The event queue now uses a data structure that has O(log n) insertion times versus the O(n) insertion time previously. This means that inserting events into the queue uses much
less CPU than in Nagios Core 3.
Macro Resolution - Macros are now sorted on startup so macro lookup can use a binary search. In addition, frequently accessed macros $USERx$, $ARGx$, and $HOSTADDRESS$ are given special case,
early lookups.
Object Definitions:
The following changes have been made to object definitions:
The host address attribute is now optional. The address attribute is set to the host name when it is absent. Most configurations set the host name attribute to the DNS host name making the
address attribute redundant.
Both hosts and services now support an hourly value attribute. The hourly value attribute is intended to represent the value of a host or service to an organization and is used by the new
minimum value contact attribute.
Services now support a parents attribute. A service parent performs a function similar to host parents and can be used in place of service dependencies in simple circumstances.
The failure_prediction_enabled flag has been removed from both host and service object definitions.
Contacts now support a minimum value attribute. The mininum value attribute is used with the host and service hourly value attributes to determine whether to notify a contact on host and
service problems.
The host obess_over_host and the service obsess_over_service attributes can now both use the shortened attribute obsess.
Object Behavior:
Contact Inheritance - According to the documentation, contacts should only be inherited from host to service if the service has no other contacts whatsoever (and the same goes for
escalations), but the way the code previously worked was that it handled contact_groups and contacts directives separately, meaning services with only 'contacts' specified were still eligible for
inheriting 'contact_groups' from the host. This has been updated to comply with the documentation.
Timeperiods - There were several issues processing timeperiods when both exclusions and exceptions were involved. The issues have been corrected.
Configuration:
The following changes have been made to the main Nagios Core configuration, nagios.cfg:
Because there are many ways to obtain object information, the object information is no longer stored if in the object cache if the configuration variable object_cache_file equals '/dev/null'.
Setting the variable to '/dev/null' will reduce the disk I/O load.
Because there are many ways to obtain status information, the status information is no longer stored if in the status data file if the configuration variable status_file equals '/dev/null'.
Setting the variable to '/dev/null' will reduce the disk I/O load.
There is a new configuration variable, log_current_states, which determines whether current states will be logged in the log files when they are rotated. In Nagios Core 3, this was always the
behavior and it is the default in Nagios Core 4. Disabling the logging of current states on log rotation can save considerable disk space for large installations.
There is a new configuration variable, check_workers, which specifies how many worker processes are created when Nagios Core starts. If not specified, the number of worker process is
determine by the number of CPUs on the system.
There is a new configuration variable, query_socket, which specifies the location of the query handler socket. The default location is /usr/local/nagios/var/rw/nagios.qh.
The configuration variables, check_result_reaper_frequency and max_check_result_reaper_time, have been deprecated. Because of the new worker architecture, checks are no longer reaped, but
they are fed back to core by the worker processes. As a result, these variables no longer make sense.
All file and directory configuration variables in the main nagios.cfg can now use paths that are relative to the location of nagios.cfg.
Although rarely used in the past, creating nagios objects in the main nagios.cfg configuration file was allowed. This is now prohibited.
Macros:
Additions - A new macro, $CHECKSOURCE$, has been added which contains information about what process performed a check.
Changes - If use_large_installation_tweaks is set, the $HOSTGROUPMEMBERS$ and $SERVICEGROUPMEMBERS$ macros are no longer exported because they can consume the available space for environment
variables.
Macros are normally available as environment variables when check, event handler, notification, and other commands are run. This can be rather CPU intensive in large Nagios installations, so
you can disable the export of environment variables completely with the enable_environment_macros option.
Macro information can be found here.
Query Handler:
The query handler is a general purpose communication mechanism that allows external entities to communicate with Nagios Core in a well-defined manner. As of this writing, all communication with
the query handler takes place through a Unix-domain socket whose location is defined by the query_socket configuration variable.
There are currently 5 built-in query handlers.
core - provides Nagios Core management and information
wproc - provides worker process registration, management and information
nerd - provides a subscription service to the Nagios Event Radio Dispatcher (NERD)
help - provides help for the query handler
echo - implements a basic query handler that simply echoes back the queries sent to it
More information about the query handler interface, including an introduction to creating a custom query handler, can be found in the source-supplied documentation.
Core Workers:
Previously, all host and service checks were performed by the full Nagios Core process. This required forking the Nagios Core process for every check. The full Nagios Core process includes a lot
of things that are not required to actually perform the check, including check scheduling, downtime handling, processing external commands, etc. As a result, forking the Nagios Core process was much
slower than was necessary. When the actual check was run, the forked process again forked a shell to run the check and the shell forked to run the plugin.
In addition, disk files were used as the inter-process communication (IPC) mechanism between the forked Nagios process doing the checking and the main Nagios process handling the check results.
In Nagios Core 4, the process of performing host and service checks is now accomplished using a lightweight worker processes. Standard worker processes start up with the main Nagios Core process
and additional, special-purpose workers, can be started at any time after Nagios Core starts. If the check command is "simple" (no shell escapes), the worker process can run the command directly,
avoiding the 2 additional forks previously required.
Also in Nagios Core 4, the worker processes report the check results to the main Nagios Core process using in-memory IPC mechanisms (the query handler interface), eliminating the disk I/O
bottleneck that used to be an issue in large installations.
When a worker process registers with the main Nagios Core process, it tells Nagios Core what checks it will handle. This feature allows external authors to create special-purpose workers which
are optimized to perform certain checks. A sample special-purpose ping check worker is included with the Nagios Core source code in the worker/ping subdirectory.
More information about workers, including an introduction to creating custom workers can be found in the source-supplied documentation.
Nagios Event Radio Dispatcher (NERD):
The Nagios Event Radio Dispatcher (NERD) is a query handler based service that streams Nagios Core events to the subscriber. Currently, there are three channels that can be subscribed to:
hostchecks, servicechecks and opathchecks.
libnagios:
libnagios is a library of functions that can be used by developers of query handlers and worker processes. libnagios currently contains the following components.
bitmap - bitmap library for calculating dependency graphs
dkhash - dual-keyed hash api
fanout - sparsely populated array used for downtime, comments, and worker jobs
iobroker - I/O broker library for multiplexing between running tasks and the master nagios process.
iocache - I/O caching libary for bulk-reading requests and parsing them
kvvec - key/value library for parsing requests and building responses
nsock - socket library for connecting to and communicating through the qh socket
nspath - general purpose path library for converting between relative and absolute paths
nsutils - small library with worker related utilities
pqueue - pqueue library written by Volkan Yazici
runcmd - for spawning and reaping commands
skiplist - skiplist library used within Nagios Core
squeue - for maintaining a queue of the running job's timeouts
worker - for utils and stuff nifty to have if you're a worker
Documentation:
Documentation of Nagios Core internals is now provided as part of the source distribution. To create an HTML version of this documentation run 'make dox' from the root of the source distribution
tree. The doxygen utilities must be installed to make this documentation.
Tests:
A much more complete test suite is now incuded with the Nagios Core source distribution.
RPM Spec File:
The RPM spec file has been completely overhauled to support more current standards.
Deprecated Features:
Extended Host and Service Information - The hostextinfo and serviceextinfo objects are now deprecated and should not be used. Support for them will be removed in a future version. The same
information specified in the hostextinfo and serviceextinfo objects can be specified in the host and service object respectively.
-x/--dont-verify-paths command line option (Don't check for circular object paths) - Because configuration checking is now so much faster, the option to skip checking for circular object
paths has been deprecated.
The following configuration variables have been deprecated: check_result_reaper_frequency, max_check_result_reaper_time, sleep_time, external_command_buffer_slots, command_check_interval
Obsoleted Features:
Failure Prediction - As noted above, the failure_prediction_enabled flag has been removed from both host and service object definitions. Failure predition was never fully implemented and
would require breaking the paradigm that Nagios Core knows nothing about the performance data returned by plugins. Failure prediction is much more approprately handled by an add-on than by Nagios
Core.
-o/--dont-verify-objects command line option - This option, while accepted in Nagios Core 3, has neither been advertized nor has had any effect for quite some time. The option has been
removed in Nagios Core 4.
Embedded Perl - Embedded Perl has historically been the least tested and the most problem prone part of Nagios Core. A significant part of the issue is that there are so many versions of Perl
available. The performance enhancements provided by the new worker process architecture make up for any performance loss due to the removal of embeddd Perl. In addition, the worker process
architecture makes possible the implementation of a special purpose worker to persistently load and run Perl plugins. The following configuration variables that were related to embedded Perl have
been obsoleted: use_embedded_perl_implicitly, enable_embedded_perl, p1_file.
Miscellaneous:
Object IDs - Primarily only of interest to developers, all of the first-class objects now have object IDs. First-class objects are timeperiod, command, contact, host, service, escalations,
dependencies and all kinds of groups. Object IDs are not persistent and are recreated on each restart.
diffstat:
net/nagios-base/Makefile | 10 +-
net/nagios-base/PLIST | 12 +-
net/nagios-base/distinfo | 41 ++----
net/nagios-base/patches/patch-Makefile.in | 38 +++---
net/nagios-base/patches/patch-base_Makefile.in | 6 +-
net/nagios-base/patches/patch-cgi_Makefile.in | 4 +-
net/nagios-base/patches/patch-cgi_avail.c | 14 --
net/nagios-base/patches/patch-cgi_cmd.c | 32 -----
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 | 8 +-
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 | 6 +-
net/nagios-base/patches/patch-configure | 12 +-
net/nagios-base/patches/patch-contrib_daemonchk.c | 14 --
net/nagios-base/patches/patch-daemon-init.in | 15 ++
net/nagios-base/patches/patch-html_Makefile.in | 88 ++++++--------
net/nagios-base/patches/patch-include_locations.h.in | 6 +-
net/nagios-base/patches/patch-lib_runcmd.c | 44 +++++++
net/nagios-base/patches/patch-sample-config_nagios.cfg.in | 6 +-
27 files changed, 168 insertions(+), 335 deletions(-)
diffs (truncated from 819 to 300 lines):
diff -r fe578248c88c -r e363bb1718c9 net/nagios-base/Makefile
--- a/net/nagios-base/Makefile Fri Apr 03 16:35:53 2015 +0000
+++ b/net/nagios-base/Makefile Fri Apr 03 17:06:08 2015 +0000
@@ -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_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 @@
${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 -r fe578248c88c -r e363bb1718c9 net/nagios-base/PLIST
--- a/net/nagios-base/PLIST Fri Apr 03 16:35:53 2015 +0000
+++ b/net/nagios-base/PLIST Fri Apr 03 17:06:08 2015 +0000
@@ -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/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/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/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 -r fe578248c88c -r e363bb1718c9 net/nagios-base/distinfo
--- a/net/nagios-base/distinfo Fri Apr 03 16:35:53 2015 +0000
+++ b/net/nagios-base/distinfo Fri Apr 03 17:06:08 2015 +0000
@@ -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 -r fe578248c88c -r e363bb1718c9 net/nagios-base/patches/patch-Makefile.in
--- a/net/nagios-base/patches/patch-Makefile.in Fri Apr 03 16:35:53 2015 +0000
+++ b/net/nagios-base/patches/patch-Makefile.in Fri Apr 03 17:06:08 2015 +0000
@@ -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 @@
-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 @@
-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 @@
- @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 @@
@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 @@
@echo ""
@echo "*** Exfoliation theme installed ***"
-@@ -320,7 +254,10 @@ install-daemoninit:
+@@ -329,7 +261,10 @@ install-daemoninit:
install-commandmode:
diff -r fe578248c88c -r e363bb1718c9 net/nagios-base/patches/patch-base_Makefile.in
--- a/net/nagios-base/patches/patch-base_Makefile.in Fri Apr 03 16:35:53 2015 +0000
+++ b/net/nagios-base/patches/patch-base_Makefile.in Fri Apr 03 17:06:08 2015 +0000
@@ -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 @@
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 -r fe578248c88c -r e363bb1718c9 net/nagios-base/patches/patch-cgi_Makefile.in
--- a/net/nagios-base/patches/patch-cgi_Makefile.in Fri Apr 03 16:35:53 2015 +0000
+++ b/net/nagios-base/patches/patch-cgi_Makefile.in Fri Apr 03 17:06:08 2015 +0000
@@ -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 -r fe578248c88c -r e363bb1718c9 net/nagios-base/patches/patch-cgi_avail.c
--- a/net/nagios-base/patches/patch-cgi_avail.c Fri Apr 03 16:35:53 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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 -r fe578248c88c -r e363bb1718c9 net/nagios-base/patches/patch-cgi_cmd.c
--- a/net/nagios-base/patches/patch-cgi_cmd.c Fri Apr 03 16:35:53 2015 +0000
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -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) {
Home |
Main Index |
Thread Index |
Old Index