From delphij@FreeBSD.org  Tue Jun  7 00:02:11 2011
Return-Path: <delphij@FreeBSD.org>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 11C371065670
	for <FreeBSD-gnats-submit@freebsd.org>; Tue,  7 Jun 2011 00:02:11 +0000 (UTC)
	(envelope-from delphij@FreeBSD.org)
Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28])
	by mx1.freebsd.org (Postfix) with ESMTP id DC4738FC17;
	Tue,  7 Jun 2011 00:02:10 +0000 (UTC)
Received: from freefall.freebsd.org (localhost [127.0.0.1])
	by freefall.freebsd.org (8.14.4/8.14.4) with ESMTP id p5702Al1049765;
	Tue, 7 Jun 2011 00:02:10 GMT
	(envelope-from delphij@freefall.freebsd.org)
Received: (from delphij@localhost)
	by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p5702AlS049764;
	Tue, 7 Jun 2011 00:02:10 GMT
	(envelope-from delphij)
Message-Id: <201106070002.p5702AlS049764@freefall.freebsd.org>
Date: Tue, 7 Jun 2011 00:02:10 GMT
From: Xin LI <delphij@freebsd.org>
Reply-To: Xin LI <delphij@freebsd.org>
To: FreeBSD-gnats-submit@freebsd.org
Cc: prehor@gmail.com
Subject: [PATCH] security/amavisd-milter: allow alternative socket path and permission
X-Send-Pr-Version: 3.113
X-GNATS-Notify: prehor@gmail.com d@delphij.net

>Number:         157674
>Category:       ports
>Synopsis:       [PATCH] security/amavisd-milter: allow alternative socket path and permission
>Confidential:   no
>Severity:       non-critical
>Priority:       medium
>Responsible:    delphij
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          change-request
>Submitter-Id:   current-users
>Arrival-Date:   Tue Jun 07 00:10:08 UTC 2011
>Closed-Date:    Thu Jun 09 00:28:14 UTC 2011
>Last-Modified:  Thu Jun  9 00:30:09 UTC 2011
>Originator:     Xin LI
>Release:        FreeBSD 8.2-STABLE i386
>Organization:
iXsystems, Inc.
>Environment:
System: FreeBSD freefall.freebsd.org 8.2-STABLE FreeBSD 8.2-STABLE #4 r220774: Mon Apr 18 13:56:14 UTC 2011 simon@freefall.freebsd.org:/usr/obj/usr/src/sys/FREEFALL i386


>Description:
	Currently security/amavisd-milter's supplied startup script does not
allow changing socket path and permission, nor amavisd-milter have the
functionality of changing permission at startup time.

	The attached patch makes it possible to:

	a) change the default location of amavisd-milter, which is important
	   in a chrooted setup;
	b) allows change of the permission of the socket.  The practical
	   default of that permission set is 0666.

>How-To-Repeat:
>Fix:


--- amavisd-milter.diff begins here ---
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/Makefile,v
retrieving revision 1.16
diff -u -p -r1.16 Makefile
--- Makefile	16 Dec 2010 02:34:00 -0000	1.16
+++ Makefile	6 Jun 2011 23:54:08 -0000
@@ -7,7 +7,7 @@
 
 PORTNAME=	amavisd-milter
 PORTVERSION=	1.5.0
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	security mail
 MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 
Index: files/amavisd-milter.sh.in
===================================================================
RCS file: /home/ncvs/ports/security/amavisd-milter/files/amavisd-milter.sh.in,v
retrieving revision 1.8
diff -u -p -r1.8 amavisd-milter.sh.in
--- files/amavisd-milter.sh.in	27 Mar 2010 00:14:38 -0000	1.8
+++ files/amavisd-milter.sh.in	6 Jun 2011 23:50:30 -0000
@@ -25,10 +25,18 @@ load_rc_config $name
 # Set defaults
 : ${amavisd_milter_enable:="NO"}
 : ${amavisd_milter_user="%%AMAVISUSER%%"}
+: ${amavisd_milter_socket:="%%AMAVISDIR%%/amavisd-milter.sock"}
+: ${amavisd_milter_socket_perm:="0666"}
 
 pidfile="${amavisd_milter_pidfile:-%%AMAVISDIR%%/amavisd-milter.pid}"
 command="%%PREFIX%%/sbin/amavisd-milter"
-command_args="-p ${pidfile}"
+command_args="-p ${pidfile} -s ${amavisd_milter_socket}"
 required_files="%%PREFIX%%/etc/amavisd.conf"
+start_postcmd="amavisd_milter_postcmd"
+
+amavisd_milter_postcmd()
+{
+	chmod ${amavisd_milter_socket_perm} ${amavisd_milter_socket}
+}
 
 run_rc_command "$1"
--- amavisd-milter.diff ends here ---


>Release-Note:
>Audit-Trail:
Responsible-Changed-From-To: freebsd-ports-bugs->delphij 
Responsible-Changed-By: edwin 
Responsible-Changed-When: Tue Jun 7 00:10:17 UTC 2011 
Responsible-Changed-Why:  
Submitter has GNATS access (via the GNATS Auto Assign Tool) 

http://www.freebsd.org/cgi/query-pr.cgi?pr=157674 
State-Changed-From-To: open->feedback 
State-Changed-By: edwin 
State-Changed-When: Tue Jun 7 00:10:21 UTC 2011 
State-Changed-Why:  
Awaiting maintainers feedback (via the GNATS Auto Assign Tool) 

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

From: Edwin Groothuis <edwin@FreeBSD.org>
To: prehor@gmail.com
Cc: bug-followup@FreeBSD.org
Subject: Re: ports/157674: [PATCH] security/amavisd-milter: allow alternative socket path and permission
Date: Tue, 7 Jun 2011 00:10:19 UT

 Maintainer of security/amavisd-milter,
 
 Please note that PR ports/157674 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/157674
 
 -- 
 Edwin Groothuis via the GNATS Auto Assign Tool
 edwin@FreeBSD.org

From: Petr Rehor <prehor@gmail.com>
To: bug-followup@freebsd.org
Cc:  
Subject: Re: ports/157674: [PATCH] security/amavisd-milter: allow alternative
 socket path and permission
Date: Thu, 9 Jun 2011 00:38:47 +0200

 I agree with the patch. Please mention in UPDATING that -s option must
 not be use in amavisd_milter_flags from now.
 
 --
 Petr Rehor
 
 On Tue, Jun 7, 2011 at 2:10 AM, Edwin Groothuis <edwin@freebsd.org> wrote:
 >
 > Maintainer of security/amavisd-milter,
 >
 > Please note that PR ports/157674 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:
 > =A0 =A0http://www.freebsd.org/cgi/query-pr.cgi?pr=3Dports/157674
 >
 > --
 > Edwin Groothuis via the GNATS Auto Assign Tool
 > edwin@FreeBSD.org
State-Changed-From-To: feedback->closed 
State-Changed-By: delphij 
State-Changed-When: Thu Jun 9 00:28:00 UTC 2011 
State-Changed-Why:  
Patch applied under maintainer approval. 

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

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/157674: commit references a PR
Date: Thu,  9 Jun 2011 00:27:57 +0000 (UTC)

 delphij     2011-06-09 00:27:43 UTC
 
   FreeBSD ports repository
 
   Modified files:
     .                    UPDATING 
     security/amavisd-milter Makefile 
     security/amavisd-milter/files amavisd-milter.sh.in 
   Log:
   Make it possible to specify socket location and permissions for the milter.
   
   Approved by:    maintainer
   PR:             ports/157674
   
   Revision  Changes    Path
   1.1076    +10 -1     ports/UPDATING
   1.17      +1 -1      ports/security/amavisd-milter/Makefile
   1.9       +10 -2     ports/security/amavisd-milter/files/amavisd-milter.sh.in
 _______________________________________________
 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:
