From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Jun 3 03:40:34 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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 7B34516A4C9 for ; Sat, 3 Jun 2006 03:40:34 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [216.136.204.21]) by mx1.FreeBSD.org (Postfix) with ESMTP id BCF7D43D5A for ; Sat, 3 Jun 2006 03:40:26 +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 k533eQ5V091296 for ; Sat, 3 Jun 2006 03:40:26 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k533eQ1s091295; Sat, 3 Jun 2006 03:40:26 GMT (envelope-from gnats) Resent-Date: Sat, 3 Jun 2006 03:40:26 GMT Resent-Message-Id: <200606030340.k533eQ1s091295@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 [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id E877B16A423 for ; Sat, 3 Jun 2006 03:34:58 +0000 (UTC) (envelope-from jarrod@wallace.netleader.com.au) Received: from ash25e.internode.on.net (ash25e.internode.on.net [203.16.214.182]) by mx1.FreeBSD.org (Postfix) with ESMTP id 3360943D46 for ; Sat, 3 Jun 2006 03:34:57 +0000 (GMT) (envelope-from jarrod@wallace.netleader.com.au) Received: from wallace.netleader.com.au (wallace.netleader.com.au [203.122.246.247]) by ash25e.internode.on.net (8.13.6/8.13.5) with ESMTP id k533YtSE060758; Sat, 3 Jun 2006 13:04:56 +0930 (CST) (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.6/8.13.6) with ESMTP id k533Ysoc054410; Sat, 3 Jun 2006 13:04:55 +0930 (CST) (envelope-from jarrod@wallace.netleader.com.au) Received: (from jarrod@localhost) by wallace.netleader.com.au (8.13.6/8.13.6/Submit) id k533YsTR054409; Sat, 3 Jun 2006 13:04:54 +0930 (CST) (envelope-from jarrod) Message-Id: <200606030334.k533YsTR054409@wallace.netleader.com.au> Date: Sat, 3 Jun 2006 13:04:54 +0930 (CST) From: Jarrod Sayers To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/98413: [maintainer-update] net-mgmt/nagios: Update to Nagios 2.4 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, 03 Jun 2006 03:40:34 -0000 >Number: 98413 >Category: ports >Synopsis: [maintainer-update] net-mgmt/nagios: Update to Nagios 2.4 >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 Jun 03 03:40:25 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 4.11-RELEASE-p17 i386 >Organization: >Environment: System: FreeBSD wallace.netleader.com.au 4.11-RELEASE-p17 FreeBSD 4.11-RELEASE-p17 #20: Thu Apr 20 10:12:15 CST 2006 root@wallace.netleader.com.au:/usr/obj/usr/src/sys/WALLACE i386 >Description: Update to Nagios 2.4: - Fix for missing include that prevented CGI compilation under Solaris [1, also affected FreeBSD 7] - Better error message reporting in the command CGI (cmd.cgi) - Fix for order of recovery/flapping notifications immediately after end of host/service flapping - Bug fix for potential crash (SIGBUS) of CGIs when reading mmap()'ed status, comment, and downtime files - Added 'install-unstripped' option to Makefile to allow installing unstripped binaries for debugging - Minor bug fix to sample redundancy handle-master-proc-event script Files Changed: - ports/net-mgmt/nagios/Makefile - ports/net-mgmt/nagios/distinfo - ports/net-mgmt/nagios/files/patch-base-Makefile.in - ports/net-mgmt/nagios/files/patch-cgi-Makefile.in Files Removed: - ports/net-mgmt/nagios/files/patch-cgi-getcgi.c [1] - ports/net-mgmt/nagios/files/patch-include-config.h.in >How-To-Repeat: >Fix: Downloadable diff: http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-2.4.diff --- net-mgmt-nagios-2.4.diff begins here --- diff -ruN ports/net-mgmt/nagios.orig/Makefile ports/net-mgmt/nagios/Makefile --- ports/net-mgmt/nagios.orig/Makefile Sat May 27 11:57:12 2006 +++ ports/net-mgmt/nagios/Makefile Sat Jun 3 11:02:34 2006 @@ -6,7 +6,7 @@ # PORTNAME= nagios -PORTVERSION= 2.3.1 +PORTVERSION= 2.4 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 May 27 11:57:12 2006 +++ ports/net-mgmt/nagios/distinfo Sat Jun 3 11:02:41 2006 @@ -1,3 +1,3 @@ -MD5 (nagios-2.3.1.tar.gz) = 22029e5b71b50036c41a44f63e58150d -SHA256 (nagios-2.3.1.tar.gz) = 40cd86756eb859cfd00c47c8a6670aac74c841393c49fc24bd5ed43099e3cdcc -SIZE (nagios-2.3.1.tar.gz) = 1734958 +MD5 (nagios-2.4.tar.gz) = bb8f0106dc7f282c239f54db1f308445 +SHA256 (nagios-2.4.tar.gz) = e62346de93df5f4387377faac9ad1fd2fbfd5628f0482646144dc2b8d266fcd8 +SIZE (nagios-2.4.tar.gz) = 1735573 diff -ruN ports/net-mgmt/nagios.orig/files/patch-base-Makefile.in ports/net-mgmt/nagios/files/patch-base-Makefile.in --- ports/net-mgmt/nagios.orig/files/patch-base-Makefile.in Tue Feb 15 08:22:42 2005 +++ ports/net-mgmt/nagios/files/patch-base-Makefile.in Sat Jun 3 11:10:09 2006 @@ -1,16 +1,15 @@ ---- base/Makefile.in.orig Thu Dec 9 07:48:33 2004 -+++ base/Makefile.in Sat Feb 12 13:59:24 2005 -@@ -181,10 +181,10 @@ - devclean: distclean +--- base/Makefile.in.orig Wed May 31 02:01:44 2006 ++++ base/Makefile.in Sat Jun 3 11:09:48 2006 +@@ -188,9 +188,9 @@ + $(MAKE) install-basic - install: + install-basic: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) - $(INSTALL) -m 774 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) +- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(BINDIR) + $(INSTALL) -m 755 $(INSTALL_OPTS) @nagios_name@ $(DESTDIR)$(BINDIR) - $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@ -- $(INSTALL) -m 774 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) + $(INSTALL) -m 755 $(INSTALL_OPTS) @nagiostats_name@ $(DESTDIR)$(BINDIR) - $(STRIP) $(DESTDIR)$(BINDIR)/@nagiostats_name@ - + strip-post-install: + $(STRIP) $(DESTDIR)$(BINDIR)/@nagios_name@ diff -ruN ports/net-mgmt/nagios.orig/files/patch-cgi-Makefile.in ports/net-mgmt/nagios/files/patch-cgi-Makefile.in --- ports/net-mgmt/nagios.orig/files/patch-cgi-Makefile.in Tue Feb 15 08:22:42 2005 +++ ports/net-mgmt/nagios/files/patch-cgi-Makefile.in Sat Jun 3 11:14:55 2006 @@ -1,14 +1,14 @@ ---- cgi/Makefile.in.orig Mon Oct 25 07:05:54 2004 -+++ cgi/Makefile.in Sat Feb 12 13:56:57 2005 -@@ -191,9 +191,9 @@ - devclean: distclean +--- cgi/Makefile.in.orig Wed May 31 02:01:44 2006 ++++ cgi/Makefile.in Sat Jun 3 11:14:04 2006 +@@ -198,9 +198,9 @@ + $(MAKE) install-basic - install: + install-basic: - $(INSTALL) -m 775 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) + $(INSTALL) -m 755 $(INSTALL_OPTS) -d $(DESTDIR)$(CGIDIR) for file in *.cgi; do \ - $(INSTALL) -m 775 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \ + $(INSTALL) -m 755 $(INSTALL_OPTS) $$file $(DESTDIR)$(CGIDIR); \ - $(STRIP) $(DESTDIR)$(CGIDIR)/$$file; \ done + strip-post-install: diff -ruN ports/net-mgmt/nagios.orig/files/patch-cgi-getcgi.c ports/net-mgmt/nagios/files/patch-cgi-getcgi.c --- ports/net-mgmt/nagios.orig/files/patch-cgi-getcgi.c Sat May 27 11:57:13 2006 +++ ports/net-mgmt/nagios/files/patch-cgi-getcgi.c Thu Jan 1 09:30:00 1970 @@ -1,10 +0,0 @@ ---- cgi/getcgi.c.orig Thu Apr 13 04:47:23 2006 -+++ cgi/getcgi.c Sun May 21 01:14:04 2006 -@@ -10,6 +10,7 @@ - #include "../include/getcgi.h" - #include - #include -+#include - - - #undef PARANOID_CGI_INPUT diff -ruN ports/net-mgmt/nagios.orig/files/patch-include-config.h.in ports/net-mgmt/nagios/files/patch-include-config.h.in --- ports/net-mgmt/nagios.orig/files/patch-include-config.h.in Wed Aug 31 21:59:48 2005 +++ ports/net-mgmt/nagios/files/patch-include-config.h.in Thu Jan 1 09:30:00 1970 @@ -1,26 +0,0 @@ ---- include/config.h.in.orig Mon Aug 29 17:34:30 2005 -+++ include/config.h.in Mon Aug 29 17:41:03 2005 -@@ -108,11 +108,6 @@ - #include - #include - --#undef HAVE_SYS_RESOURCE_H --#ifdef HAVE_SYS_RESOURCE_H --#include --#endif -- - #undef HAVE_PWD_H - #ifdef HAVE_PWD_H - #include -@@ -190,6 +185,11 @@ - #else - #include - #endif -+#endif -+ -+#undef HAVE_SYS_RESOURCE_H -+#ifdef HAVE_SYS_RESOURCE_H -+#include - #endif - - #undef HAVE_SYS_TIMEB_H --- net-mgmt-nagios-2.4.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: