From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Mar 17 00:50:01 2009 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id C36151065679 for ; Tue, 17 Mar 2009 00:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id 9A6AF8FC16 for ; Tue, 17 Mar 2009 00:50:01 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (gnats@localhost [127.0.0.1]) by freefall.freebsd.org (8.14.3/8.14.3) with ESMTP id n2H0o1oj008195 for ; Tue, 17 Mar 2009 00:50:01 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.3/8.14.3/Submit) id n2H0o1oo008194; Tue, 17 Mar 2009 00:50:01 GMT (envelope-from gnats) Resent-Date: Tue, 17 Mar 2009 00:50:01 GMT Resent-Message-Id: <200903170050.n2H0o1oo008194@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 [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 027441065673 for ; Tue, 17 Mar 2009 00:43:38 +0000 (UTC) (envelope-from jarrod@manhattan.netleader.com.au) Received: from manhattan.netleader.com.au (manhattan.netleader.com.au [123.136.33.242]) by mx1.freebsd.org (Postfix) with ESMTP id 8870A8FC0A for ; Tue, 17 Mar 2009 00:43:37 +0000 (UTC) (envelope-from jarrod@manhattan.netleader.com.au) Received: from manhattan.netleader.com.au (localhost [127.0.0.1]) by manhattan.netleader.com.au (8.14.3/8.14.3) with ESMTP id n2H0hRbl038163 (version=TLSv1/SSLv3 cipher=DHE-RSA-AES256-SHA bits=256 verify=NO); Tue, 17 Mar 2009 11:13:28 +1030 (CST) (envelope-from jarrod@manhattan.netleader.com.au) Received: (from jarrod@localhost) by manhattan.netleader.com.au (8.14.3/8.14.3/Submit) id n2H0hRt0038162; Tue, 17 Mar 2009 11:13:27 +1030 (CST) (envelope-from jarrod) Message-Id: <200903170043.n2H0hRt0038162@manhattan.netleader.com.au> Date: Tue, 17 Mar 2009 11:13:27 +1030 (CST) From: Jarrod Sayers To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/132712: [maintainer-update] net-mgmt/nagios: Merge UNHANDLED_HACK from net-mgmt/nagios-devel 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: Tue, 17 Mar 2009 00:50:02 -0000 >Number: 132712 >Category: ports >Synopsis: [maintainer-update] net-mgmt/nagios: Merge UNHANDLED_HACK from net-mgmt/nagios-devel >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: Tue Mar 17 00:50:00 UTC 2009 >Closed-Date: >Last-Modified: >Originator: Jarrod Sayers >Release: FreeBSD 7.1-RELEASE-p3 i386 >Organization: >Environment: System: FreeBSD manhattan.netleader.com.au 7.1-RELEASE-p3 FreeBSD 7.1-RELEASE-p3 #12: Mon Mar 2 20:39:19 CST 2009 root@manhattan.netleader.com.au:/usr/obj/usr/src/sys/MANHATTAN i386 >Description: Add UNHANDLED_HACK "hack" from ports/131643 which was subsequently tested in ports/132098 as a part of the Nagios 3.1.0 update. PORTREVISION intentionally not bumped as option is obscure and off by default. >How-To-Repeat: >Fix: Downloadable diff from: http://www.netleader.com.au/~jarrod/FreeBSD/net-mgmt-nagios-UNHANDLED_HACK.diff --- net-mgmt-nagios-UNHANDLED_HACK.diff begins here --- diff -ruN ports/net-mgmt/nagios.orig/Makefile ports/net-mgmt/nagios/Makefile --- ports/net-mgmt/nagios.orig/Makefile 2008-12-10 11:01:50.000000000 +1030 +++ ports/net-mgmt/nagios/Makefile 2009-03-17 10:56:21.000000000 +1030 @@ -25,7 +25,8 @@ OPTIONS= EMBEDDED_PERL "Enable embedded Perl [requires Perl 5.8.0+]" off \ NANOSLEEP "Use nanosleep in event timing" off \ - EVENT_BROKER "Enable event broker functionality" off + EVENT_BROKER "Enable event broker functionality" off \ + UNHANDLED_HACK "Display passive checks in unhandled queries" off GNU_CONFIGURE= yes @@ -104,6 +105,12 @@ CONFIGURE_ARGS+= --disable-event-broker .endif +post-patch: +.if defined(WITH_UNHANDLED_HACK) + @${REINPLACE_CMD} -e 's#\&serviceprops=42\&#\&serviceprops=10\&#g' \ + -e 's#\&hostprops=42\"#\&hostprops=10\"#g' ${WRKSRC}/html/side.html.in +.endif + pre-install: @${SH} ${PKGINSTALL} ${DISTNAME} PRE-INSTALL --- net-mgmt-nagios-UNHANDLED_HACK.diff ends here --- >Release-Note: >Audit-Trail: >Unformatted: