ports/111328: [maintainer] mail/dkim-milter update to 0.6.3

[Hirohisa Yamaguchi]

>Number:         111328
>Category:       ports
>Synopsis:       [maintainer] mail/dkim-milter update to 0.6.3
>Confidential:   no
>Severity:       non-critical
>Priority:       low
>Responsible:    freebsd-ports-bugs
>State:          open
>Quarter:        
>Keywords:       
>Date-Required:
>Class:          maintainer-update
>Submitter-Id:   current-users
>Arrival-Date:   Fri Apr 06 17:30:02 GMT 2007
>Closed-Date:
>Last-Modified:
>Originator:     Hirohisa Yamaguchi
>Release:        FreeBSD 7.0-CURRENT amd64
>Organization:
<organization of PR author (multiple lines)>
>Environment:
System: FreeBSD calliope.****.org 7.0-CURRENT FreeBSD 7.0-CURRENT #4: Mon Nov 27 15:32:41 JST 2006 root at calliope.****.org:/usr/obj/usr/src/sys/CALLIOPE64 amd64


>Description:
	There's a new version of mail/dkim-milter 0.6.3
	  Release note: http://sourceforge.net/project/shownotes.php?release_id=499256&group_id=139420

>How-To-Repeat:
	N/A

>Fix:

	The patch follows.

	This patch also contains a new rc-script that fixes passing
	same command-line option passed to the program twice.

cvs diff: Diffing .
Index: Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/Makefile,v
retrieving revision 1.18
diff -u -p -r1.18 Makefile
--- Makefile	6 Apr 2007 04:49:48 -0000	1.18
+++ Makefile	6 Apr 2007 17:16:03 -0000
@@ -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}
Index: distinfo
===================================================================
RCS file: /home/ncvs/ports/mail/dkim-milter/distinfo,v
retrieving revision 1.9
diff -u -p -r1.9 distinfo
--- distinfo	6 Apr 2007 04:49:48 -0000	1.9
+++ distinfo	6 Apr 2007 17:16:03 -0000
@@ -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
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.7
diff -u -p -r1.7 milter-dkim.sh.in
--- files/milter-dkim.sh.in	25 Mar 2007 13:09:28 -0000	1.7
+++ files/milter-dkim.sh.in	6 Apr 2007 17:16:03 -0000
@@ -37,9 +37,10 @@ milterdkim_socket=${milterdkim_socket:-"
 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
 
>Release-Note:
>Audit-Trail:
>Unformatted: