From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jan 27 10:20:13 2007 Return-Path: X-Original-To: freebsd-ports-bugs@hub.freebsd.org Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id A54F716A401 for ; Sat, 27 Jan 2007 10:20:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [69.147.83.40]) by mx1.freebsd.org (Postfix) with ESMTP id 6732713C46B for ; Sat, 27 Jan 2007 10:20:13 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.13.4/8.13.4) with ESMTP id l0RAKDjj018129 for ; Sat, 27 Jan 2007 10:20:13 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id l0RAKDYO018121; Sat, 27 Jan 2007 10:20:13 GMT (envelope-from gnats) Resent-Date: Sat, 27 Jan 2007 10:20:13 GMT Resent-Message-Id: <200701271020.l0RAKDYO018121@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Jarrod Sayers Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52]) by hub.freebsd.org (Postfix) with ESMTP id CDD8516A401 for ; Sat, 27 Jan 2007 10:18:56 +0000 (UTC) (envelope-from jarrod@wallace.netleader.com.au) Received: from wallace.netleader.com.au (wallace.netleader.com.au [203.122.246.247]) by mx1.freebsd.org (Postfix) with ESMTP id E88FD13C483 for ; Sat, 27 Jan 2007 10:18:55 +0000 (UTC) (envelope-from jarrod@wallace.netleader.com.au) Received: from wallace.netleader.com.au (localhost [127.0.0.1]) by wallace.netleader.com.au (8.13.8/8.13.8) with ESMTP id l0RA6KIv020815; Sat, 27 Jan 2007 20:36:21 +1030 (CST) (envelope-from jarrod@wallace.netleader.com.au) Received: (from jarrod@localhost) by wallace.netleader.com.au (8.13.8/8.13.8/Submit) id l0RA6K9a020814; Sat, 27 Jan 2007 20:36:20 +1030 (CST) (envelope-from jarrod) Message-Id: <200701271006.l0RA6K9a020814@wallace.netleader.com.au> Date: Sat, 27 Jan 2007 20:36:20 +1030 (CST) From: Jarrod Sayers To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/108417: [maintainer-update] net-mgmt/nagios: Update to Nagios 2.7 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jarrod Sayers List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 27 Jan 2007 10:20:13 -0000 >Number: 108417 >Category: ports >Synopsis: [maintainer-update] net-mgmt/nagios: Update to Nagios 2.7 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jan 27 10:20:12 GMT 2007 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 6.2-RELEASE i386 >Organization: >Environment: System: FreeBSD wallace.netleader.com.au 6.2-RELEASE FreeBSD 6.2-RELEASE #67: Wed Jan 17 19:32:31 CST 2007 root@wallace.netleader.com.au:/usr/obj/usr/src/sys/WALLACE i386 >Description: Update to Nagios 2.7. Changes to pkg-install.in to use new UID and GID to follow over the next few days. Files changed: - ports/GIDs - ports/UIDs - ports/net-mgmt/nagios/Makefile - ports/net-mgmt/nagios/distinfo Files added: - ports/net-mgmt/nagios/files/patch-html-docs-xodtemplate.html [1] - ports/net-mgmt/nagios/files/patch-sample-config-template-object-localhost.cfg.in [1] [1] Suggested by Dan Langille (added with modifications from ports/108362) >How-To-Repeat: >Fix: Downloadable diff from http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-2.7.diff --- net-mgmt-nagios-2.7.diff begins here --- diff -ruN ports/net-mgmt/nagios.orig/Makefile ports/net-mgmt/nagios/Makefile --- ports/net-mgmt/nagios.orig/Makefile Sat Dec 9 19:42:24 2006 +++ ports/net-mgmt/nagios/Makefile Sat Jan 27 18:41:17 2007 @@ -6,7 +6,7 @@ # PORTNAME= nagios -PORTVERSION= 2.6 +PORTVERSION= 2.7 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= nagios diff -ruN ports/net-mgmt/nagios.orig/distinfo ports/net-mgmt/nagios/distinfo --- ports/net-mgmt/nagios.orig/distinfo Sat Dec 9 19:42:24 2006 +++ ports/net-mgmt/nagios/distinfo Sat Jan 27 18:41:27 2007 @@ -1,3 +1,3 @@ -MD5 (nagios-2.6.tar.gz) = a032edba07bf389b803ce817e9406c02 -SHA256 (nagios-2.6.tar.gz) = e53cd8cc5cb00a00b66aa7e33fb34b70b783f095161cde9376cea489c5445e42 -SIZE (nagios-2.6.tar.gz) = 1734400 +MD5 (nagios-2.7.tar.gz) = d664d2785cdca3c5c8a3e84c033e8e6e +SHA256 (nagios-2.7.tar.gz) = defb4062f077f999d1da2bcfcb87786c5d7fbca7d1346c7e6a19084b5629b2c1 +SIZE (nagios-2.7.tar.gz) = 1737308 diff -ruN ports/net-mgmt/nagios.orig/files/patch-html-docs-xodtemplate.html ports/net-mgmt/nagios/files/patch-html-docs-xodtemplate.html --- ports/net-mgmt/nagios.orig/files/patch-html-docs-xodtemplate.html Thu Jan 1 09:30:00 1970 +++ ports/net-mgmt/nagios/files/patch-html-docs-xodtemplate.html Sat Jan 27 19:04:18 2007 @@ -0,0 +1,24 @@ +--- html/docs/xodtemplate.html.orig Wed Dec 27 05:03:22 2006 ++++ html/docs/xodtemplate.html Sat Jan 27 18:56:48 2007 +@@ -493,9 +493,9 @@ +

+ 

+ define service{
+-	host_name		linux-server
+-	service_description	check-disk-sda1
+-	check_command		check-disk!/dev/sda1
++	host_name		freebsd-server
++	service_description	check-disk-ad0s1a
++	check_command		check-disk!/dev/ad0s1a
+ 	max_check_attempts	5
+ 	normal_check_interval	5
+ 	retry_check_interval	3
+@@ -503,7 +503,7 @@
+ 	notification_interval	30
+ 	notification_period	24x7
+ 	notification_options	w,c,r
+-	contact_groups		linux-admins
++	contact_groups		freebsd-admins
+ 	}
+
+

diff -ruN ports/net-mgmt/nagios.orig/files/patch-sample-config-template-object-localhost.cfg.in ports/net-mgmt/nagios/files/patch-sample-config-template-object-localhost.cfg.in --- ports/net-mgmt/nagios.orig/files/patch-sample-config-template-object-localhost.cfg.in Thu Jan 1 09:30:00 1970 +++ ports/net-mgmt/nagios/files/patch-sample-config-template-object-localhost.cfg.in Sat Jan 27 19:04:11 2007 @@ -0,0 +1,36 @@ +--- sample-config/template-object/localhost.cfg.in.orig Tue Nov 28 12:59:05 2006 ++++ sample-config/template-object/localhost.cfg.in Sat Jan 27 19:01:52 2007 +@@ -151,15 +151,15 @@ + } + + +-# Linux host definition template - This is NOT a real host, just a template! ++# FreeBSD host definition template - This is NOT a real host, just a template! + + define host{ +- name linux-server ; The name of this host template ++ name freebsd-server ; The name of this host template + use generic-host ; This template inherits other values from the generic-host template +- check_period 24x7 ; By default, Linux hosts are checked round the clock +- max_check_attempts 10 ; Check each Linux host 10 times (max) +- check_command check-host-alive ; Default command to check Linux hosts +- notification_period workhours ; Linux admins hate to be woken up, so we only notify during the day ++ check_period 24x7 ; By default, FreeBSD hosts are checked round the clock ++ max_check_attempts 10 ; Check each FreeBSD host 10 times (max) ++ check_command check-host-alive ; Default command to check FreeBSD hosts ++ notification_period workhours ; FreeBSD admins hate to be woken up, so we only notify during the day + ; Note that the notification_period variable is being overridden from + ; the value that is inherited from the generic-host template! + notification_interval 120 ; Resend notification every 2 hours +@@ -173,9 +173,9 @@ + # local host (this machine). + + define host{ +- use linux-server ; Name of host template to use ++ use freebsd-server ; Name of host template to use + ; This host definition will inherit all variables that are defined +- ; in (or inherited by) the linux-server host template definition. ++ ; in (or inherited by) the freebsd-server host template definition. + host_name localhost + alias localhost + address 127.0.0.1 --- ports/UIDs.orig Sun Jan 21 08:51:22 2007 +++ ports/UIDs Sat Jan 27 19:52:11 2007 @@ -69,6 +69,7 @@ sfs:*:171:171:Self-Certifying File System:/nonexistent:/sbin/nologin agk:*:172:172:AquaGateKeeper:/nonexistent:/nonexistent polipo:*:173:173:polipo web cache:/nonexistent:/sbin/nologin +nagios:*:181:181:Nagios pseudo-user:/var/spool/nagios:/sbin/nologin moinmoin:*:192:192:MoinMoin User:/nonexistent:/sbin/nologin cups:*:193:193:Cups Owner:/nonexistent:/sbin/nologin sympa:*:200:200:Sympa Owner:/nonexistent:/sbin/nologin --- ports/GIDs.orig Sun Jan 21 08:51:20 2007 +++ ports/GIDs Sat Jan 27 19:47:43 2007 @@ -60,6 +60,7 @@ sfs:*:171: agk:*:172: polipo:*:173: +nagios:*:181: moinmoin:*:192: cups:*:193: sympa:*:200: --- net-mgmt-nagios-2.7.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: