- Update to 2.7.0

PR:		125933
Submitted by:	Hirohisa Yamaguchi <umq@ueo.co.jp> (maintainer)

5 files changed, 15 insertions, 12 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 635287ac4e42..d438116fa18e 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=	2.6.0
+PORTVERSION=	2.7.0
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -52,9 +52,9 @@ PLIST_DIRS=	etc/mail
 PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
 		autorespond.csh \
 		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-dkim-reporting-02.txt draft-kucherawy-sender-auth-header-14.txt \
-		draft-shafranovich-feedback-report-04.txt rfc4686.txt rfc4871.txt rfc5016.txt
+		draft-ietf-dkim-overview-10.txt draft-ietf-dkim-ssp-04.txt \
+		draft-kucherawy-dkim-reporting-04.txt draft-kucherawy-sender-auth-header-15.txt \
+		draft-shafranovich-feedback-report-05.txt rfc4686.txt rfc4871.txt rfc5016.txt
 .if !defined(NOPORTDOCS)
 LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/overview.html \
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 510da7fbc6f4..c12ea6e0a648 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,3 +1,3 @@
-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
+MD5 (dkim-milter-2.7.0.tar.gz) = 8a8fa80ee205132d25a482c5ff60e6e0
+SHA256 (dkim-milter-2.7.0.tar.gz) = bad14fa28acfbf600761242ed538d2e64a132f81e67b4421e2e91d7efb757784
+SIZE (dkim-milter-2.7.0.tar.gz) = 688001
diff --git a/mail/dkim-milter/files/milter-dkim.sh.in b/mail/dkim-milter/files/milter-dkim.sh.in
index 71644798829e..46c716aff123 100644
--- a/mail/dkim-milter/files/milter-dkim.sh.in
+++ b/mail/dkim-milter/files/milter-dkim.sh.in
@@ -123,6 +123,9 @@ else
 	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
@@ -135,7 +138,7 @@ else
 	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}"
     fi
 fi
 
diff --git a/mail/dkim-milter/pkg-message b/mail/dkim-milter/pkg-message
index 06c56e9b4691..0def2b9a2b85 100644
--- a/mail/dkim-milter/pkg-message
+++ b/mail/dkim-milter/pkg-message
@@ -1,9 +1,9 @@
 ************************************************************************
 
 In order to run this port, write your dkim-filter.conf and add the
-milter socket path in /etc/mail/<your_configuration>.mc:
+milter socket `socketspec' in /etc/mail/<your_configuration>.mc:
 
-INPUT_MAIL_FILTER(`dkim-filter', `S=_YOUR_SOCKET_PATH_, F=T, T=R:2m')
+INPUT_MAIL_FILTER(`dkim-filter', `S=_YOUR_SOCKET_SPEC_, 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 0cbb441bd378..a99a69df23bb 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, write your dkim-filter.conf and add your
-milter socket path in ${PREFIX}/etc/mail/main.cf:
+milter socket `socketspec' in ${PREFIX}/etc/mail/main.cf:
 
-smtpd_milters = _YOUR_SOCKET_PATH_
+smtpd_milters = _YOUR_SOCKET_SPEC_
 
 And to run the milter from startup, add milterdkim_enable="YES" in
 your /etc/rc.conf.