Make it possible to specify socket location and permissions for the milter.

Approved by:	maintainer
PR:		ports/157674

UPDATING

@@ -5,6 +5,15 @@ they are unavoidable.
 You should get into the habit of checking this file for changes each time
 you update your ports collection, before attempting any port upgrades.
 
+20110608:
+  AFFECTS: users of security/amavisd-milter
+  AUTHOR: delphij@FreeBSD.org
+
+  A change have been made to rc.d script for amavisd-milter makes it to
+  specify -s explicitly.  If you used to override the location of listening
+  socket by specifying -s, please migrate to the new way (specify
+  amavisd_milter_socket in /etc/rc.conf).
+
 20110607:
   AFFECTS: users of devel/p5-Moose and devel/p5-Class-MOP
   AUTHOR: az@FreeBSD.org

security/amavisd-milter/Makefile

@@ -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}
 

security/amavisd-milter/files/amavisd-milter.sh.in

@@ -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"