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

(-)Makefile (-1 / +1 lines)
Lines 13-19 Link Here
13
## base system, building this port may fail.
13
## base system, building this port may fail.
14
14
15
PORTNAME=	dkim-milter
15
PORTNAME=	dkim-milter
16
PORTVERSION=	0.6.2
16
PORTVERSION=	0.6.3
17
CATEGORIES=	mail
17
CATEGORIES=	mail
18
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
18
MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
19
MASTER_SITE_SUBDIR=	${PORTNAME}
19
MASTER_SITE_SUBDIR=	${PORTNAME}
(-)distinfo (-3 / +3 lines)
Lines 1-3 Link Here
1
MD5 (dkim-milter-0.6.2.tar.gz) = 83625161b55802db5850c7e13e9fbf38
1
MD5 (dkim-milter-0.6.3.tar.gz) = 1e8beaadb68824825cc7dda2e11d977c
2
SHA256 (dkim-milter-0.6.2.tar.gz) = 4fec173240d684e6e6457b67635d05340648d8ffa8205f199700f9569b31a9b4
2
SHA256 (dkim-milter-0.6.3.tar.gz) = 3810b99599c2db2a5076bed3813ac362f23ca78ed630f0ff2075f8e5fd14e5e7
3
SIZE (dkim-milter-0.6.2.tar.gz) = 477619
3
SIZE (dkim-milter-0.6.3.tar.gz) = 479669
(-)files/milter-dkim.sh.in (-6 / +32 lines)
Lines 37-45 milterdkim_socket=${milterdkim_socket:-" Link Here
37
milterdkim_domain=${milterdkim_domain:-"example.com"}
37
milterdkim_domain=${milterdkim_domain:-"example.com"}
38
milterdkim_key=${milterdkim_key:-"/var/db/domainkeys/default.key.pem"}
38
milterdkim_key=${milterdkim_key:-"/var/db/domainkeys/default.key.pem"}
39
milterdkim_selector=${milterdkim_selector:-"default"}
39
milterdkim_selector=${milterdkim_selector:-"default"}
40
milterdkim_alg=${milterdkim_alg:-"rsa-sha1"}
40
milterdkim_alg=${milterdkim_alg:-}
41
## milterdkim_flags expands escaped variables later.
41
# Options other than above can be set with $milterdkim_flags.
42
milterdkim_flags=${milterdkim_flags:-'-d ${milterdkim_domain} -c simple -m MSA -s ${milterdkim_selector} -k ${milterdkim_key} -S ${milterdkim_alg}'}
42
# see dkim-milter documentation for detail.
43
milterdkim_flags=${milterdkim_flags:-"-b sv -c simple/simple -m MSA"}
43
44
44
. %%RC_SUBR%%
45
. %%RC_SUBR%%
45
46
Lines 66-73 if [ -n "$2" ]; then Link Here
66
	fi
67
	fi
67
	eval milterdkim_domain="\${milterdkim_${profile}_domain:-${milterdkim_domain}}"
68
	eval milterdkim_domain="\${milterdkim_${profile}_domain:-${milterdkim_domain}}"
68
	eval milterdkim_key="\${milterdkim_${profile}_key:-${milterdkim_key}}"
69
	eval milterdkim_key="\${milterdkim_${profile}_key:-${milterdkim_key}}"
70
	eval milterdkim_selector="\${milterdkim_${profile}_selector:-${milterdkim_selector}}"
71
	eval milterdkim_alg="\${milterdkim_${profile}_alg:-${milterdkim_alg}}"
69
	eval milterdkim_flags="\${milterdkim_${profile}_flags:-${milterdkim_flags}}"
72
	eval milterdkim_flags="\${milterdkim_${profile}_flags:-${milterdkim_flags}}"
70
	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} -d ${milterdkim_domain} -k ${milterdkim_key} -s ${milterdkim_selector} -S ${milterdkim_alg}"
73
	if [ "x${milterdkim_domain}" != "x" ];then
74
	    milterdkim_domain="-d ${milterdkim_domain}"
75
	fi
76
	if [ "x${milterdkim_key}" != "x" ];then
77
	    milterdkim_key="-k ${milterdkim_key}"
78
	fi
79
	if [ "x${milterdkim_selector}" != "x" ];then
80
	    milterdkim_selector="-s ${milterdkim_selector}"
81
	fi
82
	if [ "x${milterdkim_alg}" != "x" ];then
83
	    milterdkim_alg="-S ${milterdkim_alg}"
84
	fi
85
	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
71
    else
86
    else
72
	echo "$0: extra argument ignored"
87
	echo "$0: extra argument ignored"
73
    fi
88
    fi
Lines 89-96 else Link Here
89
	    restart_precmd=""
104
	    restart_precmd=""
90
	fi
105
	fi
91
    else
106
    else
92
	milterdkim_flags=${milterdkim_flags}
107
	if [ "x${milterdkim_domain}" != "x" ];then
93
	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} -d ${milterdkim_domain} -k ${milterdkim_key} -s ${milterdkim_selector} -S ${milterdkim_alg}"
108
	    milterdkim_domain="-d ${milterdkim_domain}"
109
	fi
110
	if [ "x${milterdkim_key}" != "x" ];then
111
	    milterdkim_key="-k ${milterdkim_key}"
112
	fi
113
	if [ "x${milterdkim_selector}" != "x" ];then
114
	    milterdkim_selector="-s ${milterdkim_selector}"
115
	fi
116
	if [ "x${milterdkim_alg}" != "x" ];then
117
	    milterdkim_alg="-S ${milterdkim_alg}"
118
	fi
119
	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
94
    fi
120
    fi
95
fi
121
fi

Return to bug 111328