2.5.1 2008/03/20

Update for draft-kucherawy-sender-auth-header-14.
Add "subject" to "should_signhdrs" per RFC4871 section 5.5.
Fix bug #SF1911328: Restore proper behaviour of SignHeaders and
OmitHeaders, broken in the prior release's configuration
overhaul.  Problem reported by Jason Molzen.
Fix bug #SF1912332: Fix parameters passed to db->open().  Problem
reported by Tony Earnshaw.
Fix bug #SF1912569: Initialize mutexes before entering test mode.
Patch from Kaspar Brand.
LIBDKIM: More boundary checking fixes in dkim_canon_selecthdrs().
Problem noted by Warren Horvath.
LIBDKIM: Fix bug #SF1820084: Return DKIM_STAT_MULTIDNSREPLY
if a DNS query returns multiple records.

2.5.2           2008/03/28
Preserve the sender's domain name outside of mlfi_eoh() as it's
now needed in mlfi_eom().  Problem noted by Andy Fiddaman.
Fix bug #SF1921873: Pass "-K" command line switch into the new
configuration handling code.  Problem noted by Al Smith.
TOOLS: Fix flags portion of the TXT record output by dkim-genkey.
Problem noted by Michael Carland.
BUILD: Fix bug #SF1922422: Fix linker problems when POPAUTH is
defined.

4 files changed, 24 insertions, 9 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 98b4fc6ec22..679509d52fd 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2008/03/09 15:09:26 adrianp Exp $
+# $NetBSD: Makefile,v 1.14 2008/04/06 12:59:11 adrianp Exp $
 
-DISTNAME=	dkim-milter-2.5.0
+DISTNAME=	dkim-milter-2.5.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
 
@@ -34,7 +34,7 @@ OWN_DIRS_PERMS+=	${VARBASE}/run/dkim-filter \
 
 SUBST_CLASSES+=		libs
 SUBST_STAGE.libs=	pre-configure
-SUBST_FILES.libs=	${WRKSRC}/devtools/Site/site.config.m4
+SUBST_FILES.libs=	devtools/Site/site.config.m4
 SUBST_FILES.libs+=	dkim-filter/dkim-filter.conf.5 dkim-filter/dkim-stats.8
 SUBST_SED.libs+=	-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
 SUBST_SED.libs+=	-e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g'
diff --git a/mail/dkim-milter/PLIST b/mail/dkim-milter/PLIST
index 4a684899dfd..f7b49e9e50b 100644
--- a/mail/dkim-milter/PLIST
+++ b/mail/dkim-milter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2008/03/09 15:09:26 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.5 2008/04/06 12:59:11 adrianp Exp $
 ${WITH_ARLIB}lib/libar.a
 ${WITH_ARLIB}man/man3/ar.3
 lib/libdkim.a
@@ -23,7 +23,7 @@ share/doc/dkim-milter/draft-hoffman-dac-vbr-02.txt
 share/doc/dkim-milter/draft-ietf-dkim-deployment-01.txt
 share/doc/dkim-milter/draft-ietf-dkim-overview-09.txt
 share/doc/dkim-milter/draft-ietf-dkim-ssp-03.txt
-share/doc/dkim-milter/draft-kucherawy-sender-auth-header-12.txt
+share/doc/dkim-milter/draft-kucherawy-sender-auth-header-14.txt
 share/doc/dkim-milter/libdkim/dkim.html
 share/doc/dkim-milter/libdkim/dkim_alg_t.html
 share/doc/dkim-milter/libdkim/dkim_body.html
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index a09ee7d4f8c..6e263c86a61 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,6 +1,8 @@
-$NetBSD: distinfo,v 1.5 2008/03/09 15:09:26 adrianp Exp $
+$NetBSD: distinfo,v 1.6 2008/04/06 12:59:11 adrianp Exp $
 
-SHA1 (dkim-milter-2.5.0.tar.gz) = b3c6909e7fa3632c8bdb7b75bca40630adc09903
-RMD160 (dkim-milter-2.5.0.tar.gz) = 11060b2e8a501ad48681a8ba6ecc69106f6d2dfc
-Size (dkim-milter-2.5.0.tar.gz) = 639037 bytes
+SHA1 (dkim-milter-2.5.2.tar.gz) = 0862b9ea4d1bfbe04bb8cb1240f0b1783d5a0a2c
+RMD160 (dkim-milter-2.5.2.tar.gz) = 6c9b285af7c73792afde1270b527e2472d5544f9
+Size (dkim-milter-2.5.2.tar.gz) = 641510 bytes
 SHA1 (patch-aa) = 0a4c66bbf4d699d12c5b1cefbe573b13b9d6aa5d
+SHA1 (patch-ab) = ab99d7cbc6cf3ad5aff905d32c50caac7d5c02e0
+SHA1 (patch-ab.old) = e7e2f8c49b1d2aee7fd1762d509392a1da86e662
diff --git a/mail/dkim-milter/patches/patch-ab b/mail/dkim-milter/patches/patch-ab
new file mode 100644
index 00000000000..01595f7bcc3
--- /dev/null
+++ b/mail/dkim-milter/patches/patch-ab
@@ -0,0 +1,13 @@
+$NetBSD: patch-ab,v 1.3 2008/04/06 12:59:11 adrianp Exp $
+
+--- libar/Makefile.m4.orig	2007-05-26 17:06:20.000000000 +0100
++++ libar/Makefile.m4
+@@ -14,7 +14,7 @@ define(`bldSOURCES', `ar.c manual.c ')
+ bldPRODUCT_END
+ 
+ bldPRODUCT_START(`manpage', `ar')
+-define(`bldSOURCES', `ar.3')
++dnl define(`bldSOURCES', `ar.3')
+ bldPRODUCT_END
+ 
+ bldFINISH