From flo@kasimir.com  Thu Aug 12 08:29:32 2010
Return-Path: <flo@kasimir.com>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id DB3CE1065687
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 12 Aug 2010 08:29:31 +0000 (UTC)
	(envelope-from flo@kasimir.com)
Received: from mail.solomo.de (mail.solomo.de [IPv6:2a01:238:42c7:9a00::2])
	by mx1.freebsd.org (Postfix) with ESMTP id 725F28FC1C
	for <FreeBSD-gnats-submit@freebsd.org>; Thu, 12 Aug 2010 08:29:31 +0000 (UTC)
Received: from mail.solomo.de (localhost [127.0.0.1])
	by mail.solomo.de (Postfix) with ESMTP id 73ACD5C9F;
	Thu, 12 Aug 2010 10:29:30 +0200 (CEST)
Received: from mail.solomo.de ([127.0.0.1])
	by mail.solomo.de (mail.solomo.de [127.0.0.1]) (amavisd-new, port 10024)
	with LMTP id sxkNXP2xdKtW; Thu, 12 Aug 2010 10:29:28 +0200 (CEST)
Received: from dev.local (relay3.vistream.de [87.139.10.28])
	by mail.solomo.de (Postfix) with ESMTP id 5B78F5C83;
	Thu, 12 Aug 2010 10:29:28 +0200 (CEST)
Received: by dev.local (Postfix, from userid 1001)
	id CB4F53F41D; Thu, 12 Aug 2010 10:29:27 +0200 (CEST)
Message-Id: <20100812082927.CB4F53F41D@dev.local>
Date: Thu, 12 Aug 2010 10:29:27 +0200 (CEST)
From: Florian Smeets <flo@kasimir.com>
To: FreeBSD-gnats-submit@freebsd.org
Cc: melifaro@ipfw.ru
Subject: [PATCH] net/igmpproxy: prevent deletion of configfile on deinstall
X-Send-Pr-Version: 3.113
X-GNATS-Notify: melifaro@ipfw.ru melifaro@ipfw.ru

>Number:         149547
>Category:       ports
>Synopsis:       [PATCH] net/igmpproxy: prevent deletion of configfile on deinstall
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    rene
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Thu Aug 12 09:02:56 UTC 2010
>Closed-Date:    Sun Oct 31 14:48:53 UTC 2010
>Last-Modified:  Sun Oct 31 14:50:10 UTC 2010
>Originator:     Florian Smeets
>Release:        FreeBSD 9.0-CURRENT amd64
>Organization:
>Environment:
System: FreeBSD dev.local 9.0-CURRENT FreeBSD 9.0-CURRENT #0 r210753: Mon Aug  2 14:35:04
>Description:
on deinstall this port unconditionally deletes the configfile, fix this by adding some pkg-plist magic

Added file(s):
- pkg-plist

Port maintainer (melifaro@ipfw.ru) is cc'd.

Generated with FreeBSD Port Tools 0.99
>How-To-Repeat:
>Fix:
do not delete igmpproxy.conf if it is different then igmpproxy.conf.sample

--- igmpproxy-0.1,1.patch begins here ---
diff -ruN --exclude=CVS /usr/ports/net/igmpproxy.orig/Makefile /usr/ports/net/igmpproxy/Makefile
--- /usr/ports/net/igmpproxy.orig/Makefile	2010-08-12 10:13:36.000000000 +0200
+++ /usr/ports/net/igmpproxy/Makefile	2010-08-12 10:26:18.000000000 +0200
@@ -24,8 +24,4 @@
 MAN5=		igmpproxy.conf.5
 MAN8=		igmpproxy.8
 
-PLIST_FILES=	sbin/igmpproxy \
-		etc/igmpproxy.conf \
-		etc/igmpproxy.conf.sample
-
 .include <bsd.port.mk>
diff -ruN --exclude=CVS /usr/ports/net/igmpproxy.orig/pkg-plist /usr/ports/net/igmpproxy/pkg-plist
--- /usr/ports/net/igmpproxy.orig/pkg-plist	1970-01-01 01:00:00.000000000 +0100
+++ /usr/ports/net/igmpproxy/pkg-plist	2010-08-12 10:22:53.000000000 +0200
@@ -0,0 +1,3 @@
+sbin/igmpproxy
+@unexec if cmp -s %D/etc/igmpproxy.conf.sample %D/etc/igmpproxy.conf; then rm -f %D/etc/igmpproxy.conf; fi
+etc/igmpproxy.conf.sample
--- igmpproxy-0.1,1.patch ends here ---

>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->miwi 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Thu Aug 12 10:02:01 UTC 2010 
Responsible-Changed-Why:  
miwi@ wants his PRs (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149547 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Thu Aug 12 10:02:05 UTC 2010 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: melifaro@ipfw.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/149547: [PATCH] net/igmpproxy: prevent deletion of configfile on deinstall
Date: Thu, 12 Aug 2010 10:02:03 UT

 Maintainer of net/igmpproxy,
 
 Please note that PR ports/149547 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/149547
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Edwin Groothuis <edwin@FreeBSD.org>
To: melifaro@ipfw.ru
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/149547: [PATCH] net/igmpproxy: prevent deletion of configfile on deinstall
Date: Thu, 12 Aug 2010 11:25:05 UT

 Maintainer of net/igmpproxy,
 
 Please note that PR ports/149547 has just been submitted.
 
 If it contains a patch for an upgrade, an enhancement or a bug fix
 you agree on, reply to this email stating that you approve the patch
 and a committer will take care of it.
 
 The full text of the PR can be found at:
     http://www.freebsd.org/cgi/query-pr.cgi?pr=ports/149547
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Anonymous <swell.k@gmail.com>
To: Florian Smeets <flo@kasimir.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/149547: [PATCH] net/igmpproxy: prevent deletion of configfile on deinstall
Date: Thu, 12 Aug 2010 16:11:03 +0400

 Florian Smeets <flo@kasimir.com> writes:
 
 > @@ -0,0 +1,3 @@
 > +sbin/igmpproxy
 > +@unexec if cmp -s %D/etc/igmpproxy.conf.sample %D/etc/igmpproxy.conf; then rm -f %D/etc/igmpproxy.conf; fi
 > +etc/igmpproxy.conf.sample
 
 I think you're missing @exec to complement @unexec. Add the line below
 to the end of plist.
 
   @exec if [ ! -f %D/etc/igmpproxy.conf ]; then cp -p %D/%F %B/igmpproxy.conf; fi

From: Florian Smeets <flo@kasimir.com>
To: Anonymous <swell.k@gmail.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/149547: [PATCH] net/igmpproxy: prevent deletion of configfile
 on deinstall
Date: Thu, 12 Aug 2010 14:29:21 +0200

 On 12.08.10 14:11, Anonymous wrote:
 > Florian Smeets<flo@kasimir.com>  writes:
 >
 >> @@ -0,0 +1,3 @@
 >> +sbin/igmpproxy
 >> +@unexec if cmp -s %D/etc/igmpproxy.conf.sample %D/etc/igmpproxy.conf; then rm -f %D/etc/igmpproxy.conf; fi
 >> +etc/igmpproxy.conf.sample
 >
 
 Hi,
 
 > I think you're missing @exec to complement @unexec. Add the line below
 > to the end of plist.
 >
 >    @exec if [ ! -f %D/etc/igmpproxy.conf ]; then cp -p %D/%F %B/igmpproxy.conf; fi
 
 i was thinking about the @exec too, but i don't think you need an @exec 
 for every @unexec, and everything works as expected without the @exec.
 
 The port automatically installs igmpproxy.conf and 
 igmpproxy.conf.sample, so IMHO we only need the @unexec in the plist.
 
 Cheers,
 Florian

From: Anonymous <swell.k@gmail.com>
To: Florian Smeets <flo@kasimir.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/149547: [PATCH] net/igmpproxy: prevent deletion of configfile on deinstall
Date: Thu, 12 Aug 2010 16:45:18 +0400

 Florian Smeets <flo@kasimir.com> writes:
 
 >> I think you're missing @exec to complement @unexec. Add the line below
 >> to the end of plist.
 >>
 >>    @exec if [ ! -f %D/etc/igmpproxy.conf ]; then cp -p %D/%F %B/igmpproxy.conf; fi
 >
 > i was thinking about the @exec too, but i don't think you need an
 > @exec for every @unexec, and everything works as expected without the
 > @exec.
 
 The @exec line is needed when installing from package, not port.

From: Florian Smeets <flo@kasimir.com>
To: Anonymous <swell.k@gmail.com>
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/149547: [PATCH] net/igmpproxy: prevent deletion of configfile
 on deinstall
Date: Thu, 12 Aug 2010 16:59:46 +0200

 This is a multi-part message in MIME format.
 --------------030906070908080106000805
 Content-Type: text/plain; charset=ISO-8859-1; format=flowed
 Content-Transfer-Encoding: 7bit
 
 On 12.08.10 14:45, Anonymous wrote:
 > Florian Smeets<flo@kasimir.com>  writes:
 >
 >>> I think you're missing @exec to complement @unexec. Add the line below
 >>> to the end of plist.
 >>>
 >>>     @exec if [ ! -f %D/etc/igmpproxy.conf ]; then cp -p %D/%F %B/igmpproxy.conf; fi
 >>
 >> i was thinking about the @exec too, but i don't think you need an
 >> @exec for every @unexec, and everything works as expected without the
 >> @exec.
 >
 > The @exec line is needed when installing from package, not port.
 
 Oh, i did not know that. Thanks for bringing it to my attention!
 
 I've attached the new complete patch.
 
 Cheers,
 Florian
 
 --------------030906070908080106000805
 Content-Type: text/plain; x-mac-type="0"; x-mac-creator="0";
  name="igmpproxy.diff"
 Content-Transfer-Encoding: 7bit
 Content-Disposition: attachment;
  filename="igmpproxy.diff"
 
 diff -ruN --exclude=CVS /usr/ports/net/igmpproxy.orig/Makefile /usr/ports/net/igmpproxy/Makefile
 --- /usr/ports/net/igmpproxy.orig/Makefile	2010-08-12 10:13:36.000000000 +0200
 +++ /usr/ports/net/igmpproxy/Makefile	2010-08-12 15:07:50.000000000 +0200
 @@ -24,8 +24,4 @@
  MAN5=		igmpproxy.conf.5
  MAN8=		igmpproxy.8
  
 -PLIST_FILES=	sbin/igmpproxy \
 -		etc/igmpproxy.conf \
 -		etc/igmpproxy.conf.sample
 -
  .include <bsd.port.mk>
 diff -ruN --exclude=CVS /usr/ports/net/igmpproxy.orig/pkg-plist /usr/ports/net/igmpproxy/pkg-plist
 --- /usr/ports/net/igmpproxy.orig/pkg-plist	1970-01-01 01:00:00.000000000 +0100
 +++ /usr/ports/net/igmpproxy/pkg-plist	2010-08-12 15:01:48.000000000 +0200
 @@ -0,0 +1,4 @@
 +sbin/igmpproxy
 +@unexec if cmp -s %D/etc/igmpproxy.conf.sample %D/etc/igmpproxy.conf; then rm -f %D/etc/igmpproxy.conf; fi
 +etc/igmpproxy.conf.sample
 +@exec if [ ! -f %D/etc/igmpproxy.conf ]; then cp -p %D/%F %B/igmpproxy.conf; fi
 
 --------------030906070908080106000805--
Responsible-Changed-From-To: miwi->freebsd-ports-bugs 
Responsible-Changed-By: miwi 
Responsible-Changed-When: Sat Sep 11 12:15:21 UTC 2010 
Responsible-Changed-Why:  
back to pool. 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149547 
Responsible-Changed-From-To: freebsd-ports-bugs->rene 
Responsible-Changed-By: rene 
Responsible-Changed-When: Fri Oct 29 13:01:30 UTC 2010 
Responsible-Changed-Why:  
Grab, related to ports/150146 

http://www.freebsd.org/cgi/query-pr.cgi?pr=149547 
State-Changed-From-To: feedback->closed 
State-Changed-By: rene 
State-Changed-When: Sun Oct 31 14:48:37 UTC 2010 
State-Changed-Why:  
Commited, thanks 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/149547: commit references a PR
Date: Sun, 31 Oct 2010 14:47:35 +0000 (UTC)

 rene        2010-10-31 14:47:29 UTC
 
   FreeBSD ports repository
 
   Modified files:
     net/igmpproxy        Makefile 
     net/igmpproxy/files  igmpproxy.in 
   Added files:
     net/igmpproxy        pkg-plist 
   Log:
   - Do not delete the configuration file on deinstall if it was modified [1]
   - For the rc script: [2]
     - use /usr/sbin/daemon to start the rc script because igmpproxy does not
       daemonize itself
     - add shutdown keyword
     - cleanups
   - Bump PORTREVISION [2]
   PR:             ports/149547 [1], ports/150146 [2]
   Submitted by:   Florian Smeets [flo kasimir.com] [1] [2]
   Approved by:    maintainer timeout (11 weeks [1], 8 weeks [2])
   
   Revision  Changes    Path
   1.5       +1 -4      ports/net/igmpproxy/Makefile
   1.3       +12 -3     ports/net/igmpproxy/files/igmpproxy.in
   1.1       +4 -0      ports/net/igmpproxy/pkg-plist (new)
 _______________________________________________
 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"
 
>Unformatted:
