View | Details | Raw Unified | Return to bug 126034
Collapse All | Expand All

(-)Makefile (+1 lines)
Lines 14-19 Link Here
14
14
15
PORTNAME=	dkim-milter
15
PORTNAME=	dkim-milter
16
PORTVERSION=	2.7.0
16
PORTVERSION=	2.7.0
17
PORTREVISION=	1
17
CATEGORIES=	mail
18
CATEGORIES=	mail
18
MASTER_SITES=	SF
19
MASTER_SITES=	SF
19
20
(-)files/milter-dkim.sh.in (-4 / +4 lines)
Lines 82-88 if [ -n "$2" ]; then Link Here
82
	    milterdkim_cfgfile=""
82
	    milterdkim_cfgfile=""
83
	fi
83
	fi
84
	if [ "x${milterdkim_socket}" != "x" ];then
84
	if [ "x${milterdkim_socket}" != "x" ];then
85
	    milterdkim_socket="-p ${milterdkim_socket}"
85
	    _socket_prefix="-p"
86
	fi
86
	fi
87
	if [ "x${milterdkim_domain}" != "x" ];then
87
	if [ "x${milterdkim_domain}" != "x" ];then
88
	    milterdkim_domain="-d ${milterdkim_domain}"
88
	    milterdkim_domain="-d ${milterdkim_domain}"
Lines 96-102 if [ -n "$2" ]; then Link Here
96
	if [ "x${milterdkim_alg}" != "x" ];then
96
	if [ "x${milterdkim_alg}" != "x" ];then
97
	    milterdkim_alg="-S ${milterdkim_alg}"
97
	    milterdkim_alg="-S ${milterdkim_alg}"
98
	fi
98
	fi
99
	command_args="-l ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
99
	command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
100
    else
100
    else
101
	echo "$0: extra argument ignored"
101
	echo "$0: extra argument ignored"
102
    fi
102
    fi
Lines 124-130 else Link Here
124
	    milterdkim_cfgfile=""
124
	    milterdkim_cfgfile=""
125
	fi
125
	fi
126
	if [ "x${milterdkim_socket}" != "x" ];then
126
	if [ "x${milterdkim_socket}" != "x" ];then
127
	    milterdkim_socket="-p ${milterdkim_socket}"
127
	    _socket_prefix="-p"
128
	fi
128
	fi
129
	if [ "x${milterdkim_domain}" != "x" ];then
129
	if [ "x${milterdkim_domain}" != "x" ];then
130
	    milterdkim_domain="-d ${milterdkim_domain}"
130
	    milterdkim_domain="-d ${milterdkim_domain}"
Lines 138-144 else Link Here
138
	if [ "x${milterdkim_alg}" != "x" ];then
138
	if [ "x${milterdkim_alg}" != "x" ];then
139
	    milterdkim_alg="-S ${milterdkim_alg}"
139
	    milterdkim_alg="-S ${milterdkim_alg}"
140
	fi
140
	fi
141
	command_args="-l ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
141
	command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
142
    fi
142
    fi
143
fi
143
fi

Return to bug 126034