From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Dec 9 01:10:08 2006 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 522F716A403 for ; Sat, 9 Dec 2006 01:10:08 +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 2C2F643CB9 for ; Sat, 9 Dec 2006 01:09:02 +0000 (GMT) (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 kB91A26e052183 for ; Sat, 9 Dec 2006 01:10:02 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id kB91A2ZU052182; Sat, 9 Dec 2006 01:10:02 GMT (envelope-from gnats) Resent-Date: Sat, 9 Dec 2006 01:10:02 GMT Resent-Message-Id: <200612090110.kB91A2ZU052182@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 9F73716A415 for ; Sat, 9 Dec 2006 01:02:40 +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 2F3B343CA2 for ; Sat, 9 Dec 2006 01:01:38 +0000 (GMT) (envelope-from jarrod@wallace.netleader.com.au) Received: (from jarrod@localhost) by wallace.netleader.com.au (8.13.8/8.13.8/Submit) id kB912aEB012034; Sat, 9 Dec 2006 11:32:36 +1030 (CST) (envelope-from jarrod) Message-Id: <200612090102.kB912aEB012034@wallace.netleader.com.au> Date: Sat, 9 Dec 2006 11:32:36 +1030 (CST) From: Jarrod Sayers To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/106502: [maintainer-update] net-mgmt/nagios: Update to 2.6 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, 09 Dec 2006 01:10:08 -0000 >Number: 106502 >Category: ports >Synopsis: [maintainer-update] net-mgmt/nagios: Update to 2.6 >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Dec 09 01:10:01 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 6.2-RC1 i386 >Organization: >Environment: System: FreeBSD wallace.netleader.com.au 6.2-RC1 FreeBSD 6.2-RC1 #63: Thu Dec 7 21:24:18 CST 2006 root@wallace.netleader.com.au:/usr/obj/usr/src/sys/WALLACE i386 >Description: Update to Nagios 2.6. >How-To-Repeat: >Fix: Downloadable diff from: http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-2.6.diff --- net-mgmt-nagios-2.6.diff begins here --- diff -ruN ports/net-mgmt/nagios.orig/Makefile ports/net-mgmt/nagios/Makefile --- ports/net-mgmt/nagios.orig/Makefile Sat Oct 28 00:26:36 2006 +++ ports/net-mgmt/nagios/Makefile Sat Dec 9 07:56:48 2006 @@ -6,7 +6,7 @@ # PORTNAME= nagios -PORTVERSION= 2.5 +PORTVERSION= 2.6 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 Oct 28 00:26:36 2006 +++ ports/net-mgmt/nagios/distinfo Sat Dec 9 07:57:27 2006 @@ -1,3 +1,3 @@ -MD5 (nagios-2.5.tar.gz) = 1a77528f6797bd3c0320da5e4fae2b1a -SHA256 (nagios-2.5.tar.gz) = de9eb06609299cc231d0c2104a7f65367446cb86cb6aa3f6787fb25003fd452e -SIZE (nagios-2.5.tar.gz) = 1736167 +MD5 (nagios-2.6.tar.gz) = a032edba07bf389b803ce817e9406c02 +SHA256 (nagios-2.6.tar.gz) = e53cd8cc5cb00a00b66aa7e33fb34b70b783f095161cde9376cea489c5445e42 +SIZE (nagios-2.6.tar.gz) = 1734400 diff -ruN ports/net-mgmt/nagios.orig/files/patch-Makefile.in ports/net-mgmt/nagios/files/patch-Makefile.in --- ports/net-mgmt/nagios.orig/files/patch-Makefile.in Mon Jan 9 11:24:01 2006 +++ ports/net-mgmt/nagios/files/patch-Makefile.in Sat Dec 9 08:06:59 2006 @@ -1,6 +1,6 @@ ---- Makefile.in.orig Sat Nov 26 17:35:35 2005 -+++ Makefile.in Wed Dec 28 23:06:40 2005 -@@ -177,7 +177,7 @@ +--- Makefile.in.orig Tue Nov 28 12:59:04 2006 ++++ Makefile.in Sat Dec 9 08:04:47 2006 +@@ -186,7 +186,7 @@ $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR) $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(LOGDIR)/archives if [ $(INSTALLPERLSTUFF) = yes ]; then \ @@ -9,7 +9,7 @@ fi; @echo "" -@@ -204,14 +204,14 @@ +@@ -213,12 +213,12 @@ install-config: @@ -17,18 +17,14 @@ - $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample - $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample - $(INSTALL) -m 660 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample -- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample +- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample +- $(INSTALL) -m 664 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CFGDIR) + $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/nagios.cfg $(DESTDIR)$(CFGDIR)/nagios.cfg-sample + $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/cgi.cfg $(DESTDIR)$(CFGDIR)/cgi.cfg-sample + $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/resource.cfg $(DESTDIR)$(CFGDIR)/resource.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/bigger.cfg $(DESTDIR)$(CFGDIR)/bigger.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/minimal.cfg $(DESTDIR)$(CFGDIR)/minimal.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/checkcommands.cfg $(DESTDIR)$(CFGDIR)/checkcommands.cfg-sample -+ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/misccommands.cfg $(DESTDIR)$(CFGDIR)/misccommands.cfg-sample ++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/localhost.cfg $(DESTDIR)$(CFGDIR)/localhost.cfg-sample ++ $(INSTALL) -m 644 $(INSTALL_OPTS) sample-config/template-object/commands.cfg $(DESTDIR)$(CFGDIR)/commands.cfg-sample @echo "" @echo "*** Sample config file installed ***" diff -ruN ports/net-mgmt/nagios.orig/pkg-plist ports/net-mgmt/nagios/pkg-plist --- ports/net-mgmt/nagios.orig/pkg-plist Sun Jan 22 13:17:18 2006 +++ ports/net-mgmt/nagios/pkg-plist Sat Dec 9 08:06:31 2006 @@ -7,11 +7,9 @@ bin/nagios bin/nagiostats %%EMBEDDED_PERL%%bin/p1.pl -etc/nagios/bigger.cfg-sample etc/nagios/cgi.cfg-sample -etc/nagios/checkcommands.cfg-sample -etc/nagios/minimal.cfg-sample -etc/nagios/misccommands.cfg-sample +etc/nagios/commands.cfg-sample +etc/nagios/localhost.cfg-sample etc/nagios/nagios.cfg-sample etc/nagios/resource.cfg-sample %%NAGIOSWWWDIR%%/cgi-bin/avail.cgi --- net-mgmt-nagios-2.6.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: