--- mail/opendkim.new/files/milter-opendkim.in 2017-08-18 22:49:16.000000000 +0200 +++ mail/opendkim.new/files/milter-opendkim.in 2018-09-16 23:55:20.435396000 +0200 @@ -24,6 +24,9 @@ # milteropendkim_${profile}_* : Variables per profile. # Sockets must be different from each other. # +# milteropendkim_socket_perms (str): +# Permissions for local|unix socket. +# # all parameters below now can be set in opendkim.conf(5). # milteropendkim_socket (str): Path to the milter socket. # milteropendkim_domain (str): Domainpart of From: in mails to sign. @@ -43,7 +46,6 @@ stop_postcmd="dkim_postcmd" command="%%PREFIX%%/sbin/opendkim" _piddir="/var/run/milteropendkim" -_piddir_perms="0755" pidfile="${_piddir}/pid" sig_reload="USR1" @@ -56,6 +58,7 @@ : ${milteropendkim_uid="mailnull"} : ${milteropendkim_gid="mailnull"} : ${milteropendkim_cfgfile="%%PREFIX%%/etc/mail/opendkim.conf"} +: ${milteropendkim_socket_perms="0755"} # Options other than above can be set with $milteropendkim_flags. # see dkim-milter documentation for detail. @@ -66,6 +69,7 @@ pidfile="${_piddir}/${profile}.pid" eval milteropendkim_enable="\${milteropendkim_${profile}_enable:-${milteropendkim_enable}}" eval milteropendkim_socket="\${milteropendkim_${profile}_socket:-}" + eval milteropendkim_socket_perms="\${milteropendkim_${profile}_socket_perms:-}" if [ "x${milteropendkim_socket}" = "x" ];then echo "You must define a socket (milteropendkim_${profile}_socket)" exit 1 @@ -169,9 +173,8 @@ fi if [ -n "${milteropendkim_gid}" ] ; then chgrp ${milteropendkim_gid} ${_piddir} - _piddir_perms="0775" fi - chmod ${_piddir_perms} ${_piddir} + chmod ${milteropendkim_socket_perms} ${_piddir} } dkim_start_postcmd () @@ -179,9 +182,9 @@ # postcmd is executed too fast and socket is not created before checking... sleep 1 if [ -S ${milteropendkim_socket##local:} ] ; then - chmod ${_piddir_perms} ${milteropendkim_socket##local:} + chmod ${milteropendkim_socket_perms} ${milteropendkim_socket##local:} elif [ -S ${milteropendkim_socket##unix:} ] ; then - chmod ${_piddir_perms} ${milteropendkim_socket##unix:} + chmod ${milteropendkim_socket_perms} ${milteropendkim_socket##unix:} fi } --- mail/opendkim.new/Makefile 2018-09-10 15:14:50.000000000 +0200 +++ mail/opendkim.new/Makefile 2018-09-16 23:52:36.171905000 +0200 @@ -3,7 +3,7 @@ PORTNAME= opendkim PORTVERSION= 2.10.3 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= mail security MASTER_SITES= SF/${PORTNAME} \ SF/${PORTNAME}/Previous%20Releases \