Index: head/mail/dkim-milter/Makefile
===================================================================
--- head/mail/dkim-milter/Makefile	(revision 189388)
+++ head/mail/dkim-milter/Makefile	(revision 189389)
@@ -1,122 +1,122 @@
 # New ports collection makefile for:	dkim-milter
 # Date created:				10 Jan 2006
 # Whom:					Hirohisa Yamaguchi <umq@ueo.co.jp>
 #
 # $FreeBSD$
 #
 ## There is a new option WITH_POSTFIX_MILTER
 ## to make this port work with mail/postfix port.
 
 ## WITH_POSTFIX_MILTER knob implicitly defines
 ## SENDMAIL_MILTER_IN_BASE, to build with libmilter*
 ## in base system.  If you have deleted sendamil in
 ## 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}
 
 MAINTAINER=	umq@ueo.co.jp
 COMMENT=	Domainkeys Identified Mail (DKIM) milter
 
 USE_RC_SUBR=	milter-dkim.sh
 
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
 SENDMAIL_MILTER_IN_BASE=	yes
 PKGMESSAGE=	pkg-message.postfix
 
 .if defined(WITH_POSTFIX_CURRENT)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
 .else
 RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
 .endif
 .endif
 
 .if !defined(SENDMAIL_MILTER_IN_BASE)
 .if defined(SENDMAIL_WITH_SHARED_MILTER)
 LIB_DEPENDS+=	milter.3:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT}
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libmilter.a:${PORTSDIR}/mail/${SENDMAIL_MILTER_PORT}
 .endif
 .endif
 
 SENDMAIL_MILTER_PORT?=	sendmail
 SUB_FILES=	milter-dkim.sh
 WCONF=		${WRKSRC}/devtools/Site
 MAN8=		dkim-filter.8
 PLIST_FILES=	libexec/dkim-filter sbin/gentxt-dkim
 PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
 		autorespond.csh
 
 SITE+=		${FILESDIR}/site.config.m4
 .if !defined(SENDMAIL_MILTER_IN_BASE)
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif
 
 .include <bsd.port.pre.mk>
 
 SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"
 
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
 BROKEN=		dkim-milter does not verify DomainKeys correctly
 LIBDK_PORT=	mail/dk-milter
 BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/${LIBDK_PORT}:patch
 DKMILTER_DISTNAME!=	cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V DISTNAME
 LIBDK_PATH=	${PORTSDIR}/${LIBDK_PORT}/work/${DKMILTER_DISTNAME}/libdk
 .endif
 
 pre-fetch:
 .if defined(SENDMAIL_WITHOUT_MILTER)
 	@${ECHO_MSG}
 	@${ECHO_MSG} You must unset variable SENDMAIL_WITHOUT_MILTER,
 	@${ECHO_MSG} and rebuild sendmail in the ports
 	@${FALSE}
 .endif
 	@${ECHO_MSG}
 	@${ECHO_MSG} "dkim-milter has the following tunable option(s):"
 #	@${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes	Verify DomainKeys using dk-milter's libdk"
 	@${ECHO_MSG} " SENDMAIL_MILTER_IN_BASE=yes	Build to run with base sendmail"
 	@${ECHO_MSG} " WITH_POSTFIX=yes		Build to run with postfix port"
 	@${ECHO_MSG}
 	@sleep 5
 
 post-extract:
 	@${CP} ${WRKSRC}/dkim-filter/autorespond.csh ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \
 		-e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e "s|\`-O'|\`${CFLAGS}'|g" \
 		${WRKSRC}/devtools/OS/FreeBSD
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${SITE} > ${WCONF}/site.config.m4
 
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
 	@${REINPLACE_CMD} -e "/bldPUSH_SMLIB(\`dk')/s|^dnl ||" \
 		-e "/-I\.\.\/libdk\//s|^dnl ||" \
 		-e '/-DVERIFY_DOMAINKEYS/s|^dnl ||' \
 		${WRKSRC}/dkim-filter/Makefile.m4
 	${LN} -s ${LIBDK_PATH} ${WRKSRC}/
 .endif
 
 post-install:
 	@${STRIP_CMD} ${PREFIX}/libexec/dkim-filter
 	${INSTALL_SCRIPT} ${WRKSRC}/dkim-filter/gentxt.csh \
 		${PREFIX}/sbin/gentxt-dkim
 .for i in ${MAN8}
 	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8/
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/dkim-milter/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.18
\ No newline at end of property
+1.19
\ No newline at end of property
Index: head/mail/dkim-milter/distinfo
===================================================================
--- head/mail/dkim-milter/distinfo	(revision 189388)
+++ head/mail/dkim-milter/distinfo	(revision 189389)
@@ -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

Property changes on: head/mail/dkim-milter/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.9
\ No newline at end of property
+1.10
\ No newline at end of property
Index: head/mail/dkim-milter/files/milter-dkim.sh.in
===================================================================
--- head/mail/dkim-milter/files/milter-dkim.sh.in	(revision 189388)
+++ head/mail/dkim-milter/files/milter-dkim.sh.in	(revision 189389)
@@ -1,123 +1,149 @@
 #!/bin/sh
 #
 # $FreeBSD$
 #
 
 # PROVIDE: milter-dkim
 # REQUIRE: DAEMON
 # BEFORE: mail
 # KEYWORD: shutdown
 
 # Define these milterdkim_* variables in one of these files:
 #	/etc/rc.conf
 #	/etc/rc.conf.local
 #	/etc/rc.conf.d/milterdkim
 #
 # milterdkim_enable (bool):   Set to "NO" by default.
 #                             Set it to "YES" to enable dkim-milter
 # milterdkim_uid (str):       Set username to run milter.
 # milterdkim_profiles (list): Set to "" by default.
 #                             Define your profiles here.
 # milterdkim_socket (str):    Path to the milter socket.
 # milterdkim_domain (str):    Domainpart of From: in mails to sign.
 # milterdkim_key (str):       Path to the private key file to sign with.
 # milterdkim_selector (str):  Selector to use when signing
 # milterdkim_alg (str):       Algorithm to use when signing
 # milterdkim_flags (str):     Flags passed to start command.
 #
 # milterdkim_${profile}_* :   Variables per profile.
 #                             Sockets must be different from each other.
 #
 # DO NOT CHANGE THESE DEFAULT VALUES HERE
 #
 milterdkim_enable=${milterdkim_enable:-"NO"}
 milterdkim_uid=${milterdkim_uid:-"mailnull"}
 milterdkim_profiles=${milterdkim_profiles:-}
 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%%
 
 name="milterdkim"
 rcvar=`set_rcvar`
 
 start_precmd="dkim_prepcmd"
 stop_postcmd="dkim_postcmd"
 command="%%PREFIX%%/libexec/dkim-filter"
 _piddir="/var/run/milterdkim"
 pidfile="${_piddir}/pid"
 
 load_rc_config $name
 
 if [ -n "$2" ]; then
     profile="$2"
     if [ "x${milterdkim_profiles}" != "x" ]; then
 	pidfile="${_piddir}/${profile}.pid"
 	eval milterdkim_enable="\${milterdkim_${profile}_enable:-${milterdkim_enable}}"
 	eval milterdkim_socket="\${milterdkim_${profile}_socket:-}"
 	if [ "x${milterdkim_socket}" = "x" ];then
 	    echo "You must define a socket (milterdkim_${profile}_socket)"
 	    exit 1
 	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
 else
     if [ "x${milterdkim_profiles}" != "x" -a "x$1" != "x" ]; then
 	if [ "x$1" != "xrestart" ]; then
 	    for profile in ${milterdkim_profiles}; do
 		echo "===> milterdkim profile: ${profile}"
 		%%RC_SCRIPT%% $1 ${profile}
 		retcode="$?"
 		if [ "0${retcode}" -ne 0 ]; then
 		    failed="${profile} (${retcode}) ${failed:-}"
 		else
 		    success="${profile} ${success:-}"
 		fi
 	    done
 	    exit 0
 	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
 
 dkim_prepcmd ()
 {
     if [ -S ${milterdkim_socket##local:} ] ; then
         rm -f ${milterdkim_socket##local:}
     elif [ -S ${milterdkim_socket##unix:} ] ; then
         rm -f ${milterdkim_socket##unix:}
     fi
     if [ ! -d ${_piddir} ] ; then
 	mkdir -p ${_piddir}
     fi
     if [ -n "${milterdkim_uid}" ] ; then
 	chown ${milterdkim_uid} ${_piddir}
     fi
 }
 
 dkim_postcmd()
 {
     if [ -S ${milterdkim_socket##local:} ] ; then
         rm -f ${milterdkim_socket##local:}
     elif [ -S ${milterdkim_socket##unix:} ] ; then
         rm -f ${milterdkim_socket##unix:}
     fi
     # just if the directory is empty
     rmdir ${_piddir} > /dev/null 2>&1
 }
 
 run_rc_command "$1"

Property changes on: head/mail/dkim-milter/files/milter-dkim.sh.in
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.7
\ No newline at end of property
+1.8
\ No newline at end of property