From owner-freebsd-ports-bugs@FreeBSD.ORG Sat Apr 15 17:50:12 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 4FBF316A407 for ; Sat, 15 Apr 2006 17:50:12 +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 2E05943D45 for ; Sat, 15 Apr 2006 17:50:09 +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 k3FHo8xP067460 for ; Sat, 15 Apr 2006 17:50:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k3FHo8C3067459; Sat, 15 Apr 2006 17:50:08 GMT (envelope-from gnats) Resent-Date: Sat, 15 Apr 2006 17:50:08 GMT Resent-Message-Id: <200604151750.k3FHo8C3067459@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, Martin Matuska Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 47B7616A401 for ; Sat, 15 Apr 2006 17:41:43 +0000 (UTC) (envelope-from rebum@mail.vx.sk) Received: from mail.vx.sk (de.vx.sk [217.20.112.111]) by mx1.FreeBSD.org (Postfix) with ESMTP id CD84E43D45 for ; Sat, 15 Apr 2006 17:41:42 +0000 (GMT) (envelope-from rebum@mail.vx.sk) Received: from localhost (localhost [127.0.0.1]) by mail.vx.sk (Postfix) with ESMTP id EE29A22ABA for ; Sat, 15 Apr 2006 19:41:41 +0200 (CEST) Received: from mail.vx.sk ([127.0.0.1]) by localhost (mail.vx.sk [127.0.0.1]) (amavisd-new, port 10024) with LMTP id LK918toTuaOb for ; Sat, 15 Apr 2006 19:41:41 +0200 (CEST) Received: by mail.vx.sk (Postfix, from userid 1001) id 0EECB22AB8; Sat, 15 Apr 2006 19:41:41 +0200 (CEST) Message-Id: <20060415174141.0EECB22AB8@mail.vx.sk> Date: Sat, 15 Apr 2006 19:41:41 +0200 (CEST) From: Martin Matuska To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: Subject: ports/95822: [UPDATE] net-mgmt/nscas from 2.4 to 2.6 X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Martin Matuska List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 15 Apr 2006 17:50:12 -0000 >Number: 95822 >Category: ports >Synopsis: [UPDATE] net-mgmt/nscas from 2.4 to 2.6 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sat Apr 15 17:50:08 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Martin Matuska >Release: FreeBSD 6.0-RELEASE >Organization: >Environment: FreeBSD 6.0-RELEASE i386 amd64 >Description: Update of net-mgmt/nsca from 2.4 to 2.6 Added files: files/nsca.sh.in - moved from PREFIX/nagios to PREFIX/sbin and config files to PREFIX/etc - added start script - changed dependency from nagios to nagios-plugins (client app only uses this) >How-To-Repeat: >Fix: diff -Nbur net-mgmt/nsca.orig/Makefile net-mgmt/nsca/Makefile --- net-mgmt/nsca.orig/Makefile Sat Apr 15 18:55:12 2006 +++ net-mgmt/nsca/Makefile Sat Apr 15 19:32:05 2006 @@ -6,7 +6,7 @@ # PORTNAME= nsca -PORTVERSION= 2.4 +PORTVERSION= 2.6 CATEGORIES= net-mgmt MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= nagios @@ -14,24 +14,23 @@ MAINTAINER= paul@nerdlabs.com COMMENT= Nagios Service Check Acceptor -RUN_DEPENDS= nagios:${PORTSDIR}/net-mgmt/nagios +RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins LIB_DEPENDS= mcrypt.8:${PORTSDIR}/security/libmcrypt GNU_CONFIGURE= yes USE_PERL5= yes CONFIGURE_ARGS= --prefix=${PREFIX} --localstatedir=/var/spool/nagios -NAGIOS_DIR= ${LOCALBASE}/libexec/nagios -CONF_DIR= ${LOCALBASE}/etc/nagios +USE_RC_SUBR= nsca.sh DOCS= Changelog LEGAL README SECURITY # NOTE: this port installs into ${LOCALBASE} instead of ${PREFIX} do-install: - ${INSTALL_PROGRAM} ${WRKSRC}/src/nsca ${NAGIOS_DIR} - ${INSTALL_PROGRAM} ${WRKSRC}/src/send_nsca ${NAGIOS_DIR} - ${INSTALL_DATA} ${WRKSRC}/nsca.cfg ${CONF_DIR}/nsca.cfg.sample - ${INSTALL_DATA} ${WRKSRC}/send_nsca.cfg ${CONF_DIR}/send_nsca.cfg.sample + ${INSTALL_PROGRAM} ${WRKSRC}/src/nsca ${PREFIX}/sbin/nsca + ${INSTALL_PROGRAM} ${WRKSRC}/src/send_nsca ${PREFIX}/sbin/send_nsca + ${INSTALL_DATA} ${WRKSRC}/sample-config/nsca.cfg ${PREFIX}/etc/nsca.cfg-sample + ${INSTALL_DATA} ${WRKSRC}/sample-config/send_nsca.cfg ${PREFIX}/etc/send_nsca.cfg-sample .if !defined(NOPORTDOCS) @${MKDIR} ${DOCSDIR} cd ${WRKSRC} && ${INSTALL_DATA} ${DOCS} ${DOCSDIR} diff -Nbur net-mgmt/nsca.orig/distinfo net-mgmt/nsca/distinfo --- net-mgmt/nsca.orig/distinfo Sat Apr 15 18:55:12 2006 +++ net-mgmt/nsca/distinfo Sat Apr 15 19:27:02 2006 @@ -1,3 +1,3 @@ -MD5 (nsca-2.4.tar.gz) = ab58553a87940f574ec54189a43a70bc -SHA256 (nsca-2.4.tar.gz) = bba0d2c3582086c8d77ef2c7921b571d1a657eedee3bed8af4f59b3fdb3f8866 -SIZE (nsca-2.4.tar.gz) = 54788 +MD5 (nsca-2.6.tar.gz) = d526a3ac3c29648c729c5fb4fb332488 +SHA256 (nsca-2.6.tar.gz) = 6b12781537e5301bf2c902e9fa9961cb95f624856f3d89d72416d3cca734e05a +SIZE (nsca-2.6.tar.gz) = 101341 diff -Nbur net-mgmt/nsca.orig/files/nsca.sh.in net-mgmt/nsca/files/nsca.sh.in --- net-mgmt/nsca.orig/files/nsca.sh.in Thu Jan 1 01:00:00 1970 +++ net-mgmt/nsca/files/nsca.sh.in Sat Apr 15 19:18:08 2006 @@ -0,0 +1,33 @@ +#!/bin/sh +# +# $FreeBSD$ +# + +# PROVIDE: nsca +# REQUIRE: NETWORKING +# KEYWORD: shutdown + +# +# Add the following lines to /etc/rc.conf to enable nrpe2: +# +#nsca_enable="YES" +# +# + +. %%RC_SUBR%% + +name=nsca +rcvar=`set_rcvar` + +command="%%PREFIX%%/sbin/nsca" +required_files=%%PREFIX%%/etc/nsca.cfg +command_args="-c ${required_files}" +pidfile=/var/run/${name}.pid + +# set defaults + +nsca_enable=${nsca_enable:-"NO"} +nsca_flags=${nsca_flags:-""} + +load_rc_config ${name} +run_rc_command "$1" diff -Nbur net-mgmt/nsca.orig/pkg-plist net-mgmt/nsca/pkg-plist --- net-mgmt/nsca.orig/pkg-plist Sat Apr 15 18:55:12 2006 +++ net-mgmt/nsca/pkg-plist Sat Apr 15 19:20:06 2006 @@ -6,7 +6,7 @@ %%PORTDOCS%%@dirrm %%DOCSDIR%% @comment This port installs into LOCALBASE as opposed to PREFIX @cwd %%LOCALBASE%% -etc/nagios/nsca.cfg.sample -etc/nagios/send_nsca.cfg.sample -libexec/nagios/nsca -libexec/nagios/send_nsca +etc/nsca.cfg-sample +etc/send_nsca.cfg-sample +sbin/nsca +sbin/send_nsca >Release-Note: >Audit-Trail: >Unformatted: