5 files changed, 16 insertions, 108 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index d3845c1f0c4d..9e526505a903 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -13,8 +13,7 @@
 ## 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}
@@ -54,7 +53,7 @@ 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 \
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 96d5950e9868..938ef541f7f9 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -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
diff --git a/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4 b/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4
new file mode 100644
index 000000000000..46c56b5deaf2
--- /dev/null
+++ b/mail/dkim-milter/files/patch-dkim-filter__Makefile.m4
@@ -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, `', `
diff --git a/mail/dkim-milter/files/patch-dkim-filter__dkim-db.c b/mail/dkim-milter/files/patch-dkim-filter__dkim-db.c
deleted file mode 100644
index 90af566a767d..000000000000
--- a/mail/dkim-milter/files/patch-dkim-filter__dkim-db.c
+++ /dev/null
@@ -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;
- }
- 
diff --git a/mail/dkim-milter/files/patch-dkim-filter__dkim-filter.c b/mail/dkim-milter/files/patch-dkim-filter__dkim-filter.c
deleted file mode 100644
index 13c611ebe4ac..000000000000
--- a/mail/dkim-milter/files/patch-dkim-filter__dkim-filter.c
+++ /dev/null
@@ -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;