From owner-freebsd-ports-bugs@FreeBSD.ORG Mon Oct 2 18:00:41 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 0A8B316A417 for ; Mon, 2 Oct 2006 18:00:40 +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 538CC43D53 for ; Mon, 2 Oct 2006 18:00:33 +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 k92I0Xvs042096 for ; Mon, 2 Oct 2006 18:00:33 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k92I0Xqi042095; Mon, 2 Oct 2006 18:00:33 GMT (envelope-from gnats) Resent-Date: Mon, 2 Oct 2006 18:00:33 GMT Resent-Message-Id: <200610021800.k92I0Xqi042095@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, Jim Shewmaker Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125]) by hub.freebsd.org (Postfix) with ESMTP id 247D716A586 for ; Mon, 2 Oct 2006 17:51:26 +0000 (UTC) (envelope-from jimshew@xmail1.calvarychapel.com) Received: from xmail1.calvarychapel.com (64-60-7-116.static-ip.telepacific.net [64.60.7.116]) by mx1.FreeBSD.org (Postfix) with ESMTP id 9C00A43D5A for ; Mon, 2 Oct 2006 17:51:23 +0000 (GMT) (envelope-from jimshew@xmail1.calvarychapel.com) Received: (qmail 47524 invoked by uid 1000); 2 Oct 2006 17:51:23 -0000 Message-Id: <20061002175123.47523.qmail@xmail1.calvarychapel.com> Date: 2 Oct 2006 17:51:23 -0000 From: Jim Shewmaker To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Cc: jims@bluenotch.com Subject: ports/103913: [maintainer-update] ports sysutils/nagios-statd X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Jim Shewmaker List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 02 Oct 2006 18:00:41 -0000 >Number: 103913 >Category: ports >Synopsis: [maintainer-update] ports sysutils/nagios-statd >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: Mon Oct 02 18:00:32 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jim Shewmaker >Release: FreeBSD 6.1-STABLE i386 >Organization: >Environment: System: FreeBSD xmail1.calvarychapel.com 6.1-STABLE FreeBSD 6.1-STABLE #1: Wed Mar 16 21:44:34 PST 2005 root@xmail1.calvarychapel.com:/usr/obj/usr/src/sys/SMP i386 >Description: -Fix startup for rc.subr -Update to 3.12 (3.11 unfetchable) >How-To-Repeat: >Fix: superscedes ports/103497 (fixed bad patch) --- nagiosstatd.patch begins here --- diff -rNP -C 3 nagios-statd.orig/Makefile nagios-statd/Makefile *** nagios-statd.orig/Makefile Mon Sep 18 23:23:03 2006 --- nagios-statd/Makefile Thu Sep 21 11:43:41 2006 *************** *** 6,12 **** # PORTNAME= nagios-statd ! PORTVERSION= 3.11 CATEGORIES= sysutils python net-mgmt MASTER_SITES= http://www.twoevils.org/files/netsaint_statd/ --- 6,12 ---- # PORTNAME= nagios-statd ! PORTVERSION= 3.12 CATEGORIES= sysutils python net-mgmt MASTER_SITES= http://www.twoevils.org/files/netsaint_statd/ *************** *** 14,19 **** --- 14,20 ---- COMMENT= Daemon/client to check remote host information for Nagios USE_PYTHON= yes + USE_RC_SUBR= nagiosstatd.sh MAN1= nagios-stat.1 MAN8= nagios-statd.8 *************** *** 25,31 **** do-install: ${INSTALL_SCRIPT} ${WRKSRC}/bin/nagios-stat ${PREFIX}/bin ${INSTALL_SCRIPT} ${WRKSRC}/sbin/nagios-statd ${PREFIX}/sbin - ${INSTALL_SCRIPT} ${FILESDIR}/nagios-statd.sh.sample ${PREFIX}/etc/rc.d ${INSTALL_MAN} ${WRKSRC}/share/man1/nagios-stat.1 ${PREFIX}/man/man1 ${INSTALL_MAN} ${WRKSRC}/share/man8/nagios-statd.8 ${PREFIX}/man/man8 --- 26,31 ---- diff -rNP -C 3 nagios-statd.orig/distinfo nagios-statd/distinfo *** nagios-statd.orig/distinfo Mon Sep 18 23:23:40 2006 --- nagios-statd/distinfo Thu Sep 21 11:52:40 2006 *************** *** 1,3 **** ! MD5 (nagios-statd-3.11.tar.gz) = aed145d2df7a261530d91ce23ae52cca ! SHA256 (nagios-statd-3.11.tar.gz) = 45813d546b143dfa19ce2cf8bfe660f701af1311260b5f485b7a0d58f581c0a1 ! SIZE (nagios-statd-3.11.tar.gz) = 10767 --- 1,3 ---- ! MD5 (nagios-statd-3.12.tar.gz) = 8048cd2975d277079de34f65306cca04 ! SHA256 (nagios-statd-3.12.tar.gz) = 91560f7a7a8e0ee95fae622256951908d51d5a70744b5777973ce3dea7445166 ! SIZE (nagios-statd-3.12.tar.gz) = 11054 diff -rNP -C 3 nagios-statd.orig/files/nagios-statd.sh.sample nagios-statd/files/nagios-statd.sh.sample *** nagios-statd.orig/files/nagios-statd.sh.sample Sat Apr 17 15:15:42 2004 --- nagios-statd/files/nagios-statd.sh.sample Wed Dec 31 16:00:00 1969 *************** *** 1,21 **** - #!/bin/sh - # $FreeBSD: ports/sysutils/nagios-statd/files/nagios-statd.sh.sample,v 1.2 2004/04/17 22:15:42 pav Exp $ - - case "${1}" in - start) - nagios-statd - echo -n " nagios-statd" - ;; - stop) - kill -3 `ps -x | grep nagios-statd | grep python | awk '{print $1}'` - ;; - restart) - $0 stop - $0 start - ;; - *) - echo "Usage: $0 {start|stop|restart}" - ;; - esac - - exit 0 --- 0 ---- diff -rNP -C 3 nagios-statd.orig/files/nagiosstatd.sh.in nagios-statd/files/nagiosstatd.sh.in *** nagios-statd.orig/files/nagiosstatd.sh.in Wed Dec 31 16:00:00 1969 --- nagios-statd/files/nagiosstatd.sh.in Thu Sep 21 12:04:43 2006 *************** *** 0 **** --- 1,35 ---- + #!/bin/sh + + # PROVIDE: nagiosstatd + # REQUIRE: DAEMON + # BEFORE: LOGIN + # KEYWORD: shutdown + # + # + # + # Add the following lines to /etc/rc.conf.local or /etc/rc.conf to enable nagiosstatd: + # nagiosstatd_enable (bool): Set to "NO" by default. + # Set it to "YES" to enable nagiosstatd + # + + nagiosstatd_enable=${nagiosstatd_enable-"NO"} + nagiosstatd_flags=${nagiosstatd_flags-""} + nagiosstatd_pidfile=${nagiosstatd_pidfile-"/var/run/nagiosstatd.pid"} + + . %%RC_SUBR%% + + name="nagiosstatd" + #rcvar=`set_rcvar` + rcvar=${name}_enable + + pidfile="${nagiosstatd_file}" + + + command=%%PREFIX%%/sbin/nagios-statd + + load_rc_config $name + + start_precmd="export PATH=\"$PATH:/usr/local/bin\"" + + run_rc_command "$1" + diff -rNP -C 3 nagios-statd.orig/pkg-plist nagios-statd/pkg-plist *** nagios-statd.orig/pkg-plist Tue Sep 19 02:32:01 2006 --- nagios-statd/pkg-plist Thu Sep 21 12:21:22 2006 *************** *** 1,3 **** --- 1,4 ---- @comment $FreeBSD: ports/sysutils/nagios-statd/pkg-plist,v 1.1 2003/12/13 21:53:50 sergei Exp $ bin/nagios-stat sbin/nagios-statd + etc/rc.d/nagiosstatd --- nagiosstatd.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted: