CVS commit: pkgsrc/net/nagios-base

To: pkgsrc-changes%NetBSD.org@localhost
Subject: CVS commit: pkgsrc/net/nagios-base
From: "Emmanuel Dreyfus" <manu%netbsd.org@localhost>
Date: Wed, 24 May 2017 07:42:39 +0000

Module Name:    pkgsrc
Committed By:   manu
Date:           Wed May 24 07:42:39 UTC 2017

Modified Files:
        pkgsrc/net/nagios-base: Makefile PLIST distinfo
        pkgsrc/net/nagios-base/patches: patch-Makefile.in patch-base_logging.c
            patch-cgi_avail.c patch-cgi_cmd.c patch-cgi_trends.c
            patch-html_Makefile.in patch-lib_worker.c
Removed Files:
        pkgsrc/net/nagios-base/patches: patch-cgi_statusjson.c
            patch-common_comments.c patch-include_comments.h
            patch-include_statusjson.h patch-lib_nsock.c
            patch-t-tap_test__xsddefault.c patch-xdata_xcddefault.c
            patch-xdata_xrddefault.c patch-xdata_xsddefault.c

Log Message:
Update nagios-base to 4.3.2

The previous version in pkgsrc had a critical bug where status would not
update and nagios log "wproc: Core Worker seems to be choked". More
details at http://tracker.nagios.org/view.php?id=642

Here is the complete Changelog

4.3.2 - xxxx-xx-xx
------------------
FIXED
* Every 15sec /var/log/messages is flooded with "nagios: set_environment_var" (John Frickson)
* Changed release date to ISO format (yyyy-mm-dd) (John Frickson)
* `make all` fails if unzip is not installed (John Frickson)
* Quick Search no longer allows search by Alias (John Frickson)
* flexible downtime on a service immediately turns off notifications (John Frickson)
* Fix to allow url_encode to be called twice (Z. Liu)
* Update timeperiods.cfg.in (spelling) (Parth Laxmikant Kolekar)
* Spelling fixes (Josh Soref)
* Vent command pipe before remove to avoid deadlocks on writing end (Kai Kunstmann)
* CGI utility cgiutil.c does not process relative config file path names properly (John Frickson)
* xdata/xodtemplate.c bug in option-deprecation code (John Frickson)
* Wildcard searching causes service status links to not work properly (John Frickson)
* Quick search with no hits shows a permission denied error (John Frickson)
* Setting a service as its own parent is not caught by the sanity checker (-v) and causes a segfault (John Frickson)

4.3.1 - 2017-02-23
------------------
FIXES
* Service hard state generation and host hard or soft down status (John Frickson)
* Comments are duplicated through Nagios reload (John Frickson)
* host hourly value is incorrectly dumped as json boolean (John Frickson)
* Bug - Quick Search no longer allows search by IP (John Frickson)
* Config: status_update_interval can not be set to 1 (John Frickson)
* Check attempts not increasing if nagios is reloaded (John Frickson)
* nagios hangs on reload while sending external command to cmd file (John Frickson)
* Feature Request: return code xxx out of bounds - include message as well (John Frickson)

4.3.0 - 2017-02-21
------------------
SECURITY FIXES
* Fix for CVE-2016-6209 - The "corewindow" parameter (as in
  http://localhost/nagios?corewindow=www.somewhere.com) has been disabled by
  default. See the UPGRADING document for how to enable it. (John Frickson)

FIXES
* Fix early event scheduling (pmalek / John Frickson)
* on-demand host checks triggered by service checks cause attempt number increments (fredericve)
* Service notification not being send when host is in soft down state (John Frickson)
* configure does not error if no perl installed on CentOS 7 (John Frickson)
* failed passive requests leave .ok files in checkresults dir (caronc)
* Services don't show in status.cgi if "noheader" specified (John Frickson)
* Standardized check interval config file names (John Frickson)
* "Event Log" (showlog.cgi) could not open log file (John Frickson)
* "nagios_check_command" has been deprecated since v3.0. Last vestiges removed (John Frickson)

ENHANCEMENTS
* Added new flag to cgi.cfg: tac_cgi_hard_only to show only HARD states (John Frickson)
* Add broker-event for the end of a timed event (NEBTYPE_TIMEDEVENT_END) (John Frickson)
* There is no Macro to retrieve addresses of hostgroup members (now $HOSTGROUPMEMBERADDRESSES$) (John Frickson)
* Add "Page Tour" videos to several of the core web pages (John Frickson)
* Added a login page, and a `Logoff` links (John Frickson)
* On the status map, the host name will be colored if services are not all OK. (John Frickson)
* Added "Clear flapping state" command on host and services detail pages. (John Frickson)
* User-entered comment now displays below generated comment for downtime (John Frickson)

4.2.4 - 2016-12-07
------------------
SECURITY FIXES
* Fixed another root privilege escalation (CVE-2016-9566) Thanks for bringing this
  to our attention go to Dawid Golunski (http://legalhackers.com).

4.2.3 - 2016-11-21
-------------------
SECURITY FIXES
* Fixed a root privilege escalation (CVE-2016-8641) (John Frickson)

FIXES
* external command during reload doesn't work (John Frickson)
* Nagios provides no error condition as to why it fails on the verify for serviceescalation (John Frickson)
* No root group in FreeBSD and Apple OS X (John Frickson)
* jsonquery.html doesn't display scheduled_time_ok correctly (John Frickson)
* daemon_dumps_core=1 has no effect on Linux when Nagios started as root (John Frickson)
* Configuration check in hostgroup - misspelled hostname does not error (John Frickson)
* contacts or contact_groups directive with no value should not be allowed (John Frickson)
* Compile 64-bit on SPARC produces LD error (John Frickson)
* HOSTSTATEID returns 0 even if host does not exist (John Frickson)
* Submitting UNREACHABLE passive result for host sets it as DOWN if the host has no parents (John Frickson)
* nagios: job XX (pid=YY): read() returned error 11 (changed from LOG_ERR to LOG_NOTICE) (John Frickson)
* Fix for quick search not showing services if wildcard used (John Frickson)

4.2.2 - 2016-10-24
------------------
SECURITY FIXES
* There was a fix to vulnerability CVE-2008-4796 in the 4.2.0 release on
  August 1, 2016. The fix was apparently incomplete, as there was still a
  problem. However, we are now getting all RSS feeds using AJAX calls
  instead of the (outdated) MagpieRSS package. Thanks for bringing this to
  our attention go to Dawid Golunski (http://legalhackers.com).

ENHANCEMENTS
* Update status.c to display passive check icon for hosts when passive checks
        are enabled and actives disabled (John Frickson)

FIXES
* Fix permissions for Host Groups reports (status.cgi) (Patrik Halfar)
* Service Parents does not appear to be functioning as intended (lev)
* Availability report mixes up scheduled and unscheduled warning percentages (Helmut Mikulcik)
* Invalid values for saved_stamp in compute_subject_downtime_times() (John Frickson)
* Remove deprecated "framespacing" (John Frickson)
* The nagios tarball contains two identical jquery copies (John Frickson)
* extinfo.cgi does not set content-type (most cgi's don't) (John Frickson)
* Timeperiods are corrupted by external command CHANGE_SVC_CHECK_TIMEPERIOD (xoubih)
* Quick search doesn't show hosts without services (service status detail page) (John Frickson)
* In host/services details view, if exactly 100 entries would not show last one (John Frickson)
* nagios host URL parameter for NEW map doesn`t work - Network Map for All Hosts (John Frickson)
* next_problem_id is improperly initialized (gherteg)
* Passive problems not showing as "unhandled" (John Frickson)
* September reported as Sept instead of Sep (Rostislav Opočenský)
* Notifications are not sent for active alerts after scheduled downtime ends (John Frickson)
* Nagios 4.2.0 not working on Solaris (John Frickson)
* install-exfoliation and install-classicui don't work FreeBSD and Mac OS X (John Frickson)
* Updated makefile to delete some no-longer-needed files (John Frickson)

4.2.1 - 2016-09-06
------------------
FIXES
* Fix undefined variable php error (John Frickson)
* Links on the sidebar menu under 'Problems' are indented too far (John Frickson)
* Using $ARGn$ Macros in perfdata (John Frickson)
* using a wildcard in search returns service status total all zero's (John Frickson)
* read_only does not take priority (deppy)
* Running nagios -v on 4.2.0 takes 90+ seconds (John Frickson)
* Bare "make" invoked in subtarget (mjo)
* Theme images/stylesheets installed with inconsistent permissions (mjo / John Frickson)
* Missing Image for Host and Service State Trends in Availability Report (nichokap / John Frickson)
* Maintain non-persistent comments through reload (John Frickson)
* Servicegroup availability report ignores includesoftstates in service report links (PriceChild)
* error: format not a string literal and no format arguments (Karsten Weiss)
* Synced config.guess and config.sub with GNU (Zakhar Kleyman)

4.2.0 - 2016-08-01
------------------
SECURITY FIXES
* Fixed vulnerability CVE-2008-4796 (John Frickson)
* Fixed vulnerability CVE-2013-4214 (John Frickson)
* web interface vulnerable to Cross-Site Request Forgery attacks (John Frickson)

ENHANCEMENTS
* Increase socket queue length for listen()
* Added host name to the website page title (leres / John Frickson)
* Added additional icons for NetBSD and SuSE (John Frickson)
* The new Status Map will now use cgi.cfg options (John Frickson)
    default_statusmap_layout will default to "6" for the new map
* The new Status Map will now show some valid values in the popup for "Nagios Process" (John Frickson)

FIXES
* Network outage view without access to all hosts (John Frickson)
* Core workers looping (John Frickson)
* service query returns duplicate host_name and description fields in the returned data (John Frickson)
* HTML output of plug-ins is parsed in wrong way => webgui unusable (John Frickson)
* Command worker fails to handle SIGPIPE
* "View Status" links under "Map" broken in Nagios Core Version 4.1.1 (John Frickson)
* Can't send big buffer - wproc: Core Worker seems to be choked (velripn / John Frickson)
* Too big CPU load on FreeBSD and other systems using poll() interface (cejkar)
* Flexible downtime recorded as unscheduled downtime (John Frickson)
* Service Flexible downtimes produce 1 notification before entering (John Frickson)
* Once you "set flap_detection_enabled 0" it should remove flapping state from the host/services page (John Frickson)
* New map doesn't finish loading if a logo image is not found (John Frickson)
* Extraneous Div end tag in map.html (Scott Wilkerson)
* Issue with "Problems" section (John Frickson)
* Status Map icons and online/offline status dots disappear in IE11 (John Frickson)
* New network map overlays the nagios process with objects (John Frickson)
* Added Default-Start and Default-Stop to the init script (John Frickson)
* Compile / logging issues with BSD 6
* Related to above, Fixed a lot of incorrectly handled time_t's in *printf's (John Frickson)
* New map not working for RU locale (actually, most locales) (John Frickson)
* Replaced all instances of signal() with sigaction() + blocking (John Frickson)
* UTF-8 characters like german ä are not processed properly by function url_encode (John Frickson)
* nagios worker processes can hog CPU (huxley / John Frickson)
* custom time periods that include special characters were not being handled in reports (John Frickson)
* Fixed init script to wait up to 90 seconds then kill the nagios process (John Frickson)
* No Host Groups results in wrong error message (John Frickson)
* Setup Nagios users to view specific host is not working in the new network map (John Frickson)
* statusjson.cgi fails glibc realloc truncate response output (John Frickson)
* Report Time Period does not work if an @ character is in the timeperiod name (John Frickson)
* State History does not use actual plugin long_output (John Frickson)
* Time period corruption (xoubih)
* Tactical Overview - Disabled Flap Detection Link (John Frickson)

4.1.1 - 08/19/2015
------------------
FIXES
* CGI Could not read object configuration data (broken by error in 4.1.0)
* exclude (!) not working (broken by mis-applied fix for 4.1.0)

4.1.0 - 08/18/2015
------------------
ENHANCEMENTS
* Promoted JSON CGIs to released status (Eric Stanley)
* New graphical CGI displays: statusmap, trends, histogram (Eric Stanley)
* Make sticky status for acks and comments configurable enhancement #20 (Trevor McDonald / Scott Wilkerson)
* Add host_down_disable_service_checks directive to nagios.cfg #44 (Trevor McDonald / Scott Wilkerson)
* httpd.conf doesn't support Apache versions > 2.3 (DanielB / John Frickson)

FIXES
* Fix for not all service dependencies created (John Frickson)
* Fix SIGSEGV with empty custom variable (orbis / John Frickson)
* Fix contact macros in environment variables (dvoryanchikov)
* Fixed host's current attempt goes to 1 after going to hard state (John Frickson)
* Fixed two bugs/problems: Replace use of %zd in base/utils.c & incorrect va_start() in cgi/jsonutils.c (Peter Eriksson)
* Fixed: Let remove_specialized actually remove all workers (Phil Mayers)
* Fixed log file spam caused when using perfdata command directives in nagios.cfg (shashikanthbussa)
* Fixed off-by-one error in bounds check leads to segfault (Phil Mayers)
* Added links for legacy graphical displays (Eric Stanley)
* Update embedded URL's to https versions of Nagios websites (scottwilkerson)
* Fixed doxygen comments to work with latest doxygen 1.8.9.1 #30 (Trevor McDonald)
* Fixed makefile target "html" to PHONY to fix GitHub issue #28 (Trevor McDonald)
* Fixed typo as per GitHub issue #27 (Trevor McDonald)
* Fixed jsonquery.php 404 not found error, and disabled Send Query button until form populates #43 (Scott Wilkerson)
* Fixed linking in Tactical Overview for several of the Host entries in Featured section #48 (Scott Wilkerson)
* Fixed passing limit and sort options to pagination and sort links #42 (Scott Wilkerson)
* Added form field for icon URL and clean-up when it changes in CGI Status Map. (Eric Stanley)
* Added options to cgi.cfg to uncheck sticky and send when acknowledging a problem (Trevor McDonald)
* Low impact changes to automate the generation of RPMs from nagios.spec file. (T.J. Yang)
* Update index.php (Trevor McDonald)
* Fixed escaping of corewindow parameter to account for possible XSS injection (Scott Wilkerson)
* Typo correction (T.J. Yang)
* Make getCoreStatus respect cgi_base_url (Moritz Schlarb)
* Adjusted map layout to work within frames (Eric Stanley)
* Fixed map displays are now the full size of browser window (Eric Stanley)
* Fixed labels and icons on circular markup no longer scale on zoom (Eric Stanley)
* Got all maps except circular markup working with icons (Eric Stanley)
* Fixes to make legacy CGIs work again. (Eric Stanley)
* Fixes to make all/html target tolerant of being run multiple times (Eric Stanley)
* For user-supplied maps, converted node group to have transform (Eric Stanley)
* Fixed issue transitioning from circular markup map to other maps (Eric Stanley)
* Fix displayForm to trigger on the button press (Scott Wilkerson)
* Fix fo getBBox crash on Firefox (Eric Stanley)
* Fixed map now resets zoom when form apply()'d (Eric Stanley)
* Fixed so close box on dialogs actually closes dialog (Eric Stanley)
* Corrected directive in trends display (Eric Stanley)
* Fixed minor issue with link in trends links (Eric Stanley)
* Fixed issue with map displaying on Firefox (Eric Stanley)
* Added exclusions for ctags generation (Eric Stanley)
* Update map-popup.html (Scott Wilkerson)
* Initial commit of new graphical CGIs (Eric Stanley)
* Fixed Github bug #18 - archivejson.cgi returns wrong host for state change query (Eric Stanley)
* Status JSON: Added next_check to service details (Eric Stanley)
* Fixed escaping of keys for scalar values in JSON CGIs (Eric Stanley)
* build: Include <sys/loadavg.h> if it exists. (Eric J. Mislivec)
* lib-tests: test-io{cache|broker} need -lsocket to link. (Eric J. Mislivec)
* lib-tests: test-runcmd assumes GNU echo. (Eric J. Mislivec)
* lib-tests: Signal handlers don't return int on most platforms, and using a cast was the wrong way to resolve this. (Eric J. Mislivec)
* Fix some type/format mismatch warnings for pid_t. (Eric J. Mislivec)
* Fix build on Solaris. (Eric J. Mislivec)
* runcmd: Fix build when we don't HAVE_SETENV. (Eric J. Mislivec)
* Fixed checkresult output processing (Eric Mislivec)
* Corrected escaping of long output macros (Eric Mislivec)
* Fixed null pointer dereferences in archive JSON (Eric Stanley)
* Fixed memory overwrite issue in JSON string escaping (Eric Stanley)
* JSON CGI: Now escaping object and array keys (Eric Stanley)

KNOWN ISSUES
* New map does not account for multiple parents, leaving "legacy" map as an option in the menu


To generate a diff of this commit:
cvs rdiff -u -r1.67 -r1.68 pkgsrc/net/nagios-base/Makefile
cvs rdiff -u -r1.18 -r1.19 pkgsrc/net/nagios-base/PLIST
cvs rdiff -u -r1.30 -r1.31 pkgsrc/net/nagios-base/distinfo
cvs rdiff -u -r1.2 -r1.3 pkgsrc/net/nagios-base/patches/patch-Makefile.in \
    pkgsrc/net/nagios-base/patches/patch-lib_worker.c
cvs rdiff -u -r1.3 -r1.4 pkgsrc/net/nagios-base/patches/patch-base_logging.c
cvs rdiff -u -r1.4 -r1.5 pkgsrc/net/nagios-base/patches/patch-cgi_avail.c \
    pkgsrc/net/nagios-base/patches/patch-cgi_trends.c \
    pkgsrc/net/nagios-base/patches/patch-html_Makefile.in
cvs rdiff -u -r1.5 -r1.6 pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c
cvs rdiff -u -r1.1 -r0 pkgsrc/net/nagios-base/patches/patch-cgi_statusjson.c \
    pkgsrc/net/nagios-base/patches/patch-common_comments.c \
    pkgsrc/net/nagios-base/patches/patch-include_comments.h \
    pkgsrc/net/nagios-base/patches/patch-include_statusjson.h \
    pkgsrc/net/nagios-base/patches/patch-t-tap_test__xsddefault.c \
    pkgsrc/net/nagios-base/patches/patch-xdata_xcddefault.c
cvs rdiff -u -r1.2 -r0 pkgsrc/net/nagios-base/patches/patch-lib_nsock.c \
    pkgsrc/net/nagios-base/patches/patch-xdata_xrddefault.c \
    pkgsrc/net/nagios-base/patches/patch-xdata_xsddefault.c

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/net/nagios-base/Makefile
diff -u pkgsrc/net/nagios-base/Makefile:1.67 pkgsrc/net/nagios-base/Makefile:1.68
--- pkgsrc/net/nagios-base/Makefile:1.67        Tue Feb 28 15:20:09 2017
+++ pkgsrc/net/nagios-base/Makefile     Wed May 24 07:42:39 2017
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.67 2017/02/28 15:20:09 ryoon Exp $
+# $NetBSD: Makefile,v 1.68 2017/05/24 07:42:39 manu Exp $
 #
 
-DISTNAME=              nagios-4.0.8
+DISTNAME=              nagios-4.3.2
 PKGNAME=               ${DISTNAME:S/-/-base-/}
-PKGREVISION=           9
+#PKGREVISION=          1
 CATEGORIES=            net sysutils
 DISTFILES=             ${DISTNAME}${EXTRACT_SUFX}
 MASTER_SITES=          ${MASTER_SITE_SOURCEFORGE:=nagios/}
@@ -79,7 +79,6 @@ OWN_DIRS_PERMS+=${NAGIOSDIR}/rw ${NAGIOS
 OWN_DIRS_PERMS+=${NAGIOSDIR}/checkresults ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0775
 
 SPECIAL_PERMS+=        ${DESTDIR}/${PREFIX}/share/nagios/jsonquery.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
-SPECIAL_PERMS+=        ${DESTDIR}/${PREFIX}/share/nagios/rss-corefeed.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
 SPECIAL_PERMS+=        ${DESTDIR}/${PREFIX}/share/nagios/rss-newsfeed.html ${NAGIOS_USER} ${NAGIOSCMD_GROUP} 0644
 
 SUBST_CLASSES+=                files
@@ -102,8 +101,6 @@ post-install:
        ${INSTALL_DATA} ${WRKDIR}/netbsd40.png \
            ${DESTDIR}/${PREFIX}/share/nagios/images/logos/
        ${CHMOD} g-w ${DESTDIR}${PREFIX}/share/nagios/jsonquery.html
-       ${CHMOD} g-w ${DESTDIR}${PREFIX}/share/nagios/rss-corefeed.html
-       ${CHMOD} g-w ${DESTDIR}${PREFIX}/share/nagios/rss-newsfeed.html
 
 .include "../../mk/dlopen.buildlink3.mk"
 .include "../../devel/libltdl/buildlink3.mk"

Index: pkgsrc/net/nagios-base/PLIST
diff -u pkgsrc/net/nagios-base/PLIST:1.18 pkgsrc/net/nagios-base/PLIST:1.19
--- pkgsrc/net/nagios-base/PLIST:1.18   Fri Apr  3 17:06:08 2015
+++ pkgsrc/net/nagios-base/PLIST        Wed May 24 07:42:39 2017
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.18 2015/04/03 17:06:08 rodent Exp $
+@comment $NetBSD: PLIST,v 1.19 2017/05/24 07:42:39 manu Exp $
 bin/nagios
 bin/nagiostats
 libexec/nagios/cgi-bin/archivejson.cgi
@@ -32,6 +32,12 @@ share/examples/nagios/objects/templates.
 share/examples/nagios/objects/timeperiods.cfg-sample
 share/examples/nagios/objects/windows.cfg-sample
 share/examples/nagios/resource.cfg-sample
+share/nagios/angularjs/angular-1.3.9/angular.min.js
+share/nagios/angularjs/angular-1.3.9/angular.min.js.map
+share/nagios/angularjs/ui-bootstrap-tpls-0.12.0.min.js
+share/nagios/angularjs/ui-utils-0.2.1/ui-utils.js
+share/nagios/bootstrap-3.3.0/css/bootstrap-theme.min.css
+share/nagios/bootstrap-3.3.0/css/bootstrap.min.css
 share/nagios/config.inc.php
 share/nagios/contexthelp/A1.html
 share/nagios/contexthelp/A2.html
@@ -96,6 +102,12 @@ share/nagios/contexthelp/N4.html
 share/nagios/contexthelp/N5.html
 share/nagios/contexthelp/N6.html
 share/nagios/contexthelp/N7.html
+share/nagios/d3/d3.min.js
+share/nagios/graph-header.html
+share/nagios/histogram-form.html
+share/nagios/histogram-graph.html
+share/nagios/histogram-links.html
+share/nagios/histogram.html
 share/nagios/images/Nagios-clearbg.png
 share/nagios/images/NagiosEnterprises-whitebg-112x46.png
 share/nagios/images/ack.gif
@@ -213,6 +225,9 @@ share/nagios/images/logos/monitor.png
 share/nagios/images/logos/nagios.gd2
 share/nagios/images/logos/nagios.gif
 share/nagios/images/logos/nagiosvrml.png
+share/nagios/images/logos/netbsd.gif
+share/nagios/images/logos/netbsd.jpg
+share/nagios/images/logos/netbsd.png
 share/nagios/images/logos/netbsd40.gd2
 share/nagios/images/logos/netbsd40.gif
 share/nagios/images/logos/netbsd40.jpg
@@ -275,6 +290,9 @@ share/nagios/images/logos/sunlogo.gd2
 share/nagios/images/logos/sunlogo.gif
 share/nagios/images/logos/sunlogo.jpg
 share/nagios/images/logos/sunlogo.png
+share/nagios/images/logos/suse.gif
+share/nagios/images/logos/suse.jpg
+share/nagios/images/logos/suse.png
 share/nagios/images/logos/switch.gd2
 share/nagios/images/logos/switch.gif
 share/nagios/images/logos/switch40.gd2
@@ -314,6 +332,7 @@ share/nagios/images/logos/yellowdog.gif
 share/nagios/images/logos/yellowdog.jpg
 share/nagios/images/logos/yellowdog.png
 share/nagios/images/logrotate.png
+share/nagios/images/menu.png
 share/nagios/images/ndisabled.gif
 share/nagios/images/noack.gif
 share/nagios/images/notes.gif
@@ -352,25 +371,34 @@ share/nagios/images/warning.png
 share/nagios/images/weblogo1.png
 share/nagios/images/zoom1.gif
 share/nagios/images/zoom2.gif
-share/nagios/includes/jquery-1.7.1.min.js
-share/nagios/includes/rss/extlib/Snoopy.class.inc
-share/nagios/includes/rss/rss_cache.inc
-share/nagios/includes/rss/rss_fetch.inc
-share/nagios/includes/rss/rss_parse.inc
-share/nagios/includes/rss/rss_utils.inc
 share/nagios/includes/utils.inc.php
 share/nagios/index.php
+share/nagios/infobox.html
+share/nagios/js/histogram-events.js
+share/nagios/js/histogram-form.js
+share/nagios/js/histogram-graph.js
+share/nagios/js/histogram.js
 share/nagios/js/jquery-1.7.1.min.js
 share/nagios/js/jsonquery.js
+share/nagios/js/map-directive.js
+share/nagios/js/map-form.js
+share/nagios/js/map.js
+share/nagios/js/nag_funcs.js
+share/nagios/js/nagios-decorations.js
+share/nagios/js/nagios-time.js
+share/nagios/js/trends-form.js
+share/nagios/js/trends-graph.js
+share/nagios/js/trends.js
 share/nagios/jsonquery.html
 share/nagios/main.php
+share/nagios/map-directive.html
+share/nagios/map-form.html
+share/nagios/map-links.html
+share/nagios/map-popup.html
+share/nagios/map.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/spin/spin.min.js
 share/nagios/stylesheets/avail.css
 share/nagios/stylesheets/checksanity.css
 share/nagios/stylesheets/cmd.css
@@ -378,9 +406,13 @@ share/nagios/stylesheets/common.css
 share/nagios/stylesheets/config.css
 share/nagios/stylesheets/extinfo.css
 share/nagios/stylesheets/histogram.css
+share/nagios/stylesheets/histogramgraph.css
 share/nagios/stylesheets/history.css
 share/nagios/stylesheets/jsonquery.css
+share/nagios/stylesheets/map-directive.css
+share/nagios/stylesheets/map.css
 share/nagios/stylesheets/ministatus.css
+share/nagios/stylesheets/nag_funcs.css
 share/nagios/stylesheets/notifications.css
 share/nagios/stylesheets/outages.css
 share/nagios/stylesheets/showlog.css
@@ -389,6 +421,13 @@ share/nagios/stylesheets/statusmap.css
 share/nagios/stylesheets/summary.css
 share/nagios/stylesheets/tac.css
 share/nagios/stylesheets/trends.css
+share/nagios/stylesheets/trendsgraph.css
+share/nagios/trends-form.html
+share/nagios/trends-graph.html
+share/nagios/trends-host-yaxis.html
+share/nagios/trends-links.html
+share/nagios/trends-service-yaxis.html
+share/nagios/trends.html
 @pkgdir share/nagios/ssi
 @pkgdir share/nagios/media
 @pkgdir share/nagios/docs/images

Index: pkgsrc/net/nagios-base/distinfo
diff -u pkgsrc/net/nagios-base/distinfo:1.30 pkgsrc/net/nagios-base/distinfo:1.31
--- pkgsrc/net/nagios-base/distinfo:1.30        Tue Feb  9 10:12:53 2016
+++ pkgsrc/net/nagios-base/distinfo     Wed May 24 07:42:39 2017
@@ -1,42 +1,32 @@
-$NetBSD: distinfo,v 1.30 2016/02/09 10:12:53 bouyer Exp $
+$NetBSD: distinfo,v 1.31 2017/05/24 07:42:39 manu Exp $
 
-SHA1 (nagios-4.0.8.tar.gz) = d49586db6905a8e58a082251d8f89ef5c2cab872
-RMD160 (nagios-4.0.8.tar.gz) = b53631755e0a23aba918a99f58b7bea237fdd799
-SHA512 (nagios-4.0.8.tar.gz) = d72fdbcc0beb2de72e5aa788b4ccc83aa30c7f4a4460edaa831f012db04647e4836b876bb7dc235e2a1b525827e9a2a0f4d348919f69fbfbfdaa4d13e968e18c
-Size (nagios-4.0.8.tar.gz) = 1805059 bytes
+SHA1 (nagios-4.3.2.tar.gz) = 3a8a765583bd0588e77d87d32d7f2d618911c1f0
+RMD160 (nagios-4.3.2.tar.gz) = f6e8f13b3c6caed38a8d83112b880ab2a2e1c6c9
+SHA512 (nagios-4.3.2.tar.gz) = 679e76f7a232b9b0dbbc2697f51b58d09ae3d3833e0e6922bb39d90768c81f2eb09b9ab36b7fdaeca893cebd93fc1edc1232f245498d4420980ba4659df60a31
+Size (nagios-4.3.2.tar.gz) = 11096863 bytes
 SHA1 (nagios-netbsd40-icons.tar.gz) = 62919c22c5d5dc3f603c3320578431e93dfdd9fe
 RMD160 (nagios-netbsd40-icons.tar.gz) = 96ad67a107dad095213ddbf58debcfd5b46d6dee
 SHA512 (nagios-netbsd40-icons.tar.gz) = 27cd564ef6dbe076b43dc2207f8f4f49bfb575f216e90d03a157208e57e23930c1e5915353406f09bd762ad11e6306625544292bd919f8524a2239aac758afb1
 Size (nagios-netbsd40-icons.tar.gz) = 5659 bytes
-SHA1 (patch-Makefile.in) = 953eea6b276beba75ab5c64c14d10cdcf1ca2188
+SHA1 (patch-Makefile.in) = 0bf706869847ad100a809f47c2415eb30e9db098
 SHA1 (patch-base_Makefile.in) = 2b0162bb4d395b1d529f5fc1fdf9eab3ddaeb161
 SHA1 (patch-base_checks.c) = 9c5fb7a8f085eed2fb31ad623eeed22596c6c168
 SHA1 (patch-base_events.c) = 6b659c6980c69ab1947d7a829c87482f53ed817e
-SHA1 (patch-base_logging.c) = 09d532acf5978ff581b7f4d211bdd286a18c1886
+SHA1 (patch-base_logging.c) = e0efd9dc51dd9f726ada11c6e7745e1cd9755bc9
 SHA1 (patch-base_nerd.c) = 4105d3a56999077688e42c9c771e76461fe00785
 SHA1 (patch-cgi_Makefile.in) = 25c22914986c0b781f5dd665a7a53778e1031a63
-SHA1 (patch-cgi_avail.c) = d0faf28256e5ee31ad36bdb08d59d8310c7cef8d
-SHA1 (patch-cgi_cmd.c) = 6953e62e99a4df32f8dba452d2a85af66bf3ce8b
-SHA1 (patch-cgi_extinfo.c) = 8cad0787fbe0a782edb93ca299462a5718a34a4b
+SHA1 (patch-cgi_avail.c) = 44b4b0f9eaf43dd35ea6c048b6fc1dbb295c7aeb
+SHA1 (patch-cgi_cmd.c) = edbf60422c4f36f045e97b27494bc7307c60143e
 SHA1 (patch-cgi_getcgi.c) = 3af474de4f4281f18a306f7d618ff532d0a9ca9e
 SHA1 (patch-cgi_histogram.c) = 4b9f583ec4579d5c5399ad1b7102511c0282b8bc
-SHA1 (patch-cgi_statusjson.c) = 13967c18ee3eaaaf75edb8b3ee028bece73272ae
-SHA1 (patch-cgi_trends.c) = 4e5057536465192b67fcd5a141f34be816ff4452
+SHA1 (patch-cgi_trends.c) = 89188c74665522cc317ab1098746a0245f572dc8
 SHA1 (patch-common_Makefile.in) = 7fa093a6109dfa03f9b97e4312d3a09e3235f00f
-SHA1 (patch-common_comments.c) = 7739c9c74333c45e86242383073dfa78785445ec
 SHA1 (patch-common_downtime.c) = 000f1e33ab1ca1c433c3fd0de3d5bf750df6f57f
 SHA1 (patch-configure) = f57db3a43c1abc1aa0d6fe007308089c620624a4
 SHA1 (patch-daemon-init.in) = 1e50bb84fde9780d5b13edb4e232c0e3a90ac3f4
-SHA1 (patch-html_Makefile.in) = cef5febcedfaaa38cdf73283e2bda43b4c114379
-SHA1 (patch-include_comments.h) = c86328a4f1437ee1dc2b6f97be61693414dd4fce
+SHA1 (patch-html_Makefile.in) = e35b082215189c4fa552b56fc8f8a3ec8664e95b
 SHA1 (patch-include_locations.h.in) = 0ee376f6737b24f0d4ea8b37781aca70147c5e70
-SHA1 (patch-include_statusjson.h) = c5a84b9ef3114f2e2480d719bbb4a24c8965e052
-SHA1 (patch-lib_nsock.c) = bd8801e4aff13ebac26e512b44764c2da1e2e5a5
 SHA1 (patch-lib_runcmd.c) = fb34fe5cdc39aca973c1a6e125b125867e6ed262
 SHA1 (patch-lib_test-squeue.c) = 1bc197da815a069f0f37525f1acbf5fb4110d399
-SHA1 (patch-lib_worker.c) = fe1b6d00429556caaefe43afe7bb1c6d9f6fcb0b
+SHA1 (patch-lib_worker.c) = af2b8034016f0c4736a672b5cb285a2960b9f2e6
 SHA1 (patch-sample-config_nagios.cfg.in) = 4ad00840ad66d2e01b19c6db76c810fc3fb80795
-SHA1 (patch-t-tap_test__xsddefault.c) = db7166fae411a461d8b4a4a31f55af693aeb03b0
-SHA1 (patch-xdata_xcddefault.c) = ba14af868cd773d07e029a2773a44614eedc3e46
-SHA1 (patch-xdata_xrddefault.c) = 8cc130bd14b0dbd6ba57cda9819f4b5d99639178
-SHA1 (patch-xdata_xsddefault.c) = 61c22eb8601adb53ab06b685198c7000b4743c76

Index: pkgsrc/net/nagios-base/patches/patch-Makefile.in
diff -u pkgsrc/net/nagios-base/patches/patch-Makefile.in:1.2 pkgsrc/net/nagios-base/patches/patch-Makefile.in:1.3
--- pkgsrc/net/nagios-base/patches/patch-Makefile.in:1.2        Fri Apr  3 17:06:08 2015
+++ pkgsrc/net/nagios-base/patches/patch-Makefile.in    Wed May 24 07:42:39 2017
@@ -1,10 +1,11 @@
-$NetBSD: patch-Makefile.in,v 1.2 2015/04/03 17:06:08 rodent Exp $
+$NetBSD: patch-Makefile.in,v 1.3 2017/05/24 07:42:39 manu Exp $
 
 Adjustments to build procedure.
 
---- Makefile.in.orig   2014-08-12 15:00:01.000000000 +0000
-+++ Makefile.in
-@@ -25,9 +25,9 @@ prefix=@prefix@
+--- Makefile.in.orig   2017-05-09 19:03:31.000000000 +0200
++++ Makefile.in        2017-05-22 04:04:17.000000000 +0200
+@@ -24,11 +24,11 @@
+ prefix=@prefix@
  exec_prefix=@exec_prefix@
  LOGDIR=@localstatedir@
  CHECKRESULTDIR=@CHECKRESULTDIR@
@@ -16,18 +17,19 @@ Adjustments to build procedure.
  LIBEXECDIR=@libexecdir@
  LIBDIR=@libdir@
  INCLUDEDIR=@includedir@/nagios
-@@ -36,9 +36,8 @@ datarootdir=@datarootdir@
+ HTMLDIR=@datadir@
+@@ -36,9 +36,8 @@
+ LN_S=@LN_S@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
  COMMAND_OPTS=@COMMAND_OPTS@
 -HTTPD_CONF=@HTTPD_CONF@
+ LN_HTTPD_SITES_ENABLED=@LN_HTTPD_SITES_ENABLED@
  INIT_DIR=@init_dir@
--INIT_OPTS=-o root -g root
-+INIT_OPTS=-o root -g wheel
+ INIT_OPTS=@INIT_OPTS@
  CGICFGDIR=$(CGIDIR)
- 
- USE_EVENTBROKER=@USE_EVENTBROKER@
-@@ -71,75 +70,6 @@ all:
+@@ -72,77 +71,8 @@
+ all:
        cd $(SRC_BASE) && $(MAKE)
        cd $(SRC_CGI) && $(MAKE)
        cd $(SRC_HTM) && $(MAKE)
@@ -81,7 +83,7 @@ Adjustments to build procedure.
 -      @echo ""
 -      @echo "     - Look at the sample config files"
 -      @echo "     - Read the documentation on the Nagios Library at:"
--      @echo "           http://library.nagios.com";
+-      @echo "           https://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"
@@ -94,7 +96,7 @@ Adjustments to build procedure.
 -      @echo ""
 -      @echo "For more information on obtaining support for Nagios, visit:"
 -      @echo ""
--      @echo "       http://support.nagios.com";
+-      @echo "       https://support.nagios.com";
 -      @echo ""
 -      @echo "*************************************************************"
 -      @echo ""
@@ -103,7 +105,9 @@ Adjustments to build procedure.
  
  $(SRC_LIB)/libnagios.a:
        cd $(SRC_LIB) && $(MAKE)
-@@ -245,11 +175,6 @@ install-unstripped:
+ 
+@@ -246,13 +176,8 @@
+       $(MAKE) install-exfoliation
        $(MAKE) install-basic
  
  install-basic:
@@ -115,7 +119,9 @@ Adjustments to build procedure.
  
        @echo ""
        @echo "*** Main program, CGIs and HTML files installed ***"
-@@ -270,20 +195,20 @@ install-basic:
+       @echo ""
+@@ -271,22 +196,22 @@
+       @echo ""
  
  
  install-config:
@@ -150,25 +156,29 @@ Adjustments to build procedure.
        @echo ""
        @echo "*** Config files installed ***"
        @echo ""
-@@ -300,8 +225,15 @@ install-webconf:
+       @echo "Remember, these are *SAMPLE* config files.  You'll need to read"
+@@ -305,15 +230,15 @@
        @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
+       @cd contrib/exfoliation; \
+-      $(INSTALL) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/stylesheets; \
++      $(BSD_INSTALL_DATA_DIR) -d $(DESTDIR)$(HTMLDIR)/stylesheets; \
+       for file in $$(find ./stylesheets/ -type f); do \
+-              $(INSTALL) -m 644 $(INSTALL_OPTS) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \
++              $(BSD_INSTALL_DATA) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \
+       done; \
+-      $(INSTALL) $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images; \
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images; \
+       for file in $$(find ./images -type f); do \
+-              $(INSTALL) -m 644 $(INSTALL_OPTS) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \
++              $(BSD_INSTALL_DATA) $${file} $(DESTDIR)$(HTMLDIR)/$${file}; \
+       done; \
+       cd ../..
  
        @echo ""
-       @echo "*** Exfoliation theme installed ***"
-@@ -329,7 +261,10 @@ install-daemoninit:
+@@ -349,9 +274,12 @@
+       @echo ""
  
  
  install-commandmode:
@@ -180,3 +190,4 @@ Adjustments to build procedure.
        chmod g+s $(DESTDIR)$(LOGDIR)/rw
  
        @echo ""
+       @echo "*** External command directory configured ***"
Index: pkgsrc/net/nagios-base/patches/patch-lib_worker.c
diff -u pkgsrc/net/nagios-base/patches/patch-lib_worker.c:1.2 pkgsrc/net/nagios-base/patches/patch-lib_worker.c:1.3
--- pkgsrc/net/nagios-base/patches/patch-lib_worker.c:1.2       Tue Feb  9 10:12:53 2016
+++ pkgsrc/net/nagios-base/patches/patch-lib_worker.c   Wed May 24 07:42:39 2017
@@ -1,25 +1,27 @@
-$NetBSD: patch-lib_worker.c,v 1.2 2016/02/09 10:12:53 bouyer Exp $
+$NetBSD: patch-lib_worker.c,v 1.3 2017/05/24 07:42:39 manu Exp $
 
 64bit time_t workaround
-Workaround for poll(2) returning spurious POLLIN
 
---- lib/worker.c.orig  2014-08-12 17:00:01.000000000 +0200
-+++ lib/worker.c       2016-02-08 12:31:57.000000000 +0100
-@@ -194,7 +194,7 @@
- 
- #define kvvec_add_tv(kvv, key, value) \
-       do { \
--              const char *buf = mkstr("%ld.%06ld", value.tv_sec, value.tv_usec); \
-+              const char *buf = mkstr("%ld.%06ld", (unsigned long)value.tv_sec, (unsigned long)value.tv_usec); \
-               kvvec_addkv_wlen(kvv, key, sizeof(key) - 1, buf, strlen(buf)); \
-       } while (0)
- 
-@@ -439,6 +439,8 @@
- 
-               rd = read(io->fd, buf, sizeof(buf));
-               if (rd < 0) {
-+                      if (!final && errno == EAGAIN)
-+                              return;
-                       if (errno == EINTR || errno == EAGAIN)
-                               continue;
-                       if (!final && errno != EAGAIN)
+--- lib/worker.c.orig  2017-05-22 09:36:34.000000000 +0200
++++ lib/worker.c       2017-05-22 09:35:40.000000000 +0200
+@@ -303,16 +303,16 @@
+               }
+               kvvec_addkv_wlen(&resp, kv->key, kv->key_len, kv->value, kv->value_len);
+       }
+       kvvec_addkv(&resp, "wait_status", mkstr("%d", cp->ret));
+-      kvvec_add_tv(&resp, "start", cp->ei->start);
+-      kvvec_add_tv(&resp, "stop", cp->ei->stop);
++      kvvec_add_tv(&resp, "start", (unsigned long)cp->ei->start);
++      kvvec_add_tv(&resp, "stop", (unsigned long)cp->ei->stop);
+       kvvec_addkv(&resp, "runtime", mkstr("%f", cp->ei->runtime));
+       if (!reason) {
+               /* child exited nicely (or with a signal, so check wait_status) */
+               kvvec_addkv(&resp, "exited_ok", "1");
+-              kvvec_add_tv(&resp, "ru_utime", ru->ru_utime);
+-              kvvec_add_tv(&resp, "ru_stime", ru->ru_stime);
++              kvvec_add_tv(&resp, "ru_utime", (unsigned long)ru->ru_utime);
++              kvvec_add_tv(&resp, "ru_stime", (unsigned long)ru->ru_stime);
+               kvvec_add_long(&resp, "ru_minflt", ru->ru_minflt);
+               kvvec_add_long(&resp, "ru_majflt", ru->ru_majflt);
+               kvvec_add_long(&resp, "ru_inblock", ru->ru_inblock);
+               kvvec_add_long(&resp, "ru_oublock", ru->ru_oublock);

Index: pkgsrc/net/nagios-base/patches/patch-base_logging.c
diff -u pkgsrc/net/nagios-base/patches/patch-base_logging.c:1.3 pkgsrc/net/nagios-base/patches/patch-base_logging.c:1.4
--- pkgsrc/net/nagios-base/patches/patch-base_logging.c:1.3     Tue Feb  9 10:12:53 2016
+++ pkgsrc/net/nagios-base/patches/patch-base_logging.c Wed May 24 07:42:39 2017
@@ -2,18 +2,10 @@ $NetBSD$
 
 64bit time_t workaround
 
---- base/logging.c.orig        2014-08-12 17:00:01.000000000 +0200
-+++ base/logging.c     2016-02-07 21:57:26.000000000 +0100
-@@ -184,7 +184,7 @@
-       strip(buffer);
- 
-       /* write the buffer to the log file */
--      fprintf(fp, "[%lu] %s\n", log_time, buffer);
-+      fprintf(fp, "[%lu] %s\n", (u_long)log_time, buffer);
-       fflush(fp);
- 
- #ifdef USE_EVENT_BROKER
-@@ -495,7 +495,7 @@
+--- base/logging.c.orig        2017-05-09 19:03:31.000000000 +0200
++++ base/logging.c     2017-05-21 21:06:50.000000000 +0200
+@@ -532,9 +532,9 @@
+               return ERROR;
  
        /* write the timestamp */
        gettimeofday(&current_time, NULL);
@@ -22,3 +14,4 @@ $NetBSD$
  
        /* write the data */
        va_start(ap, fmt);
+       vfprintf(debug_file_fp, fmt, ap);

Index: pkgsrc/net/nagios-base/patches/patch-cgi_avail.c
diff -u pkgsrc/net/nagios-base/patches/patch-cgi_avail.c:1.4 pkgsrc/net/nagios-base/patches/patch-cgi_avail.c:1.5
--- pkgsrc/net/nagios-base/patches/patch-cgi_avail.c:1.4        Tue Feb  9 10:12:53 2016
+++ pkgsrc/net/nagios-base/patches/patch-cgi_avail.c    Wed May 24 07:42:39 2017
@@ -1,10 +1,11 @@
-$NetBSD: patch-cgi_avail.c,v 1.4 2016/02/09 10:12:53 bouyer Exp $
+$NetBSD: patch-cgi_avail.c,v 1.5 2017/05/24 07:42:39 manu Exp $
 
 64bit time_t workaround
 
---- cgi/avail.c.orig   2016-02-07 22:09:22.000000000 +0100
-+++ cgi/avail.c        2016-02-07 22:13:16.000000000 +0100
-@@ -367,10 +367,10 @@
+--- cgi/avail.c.orig   2017-05-09 19:03:31.000000000 +0200
++++ cgi/avail.c        2017-05-22 06:11:42.000000000 +0200
+@@ -366,12 +366,12 @@
+                       if(display_type == DISPLAY_HOST_AVAIL && show_all_hosts == FALSE) {
                                host_report_url("all", "View Availability Report For All Hosts");
                                printf("<BR>\n");
  #ifdef USE_TRENDS
@@ -17,7 +18,9 @@ $NetBSD: patch-cgi_avail.c,v 1.4 2016/02
  #endif
                                printf("<a href='%s?host=%s'>View Status Detail For This Host</a><BR>\n", STATUS_CGI, url_encode(host_name));
                                printf("<a href='%s?host=%s'>View Alert History For This Host</a><BR>\n", HISTORY_CGI, url_encode(host_name));
-@@ -383,11 +383,11 @@
+                               printf("<a href='%s?host=%s'>View Notifications For This Host</a><BR>\n", NOTIFICATIONS_CGI, url_encode(host_name));
+@@ -382,13 +382,13 @@
+                               service_report_url("null", "all", "View Availability Report For All Services");
                                printf("<BR>\n");
  #ifdef USE_TRENDS
                                printf("<a href='%s?host=%s", TRENDS_CGI, url_encode(host_name));
@@ -31,31 +34,45 @@ $NetBSD: patch-cgi_avail.c,v 1.4 2016/02
  #endif
                                printf("<A HREF='%s?host=%s&", HISTORY_CGI, url_encode(host_name));
                                printf("service=%s'>View Alert History For This Service</A><BR>\n", url_encode(svc_description));
-@@ -3952,9 +3952,9 @@
+                               printf("<A HREF='%s?host=%s&", NOTIFICATIONS_CGI, url_encode(host_name));
+@@ -3959,15 +3959,15 @@
+ 
  #ifdef USE_TRENDS
                printf("<p align='center'>\n");
                printf("<a href='%s?host=%s", TRENDS_CGI, url_encode(host_name));
 -              printf("&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedhoststate=%d&backtrack=%d'>", t1, t2, 
(include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : 
"no", initial_assumed_host_state, backtrack_archives);
 +              printf("&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedhoststate=%d&backtrack=%d'>", (unsigned 
long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", 
(assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_host_state, backtrack_archives);
+ #ifdef LEGACY_GRAPHICAL_CGIS
                printf("<img src='%s?createimage&smallimage&host=%s", TRENDS_CGI, url_encode(host_name));
+ #else
+               printf("<img src='%s?createimage&smallimage&host=%s", LEGACY_TRENDS_CGI, url_encode(host_name));
+ #endif
 -              printf("&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedhoststate=%d&backtrack=%d' border=1 alt='Host 
State Trends' title='Host State Trends' width='500' height='20'>", t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == 
TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_host_state, backtrack_archives);
 +              printf("&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedhoststate=%d&backtrack=%d' border=1 alt='Host 
State Trends' title='Host State Trends' width='500' height='20'>", (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", 
(assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_host_state, backtrack_archives);
                printf("</a><br>\n");
                printf("</p>\n");
  #endif
-@@ -4436,9 +4436,9 @@
+               printf("<DIV ALIGN=CENTER>\n");
+@@ -4447,15 +4447,15 @@
+               printf("<DIV ALIGN=CENTER CLASS='dataTitle'>Service State Breakdowns:</DIV>\n");
  #ifdef USE_TRENDS
                printf("<p align='center'>\n");
                printf("<a href='%s?host=%s", TRENDS_CGI, url_encode(host_name));
 -              printf("&service=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d'>", 
url_encode(svc_description), t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", 
(assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives);
 +              printf("&service=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d'>", 
url_encode(svc_description), (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? 
"yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives);
+ #ifdef LEGACY_GRAPHICAL_CGIS
                printf("<img src='%s?createimage&smallimage&host=%s", TRENDS_CGI, url_encode(host_name));
+ #else
+               printf("<img src='%s?createimage&smallimage&host=%s", LEGACY_TRENDS_CGI, url_encode(host_name));
+ #endif
 -              printf("&service=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d' 
border=1 alt='Service State Trends' title='Service State Trends' width='500' height='20'>", url_encode(svc_description), t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention 
== TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives);
 +              printf("&service=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d' 
border=1 alt='Service State Trends' title='Service State Trends' width='500' height='20'>", url_encode(svc_description), (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : 
"no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, 
backtrack_archives);
                printf("</a><br>\n");
                printf("</p>\n");
  #endif
-@@ -4677,7 +4677,7 @@
+ 
+@@ -4692,9 +4692,9 @@
+ void host_report_url(const char *hn, const char *label) {
  
        printf("<a href='%s?host=%s", AVAIL_CGI, url_encode(hn));
        printf("&show_log_entries");
@@ -64,7 +81,9 @@ $NetBSD: patch-cgi_avail.c,v 1.4 2016/02
        printf("&backtrack=%d", backtrack_archives);
        printf("&assumestateretention=%s", (assume_state_retention == TRUE) ? "yes" : "no");
        printf("&assumeinitialstates=%s", (assume_initial_states == TRUE) ? "yes" : "no");
-@@ -4701,7 +4701,7 @@
+       printf("&assumestatesduringnotrunning=%s", (assume_states_during_notrunning == TRUE) ? "yes" : "no");
+@@ -4716,9 +4716,9 @@
+ void service_report_url(const char *hn, const char *sd, const char *label) {
  
        printf("<a href='%s?host=%s", AVAIL_CGI, url_encode(hn));
        printf("&service=%s", url_encode(sd));
@@ -73,3 +92,4 @@ $NetBSD: patch-cgi_avail.c,v 1.4 2016/02
        printf("&backtrack=%d", backtrack_archives);
        printf("&assumestateretention=%s", (assume_state_retention == TRUE) ? "yes" : "no");
        printf("&assumeinitialstates=%s", (assume_initial_states == TRUE) ? "yes" : "no");
+       printf("&assumestatesduringnotrunning=%s", (assume_states_during_notrunning == TRUE) ? "yes" : "no");
Index: pkgsrc/net/nagios-base/patches/patch-cgi_trends.c
diff -u pkgsrc/net/nagios-base/patches/patch-cgi_trends.c:1.4 pkgsrc/net/nagios-base/patches/patch-cgi_trends.c:1.5
--- pkgsrc/net/nagios-base/patches/patch-cgi_trends.c:1.4       Tue Feb  9 10:12:53 2016
+++ pkgsrc/net/nagios-base/patches/patch-cgi_trends.c   Wed May 24 07:42:39 2017
@@ -1,16 +1,17 @@
-$NetBSD: patch-cgi_trends.c,v 1.4 2016/02/09 10:12:53 bouyer Exp $
+$NetBSD: patch-cgi_trends.c,v 1.5 2017/05/24 07:42:39 manu Exp $
 
 64bit time_t workaround
 
---- cgi/trends.c.orig  2016-02-07 22:18:31.000000000 +0100
-+++ cgi/trends.c       2016-02-07 22:21:11.000000000 +0100
-@@ -448,20 +448,20 @@
+--- cgi/trends.c.orig  2017-05-09 19:03:31.000000000 +0200
++++ cgi/trends.c       2017-05-22 09:15:29.000000000 +0200
+@@ -447,26 +447,26 @@
+                       printf("<TABLE BORDER=1 CELLPADDING=0 CELLSPACING=0 CLASS='linkBox'>\n");
                        printf("<TR><TD CLASS='linkBox'>\n");
  
                        if(display_type == DISPLAY_HOST_TRENDS) {
 -                              printf("<a 
href='%s?host=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedhoststate=%d&backtrack=%d&show_log_entries'>View 
Availability Report For This Host</a><BR>\n", AVAIL_CGI, url_encode(host_name), t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", 
(assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_host_state, backtrack_archives);
 +                              printf("<a 
href='%s?host=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedhoststate=%d&backtrack=%d&show_log_entries'>View 
Availability Report For This Host</a><BR>\n", AVAIL_CGI, url_encode(host_name), (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? 
"yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_host_state, backtrack_archives);
- #ifdef USE_HISTROGRAM
+ #ifdef USE_HISTOGRAM
 -                              printf("<a href='%s?host=%s&t1=%lu&t2=%lu&assumestateretention=%s'>View Alert Histogram For This Host</a><BR>\n", HISTOGRAM_CGI, url_encode(host_name), t1, t2, 
(assume_state_retention == TRUE) ? "yes" : "no");
 +                              printf("<a href='%s?host=%s&t1=%lu&t2=%lu&assumestateretention=%s'>View Alert Histogram For This Host</a><BR>\n", HISTOGRAM_CGI, url_encode(host_name), (unsigned 
long)t1, (unsigned long)t2, (assume_state_retention == TRUE) ? "yes" : "no");
  #endif
@@ -19,8 +20,13 @@ $NetBSD: patch-cgi_trends.c,v 1.4 2016/0
                                printf("<a href='%s?host=%s'>View Notifications For This Host</a><BR>\n", NOTIFICATIONS_CGI, url_encode(host_name));
                                }
                        else {
+ #ifdef LEGACY_GRAPHICAL_CGIS
 -                              printf("<a 
href='%s?host=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d'>View Trends For This 
Host</a><BR>\n", TRENDS_CGI, url_encode(host_name), t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? "yes" : 
"no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives);
 +                              printf("<a 
href='%s?host=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d'>View Trends For This 
Host</a><BR>\n", TRENDS_CGI, url_encode(host_name), (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", 
(assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives);
+ #else
+-                              printf("<a 
href='%s?host=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d'>View Trends For This 
Host</a><BR>\n", LEGACY_TRENDS_CGI, url_encode(host_name), t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", (assume_initial_states == TRUE) ? 
"yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives);
++                              printf("<a 
href='%s?host=%s&t1=%lu&t2=%lu&includesoftstates=%s&assumestateretention=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d'>View Trends For This 
Host</a><BR>\n", LEGACY_TRENDS_CGI, url_encode(host_name), (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", 
(assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives);
+ #endif
                                printf("<a href='%s?host=%s", AVAIL_CGI, url_encode(host_name));
 -                              
printf("&service=%s&t1=%lu&t2=%lu&assumestateretention=%s&includesoftstates=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d&show_log_entries'>View 
Availability Report For This Service</a><BR>\n", url_encode(svc_description), t1, t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? "yes" : "no", 
(assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives);
 +                              
printf("&service=%s&t1=%lu&t2=%lu&assumestateretention=%s&includesoftstates=%s&assumeinitialstates=%s&assumestatesduringnotrunning=%s&initialassumedservicestate=%d&backtrack=%d&show_log_entries'>View 
Availability Report For This Service</a><BR>\n", url_encode(svc_description), (unsigned long)t1, (unsigned long)t2, (include_soft_states == TRUE) ? "yes" : "no", (assume_state_retention == TRUE) ? 
"yes" : "no", (assume_initial_states == TRUE) ? "yes" : "no", (assume_states_during_notrunning == TRUE) ? "yes" : "no", initial_assumed_service_state, backtrack_archives);
@@ -30,3 +36,4 @@ $NetBSD: patch-cgi_trends.c,v 1.4 2016/0
                                printf("<A HREF='%s?host=%s&", HISTORY_CGI, url_encode(host_name));
                                printf("service=%s'>View Alert History For This Service</A><BR>\n", url_encode(svc_description));
                                printf("<A HREF='%s?host=%s&", NOTIFICATIONS_CGI, url_encode(host_name));
+                               printf("service=%s'>View Notifications For This Service</A><BR>\n", url_encode(svc_description));
Index: pkgsrc/net/nagios-base/patches/patch-html_Makefile.in
diff -u pkgsrc/net/nagios-base/patches/patch-html_Makefile.in:1.4 pkgsrc/net/nagios-base/patches/patch-html_Makefile.in:1.5
--- pkgsrc/net/nagios-base/patches/patch-html_Makefile.in:1.4   Tue Feb  9 10:12:53 2016
+++ pkgsrc/net/nagios-base/patches/patch-html_Makefile.in       Wed May 24 07:42:39 2017
@@ -1,10 +1,11 @@
-$NetBSD: patch-html_Makefile.in,v 1.4 2016/02/09 10:12:53 bouyer Exp $
+$NetBSD: patch-html_Makefile.in,v 1.5 2017/05/24 07:42:39 manu Exp $
 
 Adjustments to build procedure.
 
---- html/Makefile.in.orig      2014-08-12 17:00:01.000000000 +0200
-+++ html/Makefile.in   2016-02-08 13:16:12.000000000 +0100
-@@ -7,7 +7,7 @@
+--- html/Makefile.in.orig      2017-05-09 19:03:31.000000000 +0200
++++ html/Makefile.in   2017-05-22 09:20:24.000000000 +0200
+@@ -6,9 +6,9 @@
+ exec_prefix=@exec_prefix@
  LOGDIR=@localstatedir@
  CFGDIR=@sysconfdir@
  BINDIR=@bindir@
@@ -13,7 +14,9 @@ Adjustments to build procedure.
  HTMLDIR=@datadir@
  datarootdir=@datarootdir@
  INSTALL=@INSTALL@
-@@ -35,58 +35,58 @@
+ INSTALL_OPTS=@INSTALL_OPTS@
+@@ -43,92 +43,92 @@
+ 
  devclean: distclean
  
  install:
@@ -27,11 +30,7 @@ Adjustments to build procedure.
 -      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images
 -      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/images/logos
 -      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes
--      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss
--      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
 -      $(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) $(DESTDIR)$(HTMLDIR)
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/media
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/stylesheets
@@ -42,21 +41,72 @@ Adjustments to build procedure.
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/images/logos
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes
-+      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss
-+      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/includes/rss/extlib
 +      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/ssi
+ # Directories for new CGI pages
+-      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs
+-      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
+-      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1
+-      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0
+-      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
+-      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/d3
+-      $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/spin
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/d3
++      $(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/spin
+ # End of directories for new CGI pages
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) robots.txt $(DESTDIR)$(HTMLDIR)
+-#     $(INSTALL) -m 664 $(INSTALL_OPTS) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
 +      $(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)
+ # Remove old files
        rm -f $(DESTDIR)$(HTMLDIR)/index.html
        rm -f $(DESTDIR)$(HTMLDIR)/main.html
        rm -f $(DESTDIR)$(HTMLDIR)/side.html
+       rm -f $(DESTDIR)$(HTMLDIR)/map.html
+       rm -f $(DESTDIR)$(HTMLDIR)/rss-*
+       rm -rf $(DESTDIR)$(HTMLDIR)/include/rss
 -      $(INSTALL) -m 664 $(INSTALL_OPTS) jsonquery.html $(DESTDIR)$(HTMLDIR)
--      $(INSTALL) -m 664 $(INSTALL_OPTS) rss-corefeed.html $(DESTDIR)$(HTMLDIR)
--      $(INSTALL) -m 664 $(INSTALL_OPTS) rss-newsfeed.html $(DESTDIR)$(HTMLDIR)
 +      $(BSD_INSTALL_DATA) jsonquery.html $(DESTDIR)$(HTMLDIR)
-+      $(BSD_INSTALL_DATA) rss-corefeed.html $(DESTDIR)$(HTMLDIR)
-+      $(BSD_INSTALL_DATA) rss-newsfeed.html $(DESTDIR)$(HTMLDIR)
+ # New graphical CGI pages
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) graph-header.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) histogram.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) histogram-form.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) histogram-graph.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) histogram-links.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) infobox.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) map.php $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) map-directive.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) map-form.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) map-links.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) map-popup.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) trends.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) trends-form.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) trends-graph.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) trends-host-yaxis.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) trends-links.html $(DESTDIR)$(HTMLDIR)
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) trends-service-yaxis.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) graph-header.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) histogram.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) histogram-form.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) histogram-graph.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) histogram-links.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) infobox.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) map.php $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) map-directive.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) map-form.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) map-links.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) map-popup.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) trends.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) trends-form.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) trends-graph.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) trends-host-yaxis.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) trends-links.html $(DESTDIR)$(HTMLDIR)
++      $(BSD_INSTALL_DATA) trends-service-yaxis.html $(DESTDIR)$(HTMLDIR)
+ # End of new graphical CGI pages
        for file in *.php; \
 -      do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
 +      do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR); done
@@ -96,12 +146,24 @@ Adjustments to build procedure.
        for file in includes/*.*; \
 -      do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes; done
 +      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
-+      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
-+      do $(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
+ # Support files for new graphical CGIs
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/angular-1.3.9/angular.min.js  $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/angular-1.3.9/angular.min.js.map  $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/ui-bootstrap-tpls-0.12.0.min.js  $(DESTDIR)$(HTMLDIR)/angularjs
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) angularjs/ui-utils-0.2.1/ui-utils.js   $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) bootstrap-3.3.0/css/bootstrap.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) bootstrap-3.3.0/css/bootstrap-theme.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) d3/d3.min.js $(DESTDIR)$(HTMLDIR)/d3
+-      $(INSTALL) -m 664 $(INSTALL_OPTS) spin/spin.min.js $(DESTDIR)$(HTMLDIR)/spin
++      $(BSD_INSTALL_DATA) angularjs/angular-1.3.9/angular.min.js  $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
++      $(BSD_INSTALL_DATA) angularjs/angular-1.3.9/angular.min.js.map  $(DESTDIR)$(HTMLDIR)/angularjs/angular-1.3.9
++      $(BSD_INSTALL_DATA) angularjs/ui-bootstrap-tpls-0.12.0.min.js  $(DESTDIR)$(HTMLDIR)/angularjs
++      $(BSD_INSTALL_DATA) angularjs/ui-utils-0.2.1/ui-utils.js   $(DESTDIR)$(HTMLDIR)/angularjs/ui-utils-0.2.1
++      $(BSD_INSTALL_DATA) bootstrap-3.3.0/css/bootstrap.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
++      $(BSD_INSTALL_DATA) bootstrap-3.3.0/css/bootstrap-theme.min.css $(DESTDIR)$(HTMLDIR)/bootstrap-3.3.0/css
++      $(BSD_INSTALL_DATA) d3/d3.min.js $(DESTDIR)$(HTMLDIR)/d3
++      $(BSD_INSTALL_DATA) spin/spin.min.js $(DESTDIR)$(HTMLDIR)/spin
+ # End of support files for new graphical CGIs
  
  install-unstripped:
        $(MAKE) install

Index: pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c
diff -u pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c:1.5 pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c:1.6
--- pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c:1.5  Sun Feb  7 21:52:06 2016
+++ pkgsrc/net/nagios-base/patches/patch-cgi_cmd.c      Wed May 24 07:42:39 2017
@@ -1,19 +1,10 @@
-$NetBSD: patch-cgi_cmd.c,v 1.5 2016/02/07 21:52:06 bouyer Exp $
+$NetBSD: patch-cgi_cmd.c,v 1.6 2017/05/24 07:42:39 manu Exp $
 
 Fix build in SunOS.
 64bit time_t workaround.
 
 --- cgi/cmd.c.orig     2014-08-12 17:00:01.000000000 +0200
 +++ cgi/cmd.c  2016-02-07 22:41:29.000000000 +0100
-@@ -1403,7 +1403,7 @@
-       service *temp_service;
-       host *temp_host;
-       hostgroup *temp_hostgroup;
--      comment *temp_comment;
-+      my_comment *temp_comment;
-       scheduled_downtime *temp_downtime;
-       servicegroup *temp_servicegroup = NULL;
-       contact *temp_contact = NULL;
 @@ -1906,7 +1906,7 @@
        if(!command_name || (strlen(command_name) > 6 && !memcmp("CHANGE", command_name, 6)))
                return ERROR;

Prev by Date: CVS commit: pkgsrc/doc
Next by Date: CVS commit: pkgsrc/doc
Previous by Thread: CVS commit: pkgsrc/doc
Next by Thread: CVS commit: pkgsrc/doc
Indexes:

Home | Main Index | Thread Index | Old Index