View | Details | Raw Unified | Return to bug 208056 | Differences between
and this patch

Collapse All | Expand All

(-)mail/opendkim.new/files/milter-opendkim.in (-5 / +8 lines)
Lines 24-29 Link Here
24
# milteropendkim_${profile}_* :   Variables per profile.
24
# milteropendkim_${profile}_* :   Variables per profile.
25
#                             Sockets must be different from each other.
25
#                             Sockets must be different from each other.
26
#
26
#
27
# milteropendkim_socket_perms (str):
28
#                                 Permissions for local|unix socket.
29
#
27
#  all parameters below now can be set in opendkim.conf(5).
30
#  all parameters below now can be set in opendkim.conf(5).
28
# milteropendkim_socket (str):    Path to the milter socket.
31
# milteropendkim_socket (str):    Path to the milter socket.
29
# milteropendkim_domain (str):    Domainpart of From: in mails to sign.
32
# milteropendkim_domain (str):    Domainpart of From: in mails to sign.
Lines 43-49 Link Here
43
stop_postcmd="dkim_postcmd"
46
stop_postcmd="dkim_postcmd"
44
command="%%PREFIX%%/sbin/opendkim"
47
command="%%PREFIX%%/sbin/opendkim"
45
_piddir="/var/run/milteropendkim"
48
_piddir="/var/run/milteropendkim"
46
_piddir_perms="0755"
47
pidfile="${_piddir}/pid"
49
pidfile="${_piddir}/pid"
48
sig_reload="USR1"
50
sig_reload="USR1"
49
51
Lines 56-61 Link Here
56
: ${milteropendkim_uid="mailnull"}
58
: ${milteropendkim_uid="mailnull"}
57
: ${milteropendkim_gid="mailnull"}
59
: ${milteropendkim_gid="mailnull"}
58
: ${milteropendkim_cfgfile="%%PREFIX%%/etc/mail/opendkim.conf"}
60
: ${milteropendkim_cfgfile="%%PREFIX%%/etc/mail/opendkim.conf"}
61
: ${milteropendkim_socket_perms="0755"}
59
62
60
# Options other than above can be set with $milteropendkim_flags.
63
# Options other than above can be set with $milteropendkim_flags.
61
# see dkim-milter documentation for detail.
64
# see dkim-milter documentation for detail.
Lines 66-71 Link Here
66
	pidfile="${_piddir}/${profile}.pid"
69
	pidfile="${_piddir}/${profile}.pid"
67
	eval milteropendkim_enable="\${milteropendkim_${profile}_enable:-${milteropendkim_enable}}"
70
	eval milteropendkim_enable="\${milteropendkim_${profile}_enable:-${milteropendkim_enable}}"
68
	eval milteropendkim_socket="\${milteropendkim_${profile}_socket:-}"
71
	eval milteropendkim_socket="\${milteropendkim_${profile}_socket:-}"
72
	eval milteropendkim_socket_perms="\${milteropendkim_${profile}_socket_perms:-}"
69
	if [ "x${milteropendkim_socket}" = "x" ];then
73
	if [ "x${milteropendkim_socket}" = "x" ];then
70
	    echo "You must define a socket (milteropendkim_${profile}_socket)"
74
	    echo "You must define a socket (milteropendkim_${profile}_socket)"
71
	    exit 1
75
	    exit 1
Lines 169-177 Link Here
169
    fi
173
    fi
170
    if [ -n "${milteropendkim_gid}" ] ; then
174
    if [ -n "${milteropendkim_gid}" ] ; then
171
       chgrp ${milteropendkim_gid} ${_piddir}
175
       chgrp ${milteropendkim_gid} ${_piddir}
172
       _piddir_perms="0775"
173
    fi
176
    fi
174
    chmod ${_piddir_perms} ${_piddir}
177
    chmod ${milteropendkim_socket_perms} ${_piddir}
175
}
178
}
176
179
177
dkim_start_postcmd ()
180
dkim_start_postcmd ()
Lines 179-187 Link Here
179
    # postcmd is executed too fast and socket is not created before checking...
182
    # postcmd is executed too fast and socket is not created before checking...
180
    sleep 1
183
    sleep 1
181
    if [ -S ${milteropendkim_socket##local:} ] ; then
184
    if [ -S ${milteropendkim_socket##local:} ] ; then
182
        chmod ${_piddir_perms} ${milteropendkim_socket##local:}
185
        chmod ${milteropendkim_socket_perms} ${milteropendkim_socket##local:}
183
    elif [ -S ${milteropendkim_socket##unix:} ] ; then
186
    elif [ -S ${milteropendkim_socket##unix:} ] ; then
184
        chmod ${_piddir_perms} ${milteropendkim_socket##unix:}
187
        chmod ${milteropendkim_socket_perms} ${milteropendkim_socket##unix:}
185
    fi
188
    fi
186
}
189
}
187
190
(-)mail/opendkim.new/Makefile (-1 / +1 lines)
Lines 3-9 Link Here
3
3
4
PORTNAME=	opendkim
4
PORTNAME=	opendkim
5
PORTVERSION=	2.10.3
5
PORTVERSION=	2.10.3
6
PORTREVISION=	8
6
PORTREVISION=	9
7
CATEGORIES=	mail security
7
CATEGORIES=	mail security
8
MASTER_SITES=	SF/${PORTNAME} \
8
MASTER_SITES=	SF/${PORTNAME} \
9
		SF/${PORTNAME}/Previous%20Releases \
9
		SF/${PORTNAME}/Previous%20Releases \

Return to bug 208056