aboutsummaryrefslogtreecommitdiffstats
path: root/mail/dkim-milter
diff options
context:
space:
mode:
authorache <ache@FreeBSD.org>2008-07-29 04:15:40 +0800
committerache <ache@FreeBSD.org>2008-07-29 04:15:40 +0800
commitff1dc012d926b4867c885fafe377ea732bf876fa (patch)
tree96e48ad9d388393a215c7547e56dfcc751bd261f /mail/dkim-milter
parent9d7293d684f99d278a7aab46023f0bc898498523 (diff)
downloadfreebsd-ports-gnome-ff1dc012d926b4867c885fafe377ea732bf876fa.tar.gz
freebsd-ports-gnome-ff1dc012d926b4867c885fafe377ea732bf876fa.tar.zst
freebsd-ports-gnome-ff1dc012d926b4867c885fafe377ea732bf876fa.zip
previous changes in mail/dkim-milter rc script concerning
milterdkim_socket break precmd/postcmd. PR: 126034 Submitted by: Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
Diffstat (limited to 'mail/dkim-milter')
-rw-r--r--mail/dkim-milter/Makefile1
-rw-r--r--mail/dkim-milter/files/milter-dkim.sh.in8
2 files changed, 5 insertions, 4 deletions
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index d438116fa18e..abe1c61ed074 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -14,6 +14,7 @@
PORTNAME= dkim-milter
PORTVERSION= 2.7.0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF
diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in
index 46c716aff123..aa24feb301b1 100644
--- a/mail/dkim-milter/files/milter-dkim.sh.in
+++ b/mail/dkim-milter/files/milter-dkim.sh.in
@@ -82,7 +82,7 @@ if [ -n "$2" ]; then
milterdkim_cfgfile=""
fi
if [ "x${milterdkim_socket}" != "x" ];then
- milterdkim_socket="-p ${milterdkim_socket}"
+ _socket_prefix="-p"
fi
if [ "x${milterdkim_domain}" != "x" ];then
milterdkim_domain="-d ${milterdkim_domain}"
@@ -96,7 +96,7 @@ if [ -n "$2" ]; then
if [ "x${milterdkim_alg}" != "x" ];then
milterdkim_alg="-S ${milterdkim_alg}"
fi
- command_args="-l ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+ command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
else
echo "$0: extra argument ignored"
fi
@@ -124,7 +124,7 @@ else
milterdkim_cfgfile=""
fi
if [ "x${milterdkim_socket}" != "x" ];then
- milterdkim_socket="-p ${milterdkim_socket}"
+ _socket_prefix="-p"
fi
if [ "x${milterdkim_domain}" != "x" ];then
milterdkim_domain="-d ${milterdkim_domain}"
@@ -138,7 +138,7 @@ else
if [ "x${milterdkim_alg}" != "x" ];then
milterdkim_alg="-S ${milterdkim_alg}"
fi
- command_args="-l ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+ command_args="-l ${_socket_prefix} ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
fi
fi