From owner-freebsd-ports-bugs@FreeBSD.ORG Fri Sep 22 19:30:36 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 27AAD16A532 for ; Fri, 22 Sep 2006 19:30:36 +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 6D01743D6E for ; Fri, 22 Sep 2006 19:30:21 +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 k8MJUKSl023081 for ; Fri, 22 Sep 2006 19:30:20 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.13.4/8.13.4/Submit) id k8MJUKUv023080; Fri, 22 Sep 2006 19:30:20 GMT (envelope-from gnats) Resent-Date: Fri, 22 Sep 2006 19:30:20 GMT Resent-Message-Id: <200609221930.k8MJUKUv023080@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 BCFA616A5FF for ; Fri, 22 Sep 2006 19:23:44 +0000 (UTC) (envelope-from jimshew@gmail.com) Received: from wx-out-0506.google.com (wx-out-0506.google.com [66.249.82.239]) by mx1.FreeBSD.org (Postfix) with ESMTP id EFAF443DBE for ; Fri, 22 Sep 2006 19:21:03 +0000 (GMT) (envelope-from jimshew@gmail.com) Received: by wx-out-0506.google.com with SMTP id i27so1117506wxd for ; Fri, 22 Sep 2006 12:21:02 -0700 (PDT) Received: by 10.70.92.14 with SMTP id p14mr1602349wxb; Fri, 22 Sep 2006 12:21:02 -0700 (PDT) Received: by 10.70.28.11 with HTTP; Fri, 22 Sep 2006 12:21:02 -0700 (PDT) Message-Id: <820e65860609221221j1dda39f0s1d1c003554f24553@mail.gmail.com> Date: Fri, 22 Sep 2006 12:21:02 -0700 From: "Jim Shewmaker" To: FreeBSD-gnats-submit@FreeBSD.org, jims@bluenotch.com In-Reply-To: <200609211939.k8LJdN8c010596@aims1.calvaryd.org> References: <200609211939.k8LJdN8c010596@aims1.calvaryd.org> Cc: Subject: ports/103497: [maintainer-update] sysutils/nagios-statd X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 22 Sep 2006 19:30:36 -0000 >Number: 103497 >Category: ports >Synopsis: [maintainer-update] 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: Fri Sep 22 19:30:20 GMT 2006 >Closed-Date: >Last-Modified: >Originator: Jim Shewmaker >Release: FreeBSD 6.2-PRERELEASE i386 >Organization: >Environment: System: FreeBSD test.bluenotch.org 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #1: Wed Sep 20 13:12:20 PDT 2006 root@test.bluenotch.org:/mnt/build/obj/usr/src/sys/ORACLE i386 >Description: Fix unfetchable file, update to 3.12, finally rcNG'ify >How-To-Repeat: >Fix: --- 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.samplenagios-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.22004/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 --- ------=_Part_34673_33476883.1158952862388 Content-Type: text/html; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit Content-Disposition: inline >Submitter-Id:  current-users
>Originator:    Jim Shewmaker
>Organization:
>Confidential:  no
>Synopsis:      [maintainer-update] sysutils/nagios-statd
>Severity:      non-critical
>Priority:      medium
>Category:      ports
>Class:         maintainer-update
>Release:       FreeBSD 6.2-PRERELEASE i386
>Environment:
System: FreeBSD test.bluenotch.org 6.2-PRERELEASE FreeBSD 6.2-PRERELEASE #1: Wed Sep 20 13:12:20 PDT 2006 root@test.bluenotch.org:/mnt/build/obj/usr/src/sys/ORACLE i386



>Description:
       Fix unfetchable file, update to 3.12, finally rcNG'ify

>How-To-Repeat:

>Fix:



--- 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= Release-Note: >Audit-Trail: >Unformatted: ------=_Part_34673_33476883.1158952862388 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Content-Disposition: inline >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
    &nbs p;  ${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
    &nbs p;  ${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 1 5: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       &nbs p;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.c onf to enable nagiosstatd:
+ # nagiosstatd_enable (bool): Set to "NO" by default.
+ #                          Set it to "YES&quo t; 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 ---


------=_Part_34673_33476883.1158952862388--