From owner-freebsd-ports-bugs@FreeBSD.ORG Tue Jun 7 00:10:09 2011 Return-Path: Delivered-To: freebsd-ports-bugs@hub.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id F3ECC1065673 for ; Tue, 7 Jun 2011 00:10:08 +0000 (UTC) (envelope-from gnats@FreeBSD.org) Received: from freefall.freebsd.org (freefall.freebsd.org [IPv6:2001:4f8:fff6::28]) by mx1.freebsd.org (Postfix) with ESMTP id D184D8FC13; Tue, 7 Jun 2011 00:10:08 +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 p570A8BT059021; Tue, 7 Jun 2011 00:10:08 GMT (envelope-from gnats@freefall.freebsd.org) Received: (from gnats@localhost) by freefall.freebsd.org (8.14.4/8.14.4/Submit) id p570A8Xa059017; Tue, 7 Jun 2011 00:10:08 GMT (envelope-from gnats) Resent-Date: Tue, 7 Jun 2011 00:10:08 GMT Resent-Message-Id: <201106070010.p570A8Xa059017@freefall.freebsd.org> Resent-From: FreeBSD-gnats-submit@FreeBSD.org (GNATS Filer) Resent-To: freebsd-ports-bugs@FreeBSD.org Resent-Cc: d@delphij.net Resent-Reply-To: FreeBSD-gnats-submit@FreeBSD.org, Xin LI Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34]) by hub.freebsd.org (Postfix) with ESMTP id 11C371065670 for ; 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 To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 X-GNATS-Notify: d@delphij.net Cc: prehor@gmail.com Subject: ports/157674: [PATCH] security/amavisd-milter: allow alternative socket path and permission X-BeenThere: freebsd-ports-bugs@freebsd.org X-Mailman-Version: 2.1.5 Precedence: list Reply-To: Xin LI List-Id: Ports bug reports List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 07 Jun 2011 00:10:09 -0000 >Number: 157674 >Category: ports >Synopsis: [PATCH] security/amavisd-milter: allow alternative socket path and permission >Confidential: no >Severity: non-critical >Priority: medium >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Tue Jun 07 00:10:08 UTC 2011 >Closed-Date: >Last-Modified: >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: >Unformatted: