diff options
| author | Andrey A. Chernov <ache@FreeBSD.org> | 2007-04-06 17:41:00 +0000 |
|---|---|---|
| committer | Andrey A. Chernov <ache@FreeBSD.org> | 2007-04-06 17:41:00 +0000 |
| commit | bd561841462d8fd13d3de77747b8882019c41ed8 (patch) | |
| tree | 1d87383b46d336594fc3167871d7fd09dd1e7a9c /mail | |
| parent | Chase a silent update. (diff) | |
Upgrade to 0.6.3
PR: 111328
Submitted by: Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
Notes
Notes:
svn path=/head/; revision=189389
Diffstat (limited to 'mail')
| -rw-r--r-- | mail/dkim-milter/Makefile | 2 | ||||
| -rw-r--r-- | mail/dkim-milter/distinfo | 6 | ||||
| -rw-r--r-- | mail/dkim-milter/files/milter-dkim.sh.in | 38 |
3 files changed, 36 insertions, 10 deletions
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile index 14572f2309ee..0c3c61f1c28b 100644 --- a/mail/dkim-milter/Makefile +++ b/mail/dkim-milter/Makefile @@ -13,7 +13,7 @@ ## base system, building this port may fail. PORTNAME= dkim-milter -PORTVERSION= 0.6.2 +PORTVERSION= 0.6.3 CATEGORIES= mail MASTER_SITES= ${MASTER_SITE_SOURCEFORGE} MASTER_SITE_SUBDIR= ${PORTNAME} diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo index e4c4bdc0914f..8f73243a320e 100644 --- a/mail/dkim-milter/distinfo +++ b/mail/dkim-milter/distinfo @@ -1,3 +1,3 @@ -MD5 (dkim-milter-0.6.2.tar.gz) = 83625161b55802db5850c7e13e9fbf38 -SHA256 (dkim-milter-0.6.2.tar.gz) = 4fec173240d684e6e6457b67635d05340648d8ffa8205f199700f9569b31a9b4 -SIZE (dkim-milter-0.6.2.tar.gz) = 477619 +MD5 (dkim-milter-0.6.3.tar.gz) = 1e8beaadb68824825cc7dda2e11d977c +SHA256 (dkim-milter-0.6.3.tar.gz) = 3810b99599c2db2a5076bed3813ac362f23ca78ed630f0ff2075f8e5fd14e5e7 +SIZE (dkim-milter-0.6.3.tar.gz) = 479669 diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in index 8ca27db5fe01..897f2972d4cd 100644 --- a/mail/dkim-milter/files/milter-dkim.sh.in +++ b/mail/dkim-milter/files/milter-dkim.sh.in @@ -37,9 +37,10 @@ milterdkim_socket=${milterdkim_socket:-"local:/var/run/milterdkim/filter"} milterdkim_domain=${milterdkim_domain:-"example.com"} milterdkim_key=${milterdkim_key:-"/var/db/domainkeys/default.key.pem"} milterdkim_selector=${milterdkim_selector:-"default"} -milterdkim_alg=${milterdkim_alg:-"rsa-sha1"} -## milterdkim_flags expands escaped variables later. -milterdkim_flags=${milterdkim_flags:-'-d ${milterdkim_domain} -c simple -m MSA -s ${milterdkim_selector} -k ${milterdkim_key} -S ${milterdkim_alg}'} +milterdkim_alg=${milterdkim_alg:-} +# Options other than above can be set with $milterdkim_flags. +# see dkim-milter documentation for detail. +milterdkim_flags=${milterdkim_flags:-"-b sv -c simple/simple -m MSA"} . %%RC_SUBR%% @@ -66,8 +67,22 @@ if [ -n "$2" ]; then fi eval milterdkim_domain="\${milterdkim_${profile}_domain:-${milterdkim_domain}}" eval milterdkim_key="\${milterdkim_${profile}_key:-${milterdkim_key}}" + eval milterdkim_selector="\${milterdkim_${profile}_selector:-${milterdkim_selector}}" + eval milterdkim_alg="\${milterdkim_${profile}_alg:-${milterdkim_alg}}" eval milterdkim_flags="\${milterdkim_${profile}_flags:-${milterdkim_flags}}" - command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} -d ${milterdkim_domain} -k ${milterdkim_key} -s ${milterdkim_selector} -S ${milterdkim_alg}" + if [ "x${milterdkim_domain}" != "x" ];then + milterdkim_domain="-d ${milterdkim_domain}" + fi + if [ "x${milterdkim_key}" != "x" ];then + milterdkim_key="-k ${milterdkim_key}" + fi + if [ "x${milterdkim_selector}" != "x" ];then + milterdkim_selector="-s ${milterdkim_selector}" + fi + if [ "x${milterdkim_alg}" != "x" ];then + milterdkim_alg="-S ${milterdkim_alg}" + fi + command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}" else echo "$0: extra argument ignored" fi @@ -89,8 +104,19 @@ else restart_precmd="" fi else - milterdkim_flags=${milterdkim_flags} - command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} -d ${milterdkim_domain} -k ${milterdkim_key} -s ${milterdkim_selector} -S ${milterdkim_alg}" + if [ "x${milterdkim_domain}" != "x" ];then + milterdkim_domain="-d ${milterdkim_domain}" + fi + if [ "x${milterdkim_key}" != "x" ];then + milterdkim_key="-k ${milterdkim_key}" + fi + if [ "x${milterdkim_selector}" != "x" ];then + milterdkim_selector="-s ${milterdkim_selector}" + fi + if [ "x${milterdkim_alg}" != "x" ];then + milterdkim_alg="-S ${milterdkim_alg}" + fi + command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}" fi fi |