- Update to 2.6.0.

- Added note on UPDATING to upgrade dkim-milter.

PR:		ports/124486
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)
Approved by:	gabor (mentor, implicit)

6 files changed, 31 insertions, 27 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 50bc39792f24..635287ac4e42 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -13,17 +13,16 @@
 ## base system, building this port may fail.
 
 PORTNAME=	dkim-milter
-PORTVERSION=	2.5.5
-PORTREVISION=	1
+PORTVERSION=	2.6.0
 CATEGORIES=	mail
-MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
-MASTER_SITE_SUBDIR=	${PORTNAME}
+MASTER_SITES=	SF
 
 MAINTAINER=	umq@ueo.co.jp
 COMMENT=	Domainkeys Identified Mail (DKIM) milter
 
 USE_RC_SUBR=	milter-dkim.sh
 USE_OPENSSL=	yes
+USE_LDCONFIG=	yes
 
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
 WITH_SENDMAIL_BASE=	yes
@@ -52,10 +51,10 @@ PLIST_FILES=	etc/mail/dkim-filter.conf.sample include/dkim.h \
 PLIST_DIRS=	etc/mail
 PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
 		autorespond.csh \
-		draft-hoffman-dac-vbr-02.txt draft-ietf-dkim-deployment-01.txt \
+		draft-hoffman-dac-vbr-03.txt draft-ietf-dkim-deployment-01.txt \
 		draft-ietf-dkim-overview-09.txt draft-ietf-dkim-ssp-03.txt \
-		draft-kucherawy-sender-auth-header-14.txt \
-		rfc4686.txt rfc4871.txt rfc5016.txt
+		draft-kucherawy-dkim-reporting-02.txt draft-kucherawy-sender-auth-header-14.txt \
+		draft-shafranovich-feedback-report-04.txt rfc4686.txt rfc4871.txt rfc5016.txt
 .if !defined(NOPORTDOCS)
 LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/overview.html \
@@ -91,15 +90,16 @@ LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/dkim_options.html \
 		${DOCSDIR_REL}/libdkim/dkim_param_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy.html \
+		${DOCSDIR_REL}/libdkim/dkim_policy_getreportinfo.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy_syntax.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_presult.html \
 		${DOCSDIR_REL}/libdkim/dkim_pstate.html \
 		${DOCSDIR_REL}/libdkim/dkim_query_t.html \
-		${DOCSDIR_REL}/libdkim/dkim_reportinfo.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_dns_callback.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_final.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_key_lookup.html \
+		${DOCSDIR_REL}/libdkim/dkim_set_margin.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_policy_lookup.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_prescreen.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_signature_handle.html \
@@ -115,9 +115,11 @@ LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_geterrorstr.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getflags.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getkeysize.html \
+		${DOCSDIR_REL}/libdkim/dkim_sig_getreportinfo.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getselector.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getsignalg.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getsigntime.html \
+		${DOCSDIR_REL}/libdkim/dkim_sig_hdrsigned.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_ignore.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_process.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_syntax.html \
diff --git a/mail/dkim-milter/Makefile.features b/mail/dkim-milter/Makefile.features
index 2a466002b633..2c455b8ab37d 100644
--- a/mail/dkim-milter/Makefile.features
+++ b/mail/dkim-milter/Makefile.features
@@ -11,10 +11,6 @@
 SITE_SUB+=	-e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||'
 .endif
 
-.if defined(WITH_AUTHSERV_JOBID) && !defined(WITHOUT_AUTHSERV_JOBID)
-SITE_SUB+=	-e '/-D_FFR_AUTHSERV_JOBID/s|^dnl ||'
-.endif
-
 .if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB)
 SITE_SUB+=	-e '/-D_FFR_BODYLENGTH_DB/s|^dnl ||'
 .endif
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index c681800d81f5..510da7fbc6f4 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,3 +1,3 @@
-MD5 (dkim-milter-2.5.5.tar.gz) = 8e2be29e0edb198642523880821b3166
-SHA256 (dkim-milter-2.5.5.tar.gz) = 683b9924225e30ec4add5eb3229552fd8f5e3b94f5bace50429f66f2235424fe
-SIZE (dkim-milter-2.5.5.tar.gz) = 646196
+MD5 (dkim-milter-2.6.0.tar.gz) = ce97bbd5b220bb4266cfd662c8fdf6d0
+SHA256 (dkim-milter-2.6.0.tar.gz) = dfc84cbb2de3f16fca9beea543da34225fa56bf873fc422c6ae63145e57f64b3
+SIZE (dkim-milter-2.6.0.tar.gz) = 681667
diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in
index dc43908dbc50..71644798829e 100644
--- a/mail/dkim-milter/files/milter-dkim.sh.in
+++ b/mail/dkim-milter/files/milter-dkim.sh.in
@@ -18,24 +18,27 @@
 # milterdkim_uid (str):       Set username to run milter.
 # milterdkim_profiles (list): Set to "" by default.
 #                             Define your profiles here.
+# milterdkim_cfgfile (str):   Configuration file. See dkim-filter.conf(5)
+#
+# milterdkim_${profile}_* :   Variables per profile.
+#                             Sockets must be different from each other.
+#
+#  all parameters below now can be set in dkim-filter.conf(5).
 # milterdkim_socket (str):    Path to the milter socket.
-# milterdkim_cfgfile (str):   Configuration file. Also see dkim-filter.conf(5)
 # 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_cfgfile=${milterdkim_cfgfile:-"%%PREFIX%%/etc/mail/dkim-filter.conf"}
+
+milterdkim_socket=${milterdkim_socket:-}
 milterdkim_domain=${milterdkim_domain:-}
 milterdkim_key=${milterdkim_key:-}
 milterdkim_selector=${milterdkim_selector:-}
@@ -78,6 +81,9 @@ if [ -n "$2" ]; then
 	else
 	    milterdkim_cfgfile=""
 	fi
+	if [ "x${milterdkim_socket}" != "x" ];then
+	    milterdkim_socket="-p ${milterdkim_socket}"
+	fi
 	if [ "x${milterdkim_domain}" != "x" ];then
 	    milterdkim_domain="-d ${milterdkim_domain}"
 	fi
@@ -90,7 +96,7 @@ if [ -n "$2" ]; then
 	if [ "x${milterdkim_alg}" != "x" ];then
 	    milterdkim_alg="-S ${milterdkim_alg}"
 	fi
-	command_args="-l -p ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
+	command_args="-l ${milterdkim_socket} -u ${milterdkim_uid} -P ${pidfile} ${milterdkim_cfgfile} ${milterdkim_domain} ${milterdkim_key} ${milterdkim_selector} ${milterdkim_alg}"
     else
 	echo "$0: extra argument ignored"
     fi
diff --git a/mail/dkim-milter/pkg-message b/mail/dkim-milter/pkg-message
index efdf6da6ff85..06c56e9b4691 100644
--- a/mail/dkim-milter/pkg-message
+++ b/mail/dkim-milter/pkg-message
@@ -1,9 +1,9 @@
 ************************************************************************
 
-In order to run this port, please add the following lines to
-/etc/mail/<your_configuration>.mc:
+In order to run this port, write your dkim-filter.conf and add the
+milter socket path in /etc/mail/<your_configuration>.mc:
 
-INPUT_MAIL_FILTER(`dkim-filter', `S=unix:/var/run/milterdkim/filter, F=T, T=R:2m')
+INPUT_MAIL_FILTER(`dkim-filter', `S=_YOUR_SOCKET_PATH_, F=T, T=R:2m')
 
 And to run the milter from startup, add milterdkim_enable="YES" in
 your /etc/rc.conf.
diff --git a/mail/dkim-milter/pkg-message.postfix b/mail/dkim-milter/pkg-message.postfix
index 48ee6898cf84..0cbb441bd378 100644
--- a/mail/dkim-milter/pkg-message.postfix
+++ b/mail/dkim-milter/pkg-message.postfix
@@ -1,9 +1,9 @@
 ************************************************************************
 
-In order to run this port, please add the following lines to
-${PREFIX}/etc/mail/main.cf:
+In order to run this port, write your dkim-filter.conf and add your
+milter socket path in ${PREFIX}/etc/mail/main.cf:
 
-smtpd_milters = unix:/var/run/milterdkim/filter
+smtpd_milters = _YOUR_SOCKET_PATH_
 
 And to run the milter from startup, add milterdkim_enable="YES" in
 your /etc/rc.conf.