From paul@aps.org  Tue Feb 25 18:52:35 2003
Return-Path: <paul@aps.org>
Received: from mx1.FreeBSD.org (mx1.freebsd.org [216.136.204.125])
	by hub.freebsd.org (Postfix) with ESMTP id B74D537B401
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Feb 2003 18:52:35 -0800 (PST)
Received: from ridge.aps.org (ridge.aps.org [149.28.1.5])
	by mx1.FreeBSD.org (Postfix) with ESMTP id D618043F75
	for <FreeBSD-gnats-submit@freebsd.org>; Tue, 25 Feb 2003 18:52:34 -0800 (PST)
	(envelope-from paul@aps.org)
Received: from lugnut.aps.org (lugnut.aps.org [149.28.3.182])
	by ridge.aps.org (8.9.3+Sun/8.9.3) with ESMTP id VAA20091;
	Tue, 25 Feb 2003 21:52:34 -0500 (EST)
Received: from lugnut.aps.org (localhost [127.0.0.1])
	by lugnut.aps.org (Postfix) with ESMTP
	id 07068135; Tue, 25 Feb 2003 21:52:34 -0500 (EST)
Received: (from paul@localhost)
	by lugnut.aps.org (8.12.6/8.12.6/Submit) id h1Q2qXpn004536;
	Tue, 25 Feb 2003 21:52:33 -0500 (EST)
Message-Id: <200302260252.h1Q2qXpn004536@lugnut.aps.org>
Date: Tue, 25 Feb 2003 21:52:33 -0500 (EST)
From: Paul Dlug <paul@nerdlabs.com>
Reply-To: Paul Dlug <paul@nerdlabs.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: paul@nerdlabs.com
Subject: Update: net/nrpe to 1.8 plus minor fixes
X-Send-Pr-Version: 3.113
X-GNATS-Notify:

>Number:         48690
>Category:       ports
>Synopsis:       Update: net/nrpe to 1.8 plus minor fixes
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Tue Feb 25 19:00:28 PST 2003
>Closed-Date:    Tue Mar 04 17:33:07 PST 2003
>Last-Modified:  Tue Mar 04 17:33:07 PST 2003
>Originator:     Paul Dlug
>Release:        FreeBSD 5.0-RELEASE-p3 i386
>Organization:
>Environment:
System: FreeBSD lugnut.aps.org 5.0-RELEASE-p3 FreeBSD 5.0-RELEASE-p3 #1: Tue Feb 25 11:22:55 EST 2003 root@lugnut.aps.org:/usr/obj/usr/src/sys/LUGNUT i386


	
>Description:
	Updated the net/nrpe port to version 1.8 which contains minor bug fixes. Corrected incorrect paths to plugins in the sample configuration file. Installed the check_nrpe plugin (in case the installer wants to use this host as a client).
>How-To-Repeat:
	
>Fix:

diff -ruN nrpe.bak/Makefile nrpe/Makefile
--- nrpe.bak/Makefile   Tue Feb 25 21:30:36 2003
+++ nrpe/Makefile       Tue Feb 25 21:35:41 2003
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=      nrpe
-PORTVERSION=   1.7
+PORTVERSION=   1.8
 PORTREVISION=  0
 CATEGORIES=    net
 MASTER_SITES=  ${MASTER_SITE_SOURCEFORGE}
@@ -22,9 +22,11 @@
 pre-install:
        @PKG_PREFIX="${PREFIX}" ${SH} ${PKGINSTALL} ${PKGNAME} PRE-INSTALL
        ${SED} -i bak -e "s=/usr/local/bin/nrpe=${PREFIX}/sbin/nrpe=" ${WRKSRC}/init-script.freebsd
+       ${SED} -i bak -e "s=/usr/local/libexec=/usr/local/libexec/nagios=" ${WRKSRC}/nrpe.cfg
 
 do-install:
        ${INSTALL_PROGRAM} ${WRKSRC}/src/nrpe ${PREFIX}/sbin/nrpe
+       ${INSTALL_PROGRAM} ${WRKSRC}/src/check_nrpe ${PREFIX}/libexec/nagios/check_nrpe
        ${INSTALL_DATA} ${WRKSRC}/nrpe.cfg ${PREFIX}/etc/nrpe.cfg-sample
        ${INSTALL_SCRIPT} ${WRKSRC}/init-script.freebsd ${PREFIX}/etc/rc.d/nrpe.sh
 
diff -ruN nrpe.bak/distinfo nrpe/distinfo
--- nrpe.bak/distinfo   Tue Feb 25 21:30:36 2003
+++ nrpe/distinfo       Tue Feb 25 21:32:15 2003
@@ -1 +1 @@
-MD5 (nrpe-1.7.tar.gz) = f9462e9446ef1928e27a612ac5f87fdb
+MD5 (nrpe-1.8.tar.gz) = b285e2838685508ab85395f480018373


>Release-Note:
>Audit-Trail:

