5 files changed, 105 insertions, 6 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 0c3c61f1c28b..0ebfa5832ff8 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -13,7 +13,7 @@
 ## base system, building this port may fail.
 
 PORTNAME=	dkim-milter
-PORTVERSION=	0.6.3
+PORTVERSION=	0.6.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -22,6 +22,7 @@ MAINTAINER=	umq@ueo.co.jp
 COMMENT=	Domainkeys Identified Mail (DKIM) milter
 
 USE_RC_SUBR=	milter-dkim.sh
+USE_OPENSSL=	yes
 
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
 SENDMAIL_MILTER_IN_BASE=	yes
@@ -75,6 +76,10 @@ pre-fetch:
 	@${FALSE}
 .endif
 	@${ECHO_MSG}
+	@${ECHO_MSG} "If you do not have OpenSSL 0.9.8 or later installed,"
+	@${ECHO_MSG} "set WITH_OPENSSL_PORT=yes to support rsa-sha256 algorithm"
+	@${ECHO_MSG} "which is requied in the latest specification."
+	@${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"
@@ -93,6 +98,8 @@ post-patch:
 		${WRKSRC}/devtools/OS/FreeBSD
 	@${SED} -e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g" \
+		-e "s|%%OPENSSLINC%%|${OPENSSLINC}|g" \
+		-e "s|%%OPENSSLLIB%%|${OPENSSLLIB}|g" \
 		${SITE} > ${WCONF}/site.config.m4
 
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
@@ -103,6 +110,8 @@ post-patch:
 	${LN} -s ${LIBDK_PATH} ${WRKSRC}/
 .endif
 
+.include "${.CURDIR}/Makefile.features"
+
 post-install:
 	@${STRIP_CMD} ${PREFIX}/libexec/dkim-filter
 	${INSTALL_SCRIPT} ${WRKSRC}/dkim-filter/gentxt.csh \
diff --git a/mail/dkim-milter/Makefile.features b/mail/dkim-milter/Makefile.features
new file mode 100644
index 000000000000..ddd36e2b295f
--- /dev/null
+++ b/mail/dkim-milter/Makefile.features
@@ -0,0 +1,86 @@
+# Makefile.features
+# Author:			Hirohisa Yamaguchi <umq@ueo.co.jp>
+#
+# This file is used to tune build time options.
+# Please refer FEATURES file distributed with the source for details.
+#
+# $FreeBSD$
+#
+
+.if defined(WITH_ALLMAN_SSP_02) && !defined(WITHOUT_ALLMAN_SSP_02)
+	@${REINPLACE_CMD} -e '/-D_FFR_ALLMAN_SSP_02/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4 \
+		${WRKSRC}/libdkim/Makefile.m4
+.endif
+
+.if defined(WITH_ANTICIPATE_SENDMAIL_MUNGE) && !defined(WITHOUT_ANTICIPATE_SENDMAIL_MUNGE)
+	@${REINPLACE_CMD} -e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_FLUSH_HEADERS) && !defined(WITHOUT_FLUSH_HEADERS)
+	@${REINPLACE_CMD} -e '/-D_FFR_FLUSH_HEADERS/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_LOG_SSL_ERRORS) && !defined(WITHOUT_LOG_SSL_ERRORS)
+	@${REINPLACE_CMD} -e '/-D_FFR_LOG_SSL_ERRORS/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_MULTIPLE_KEYS) && !defined(WITHOUT_MULTIPLE_KEYS)
+	@${REINPLACE_CMD} -e '/-D_FFR_MULTIPLE_KEYS/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_OMIT_HEADERS) && !defined(WITHOUT_OMIT_HEADERS)
+	@${REINPLACE_CMD} -e '/-D_FFR_OMIT_HEADERS/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_QUERY_FILE) && !defined(WITHOUT_QUERY_FILE)
+	@${REINPLACE_CMD} -e '/-D_FFR_QUERY_FILE/s|^dnl ||' \
+		${WRKSRC}/libdkim/Makefile.m4
+.endif
+
+.if defined(WITH_QUARANTINE) && !defined(WITHOUT_QUARANTINE)
+	@${REINPLACE_CMD} -e '/-D_FFR_QUARANTINE/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_REPORTINFO) && !defined(WITHOUT_REPORTINFO)
+	@${REINPLACE_CMD} -e '/-D_FFR_REPORTINFO/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_REQUIRED_HEADERS) && !defined(WITHOUT_REQUIRED_HEADERS)
+	@${REINPLACE_CMD} -e '/-D_FFR_REQUIRED_HEADERS/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
+	@${REINPLACE_CMD} -e '/-D_FFR_SELECT_CANONICALIZATION/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_SELECT_SIGN_HEADERS) && !defined(WITHOUT_SELECT_SIGN_HEADERS)
+	@${REINPLACE_CMD} -e '/-D_FFR_SELECT_SIGN_HEADERS/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_SET_DNS_CALLBACK) && !defined(WITHOUT_SET_DNS_CALLBACK)
+	@${REINPLACE_CMD} -e '/-D_FFR_SET_DNS_CALLBACK/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4 \
+		${WRKSRC}/libdkim/Makefile.m4
+.endif
+
+.if defined(WITH_SET_REPLY) && !defined(WITHOUT_SET_REPLY)
+	@${REINPLACE_CMD} -e '/-D_FFR_SET_REPLY/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4
+.endif
+
+.if defined(WITH_VBR) && !defined(WITHOUT_VBR)
+	@${REINPLACE_CMD} -e '/-D_FFR_VBR/s|^dnl ||' \
+		${WRKSRC}/dkim-filter/Makefile.m4 \
+		${WRKSRC}/libdkim/Makefile.m4
+.endif
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 8f73243a320e..f0bc333010ec 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (dkim-milter-0.6.4.tar.gz) = 6324ea1949b36e6a08bdc590c43b2908
+SHA256 (dkim-milter-0.6.4.tar.gz) = d074811c9785ff8069049842d8dddd806fb34ddb2b5b3eb28e8318eb15a1bafd
+SIZE (dkim-milter-0.6.4.tar.gz) = 482643
diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in
index 897f2972d4cd..1d604fee72a9 100644
--- a/mail/dkim-milter/files/milter-dkim.sh.in
+++ b/mail/dkim-milter/files/milter-dkim.sh.in
@@ -35,8 +35,8 @@ 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_key=${milterdkim_key:-}
+milterdkim_selector=${milterdkim_selector:-}
 milterdkim_alg=${milterdkim_alg:-}
 # Options other than above can be set with $milterdkim_flags.
 # see dkim-milter documentation for detail.
diff --git a/mail/dkim-milter/files/site.config.m4 b/mail/dkim-milter/files/site.config.m4
index 27e89c0c22a6..23dee76199f5 100644
--- a/mail/dkim-milter/files/site.config.m4
+++ b/mail/dkim-milter/files/site.config.m4
@@ -4,3 +4,7 @@ define(`confMANROOTMAN',`%%PREFIX%%/man/man')
 define(`confUBINDIR',`%%PREFIX%%/libexec')
 define(`confLIBDIR',`%%PREFIX%%/lib')
 define(`confDONT_INSTALL_CATMAN',`True')
+APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')
+APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%%')
+APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')
+APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%%')