Index: head/mail/dkim-milter/Makefile
===================================================================
--- head/mail/dkim-milter/Makefile	(revision 209818)
+++ head/mail/dkim-milter/Makefile	(revision 209819)
@@ -1,304 +1,303 @@
 # New ports collection makefile for:	dkim-milter
 # Date created:				10 Jan 2006
 # Whom:					Hirohisa Yamaguchi <umq@ueo.co.jp>
 #
 # $FreeBSD$
 #
 ## There is a new option WITH_POSTFIX_MILTER
 ## to make this port work with mail/postfix port.
 
 ## WITH_POSTFIX_MILTER knob implicitly defines
 ## WITH_SENDMAIL_BASE, to build with libmilter*
 ## in base system.  If you have deleted sendamil in
 ## base system, building this port may fail.
 
 PORTNAME=	dkim-milter
-PORTVERSION=	2.5.0
-PORTREVISION=	1
+PORTVERSION=	2.5.1
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	${PORTNAME}
 
 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)
 WITH_SENDMAIL_BASE=	yes
 PKGMESSAGE=	pkg-message.postfix
 
 .if defined(SENDMAIL_MILTER_IN_BASE)
 WITH_SENDMAIL_BASE=yes
 .endif
 
 .if defined(WITH_POSTFIX_CURRENT)
 RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix-current
 .else
 RUN_DEPENDS+=	${LOCALBASE}/libexec/postfix/smtpd:${PORTSDIR}/mail/postfix
 .endif
 .endif
 
 SUB_FILES=	milter-dkim.sh
 WCONF=		${WRKSRC}/devtools/Site
 MAN5=		dkim-filter.conf.5
 MAN8=		dkim-filter.8 dkim-genkey.8 dkim-testkey.8 dkim-testssp.8
 PLIST_FILES=	etc/mail/dkim-filter.conf.sample include/dkim.h \
 		bin/dkim-genkey %%STATS%%bin/dkim-stats bin/dkim-testkey \
 		bin/dkim-testssp %%LIBDKIM%%lib/libdkim.a \
 		%%LIBDKIMSHARED%%lib/libdkim.so %%LIBDKIMSHARED%%lib/libdkim.so.0 \
 		libexec/dkim-filter
 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-ietf-dkim-overview-09.txt draft-ietf-dkim-ssp-03.txt \
-		draft-kucherawy-sender-auth-header-12.txt \
+		draft-kucherawy-sender-auth-header-14.txt \
 		rfc4686.txt rfc4871.txt rfc5016.txt
 .if !defined(NOPORTDOCS)
 LIBDOCS=	${DOCSDIR_REL}/libdkim/index.html \
 		${DOCSDIR_REL}/libdkim/overview.html \
 		${DOCSDIR_REL}/libdkim/dkim.html \
 		${DOCSDIR_REL}/libdkim/dkim_alg_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_body.html \
 		${DOCSDIR_REL}/libdkim/dkim_canon_t.html \
 		${DOCSDIR_REL}/libdkim/dkim_cbstat.html \
 		${DOCSDIR_REL}/libdkim/dkim_chunk.html \
 		${DOCSDIR_REL}/libdkim/dkim_close.html \
 		${DOCSDIR_REL}/libdkim/dkim_eoh.html \
 		${DOCSDIR_REL}/libdkim/dkim_eom.html \
 		${DOCSDIR_REL}/libdkim/dkim_flush_cache.html \
 		${DOCSDIR_REL}/libdkim/dkim_free.html \
 		${DOCSDIR_REL}/libdkim/dkim_get_user_context.html \
 		${DOCSDIR_REL}/libdkim/dkim_getcachestats.html \
 		${DOCSDIR_REL}/libdkim/dkim_getdomain.html \
 		${DOCSDIR_REL}/libdkim/dkim_geterror.html \
 		${DOCSDIR_REL}/libdkim/dkim_getmode.html \
 		${DOCSDIR_REL}/libdkim/dkim_getpolicystr.html \
 		${DOCSDIR_REL}/libdkim/dkim_getpresult.html \
 		${DOCSDIR_REL}/libdkim/dkim_getpresultstr.html \
 		${DOCSDIR_REL}/libdkim/dkim_getresultstr.html \
 		${DOCSDIR_REL}/libdkim/dkim_getsighdr.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_key_syntax.html \
 		${DOCSDIR_REL}/libdkim/dkim_lib.html \
 		${DOCSDIR_REL}/libdkim/dkim_minbody.html \
 		${DOCSDIR_REL}/libdkim/dkim_ohdrs.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_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_policy_lookup.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_prescreen.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_signature_handle.html \
 		${DOCSDIR_REL}/libdkim/dkim_set_signature_handle_free.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_sig_syntax.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 \
 		${DOCSDIR_REL}/libdkim/dkim_ssl_version.html \
 		${DOCSDIR_REL}/libdkim/dkim_stat.html \
 		${DOCSDIR_REL}/libdkim/dkim_verify.html \
 		${DOCSDIR_REL}/libdkim/rfc2822_mailbox_split.html
 PLIST_FILES+=	${DOCSDIR_REL}/README.dkim-filter \
 		${DOCSDIR_REL}/README.libdkim \
 		${LIBDOCS}
 PLIST_DIRS+=	${DOCSDIR_REL}/libdkim
 .endif
 
 .include <bsd.port.pre.mk>
 
 WITHOUT_MILTER_CFLAGS=	yes
 WITHOUT_MILTER_LDFLAGS=	yes
 .include "${PORTSDIR}/mail/sendmail/bsd.milter.mk"
 
 SITE+=		${FILESDIR}/site.config.m4
 .if defined(WITH_SENDMAIL_PORT)
 SITE+=		${FILESDIR}/site.config.m4.milter
 .endif
 SITE+=		${WRKSRC}/site.config.m4.dist
 SITE_SUB+=	-e "s|%%PREFIX%%|${PREFIX}|g" \
 		-e "s|%%LOCALBASE%%|${LOCALBASE}|g"
 .if defined(WITH_SENDMAIL_STATIC_MILTER)
 SITE_SUB+=	-e 's|%%STATIC%%||g'
 .else
 SITE_SUB+=	-e 's|%%STATIC%%|dnl |g'
 .endif
 
 SUB_LIST=	"RC_SCRIPT=${PREFIX}/etc/rc.d/${USE_RC_SUBR:S/.sh$//}${RC_SUBR_SUFFIX}"
 
 .if defined(WITH_LIBDKIM_SHARED)
 .if ${ARCH} == "amd64"
 BROKEN=		The devtools do not support the feature
 .endif
 SITE_SUB+=	-e '\|bld_LIBDKIM_SHARED|s/^dnl //g'
 .else
 .endif
 .if defined(WITH_LIBDKIM_INSTALL)
 SITE_SUB+=	-e '\|bld_LIBDKIM_INSTALL|s/^dnl //g'
 .if defined(WITH_LIBDKIM_SHARED)
 PLIST_SUB+=	LIBDKIM="@comment "
 PLIST_SUB+=	LIBDKIMSHARED=""
 USE_LDCONFIG=	yes
 .else
 PLIST_SUB+=	LIBDKIM=""
 PLIST_SUB+=	LIBDKIMSHARED="@comment "
 .endif
 .else
 PLIST_SUB+=	LIBDKIM="@comment "
 PLIST_SUB+=	LIBDKIMSHARED="@comment "
 .endif
 .if defined(WITH_DEBUG)
 SITE_SUB+=	-e '\|confOPTIMIZE.*-g|s/^dnl //g'
 .endif
 .if !defined(WITHOUT_ARLIB)
 SITE_SUB+=	-e '\|bld_USE_ARLIB|s/^dnl //g'
 .endif
 .if defined(WITH_POPAUTH) && !defined(WITHOUT_POPAUTH)
 SITE_SUB+=	-e '/-DPOPAUTH/s/^dnl //g'
 .endif
 .if defined(WITH_QUERY_CACHE) && !defined(WITHOUT_QUERY_CACHE)
 SITE_SUB+=	-e '/-DQUERY_CACHE/s/^dnl //g'
 .endif
 
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
 LIBDK_PORT=	mail/dk-milter
 BUILD_DEPENDS+=	${NONEXISTENT}:${PORTSDIR}/${LIBDK_PORT}:patch
 LIBDK_PATH!=	cd ${PORTSDIR}/${LIBDK_PORT} && ${MAKE} -V WRKSRC
 SITE_SUB+=	-e '\|bld_VERIFY_DOMAINKEYS|s/^dnl //'
 PORTDOCS+=	rfc4870.txt
 .endif
 
 .if defined(WITH_STATS) && !defined(WITHOUT_STATS)
 MAN8+=		dkim-stats.8
 PLIST_SUB+=	STATS=""
 .else
 PLIST_SUB+=	STATS="@comment "
 .endif
 
 .if (defined(WITH_POPAUTH) \
 	|| defined(WITH_QUERY_CACHE) \
 	|| defined(WITH_BODYLENGTH_DB) \
 	|| defined(WITH_STATS)) \
 	&& !defined(WITH_BDB_BASE)
 USE_BDB=	41+
 SITE_SUB+=	-e 's|%%BDB%%||g' \
 		-e "s|%%BDB_LIB_DIR%%|${BDB_LIB_DIR}|g" \
 		-e "s|%%BDB_INCLUDE_DIR%%|${BDB_INCLUDE_DIR}|g" \
 		-e "s|%%BDB_LIB_NAME%%|${BDB_LIB_NAME}|g"
 .else
 SITE_SUB+=	-e 's|%%BDB%%|dnl |g'
 .endif
 .if defined(WITH_OPENSSL_BASE) || defined(OPENSSL_OVERWRITE_BASE)
 SITE_SUB+=	-e 's|%%OPENSSL%%|dnl |g'
 .else
 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)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "SENDMAIL_MILTER_IN_BASE now deprecated,"
 	@${ECHO_MSG} "please set WITH_SENDMAIL_BASE=yes instead"
 .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_POPAUTH=yes		Query POP-before-SMTP authentication database"
 	@${ECHO_MSG} " WITH_QUERY_CACHE=yes		Cache DNS Query"
 	@${ECHO_MSG} " WITH_VERIFY_DOMAINKEYS=yes	Verify DomainKeys using dk-milter's libdk"
 	@${ECHO_MSG} " WITH_SENDMAIL_BASE=yes		Build to run with base sendmail"
 	@${ECHO_MSG} " WITH_SENDMAIL_PORT=yes		Build to run with ports' sendmail"
 	@${ECHO_MSG} " WITH_POSTFIX=yes		Build to run with postfix port"
 	@${ECHO_MSG} " WITH_LIBDKIM_INSTALL=yes	Install libdkim library"
 	@${ECHO_MSG}
 	@sleep 5
 
 post-extract:
 	@${CP} ${WRKSRC}/dkim-filter/autorespond.csh ${WRKSRC}
 
 .include	"${.CURDIR}/Makefile.features"
 post-patch:
 	@${REINPLACE_CMD} -e 's|-pthread|${PTHREAD_LIBS}|' \
 		-e 's|-D_THREAD_SAFE|${PTHREAD_CFLAGS}|' \
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		-e "s|\`-O'|\`${CFLAGS}'|g" \
 		${WRKSRC}/devtools/OS/FreeBSD
 	@${SED} ${SITE_SUB} -e '\|^dnl |d' -e '/^dnl$$/d' \
 		${SITE} > ${WCONF}/site.config.m4
 
 pre-configure:
 .if defined(WITH_VERIFY_DOMAINKEYS) && !defined(WITHOUT_VERIFY_DOMAINKEYS)
 	${LN} -s ${LIBDK_PATH}/libdk ${WRKSRC}/
 	${CP} ${LIBDK_PATH}/rfc4870.txt ${WRKSRC}/
 .endif
 
 post-install:
 .if !defined(WITH_DEBUG)
 	@${STRIP_CMD} ${PREFIX}/libexec/dkim-filter
 .endif
 	@${MKDIR} ${PREFIX}/etc/mail
 	${INSTALL_DATA} ${WRKSRC}/dkim-filter/dkim-filter.conf.sample ${PREFIX}/etc/mail/
 .for i in ${MAN5}
 	@${RM} -f ${MANPREFIX}/man/cat5/${i} ${MANPREFIX}/man/cat5/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man5/
 .endfor
 .for i in ${MAN8}
 	@${RM} -f ${MANPREFIX}/man/cat8/${i} ${MANPREFIX}/man/cat8/${i}.gz
 	${INSTALL_MAN} ${WRKSRC}/*/${i} ${MANPREFIX}/man/man8/
 .endfor
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR}
 .for f in ${PORTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/${f} ${DOCSDIR}
 .endfor
 	${INSTALL_DATA} ${WRKSRC}/dkim-filter/README ${DOCSDIR}/README.dkim-filter
 	${INSTALL_DATA} ${WRKSRC}/libdkim/README ${DOCSDIR}/README.libdkim
 	${MKDIR} ${DOCSDIR}/libdkim
 .for f in ${LIBDOCS}
 	${INSTALL_DATA} ${WRKSRC}/libdkim/docs/`${BASENAME} ${f}` ${DOCSDIR}/libdkim/
 .endfor
 .endif
 	@${CAT} ${PKGMESSAGE}
 
 .include <bsd.port.post.mk>

Property changes on: head/mail/dkim-milter/Makefile
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.44
\ No newline at end of property
+1.45
\ No newline at end of property
Index: head/mail/dkim-milter/distinfo
===================================================================
--- head/mail/dkim-milter/distinfo	(revision 209818)
+++ head/mail/dkim-milter/distinfo	(revision 209819)
@@ -1,3 +1,3 @@
-MD5 (dkim-milter-2.5.0.tar.gz) = 4780f1e2efe02a28a36203dd5cee39b6
-SHA256 (dkim-milter-2.5.0.tar.gz) = 9372bdfa34c14d2b957dbac275d6a00cb6ac321fda8803b8e86ca1c73ac14855
-SIZE (dkim-milter-2.5.0.tar.gz) = 639037
+MD5 (dkim-milter-2.5.1.tar.gz) = 591ffca39c0dbdf07bd3491d0da89332
+SHA256 (dkim-milter-2.5.1.tar.gz) = 5d0c193967b593568659bbcfc3305b6852ce9557d2864258942e597907f39303
+SIZE (dkim-milter-2.5.1.tar.gz) = 641272

Property changes on: head/mail/dkim-milter/distinfo
___________________________________________________________________
Modified: cvs2svn:cvs-rev
## -1 +1 ##
-1.33
\ No newline at end of property
+1.34
\ No newline at end of property
Index: head/mail/dkim-milter/files/patch-dkim-filter__dkim-filter.c
===================================================================
--- head/mail/dkim-milter/files/patch-dkim-filter__dkim-filter.c	(revision 209818)
+++ head/mail/dkim-milter/files/patch-dkim-filter__dkim-filter.c	(nonexistent)
@@ -1,50 +0,0 @@
---- ./dkim-filter/dkim-filter.c.orig	2008-03-06 04:29:36.000000000 +0900
-+++ ./dkim-filter/dkim-filter.c	2008-03-12 23:57:52.000000000 +0900
-@@ -2481,6 +2481,16 @@
- 		if (status != DKIM_STAT_OK)
- 			return FALSE;
- 	}
-+	else
-+	{
-+		status = dkim_options(conf->conf_libdkim, DKIM_OP_SETOPT,
-+		                      DKIM_OPTS_SKIPHDRS,
-+		                      (void *) should_not_signhdrs,
-+		                      sizeof (u_char **));
-+
-+		if (status != DKIM_STAT_OK)
-+			return FALSE;
-+	}
- 
- 	if (conf->conf_signhdrs != NULL)
- 	{
-@@ -2494,8 +2504,8 @@
- 	else
- 	{
- 		status = dkim_options(conf->conf_libdkim, DKIM_OP_SETOPT,
--		                      DKIM_OPTS_SKIPHDRS,
--		                      (void *) should_not_signhdrs,
-+		                      DKIM_OPTS_SIGNHDRS,
-+		                      (void *) should_signhdrs,
- 		                      sizeof (u_char **));
- 
- 		if (status != DKIM_STAT_OK)
-@@ -7447,6 +7457,9 @@
- 	}
- #endif /* _FFR_BODYLENGTH_DB */
- 
-+	pthread_mutex_init(&popen_lock, NULL);
-+	pthread_mutex_init(&conf_lock, NULL);
-+
- 	/* perform test mode */
- 	if (testfile != NULL)
- 	{
-@@ -7456,9 +7469,6 @@
- 		return status;
- 	}
- 
--	pthread_mutex_init(&popen_lock, NULL);
--	pthread_mutex_init(&conf_lock, NULL);
--
- 	memset(argstr, '\0', sizeof argstr);
- 	end = &argstr[sizeof argstr - 1];
- 	n = sizeof argstr;

Property changes on: head/mail/dkim-milter/files/patch-dkim-filter__dkim-filter.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/mail/dkim-milter/files/patch-dkim-filter__dkim-db.c
===================================================================
--- head/mail/dkim-milter/files/patch-dkim-filter__dkim-db.c	(revision 209818)
+++ head/mail/dkim-milter/files/patch-dkim-filter__dkim-db.c	(nonexistent)
@@ -1,52 +0,0 @@
---- ./dkim-filter/dkim-db.c.orig	2008-03-05 02:41:25.000000000 +0900
-+++ ./dkim-filter/dkim-db.c	2008-03-12 23:57:52.000000000 +0900
-@@ -46,15 +46,22 @@
- 	int flags = 0;
- #endif /* DB_VERSION_CHECK(2,0,0) */
- 	int status = 0;
-+	DBTYPE dbtype;
- 
- 	assert(db != NULL);
- 	assert(file != NULL);
- 
- #if DB_VERSION_CHECK(2,0,0)
- 	if (ro)
-+	{
- 		flags |= DB_RDONLY;
-+		dbtype = DB_UNKNOWN;
-+	}
- 	else
-+	{
- 		flags |= DB_CREATE;
-+		dbtype = DB_BTREE;
-+	}
- #endif /* DB_VERSION_CHECK(2,0,0) */
- 
- #if DB_VERSION_CHECK(3,0,0)
-@@ -62,21 +69,21 @@
- 	if (status == 0)
- 	{
- # if DB_VERSION_CHECK(4,1,25)
--		status = (*db)->open(*db, NULL, file, NULL, DB_UNKNOWN,
-+		status = (*db)->open((*db), NULL, file, NULL, dbtype,
- 		                     flags, 0);
- # else /* DB_VERSION_CHECK(4,1,25) */
--		status = (*db)->open(*db, file, NULL, DB_UNKNOWN,
--		                     flags, 0);
-+		status = (*db)->open((*db), file, NULL, dbtype, flags, 0);
- # endif /* DB_VERSION_CHECK(4,1,25) */
- 	}
- #elif DB_VERSION_CHECK(2,0,0)
--	status = db_open(file, DB_HASH, flags, DB_MODE, NULL, NULL, db);
-+	status = db_open(file, dbtype, flags, DB_MODE, NULL, NULL, db);
- #else /* DB_VERSION_MAJOR < 2 */
- 	*db = dbopen(file, (ro ? O_RDONLY :(O_CREAT|O_RDWR)), DB_MODE,
--	             DB_HASH, NULL);
-+	             dbtype, NULL);
- 	if (*db == NULL)
- 		status = errno;
- #endif /* DB_VERSION_CHECK */
-+
- 	return status;
- }
- 

Property changes on: head/mail/dkim-milter/files/patch-dkim-filter__dkim-db.c
___________________________________________________________________
Deleted: cvs2svn:cvs-rev
## -1 +0,0 ##
-1.1
\ No newline at end of property
Deleted: fbsd:nokeywords
## -1 +0,0 ##
-yes
\ No newline at end of property
Index: head/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4
===================================================================
--- head/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4	(nonexistent)
+++ head/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4	(revision 209819)
@@ -0,0 +1,11 @@
+--- ./dkim-filter/Makefile.m4.orig	2008-03-06 02:58:40.000000000 +0900
++++ ./dkim-filter/Makefile.m4	2008-03-22 02:05:26.000000000 +0900
+@@ -12,7 +12,7 @@
+ ifelse(index(confENVDEF, `-DQUERY_CACHE'), -1, `', `
+ define(`confUSE_DB', `TRUE')
+ ')
+-ifelse(index(confENVDEF, `-DPOPAUTH'), -1, `', `
++ifelse(index(conf_dkim_filter_ENVDEF, `-DPOPAUTH'), -1, `', `
+ define(`confUSE_DB', `TRUE')
+ ')
+ ifelse(index(confENVDEF, `-D_FFR_BODYLENGTH_DB'), -1, `', `

Property changes on: head/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4
___________________________________________________________________
Added: cvs2svn:cvs-rev
## -0,0 +1 ##
+1.3
\ No newline at end of property
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property