From: Yen-Ming Lee <leeym@FreeBSD.org>
To: freebsd-gnats-submit@FreeBSD.org, paul@nerdlabs.com
Cc:  
Subject: Re: ports/48690: Update: net/nrpe to 1.8 plus minor fixes
Date: Mon, 3 Mar 2003 16:39:25 +0800

 --9jxsPFA5p3P2qPhR
 Content-Type: text/plain; charset=big5
 Content-Disposition: inline
 Content-Transfer-Encoding: 8bit
 
 How about add USE_REINPALCE=yes
 and use ${REINPLACE_CMD} insteaf of "${SED} -i bak"?
 
 BTW, Don't forget to add libexec/nagios/check_nrpe into pkg-plist
 
 -- 
 Yen-Ming Lee [۩] KeyID: 0x5EB52E51 : www.leeym.com : Taipei, Taiwan
 leeym@{ leeym.com, FreeBSD.org, yahoo-inc.com, ntu.edu.tw, civil.ncku.edu.tw }
 
 --9jxsPFA5p3P2qPhR
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (FreeBSD)
 
 iQCVAwUBPmMUvcnMx0NetS5RAQEITQP+OD61cR/sL0QaJq/jYzlsRVq6hq/bQApy
 RI7otoSaRDZvLU6nGmlmT+7AylMTvE+3oT4u7tfsAt6ql9wxmI7ggBgwtIt3/MFP
 /jzkQdv2C5nxSClvvQ+kyKBYppaFcj7jdAz8LeXYnGX1R7KjsTC3xMvpvBSfBwkL
 NVqMWg/jIeg=
 =RU3P
 -----END PGP SIGNATURE-----
 
 --9jxsPFA5p3P2qPhR--

From: "Paul Dlug" <paul@nerdlabs.com>
To: <leeym@FreeBSD.org>
Cc: <freebsd-gnats-submit@FreeBSD.org>, <paul@nerdlabs.com>
Subject: Re: ports/48690: Update: net/nrpe to 1.8 plus minor fixes
Date: Mon, 3 Mar 2003 17:01:48 -0500 (EST)

 Thanks, I make the corrections and submit an update. Should I send a diff
 against the current port or a diff against my previously submitted diff?
 
 Thanks,
 Paul
 
 > How about add USE_REINPALCE=yes
 > and use ${REINPLACE_CMD} insteaf of "${SED} -i bak"?
 >
 > BTW, Don't forget to add libexec/nagios/check_nrpe into pkg-plist
 >
 > --
 > Yen-Ming Lee [۩] KeyID: 0x5EB52E51 : www.leeym.com : Taipei, Taiwan
 > leeym@{ leeym.com, FreeBSD.org, yahoo-inc.com, ntu.edu.tw,
 > civil.ncku.edu.tw }
 
 

From: Yen-Ming Lee <leeym@FreeBSD.org>
To: Paul Dlug <paul@nerdlabs.com>
Cc: leeym@FreeBSD.org, freebsd-gnats-submit@FreeBSD.org
Subject: Re: ports/48690: Update: net/nrpe to 1.8 plus minor fixes
Date: Tue, 4 Mar 2003 08:17:37 +0800

 --vkogqOf2sHV7VnPd
 Content-Type: text/plain; charset=big5
 Content-Disposition: inline
 Content-Transfer-Encoding: 8bit
 
 On Mon, Mar 03, 2003 at 05:01:48PM -0500, Paul Dlug wrote:
 > Thanks, I make the corrections and submit an update. Should I send a diff
 > against the current port or a diff against my previously submitted diff?
 > 
 > Thanks,
 > Paul
 
 Both are OK for me ;)
 
 -- 
 Yen-Ming Lee [۩] KeyID: 0x5EB52E51 : www.leeym.com : Taipei, Taiwan
 leeym@{ leeym.com, FreeBSD.org, yahoo-inc.com, ntu.edu.tw, civil.ncku.edu.tw }
 
 --vkogqOf2sHV7VnPd
 Content-Type: application/pgp-signature
 Content-Disposition: inline
 
 -----BEGIN PGP SIGNATURE-----
 Version: GnuPG v1.2.1 (FreeBSD)
 
 iQCVAwUBPmPwocnMx0NetS5RAQG13AP+N5JQK64Pv++z1apKgtAu/+aZnaUctPDQ
 L7ltBNcP6UkXRyHznJQoDUiSyi3zrWz0wx0nG9FT3cN1VG3bGGSlRwMOWrojBJUD
 HA+EPSvqRaPJsJW+gUDW3EU/ULXDnPpKryUpWkN0slkT7KRqFzamGwOqAvgwIgtA
 KgbinMwOZJ8=
 =2TsP
 -----END PGP SIGNATURE-----
 
 --vkogqOf2sHV7VnPd--
State-Changed-From-To: open->closed 
State-Changed-By: leeym 
State-Changed-When: Tue Mar 4 17:33:06 PST 2003 
State-Changed-Why:  
Committed with minor modification, thanks. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=48690 
>Unformatted:
