From umq@ueo.co.jp  Mon Jul 28 13:17:07 2008
Return-Path: <umq@ueo.co.jp>
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 5B3ED1065671
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 28 Jul 2008 13:17:07 +0000 (UTC)
	(envelope-from umq@ueo.co.jp)
Received: from msa1-25.plala.or.jp (msa1.plala.or.jp [58.93.251.201])
	by mx1.freebsd.org (Postfix) with ESMTP id DCA478FC13
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 28 Jul 2008 13:17:06 +0000 (UTC)
	(envelope-from umq@ueo.co.jp)
Received: from eupheme.kaumoge.org ([121.112.64.124])
          by msa1-25.plala.or.jp with ESMTP
          id <20080728131705.OEKO19670.msa1-25.plala.or.jp@eupheme.kaumoge.org>
          for <FreeBSD-gnats-submit@freebsd.org>;
          Mon, 28 Jul 2008 22:17:05 +0900
Received: from calliope.kaumoge.org (calliope.kaumoge.org [192.168.24.120])
	by eupheme.kaumoge.org (8.12.11/8.12.11/20030713) with ESMTP id m6SDHQGn070393
	for <FreeBSD-gnats-submit@freebsd.org>; Mon, 28 Jul 2008 22:17:27 +0900 (JST)
	(envelope-from umq@ueo.co.jp)
Message-Id: <86fxpu2lnz.wl%umq@ueo.co.jp>
Date: Mon, 28 Jul 2008 22:17:04 +0900
From: Hirohisa Yamaguchi <umq@ueo.co.jp>
To: FreeBSD-gnats-submit@freebsd.org
Subject: [maintainer] mail/dkim-milter rc script bug fix
X-Send-Pr-Version: 3.113

>Number:         126034
>Category:       ports
>Synopsis:       [maintainer] mail/dkim-milter rc script bug fix
>Confidential:   no
>Severity:       serious
>Priority:       medium
>Responsible:    freebsd-ports-bugs
>State:          closed
>Quarter:        
>Keywords:       
>Date-Required:  
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Mon Jul 28 13:20:03 UTC 2008
>Closed-Date:    Mon Jul 28 20:16:02 UTC 2008
>Last-Modified:  Mon Jul 28 20:20:01 UTC 2008
>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:
State-Changed-From-To: open->closed 
State-Changed-By: ache 
State-Changed-When: Mon Jul 28 20:13:40 UTC 2008 
State-Changed-Why:  
Committed 

http://www.freebsd.org/cgi/query-pr.cgi?pr=126034 

From: dfilter@FreeBSD.ORG (dfilter service)
To: bug-followup@FreeBSD.org
Cc:  
Subject: Re: ports/126034: commit references a PR
Date: Mon, 28 Jul 2008 20:15:55 +0000 (UTC)

 ache        2008-07-28 20:15:40 UTC
 
   FreeBSD ports repository
 
   Modified files:
     mail/dkim-milter     Makefile 
     mail/dkim-milter/files milter-dkim.sh.in 
   Log:
   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)
   
   Revision  Changes    Path
   1.52      +1 -0      ports/mail/dkim-milter/Makefile
   1.14      +5 -5      ports/mail/dkim-milter/files/milter-dkim.sh.in
 _______________________________________________
 cvs-all@freebsd.org mailing list
 http://lists.freebsd.org/mailman/listinfo/cvs-all
 To unsubscribe, send any mail to "cvs-all-unsubscribe@freebsd.org"
 
>Unformatted:
