- Update to 2.0.1

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

4 files changed, 39 insertions, 20 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 93c8cadeebf1..2a835042c866 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=	1.2.0
+PORTVERSION=	2.0.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
@@ -49,7 +49,7 @@ PLIST_FILES=	libexec/dkim-filter sbin/gentxt-dkim \
 PLIST_DIRS=	etc/mail
 PORTDOCS=	FEATURES INSTALL KNOWNBUGS LICENSE README RELEASE_NOTES \
 		autorespond.csh \
-		draft-hoffman-dac-vbr-00.txt draft-ietf-dkim-overview-05.txt \
+		draft-hoffman-dac-vbr-01.txt draft-ietf-dkim-overview-05.txt \
 		draft-ietf-dkim-ssp-00.txt draft-ietf-dkim-ssp-requirements-04.txt \
 		rfc4686.txt rfc4871.txt
 .if !defined(NOPORTDOCS)
@@ -64,13 +64,10 @@ LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/dkim_eoh.html \
 		${DOCSDIR_REL}/libdkim/dkim_eom.html \
 		${DOCSDIR_REL}/libdkim/dkim_free.html \
-		${DOCSDIR_REL}/libdkim/dkim_getcanonlen.html \
-		${DOCSDIR_REL}/libdkim/dkim_getkeysize.html \
-		${DOCSDIR_REL}/libdkim/dkim_getselector.html \
-		${DOCSDIR_REL}/libdkim/dkim_getsigdomain.html \
+		${DOCSDIR_REL}/libdkim/dkim_get_user_context.html \
 		${DOCSDIR_REL}/libdkim/dkim_getsighdr.html \
-		${DOCSDIR_REL}/libdkim/dkim_getsignalg.html \
-		${DOCSDIR_REL}/libdkim/dkim_getsigntime.html \
+		${DOCSDIR_REL}/libdkim/dkim_getsiglist.html \
+		${DOCSDIR_REL}/libdkim/dkim_getsignature.html \
 		${DOCSDIR_REL}/libdkim/dkim_header.html \
 		${DOCSDIR_REL}/libdkim/dkim_init.html \
 		${DOCSDIR_REL}/libdkim/dkim_lib.html \
@@ -82,6 +79,7 @@ LIBDOCS=	${DOCSDIR_REL}/libdkim/index.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_policy_lookup.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_prescreen.html \
@@ -90,8 +88,20 @@ LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_signature_tagvalues.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_signer.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_user_context.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_getdomain.html \
+		${DOCSDIR_REL}/libdkim/dkim_sig_geterror.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_getselector.html \
+		${DOCSDIR_REL}/libdkim/dkim_sig_getsignalg.html \
+		${DOCSDIR_REL}/libdkim/dkim_sig_getsigntime.html \
 		${DOCSDIR_REL}/libdkim/dkim_sig_ignore.html \
+		${DOCSDIR_REL}/libdkim/dkim_sig_process.html \
+		${DOCSDIR_REL}/libdkim/dkim_sigerror.html \
 		${DOCSDIR_REL}/libdkim/dkim_siginfo.html \
 		${DOCSDIR_REL}/libdkim/dkim_sigkey_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_sign.html \
@@ -167,6 +177,12 @@ SITE_SUB+=	-e 's|%%OPENSSL%%||g' \
 		-e "s|%%OPENSSLINC%%|${OPENSSLINC}|g" \
 		-e "s|%%OPENSSLLIB%%|${OPENSSLLIB}|g"
 .endif
+.if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)
+SITE_SUB+=	-e 's|%%LIBTRE%%||g'
+LIB_DEPENDS+=	tre:${PORTSDIR}/textproc/libtre
+.else
+SITE_SUB+=	-e 's|%%LIBTRE%%|dnl |g'
+.endif
 
 pre-fetch:
 .if defined(SENDMAIL_MILTER_IN_BASE)
diff --git a/mail/dkim-milter/Makefile.features b/mail/dkim-milter/Makefile.features
index 433fc0168415..ee44481d9bf2 100644
--- a/mail/dkim-milter/Makefile.features
+++ b/mail/dkim-milter/Makefile.features
@@ -15,12 +15,12 @@ SITE_SUB+=	-e '/-D_FFR_ANTICIPATE_SENDMAIL_MUNGE/s|^dnl ||'
 SITE_SUB+=	-e '/-D_FFR_CAPTURE_UNKNOWN_ERRORS/s|^dnl ||'
 .endif
 
-.if defined(WITH_FLUSH_HEADERS) && !defined(WITHOUT_FLUSH_HEADERS)
-SITE_SUB+=	-e '/-D_FFR_FLUSH_HEADERS/s|^dnl ||'
+.if defined(WITH_DIFFHEADERS) && !defined(WITHOUT_DIFFHEADERS)
+SITE_SUB+=	-e '/-D_FFR_DIFFHEADERS/s|^dnl ||'
 .endif
 
-.if defined(WITH_HASH_BUFFERING) && !defined(WITHOUT_HASH_BUFFERING)
-SITE_SUB+=	-e '/-D_FFR_HASH_BUFFERING/s|^dnl ||'
+.if defined(WITH_KEY_REUSE) && !defined(WITHOUT_KEY_REUSE)
+SITE_SUB+=	-e '/-D_FFR_KEY_REUSE/s|^dnl ||'
 .endif
 
 .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index da205e27d2bd..dff75269f2db 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,3 +1,3 @@
-MD5 (dkim-milter-1.2.0.tar.gz) = b677371db85a83f21d78ea6c83915eda
-SHA256 (dkim-milter-1.2.0.tar.gz) = 6c3797940aaf342ee0504c996bcf96e1fc9f78328da4e6bda5fb0b49cffa2274
-SIZE (dkim-milter-1.2.0.tar.gz) = 520694
+MD5 (dkim-milter-2.0.1.tar.gz) = ca2c408156ae08f39e571387bd8dfbb3
+SHA256 (dkim-milter-2.0.1.tar.gz) = 39771331c639cdec3ff101756d92233c2461b3d72d39b810f648a21bba03bb62
+SIZE (dkim-milter-2.0.1.tar.gz) = 546559
diff --git a/mail/dkim-milter/files/site.config.m4 b/mail/dkim-milter/files/site.config.m4
index 5a47ce8894a0..10e9967b3fea 100644
--- a/mail/dkim-milter/files/site.config.m4
+++ b/mail/dkim-milter/files/site.config.m4
@@ -5,8 +5,11 @@ define(`confUBINDIR',`%%PREFIX%%/libexec')
 define(`confLIBDIR',`%%PREFIX%%/lib')
 define(`confDONT_INSTALL_CATMAN',`True')
 %%STATIC%%APPENDDEF(`confLIBS', `-static ')
-%%BDB%%APPENDDEF(`confLIBDIRS', `-L%%BDB_LIB_DIR%%')
-%%BDB%%APPENDDEF(`confINCDIRS', `-I%%BDB_INCLUDE_DIR%%')
-%%BDB%%APPENDDEF(`confLIBS', `-l%%BDB_LIB_NAME%%')
-%%OPENSSL%%APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%% -R%%OPENSSLLIB%%')
-%%OPENSSL%%APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%%')
+%%BDB%%APPENDDEF(`confLIBDIRS', `-L%%BDB_LIB_DIR%% ')
+%%BDB%%APPENDDEF(`confINCDIRS', `-I%%BDB_INCLUDE_DIR%% ')
+%%BDB%%APPENDDEF(`confLIBS', `-l%%BDB_LIB_NAME%% ')
+%%OPENSSL%%APPENDDEF(`confLIBDIRS', `-L%%OPENSSLLIB%% -R%%OPENSSLLIB%% ')
+%%OPENSSL%%APPENDDEF(`confINCDIRS', `-I%%OPENSSLINC%% ')
+%%LIBTRE%%APPENDDEF(`confINCDIRS', `-I/usr/local/include/tre ')
+%%LIBTRE%%APPENDDEF(`confLIBDIRS', `-L/usr/local/lib ')
+%%LIBTRE%%APPENDDEF(`confLIBS', `-ltre ')