Import a fix for CVE-2013-7108 and CVE-2013-7205, which is multiple

off-by-one errors causing information leakage and possibly DoS.

Restructure the patch files to follow the newer naming conventions.
Add the rc.d script to PLIST.

Bump PKGREVISION.

25 files changed, 243 insertions, 24 deletions

diff --git a/net/nagios-base/Makefile b/net/nagios-base/Makefile
index 8197d832e4e..d62a905ba19 100644
--- a/net/nagios-base/Makefile
+++ b/net/nagios-base/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.51 2014/03/13 11:08:52 jperkin Exp $
+# $NetBSD: Makefile,v 1.52 2014/04/02 10:22:37 he Exp $
 #
 
 DISTNAME=		nagios-3.5.0
 PKGNAME=		${DISTNAME:S/-/-base-/}
-PKGREVISION=		1
+PKGREVISION=		2
 CATEGORIES=		net sysutils
 DISTFILES=		${DISTNAME}${EXTRACT_SUFX}
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=nagios/}
diff --git a/net/nagios-base/PLIST b/net/nagios-base/PLIST
index 2e1cf3508dd..c1ffd4548c9 100644
--- a/net/nagios-base/PLIST
+++ b/net/nagios-base/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2014/03/11 14:05:09 jperkin Exp $
+@comment $NetBSD: PLIST,v 1.16 2014/04/02 10:22:37 he Exp $
 bin/nagios
 bin/nagiostats
 bin/p1.pl
@@ -30,6 +30,7 @@ share/examples/nagios/objects/templates.cfg-sample
 share/examples/nagios/objects/timeperiods.cfg-sample
 share/examples/nagios/objects/windows.cfg-sample
 share/examples/nagios/resource.cfg-sample
+share/examples/rc.d/nagios
 share/nagios/config.inc.php
 share/nagios/contexthelp/A1.html
 share/nagios/contexthelp/A2.html
diff --git a/net/nagios-base/distinfo b/net/nagios-base/distinfo
index d3c9d41d830..50f3d3579fd 100644
--- a/net/nagios-base/distinfo
+++ b/net/nagios-base/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.18 2013/08/05 11:22:29 obache Exp $
+$NetBSD: distinfo,v 1.19 2014/04/02 10:22:37 he Exp $
 
 SHA1 (nagios-3.5.0.tar.gz) = 972e76c638b7d3f15d994eaa8fce0e4907d5d6e1
 RMD160 (nagios-3.5.0.tar.gz) = d75a764486fd3dc0462fb49924698754852d39be
@@ -6,12 +6,25 @@ Size (nagios-3.5.0.tar.gz) = 1789376 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-aa) = 2e8c278785de40073d7d39d3dc94696268af28e9
-SHA1 (patch-ab) = d15eb8913b28ed12664ee224941270e75857ecc1
-SHA1 (patch-ac) = a948575bd26e3b0d835c62cb96cba2657b38ffee
-SHA1 (patch-ad) = a5e4956aab0f002ec9076f65da013e7fb094027d
-SHA1 (patch-ae) = 35418dbe26f2e7c14d6a98951e62247344ae80b0
-SHA1 (patch-af) = a91ab37f16e8adda3146a2dde7273ebf841ef9af
-SHA1 (patch-ag) = ae13cf98b7e2f68304406ebab80292c5c4c8ea30
-SHA1 (patch-ah) = 702571fe4a0073c1d1a9f7b166a85d4cf41f284c
-SHA1 (patch-ai) = 9212106c141be6faaf65e4e4909fcf92907c0e58
+SHA1 (patch-Makefile.in) = 6a02bb8a9e4f10ddf19458c8485ccda813057637
+SHA1 (patch-base_Makefile.in) = 4c56192ec7d4df0b162f1fe09018902a970dd5c7
+SHA1 (patch-cgi_Makefile.in) = d8e6bb1ca4039e1f613caae8537666738f61ce08
+SHA1 (patch-cgi_avail.c) = 1ca4bbc28496ba1a4f4034284d003b8bfaed5a82
+SHA1 (patch-cgi_cmd.c) = a62e800e500ded9f32441649a0474d644e837d9b
+SHA1 (patch-cgi_config.c) = 9eb7887ee774e312f9254e9db38a04e41614d5e8
+SHA1 (patch-cgi_extinfo.c) = 27fada8f82a42ff80933ed8bacf6e6263ea7f3c0
+SHA1 (patch-cgi_getcgi.c) = 3aa7223473c7a961645591ee9ad46120cd7231b3
+SHA1 (patch-cgi_histogram.c) = 1d24e481a34db0d469de81ef70f079a01b704314
+SHA1 (patch-cgi_notifications.c) = 414013df5a298efd37051273d4da9aee46516241
+SHA1 (patch-cgi_outages.c) = dec955b3468b052ec988b46abb9933ff65e44505
+SHA1 (patch-cgi_status.c) = 009da866967e992fdd8f11bd9e53dbc9cbffeace
+SHA1 (patch-cgi_statusmap.c) = 73be1d14a7daf327eee253cfe66f4ebb50ae4fca
+SHA1 (patch-cgi_statuswml.c) = 027d1f7d9e246374d84804a5a4472cc70ae2edf1
+SHA1 (patch-cgi_summary.c) = 0a8c903b5eb1a9abc33af5091e97e31682cf2cb5
+SHA1 (patch-cgi_trends.c) = 49dcdb16d150268352176360197b03cbaabcc357
+SHA1 (patch-common_Makefile.in) = 9531dcc15c3a4fa953070275065d50978aeef050
+SHA1 (patch-configure) = a62a51408ac2b09176dcfdea4efab02abe652c7f
+SHA1 (patch-contrib_daemonchk.c) = c95efd621e1496f508d5938acc8f354afbb99277
+SHA1 (patch-html_Makefile.in) = 70f48e5aefe914a2c58d82dd38ec16e8b4cd8b71
+SHA1 (patch-include_locations.h.in) = 17c721da9b5d44fe159d385f3c0da2157df14231
+SHA1 (patch-sample-config_nagios.cfg.in) = c8422814bad0b19dfefe116b6db961ac7213c92f
diff --git a/net/nagios-base/patches/patch-aa b/net/nagios-base/patches/patch-Makefile.in
index 48e1ef91abe..8a5eca0a40d 100644
--- a/net/nagios-base/patches/patch-aa
+++ b/net/nagios-base/patches/patch-Makefile.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-aa,v 1.11 2013/08/05 11:22:29 obache Exp $
+$NetBSD: patch-Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
 
 --- Makefile.in.orig	2012-04-25 12:30:47.000000000 +0000
 +++ Makefile.in
diff --git a/net/nagios-base/patches/patch-ac b/net/nagios-base/patches/patch-base_Makefile.in
index d9276568d0b..f6fbf1e6711 100644
--- a/net/nagios-base/patches/patch-ac
+++ b/net/nagios-base/patches/patch-base_Makefile.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-ac,v 1.9 2013/08/05 11:22:29 obache Exp $
+$NetBSD: patch-base_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
 
 --- base/Makefile.in.orig	2010-10-23 10:00:59.000000000 +0000
 +++ base/Makefile.in
diff --git a/net/nagios-base/patches/patch-ab b/net/nagios-base/patches/patch-cgi_Makefile.in
index 6c2f052b066..d4e88a750f7 100644
--- a/net/nagios-base/patches/patch-ab
+++ b/net/nagios-base/patches/patch-cgi_Makefile.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-ab,v 1.7 2013/08/05 11:22:29 obache Exp $
+$NetBSD: patch-cgi_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
 
 --- cgi/Makefile.in.orig	2010-10-23 10:00:59.000000000 +0000
 +++ cgi/Makefile.in
diff --git a/net/nagios-base/patches/patch-cgi_avail.c b/net/nagios-base/patches/patch-cgi_avail.c
new file mode 100644
index 00000000000..a85a421b817
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_avail.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_avail.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/avail.c.orig	2012-02-03 15:23:14.000000000 +0000
++++ cgi/avail.c
+@@ -1141,7 +1141,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_cmd.c b/net/nagios-base/patches/patch-cgi_cmd.c
new file mode 100644
index 00000000000..fe9d04401e7
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_cmd.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_cmd.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/cmd.c.orig	2013-03-09 21:46:35.000000000 +0000
++++ cgi/cmd.c
+@@ -321,7 +321,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_config.c b/net/nagios-base/patches/patch-cgi_config.c
new file mode 100644
index 00000000000..3432691035d
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_config.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_config.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/config.c.orig	2013-02-27 01:37:32.000000000 +0000
++++ cgi/config.c
+@@ -386,7 +386,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_extinfo.c b/net/nagios-base/patches/patch-cgi_extinfo.c
new file mode 100644
index 00000000000..dedd14f107c
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_extinfo.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_extinfo.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/extinfo.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/extinfo.c
+@@ -651,7 +651,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-ah b/net/nagios-base/patches/patch-cgi_getcgi.c
index f72f312c5d7..da91f2c8420 100644
--- a/net/nagios-base/patches/patch-ah
+++ b/net/nagios-base/patches/patch-cgi_getcgi.c
@@ -1,4 +1,6 @@
-$NetBSD: patch-ah,v 1.4 2012/12/14 18:49:51 manu Exp $
+$NetBSD: patch-cgi_getcgi.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Also include limits.h.
 
 --- cgi/getcgi.c.orig	2012-10-04 18:31:47.000000000 +0200
 +++ cgi/getcgi.c	2012-10-04 18:31:57.000000000 +0200
diff --git a/net/nagios-base/patches/patch-cgi_histogram.c b/net/nagios-base/patches/patch-cgi_histogram.c
new file mode 100644
index 00000000000..d568b6a7e44
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_histogram.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_histogram.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/histogram.c.orig	2011-11-21 20:51:52.000000000 +0000
++++ cgi/histogram.c
+@@ -1069,7 +1069,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_notifications.c b/net/nagios-base/patches/patch-cgi_notifications.c
new file mode 100644
index 00000000000..9700411d949
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_notifications.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_notifications.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/notifications.c.orig	2012-02-03 15:22:56.000000000 +0000
++++ cgi/notifications.c
+@@ -358,7 +358,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_outages.c b/net/nagios-base/patches/patch-cgi_outages.c
new file mode 100644
index 00000000000..f30cdb9bc00
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_outages.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_outages.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/outages.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/outages.c
+@@ -269,7 +269,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_status.c b/net/nagios-base/patches/patch-cgi_status.c
new file mode 100644
index 00000000000..6d377bc7c15
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_status.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_status.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/status.c.orig	2013-03-09 21:46:35.000000000 +0000
++++ cgi/status.c
+@@ -600,7 +600,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_statusmap.c b/net/nagios-base/patches/patch-cgi_statusmap.c
new file mode 100644
index 00000000000..c9d71e3660d
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_statusmap.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_statusmap.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/statusmap.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/statusmap.c
+@@ -407,7 +407,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_statuswml.c b/net/nagios-base/patches/patch-cgi_statuswml.c
new file mode 100644
index 00000000000..6599f29552f
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_statuswml.c
@@ -0,0 +1,21 @@
+$NetBSD: patch-cgi_statuswml.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/statuswml.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/statuswml.c
+@@ -235,8 +235,13 @@ int process_cgivars(void) {
+ 
+ 	for(x = 0; variables[x] != NULL; x++) {
+ 
++		/* do some basic length checking on the variable identifier to prevent buffer overflows */
++		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
++			continue;
++			}
++
+ 		/* we found the hostgroup argument */
+-		if(!strcmp(variables[x], "hostgroup")) {
++		else if(!strcmp(variables[x], "hostgroup")) {
+ 			display_type = DISPLAY_HOSTGROUP;
+ 			x++;
+ 			if(variables[x] == NULL) {
diff --git a/net/nagios-base/patches/patch-cgi_summary.c b/net/nagios-base/patches/patch-cgi_summary.c
new file mode 100644
index 00000000000..d544b3e3812
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_summary.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_summary.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/summary.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/summary.c
+@@ -761,7 +761,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-cgi_trends.c b/net/nagios-base/patches/patch-cgi_trends.c
new file mode 100644
index 00000000000..0797ab9b171
--- /dev/null
+++ b/net/nagios-base/patches/patch-cgi_trends.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-cgi_trends.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- cgi/trends.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ cgi/trends.c
+@@ -1271,7 +1271,6 @@ int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 
diff --git a/net/nagios-base/patches/patch-ae b/net/nagios-base/patches/patch-common_Makefile.in
index 5acb45618f5..41da57b2662 100644
--- a/net/nagios-base/patches/patch-ae
+++ b/net/nagios-base/patches/patch-common_Makefile.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-ae,v 1.4 2011/04/08 22:37:25 morr Exp $
+$NetBSD: patch-common_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
 
 --- common/Makefile.in.orig	2009-06-17 03:57:21.000000000 +0000
 +++ common/Makefile.in
diff --git a/net/nagios-base/patches/patch-ag b/net/nagios-base/patches/patch-configure
index 7b48168c284..672918bb075 100644
--- a/net/nagios-base/patches/patch-ag
+++ b/net/nagios-base/patches/patch-configure
@@ -1,4 +1,6 @@
-$NetBSD: patch-ag,v 1.8 2011/08/02 14:03:18 bouyer Exp $
+$NetBSD: patch-configure,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
 
 --- configure.orig	2011-07-26 05:16:26.000000000 +0200
 +++ configure	2011-08-01 18:36:37.000000000 +0200
diff --git a/net/nagios-base/patches/patch-contrib_daemonchk.c b/net/nagios-base/patches/patch-contrib_daemonchk.c
new file mode 100644
index 00000000000..d446c890df4
--- /dev/null
+++ b/net/nagios-base/patches/patch-contrib_daemonchk.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-contrib_daemonchk.c,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix off-by-one vulnerabilities, ref. http://secunia.com/advisories/55976/
+
+--- contrib/daemonchk.c.orig	2011-08-17 07:36:27.000000000 +0000
++++ contrib/daemonchk.c
+@@ -174,7 +174,6 @@ static int process_cgivars(void) {
+ 
+ 		/* do some basic length checking on the variable identifier to prevent buffer overflows */
+ 		if(strlen(variables[x]) >= MAX_INPUT_BUFFER - 1) {
+-			x++;
+ 			continue;
+ 			}
+ 		}
diff --git a/net/nagios-base/patches/patch-ad b/net/nagios-base/patches/patch-html_Makefile.in
index cea6a67149a..c57ab310ce9 100644
--- a/net/nagios-base/patches/patch-ad
+++ b/net/nagios-base/patches/patch-html_Makefile.in
@@ -1,7 +1,7 @@
-$NetBSD: patch-ad,v 1.10 2013/08/05 11:22:29 obache Exp $
+$NetBSD: patch-html_Makefile.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
 
---- html/Makefile.in.orig	2012-02-13 21:40:42.000000000 +0100
-+++ html/Makefile.in	2012-10-05 15:13:58.000000000 +0200
 --- html/Makefile.in.orig	2012-02-13 20:40:42.000000000 +0000
 +++ html/Makefile.in
 @@ -7,7 +7,7 @@ exec_prefix=@exec_prefix@
diff --git a/net/nagios-base/patches/patch-ai b/net/nagios-base/patches/patch-include_locations.h.in
index 3bac72dc35c..f20c80277ab 100644
--- a/net/nagios-base/patches/patch-ai
+++ b/net/nagios-base/patches/patch-include_locations.h.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-ai,v 1.4 2011/04/08 22:37:25 morr Exp $
+$NetBSD: patch-include_locations.h.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Adjustments to build procedure.
 
 --- include/locations.h.in.orig	2008-11-30 17:22:59.000000000 +0000
 +++ include/locations.h.in
diff --git a/net/nagios-base/patches/patch-af b/net/nagios-base/patches/patch-sample-config_nagios.cfg.in
index 5142739fa5c..51c4fa64dfb 100644
--- a/net/nagios-base/patches/patch-af
+++ b/net/nagios-base/patches/patch-sample-config_nagios.cfg.in
@@ -1,4 +1,6 @@
-$NetBSD: patch-af,v 1.4 2011/04/08 22:37:25 morr Exp $
+$NetBSD: patch-sample-config_nagios.cfg.in,v 1.1 2014/04/02 10:22:37 he Exp $
+
+Fix placement of temporary file.
 
 --- sample-config/nagios.cfg.in.orig	2010-10-04 02:27:55.000000000 +0000
 +++ sample-config/nagios.cfg.in