From nobody@FreeBSD.org  Mon Apr 26 21:07:48 2010
Return-Path: <nobody@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 758D1106566B
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Apr 2010 21:07:48 +0000 (UTC)
	(envelope-from nobody@FreeBSD.org)
Received: from www.freebsd.org (www.freebsd.org [IPv6:2001:4f8:fff6::21])
	by mx1.freebsd.org (Postfix) with ESMTP id 641898FC1A
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Apr 2010 21:07:48 +0000 (UTC)
Received: from www.freebsd.org (localhost [127.0.0.1])
	by www.freebsd.org (8.14.3/8.14.3) with ESMTP id o3QL7mZr022889
	for <freebsd-gnats-submit@FreeBSD.org>; Mon, 26 Apr 2010 21:07:48 GMT
	(envelope-from nobody@www.freebsd.org)
Received: (from nobody@localhost)
	by www.freebsd.org (8.14.3/8.14.3/Submit) id o3QL7lNL022888;
	Mon, 26 Apr 2010 21:07:47 GMT
	(envelope-from nobody)
Message-Id: <201004262107.o3QL7lNL022888@www.freebsd.org>
Date: Mon, 26 Apr 2010 21:07:47 GMT
From: Boris Kochergin <spawk@acm.poly.edu>
To: freebsd-gnats-submit@FreeBSD.org
Subject: [UPDATE] sysutils/geomWatch to 1.2.0
X-Send-Pr-Version: www-3.1
X-GNATS-Notify:

>Number:         146071
>Category:       ports
>Synopsis:       [UPDATE] sysutils/geomWatch to 1.2.0
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    sahil
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Apr 26 21:10:02 UTC 2010
>Closed-Date:    Mon May 03 02:50:29 UTC 2010
>Last-Modified:  Mon May 03 02:50:29 UTC 2010
>Originator:     Boris Kochergin
>Release:        8.0-RELEASE-p2
>Organization:
Polytechnic Institute of NYU
>Environment:
FreeBSD peer 8.0-RELEASE-p2 FreeBSD 8.0-RELEASE-p2 #2: Mon Feb 22 23:18:53 EST 2010     root@peer:/usr/obj/usr/src/sys/PEER  i386

>Description:
New features:

- Added support for monitoring ZFS pools.

Bug fixes:

- Comments in the configuration file can now contain double quotes.

- The current working directory is now changed to "/" before becoming a background daemon.

- The standard input and standard output file descriptors are now closed before becoming a background daemon, as they are no longed needed at that point. Standard error is still useful for collecting SMTP error messages.

Port changes:

- Modified Makefile COMMENT and pkg-descr to reflect ZFS functionality.

- Whitespace fix in files/pkg-message.in (to committer: could you please add a newline at the end of files/pkg-message.in? diff eats it. Thanks).
>How-To-Repeat:

>Fix:


Patch attached with submission follows:

diff -ruN geomWatch.old/Makefile geomWatch/Makefile
--- geomWatch.old/Makefile	2010-04-26 16:51:24.965038561 -0400
+++ geomWatch/Makefile	2010-04-26 15:27:18.453997742 -0400
@@ -6,14 +6,14 @@
 #
 
 PORTNAME=	geomWatch
-PORTVERSION=	1.1.2
+PORTVERSION=	1.2.0
 CATEGORIES=	sysutils
 MASTER_SITES=	http://isis.poly.edu/~bk/geomWatch/ \
 		http://bk.macroblock.net/geomWatch/
 EXTRACT_SUFX=	.tbz
 
 MAINTAINER=	spawk@acm.poly.edu
-COMMENT=	Watches for and e-mails admins about GEOM state changes
+COMMENT=	Watches for and e-mails admins about GEOM/ZFS state changes
 
 LIB_DEPENDS=	esmtp.6:${PORTSDIR}/mail/libesmtp
 
diff -ruN geomWatch.old/distinfo geomWatch/distinfo
--- geomWatch.old/distinfo	2010-04-26 16:51:24.963038586 -0400
+++ geomWatch/distinfo	2010-04-26 16:44:50.824991890 -0400
@@ -1,3 +1,3 @@
-MD5 (geomWatch-1.1.2.tbz) = 0b9b9a31dd07deb59c6fa34d94de247e
-SHA256 (geomWatch-1.1.2.tbz) = 6b793ddc71847e0b97b18f6431d753152087bd8672060dcff05fd322375034f4
-SIZE (geomWatch-1.1.2.tbz) = 6840
+MD5 (geomWatch-1.2.0.tbz) = 587fbb59fecf107ea5130ad567d4b1b1
+SHA256 (geomWatch-1.2.0.tbz) = 660bc8da29cba43bd3e206bb9af50c9f26ebd287f6ddc6ef7064f8ef794e834c
+SIZE (geomWatch-1.2.0.tbz) = 258951
diff -ruN geomWatch.old/files/pkg-message.in geomWatch/files/pkg-message.in
--- geomWatch.old/files/pkg-message.in	2010-04-26 16:51:24.958037671 -0400
+++ geomWatch/files/pkg-message.in	2010-04-26 16:37:34.662944595 -0400
@@ -1,8 +1,8 @@
 
 A sample geomWatch configuration file has been installed as
 %%PREFIX%%/etc/geomWatch.conf.sample. You should copy it to
