Date: Mon, 28 Jul 2008 22:17:04 +0900 From: Hirohisa Yamaguchi <umq@ueo.co.jp> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/126034: [maintainer] mail/dkim-milter rc script bug fix Message-ID: <86fxpu2lnz.wl%umq@ueo.co.jp> Resent-Message-ID: <200807281320.m6SDK47q094804@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 126034
>Category: ports
>Synopsis: [maintainer] mail/dkim-milter rc script bug fix
>Confidential: no
>Severity: serious
>Priority: medium
>Responsible: freebsd-ports-bugs
>State: open
>Quarter:
>Keywords:
>Date-Required:
>Class: maintainer-update
>Submitter-Id: current-users
>Arrival-Date: Mon Jul 28 13:20:03 UTC 2008
>Closed-Date:
>Last-Modified:
>Originator: Hirohisa Yamaguchi
>Release: FreeBSD 8.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 8.0-CURRENT FreeBSD 8.0-CURRENT #17: Thu Jul 10 06:27:38 JST 2008 root@calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64
>Description:
previous changes in mail/dkim-milter rc script concerning
milterdkim_socket break precmd/postcmd.
>How-To-Repeat:
1. install mail/dkim-milter
2. set milterdkim_socket in rc.conf
3. /usr/local/etc/rc.d/milterdkim start
[ -S -p local:/var/run/milterdkim/filter ]
[: -p: unexpected operator
>Fix:
the patch follows
cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v
retrieving revision 1.51
diff -p -u -r1.51 Makefile
--- Makefile 27 Jul 2008 20:16:34 -0000 1.51
+++ Makefile 28 Jul 2008 13:11:41 -0000
@@ -14,6 +14,7 @@
PORTNAME= dkim-milter
PORTVERSION= 2.7.0
+PORTREVISION= 1
CATEGORIES= mail
MASTER_SITES= SF
cvs diff: Diffing files
Index: files/milter-dkim.sh.in
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/files/milter-dkim.sh.in,v
retrieving revision 1.13
diff -p -u -r1.13 milter-dkim.sh.in
--- files/milter-dkim.sh.in 27 Jul 2008 20:16:35 -0000 1.13
+++ files/milter-dkim.sh.in 28 Jul 2008 13:11:41 -0000
@@ -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
>Release-Note:
>Audit-Trail:
>Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?86fxpu2lnz.wl%umq>