- Update to 2.8.0

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

3 files changed, 25 insertions, 14 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 837626fb2ada..65b9eadd330d 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.7.2
+PORTVERSION=	2.8.0
 CATEGORIES=	mail
 MASTER_SITES=	SF
 
@@ -51,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-03.txt draft-ietf-dkim-deployment-01.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
+		draft-hoffman-dac-vbr-05.txt draft-ietf-dkim-deployment-02.txt \
+		draft-ietf-dkim-overview-10.txt draft-ietf-dkim-ssp-08.txt \
+		draft-kucherawy-dkim-reporting-04.txt draft-kucherawy-sender-auth-header-19.txt \
+		draft-shafranovich-feedback-report-06.txt rfc4686.txt rfc4871.txt rfc5016.txt
 .if !defined(NOPORTDOCS)
 LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/overview.html \
@@ -65,6 +65,7 @@ LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/dkim_cbstat.html \
 		${DOCSDIR_REL}/libdkim/dkim_chunk.html \
 		${DOCSDIR_REL}/libdkim/dkim_close.html \
+		${DOCSDIR_REL}/libdkim/dkim_dnssec.html \
 		${DOCSDIR_REL}/libdkim/dkim_eoh.html \
 		${DOCSDIR_REL}/libdkim/dkim_eom.html \
 		${DOCSDIR_REL}/libdkim/dkim_flush_cache.html \
@@ -90,6 +91,7 @@ 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_getdnssec.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy_getreportinfo.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy_syntax.html \
 		${DOCSDIR_REL}/libdkim/dkim_policy_t.html \
@@ -110,6 +112,7 @@ LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getbh.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getcanonlen.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getcontext.html \
+		${DOCSDIR_REL}/libdkim/dkim_sig_getdnssec.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_getdomain.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_geterror.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_geterrorstr.html \
diff --git a/mail/dkim-milter/Makefile.features b/mail/dkim-milter/Makefile.features
index 2c455b8ab37d..75c0659fb2bc 100644
--- a/mail/dkim-milter/Makefile.features
+++ b/mail/dkim-milter/Makefile.features
@@ -7,10 +7,6 @@
 # $FreeBSD$
 #
 
-.if defined(WITH_ANTICIPATE_SENDMAIL_MUNGE) && !defined(WITHOUT_ANTICIPATE_SENDMAIL_MUNGE)
-SITE_SUB+=	-e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||'
-.endif
-
 .if defined(WITH_BODYLENGTH_DB) && !defined(WITHOUT_BODYLENGTH_DB)
 SITE_SUB+=	-e '/-D_FFR_BODYLENGTH_DB/s|^dnl ||'
 .endif
@@ -19,14 +15,26 @@ SITE_SUB+=	-e '/-D_FFR_BODYLENGTH_DB/s|^dnl ||'
 SITE_SUB+=	-e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s|^dnl ||'
 .endif
 
+.if defined(WITH_COMMAIZE) && !defined(WITHOUT_COMMAIZE)
+SITE_SUB+=	-e '/-D_FFR_COMMAIZE/s|^dnl ||'
+.endif
+
 .if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)
 SITE_SUB+=	-e '/-D_FFR_DIFFHEADERS/s|^dnl ||'
 .endif
 
+.if defined(WITH_DKIM_REPUTATION) && !defined(WITHOUT_DKIM_REPUTATION)
+SITE_SUB+=	-e '/-D_FFR_DKIM_REPUTATION/s|^dnl ||'
+.endif
+
 .if defined(WITH_DNS_UPGRADE) && !defined(WITHOUT_DNS_UPGRADE)
 SITE_SUB+=	-e '/-D_FFR_DNS_UPGRADE/s|^dnl ||'
 .endif
 
+.if defined(WITH_MULTIPLE_SIGNATURES) && !defined(WITHOUT_MULTIPLE_SIGNATURES)
+SITE_SUB+=	-e '/-D_FFR_MULTIPLE_SIGNATURES/s|^dnl ||'
+.endif
+
 .if defined(WITH_PARSE_TIME) && !defined(WITHOUT_PARSE_TIME)
 BROKEN=		The feature ``_FFR_PARSE_TIME'' is incomplete, does not work
 SITE_SUB+=	-e '/-D_FFR_PARSE_TIME/s|^dnl ||'
@@ -36,8 +44,8 @@ SITE_SUB+=	-e '/-D_FFR_PARSE_TIME/s|^dnl ||'
 SITE_SUB+=	-e '/-D_FFR_REPLACE_RULES/s|^dnl ||'
 .endif
 
-.if defined(WITH_REQUIRED_HEADERS) && !defined(WITHOUT_REQUIRED_HEADERS)
-SITE_SUB+=	-e '/-D_FFR_REQUIRED_HEADERS/s|^dnl ||'
+.if defined(WITH_REPORT_INTERVALS) && !defined(WITHOUT_REPORT_INTERVALS)
+SITE_SUB+=	-e '/-D_FFR_REPORT_INTERVALS/s|^dnl ||'
 .endif
 
 .if defined(WITH_SELECT_CANONICALIZATION) && !defined(WITHOUT_SELECT_CANONICALIZATION)
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index eda86d9baed3..9c54e9fa02cc 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,3 +1,3 @@
-MD5 (dkim-milter-2.7.2.tar.gz) = db26dd58142190a3aff24be0cef1156f
-SHA256 (dkim-milter-2.7.2.tar.gz) = f430ffd88bd231bc82e207abac872456290bc01d963b57dd2d1fc93e49ef1870
-SIZE (dkim-milter-2.7.2.tar.gz) = 690101
+MD5 (dkim-milter-2.8.0.tar.gz) = 060ffddd0d8d114d4c482e04337af5a9
+SHA256 (dkim-milter-2.8.0.tar.gz) = 94c16d3b69d7300678d5c44e80803622ae7cee65ffe1084cc64824f3e4593be2
+SIZE (dkim-milter-2.8.0.tar.gz) = 725718