-%%PREFIX%%/etc/geomWatch.conf, edit it to your liking, and add the following line
-to /etc/rc.conf:
+%%PREFIX%%/etc/geomWatch.conf, edit it to your liking, and add the following
+line to /etc/rc.conf:
 
 geomwatch_enable="YES"
 
diff -ruN geomWatch.old/pkg-descr geomWatch/pkg-descr
--- geomWatch.old/pkg-descr	2010-04-26 16:51:24.960038484 -0400
+++ geomWatch/pkg-descr	2010-04-26 15:27:18.467996727 -0400
@@ -1,9 +1,9 @@
-geomWatch is a program for monitoring the well-being of GEOM providers. It
-checks the state of each configured provider at a configured interval, and, if
-it notices that a provider has lost a component, or encounters a problem while
-checking a provider's state, it will send an e-mail with details of the
-matter--such as what components were lost and which remain, or, in the event of
-a problem, what the problem was--to an arbitrary number of recipients, so that
+geomWatch is a program for monitoring the well-being of GEOM providers and ZFS
+pools. It checks the state of each configured provider and pool at a configured
+interval, and, if it notices that a component has been lost, or encounters a
+problem during the check, it will send an e-mail with details of the matter--
+such as what components were lost and which remain, or, in the event of a
+problem, what the problem was--to an arbitrary number of recipients, so that
 corrective action can be taken (for example, replacing a failed disk).
 
 WWW: http://acm.poly.edu/wiki/GEOM_Watch


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->sahil 
Responsible-Changed-By: sahil 
Responsible-Changed-When: Mon Apr 26 23:15:19 UTC 2010 
Responsible-Changed-Why:  
I'll take it. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=146071 

From: Sahil Tandon <sahil@FreeBSD.org>
To: spawk@acm.poly.edu
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/146071: [UPDATE] sysutils/geomWatch to 1.2.0
Date: Sun, 2 May 2010 17:48:24 -0400

 --PNTmBPCT7hxwcZjr
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: inline
 
 Boris,
 
 Please see attached diff.  Do you approve my slight adjustments?  And
 would you also consider handling the installation of configuration files
 thusly:
 
 http://www.freebsd.org/doc/en/books/porters-handbook/book.html#PLIST-CONFIG
 
 Thanks,
 -- 
 Sahil Tandon <sahil@FreeBSD.org>
 
 --PNTmBPCT7hxwcZjr
 Content-Type: text/plain; charset=us-ascii
 Content-Disposition: attachment; filename="geomWatch.diff"
 
 Index: Makefile
 ===================================================================
 RCS file: /home/pcvs/ports/sysutils/geomWatch/Makefile,v
 retrieving revision 1.5
 diff -u -r1.5 Makefile
 --- Makefile	2 Feb 2010 17:24:11 -0000	1.5
 +++ Makefile	2 May 2010 21:44:54 -0000
 @@ -6,25 +6,25 @@
  #
  
  PORTNAME=	geomWatch
 -PORTVERSION=	1.1.2
 +PORTVERSION=	1.2.0
  CATEGORIES=	sysutils
 -MASTER_SITES=	http://isis.poly.edu/~bk/geomWatch/ \
 -		http://bk.macroblock.net/geomWatch/
 +MASTER_SITES=	http://isis.poly.edu/~bk/${PORTNAME}/ \
 +		http://bk.macroblock.net/${PORTNAME}/
  EXTRACT_SUFX=	.tbz
  
  MAINTAINER=	spawk@acm.poly.edu
 -COMMENT=	Watches for and e-mails admins about GEOM state changes
 +COMMENT=	Watches for and e-mails admins about GEOM/ZFS state changes
  
  LIB_DEPENDS=	esmtp.6:${PORTSDIR}/mail/libesmtp
  
 -PLIST_FILES=	sbin/geomWatch \
 -				etc/rc.d/geomWatch \
 -		etc/geomWatch.conf.sample
 +PLIST_FILES=	sbin/${PORTNAME} \
 +		etc/${PORTNAME}.conf.sample
  
 -SUB_FILES=	pkg-message geomWatch
 +SUB_FILES=	pkg-message
 +
 +USE_RC_SUBR=	${PORTNAME}
  
  post-install:
 -	${INSTALL_SCRIPT} ${WRKDIR}/geomWatch ${PREFIX}/etc/rc.d/geomWatch
  	@${CAT} ${PKGMESSAGE}
  
  .include <bsd.port.mk>
 Index: distinfo
 ===================================================================
 RCS file: /home/pcvs/ports/sysutils/geomWatch/distinfo,v
 retrieving revision 1.4
 diff -u -r1.4 distinfo
 --- distinfo	2 Feb 2010 17:24:11 -0000	1.4
 +++ distinfo	2 May 2010 21:44:54 -0000
 @@ -1,3 +1,3 @@
 -MD5 (geomWatch-1.1.2.tbz) = 0b9b9a31dd07deb59c6fa34d94de247e
 -SHA256 (geomWatch-1.1.2.tbz) = 6b793ddc71847e0b97b18f6431d753152087bd8672060dcff05fd322375034f4
 -SIZE (geomWatch-1.1.2.tbz) = 6840
 +MD5 (geomWatch-1.2.0.tbz) = 587fbb59fecf107ea5130ad567d4b1b1
 +SHA256 (geomWatch-1.2.0.tbz) = 660bc8da29cba43bd3e206bb9af50c9f26ebd287f6ddc6ef7064f8ef794e834c
 +SIZE (geomWatch-1.2.0.tbz) = 258951
 Index: pkg-descr
 ===================================================================
 RCS file: /home/pcvs/ports/sysutils/geomWatch/pkg-descr,v
 retrieving revision 1.1
 diff -u -r1.1 pkg-descr
 --- pkg-descr	14 Jan 2010 04:26:41 -0000	1.1
 +++ pkg-descr	2 May 2010 21:44:54 -0000
 @@ -1,9 +1,9 @@
 -geomWatch is a program for monitoring the well-being of GEOM providers. It
 -checks the state of each configured provider at a configured interval, and, if
 -it notices that a provider has lost a component, or encounters a problem while
 -checking a provider's state, it will send an e-mail with details of the
 -matter--such as what components were lost and which remain, or, in the event of
 -a problem, what the problem was--to an arbitrary number of recipients, so that
 +geomWatch is a program for monitoring the well-being of GEOM providers and ZFS
 +pools. It checks the state of each configured provider and pool at a configured
 +interval, and, if it notices that a component has been lost, or encounters a
 +problem during the check, it will send an e-mail with details of the matter--
 +such as what components were lost and which remain, or, in the event of a
 +problem, what the problem was--to an arbitrary number of recipients, so that
  corrective action can be taken (for example, replacing a failed disk).
  
  WWW: http://acm.poly.edu/wiki/GEOM_Watch
 Index: files/pkg-message.in
 ===================================================================
 RCS file: /home/pcvs/ports/sysutils/geomWatch/files/pkg-message.in,v
 retrieving revision 1.2
 diff -u -r1.2 pkg-message.in
 --- files/pkg-message.in	15 Jan 2010 00:55:51 -0000	1.2
 +++ files/pkg-message.in	2 May 2010 21:44:54 -0000
 @@ -1,8 +1,8 @@
  
  A sample geomWatch configuration file has been installed as
  %%PREFIX%%/etc/geomWatch.conf.sample. You should copy it to
 -%%PREFIX%%/etc/geomWatch.conf, edit it to your liking, and add the following line
 -to /etc/rc.conf:
 +%%PREFIX%%/etc/geomWatch.conf, edit it to your liking, and add the following
 +line to /etc/rc.conf:
  
  geomwatch_enable="YES"
  
 
 --PNTmBPCT7hxwcZjr--

From: Boris Kochergin <spawk@acm.poly.edu>
To: Sahil Tandon <sahil@FreeBSD.org>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/146071: [UPDATE] sysutils/geomWatch to 1.2.0
Date: Sun, 02 May 2010 19:22:31 -0400

 Hi. The adjustments look fine. I will also be sure to handle 
 configuration file installation the way you recommend in the next port 
 update. Thank you.
 
 -Boris

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/146071: commit references a PR
Date: Mon,  3 May 2010 02:49:15 +0000 (UTC)

 sahil       2010-05-03 02:48:55 UTC
 
   FreeBSD ports repository
 
   Modified files:
     sysutils/geomWatch   Makefile distinfo pkg-descr 
     sysutils/geomWatch/files pkg-message.in 
   Log:
   - Update to 1.2.0
   - Note new functionality in COMMENT
   - USE_RC_SUBR instead of manually installing rc script
   - Use ${PORTNAME} where possible
   
   PR:             ports/146071
   Submitted by:   Boris Kochergin <spawk@acm.poly.edu> (maintainer)
   Approved by:    wxs@ (mentor)
   
   Revision  Changes    Path
   1.6       +9 -9      ports/sysutils/geomWatch/Makefile
   1.5       +3 -3      ports/sysutils/geomWatch/distinfo
   1.3       +2 -2      ports/sysutils/geomWatch/files/pkg-message.in
   1.2       +6 -6      ports/sysutils/geomWatch/pkg-descr
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
State-Changed-From-To: open->closed 
State-Changed-By: sahil 
State-Changed-When: Mon May 3 02:50:28 UTC 2010 
State-Changed-Why:  
Committed, with minor changes. Thanks! 

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