From 7619da73920cb9bfb50a9435d7f378fc85834468 Mon Sep 17 00:00:00 2001
From: manu <manu>
Date: Fri, 14 Dec 2012 18:49:51 +0000
Subject: [PATCH] Upgrade nagios to 3.4.3, from Benoit Godefert

Changelog since 3.3.1
3.4.3 - 11/30/2012
------------------
- Reverted squeue changes intended for Nagios 4
- Reapplied all patches from 3.4.2 release
- Applied fix for pagination and sorting on status.cgi #381 (Phil Randal)

3.4.2 - 11/09/2012
------------------
FIXES
* Fixed issue where deleting a downtime could cause Nagios to crash (Eric Stanley)
* Corrected logic so that end times for flexible downtimes are calculated from the dow
ntime start rather than the current time in the case where Nagios is restarted (Eric S
tanley)
* Fixed issue introduced by fix for bug #124 where flexible downtimes are not taken in
to account on Nagios restart. (Scott Wilkerson, Eric Stanley)
* Fixed bug #247: If a service reports no performance data, the perfdata log file has
no line indicating the test. (omnikron@free.fr)
* Fixed link for unhandled unreachable host problems on tactical overview page (Rudolf
 Cejka)
* Fixed bug #345 with wild card searches not paging properly on status.cgi (Phil Randa
l)
* Fixed bug #343 on status.cgi where Service Group Summary can potentially show wrong
totals (Mark Ziesemer)
* Fixed memory leaks on SIGHUP (Carlos Velasco)

3.4.1 - 05/11/2012
------------------
FIXES
* Double quotes in check_command definition break functionality (#332, reverts #86)


3.4.0 - 05/04/2012
------------------
ENHANCEMENTS
* Added service_check_timeout_state configuration variable (Bill McGonigle)
* Permanently remove sleep on run_event == FALSE in main loop (Max <perldork@webwizard
design.com>)
* Reduce notification load by moving notification viability check into notification li
st creation (Opsview Team)
* Added code to apply allow_empty_hostgroup_assignment flag to host and service depend
encies (Daniel Wittenberg)
* Users can now see hostgroups and servicegroups that contain at least one host or ser
vice they are authorized for, instead of having to be authorized for them all (Ethan G
alstad)
* RSS feed boxes fallback if an error occurs (Ethan Galstad)
* RSS feeds no longer block main page load (Mike Guthrie)

FIXES
* Fix $NOTIFICATIONRECIPIENTS$ macro to contain all contacts assigned to host|service,
 not only notified contacts (Bug #98 Matt Harrington)
* Scheduled Downtime Notifications Resent On Nagios Restart/reload (Bug #124 - ricardo
)
* NOTIFICATIONTYPE MACRO never became CUSTOM (Bug #168 - Alexey Dvoryanchikov)
* Plugged minor memory leaks in notification logic
---
 net/nagios-base/PLIST            |  21 +++---
 net/nagios-base/distinfo         |  14 ++--
 net/nagios-base/patches/patch-aa |  30 +++++---
 net/nagios-base/patches/patch-ad | 122 ++++++++++++++++++-------------
 net/nagios-base/patches/patch-ah |  18 ++---
 5 files changed, 121 insertions(+), 84 deletions(-)

diff --git a/net/nagios-base/PLIST b/net/nagios-base/PLIST
index 70491bc8f1815..3c62d66bb6a53 100644
--- a/net/nagios-base/PLIST
+++ b/net/nagios-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2011/08/02 14:03:18 bouyer Exp $
+@comment $NetBSD: PLIST,v 1.11 2012/12/14 18:49:51 manu Exp $
 bin/nagios
 bin/nagiostats
 bin/p1.pl
@@ -95,12 +95,17 @@ share/nagios/contexthelp/N4.html
 share/nagios/contexthelp/N5.html
 share/nagios/contexthelp/N6.html
 share/nagios/contexthelp/N7.html
+share/nagios/images/Nagios-clearbg.png
 share/nagios/images/NagiosEnterprises-whitebg-112x46.png
 share/nagios/images/ack.gif
-share/nagios/images/action.gif
 share/nagios/images/action-graph.gif
 share/nagios/images/action-nagios.gif
 share/nagios/images/action-orig.gif
+share/nagios/images/action.gif
+share/nagios/images/b_first2.png
+share/nagios/images/b_last2.png
+share/nagios/images/b_next2.png
+share/nagios/images/b_prev2.png
 share/nagios/images/command.png
 share/nagios/images/comment.gif
 share/nagios/images/contexthelp1.gif
@@ -342,14 +347,10 @@ share/nagios/images/warning.png
 share/nagios/images/weblogo1.png
 share/nagios/images/zoom1.gif
 share/nagios/images/zoom2.gif
-share/nagios/includes/rss/AUTHORS
-share/nagios/includes/rss/CHANGES
-share/nagios/includes/rss/ChangeLog
-share/nagios/includes/rss/INSTALL
-share/nagios/includes/rss/NEWS
-share/nagios/includes/rss/README
-share/nagios/includes/rss/TROUBLESHOOTING
-share/nagios/includes/rss/cookbook
+share/nagios/includes/jquery-1.7.1.min.js
+share/nagios/js/jquery-1.7.1.min.js
+share/nagios/rss-corefeed.php
+share/nagios/rss-newsfeed.php
 share/nagios/includes/rss/extlib/Snoopy.class.inc
 share/nagios/includes/rss/rss_cache.inc
 share/nagios/includes/rss/rss_fetch.inc
diff --git a/net/nagios-base/distinfo b/net/nagios-base/distinfo
index 351f3bbfde247..32bddb9f3e667 100644
--- a/net/nagios-base/distinfo
+++ b/net/nagios-base/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.14 2011/11/27 19:49:15 joerg Exp $
+$NetBSD: distinfo,v 1.15 2012/12/14 18:49:51 manu Exp $
 
-SHA1 (nagios-3.3.1.tar.gz) = 7b2523de0dacb51b5162dd53fc4c909397800125
-RMD160 (nagios-3.3.1.tar.gz) = 38d427f9d137ba75b84f3bfe2a98b72a768f6158
-Size (nagios-3.3.1.tar.gz) = 1714630 bytes
-SHA1 (patch-aa) = 387aa5be2cd2ab7990fb918cba9a73e88b99c1ff
+SHA1 (nagios-3.4.3.tar.gz) = 3e9b73b9e219829ec4dca6ffe44106401d430ad3
+RMD160 (nagios-3.4.3.tar.gz) = 34121ab4e2a6d400f55db452133542dd3a7a324d
+Size (nagios-3.4.3.tar.gz) = 1784746 bytes
+SHA1 (patch-aa) = 7f08522be804aec2b439f0a550f2f0fdb26c827b
 SHA1 (patch-ab) = 37beee7195879806a2cd44cde2f376e07fc13470
 SHA1 (patch-ac) = 66a112e4545e54f408f0e53f4ed05e4720713c48
-SHA1 (patch-ad) = 45ba0e08e5dd68b354a0e925e36b1a6944a57f2d
+SHA1 (patch-ad) = 475c22bdcf41d590dae8309a7f410a53ae9cc872
 SHA1 (patch-ae) = 35418dbe26f2e7c14d6a98951e62247344ae80b0
 SHA1 (patch-af) = a91ab37f16e8adda3146a2dde7273ebf841ef9af
 SHA1 (patch-ag) = ae13cf98b7e2f68304406ebab80292c5c4c8ea30
-SHA1 (patch-ah) = 18b395833303543469b510bf50d73568d3a40cd9
+SHA1 (patch-ah) = 702571fe4a0073c1d1a9f7b166a85d4cf41f284c
 SHA1 (patch-ai) = 9212106c141be6faaf65e4e4909fcf92907c0e58
diff --git a/net/nagios-base/patches/patch-aa b/net/nagios-base/patches/patch-aa
index a9fa8883b91da..727ab0f1853fb 100644
--- a/net/nagios-base/patches/patch-aa
+++ b/net/nagios-base/patches/patch-aa
@@ -1,8 +1,9 @@
-$NetBSD: patch-aa,v 1.9 2011/08/02 14:03:18 bouyer Exp $
+$NetBSD: patch-aa,v 1.10 2012/12/14 18:49:51 manu Exp $
 
---- Makefile.in.orig	2011-07-26 04:02:18.000000000 +0200
-+++ Makefile.in	2011-08-01 20:14:30.000000000 +0200
-@@ -24,17 +24,16 @@
+--- Makefile.in.orig	2012-04-25 14:30:47.000000000 +0200
++++ Makefile.in	2012-10-04 18:40:13.000000000 +0200
+@@ -23,19 +23,18 @@
+ prefix=@prefix@
  exec_prefix=@exec_prefix@
  LOGDIR=@localstatedir@
  CHECKRESULTDIR=@CHECKRESULTDIR@
@@ -23,7 +24,9 @@ $NetBSD: patch-aa,v 1.9 2011/08/02 14:03:18 bouyer Exp $
  CGICFGDIR=$(CGIDIR)
  PERLDIR=@PERLDIR@
  
-@@ -69,74 +68,6 @@
+ USE_EVENTBROKER=@USE_EVENTBROKER@
+@@ -71,76 +70,8 @@
+ all:
  	cd $(SRC_BASE) && $(MAKE)
  	cd $(SRC_CGI) && $(MAKE)
  	cd $(SRC_HTM) && $(MAKE)
@@ -98,7 +101,9 @@ $NetBSD: patch-aa,v 1.9 2011/08/02 14:03:18 bouyer Exp $
  
  nagios:
  	cd $(SRC_BASE) && $(MAKE)
-@@ -230,14 +161,10 @@
+ 
+@@ -233,16 +164,12 @@
+ 	$(MAKE) install-exfoliation	
  	$(MAKE) install-basic
  
  install-basic:
@@ -115,7 +120,9 @@ $NetBSD: patch-aa,v 1.9 2011/08/02 14:03:18 bouyer Exp $
  	@echo ""
  	@echo "*** Main program, CGIs and HTML files installed ***"
  	@echo ""
-@@ -257,20 +184,20 @@
+ 	@echo "You can continue with installing Nagios as follows (type 'make'"
+@@ -260,22 +187,22 @@
+ 	@echo ""
  
  
  install-config:
@@ -150,7 +157,9 @@ $NetBSD: patch-aa,v 1.9 2011/08/02 14:03:18 bouyer Exp $
  	@echo ""
  	@echo "*** Config files installed ***"
  	@echo ""
-@@ -287,8 +214,15 @@
+ 	@echo "Remember, these are *SAMPLE* config files.  You'll need to read"
+@@ -290,10 +217,17 @@
+ 	@echo "*** Nagios/Apache conf file installed ***"
  	@echo ""
  	
  install-exfoliation:
@@ -168,7 +177,9 @@ $NetBSD: patch-aa,v 1.9 2011/08/02 14:03:18 bouyer Exp $
  
  	@echo ""
  	@echo "*** Exfoliation theme installed ***"
-@@ -316,7 +250,10 @@
+ 	@echo "NOTE: Use 'make install-classicui' to revert to classic Nagios theme";
+@@ -319,9 +253,12 @@
+ 	@echo ""
  
  
  install-commandmode:
@@ -180,3 +191,4 @@ $NetBSD: patch-aa,v 1.9 2011/08/02 14:03:18 bouyer Exp $
  	chmod g+s $(DESTDIR)$(LOGDIR)/rw
  
  	@echo ""
+ 	@echo "*** External command directory configured ***"
diff --git a/net/nagios-base/patches/patch-ad b/net/nagios-base/patches/patch-ad
index 169ebb5eb5bf8..2ee2cb26f4869 100644
--- a/net/nagios-base/patches/patch-ad
+++ b/net/nagios-base/patches/patch-ad
@@ -1,8 +1,7 @@
-$NetBSD: patch-ad,v 1.8 2011/08/02 14:03:18 bouyer Exp $
-
---- html/Makefile.in.orig	2011-07-24 19:53:52.000000000 +0200
-+++ html/Makefile.in	2011-08-01 18:50:04.000000000 +0200
-@@ -7,7 +7,7 @@
+--- html/Makefile.in.orig	2012-02-13 21:40:42.000000000 +0100
++++ html/Makefile.in	2012-10-05 15:13:58.000000000 +0200
+@@ -6,9 +6,9 @@
+ exec_prefix=@exec_prefix@
  LOGDIR=@localstatedir@
  CFGDIR=@sysconfdir@
  BINDIR=@bindir@
@@ -11,7 +10,9 @@ $NetBSD: patch-ad,v 1.8 2011/08/02 14:03:18 bouyer Exp $
  HTMLDIR=@datadir@
  INSTALL=@INSTALL@
  INSTALL_OPTS=@INSTALL_OPTS@
-@@ -33,52 +33,52 @@
+ COMMAND_OPTS=@COMMAND_OPTS@
+@@ -33,57 +33,57 @@
+ 
  devclean: distclean
  
  install:
@@ -21,6 +22,7 @@ $NetBSD: patch-ad,v 1.8 2011/08/02 14:03:18 bouyer Exp $
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/contexthelp
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs
 -	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/docs/images
+-	$(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(HTMLDIR)/js
 -	$(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
@@ -29,64 +31,86 @@ $NetBSD: patch-ad,v 1.8 2011/08/02 14:03:18 bouyer Exp $
 -	$(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
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/contexthelp
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs
-+	${BSD_INSTALL_DATA_DIR} $(DESTDIR)$(HTMLDIR)/docs/images
-+	${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
-+	${BSD_INSTALL_DATA} robots.txt $(DESTDIR)$(HTMLDIR)
-+	#${BSD_INSTALL_DATA} 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
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/contexthelp
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/docs/images
++	$(BSD_INSTALL_DATA_DIR) $(DESTDIR)$(HTMLDIR)/js
++	$(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
++	$(BSD_INSTALL_DATA) robots.txt $(DESTDIR)$(HTMLDIR)
++#	$(BSD_INSTALL_DATA) docs/robots.txt $(DESTDIR)$(HTMLDIR)/docs
  # Remove old HTML files (PHP files are used now)
  	rm -f $(DESTDIR)$(HTMLDIR)/index.html
  	rm -f $(DESTDIR)$(HTMLDIR)/main.html
  	rm -f $(DESTDIR)$(HTMLDIR)/side.html
- 	for file in *.php; \
+-	for file in *.php; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR); done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR); done
- #	for file in media/*.wav; \
- #	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
- 	for file in stylesheets/*.css; \
+-#	for file in media/*.wav; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/media; done
+-	for file in stylesheets/*.css; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
- 	for file in contexthelp/*.html; \
+-	for file in contexthelp/*.html; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
- #	for file in docs/*.html; \
- #	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
- #	for file in docs/images/*.*; \
- #	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
- 	for file in images/*.gif; \
+-	for file in js/*.js; \
+-	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/js; done
+-#	for file in docs/*.html; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs; done
+-#	for file in docs/images/*.*; \
+-#	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
+-	for file in images/*.gif; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
- 	for file in images/*.jpg; \
+-	for file in images/*.jpg; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
- 	for file in images/*.png; \
+-	for file in images/*.png; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
- 	for file in images/*.ico; \
+-	for file in images/*.ico; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images; done
- 	for file in images/logos/*.*; \
+-	for file in images/logos/*.*; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
-+	do ${BSD_INSTALL_DATA} $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
- 	for file in includes/*.*; \
+-	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/*; \
-+	for file in AUTHORS NEWS rss_parse.inc CHANGES README rss_utils.inc ChangeLog TROUBLESHOOTING rss_cache.inc INSTALL cookbook rss_fetch.inc ; \
+-	for file in includes/rss/*.*; \
 -	do $(INSTALL) -m 664 $(INSTALL_OPTS) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
-+	do ${BSD_INSTALL_DATA} includes/rss/$$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
- 	for file in includes/rss/extlib/*; \
+-	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
++	for file in *.php; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR); done
++#	for file in media/*.wav; do \
++#	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/media; done
++	for file in stylesheets/*.css; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/stylesheets; done
++	for file in contexthelp/*.html; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/contexthelp; done
++	for file in js/*.js; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/js; done
++#	for file in docs/*.html; do \
++#	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs; done
++#	for file in docs/images/*.*; do \
++#	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/docs/images; done
++	for file in images/*.gif; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	for file in images/*.jpg; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	for file in images/*.png; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	for file in images/*.ico; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images; done
++	for file in images/logos/*.*; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/images/logos; done
++	for file in includes/*.*; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes; done
++	for file in includes/rss/*.*; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss; done
++	for file in includes/rss/extlib/*.*; do \
++	$(BSD_INSTALL_DATA) $$file $(DESTDIR)$(HTMLDIR)/includes/rss/extlib; done
  
  install-unstripped:
  	$(MAKE) install
+ 
diff --git a/net/nagios-base/patches/patch-ah b/net/nagios-base/patches/patch-ah
index 7c5f30f737771..f72f312c5d73b 100644
--- a/net/nagios-base/patches/patch-ah
+++ b/net/nagios-base/patches/patch-ah
@@ -1,12 +1,12 @@
-$NetBSD: patch-ah,v 1.3 2011/08/02 14:03:18 bouyer Exp $
+$NetBSD: patch-ah,v 1.4 2012/12/14 18:49:51 manu Exp $
 
---- cgi/getcgi.c.orig	2011-07-26 02:16:13.000000000 +0200
-+++ cgi/getcgi.c	2011-08-01 18:37:39.000000000 +0200
+--- cgi/getcgi.c.orig	2012-10-04 18:31:47.000000000 +0200
++++ cgi/getcgi.c	2012-10-04 18:31:57.000000000 +0200
 @@ -10,6 +10,7 @@
- #include "../include/getcgi.h"
- #include <stdio.h>
- #include <stdlib.h>
+ #include "../include/getcgi.h"
+ #include <stdio.h>
+ #include <stdlib.h>
 +#include <limits.h>
- 
- 
- #undef PARANOID_CGI_INPUT
+ 
+ 
+ #undef PARANOID_CGI_INPUT