Update to 2.5.0

Add "AutoRestartCount" and "AutoRestartRate" configuration
parameters to limit runaway restart loops.
Feature request #SF1735573: Add "AlwaysAddARHeader" option, which
will add an Authentication-Results of "none" for unsigned
messages from domains without a "strict" policy.
Feature request #SF1807748: Reload the configuration file on
receipt of SIGUSR1.  Requested by Florian Sager.
Feature request #SF1811969: Add _FFR_BODYLENGTH_DB which adds a
"BodyLengthDBFile" feature, allowing a per-recipient decision
on whether or not to use an "l=" tag when signing.  Patch
contributed by Daniel Black.
Feature request #SF1841955: Add an "Include" facility to the
configuration file.
Feature request #SF1876941: Make the syslog facility selectable.
Based on a patch from Jose-Marcio Martins da Cruz of Ecole
des Mines de Paris.
Feature request #SF1876943: Add _FFR_AUTHSERV_JOBID allowing the
job ID to be included as part of the "authserv-id" in
Authentication-Results: headers.  Based on a patch from
Jose-Marcio Martins da Cruz of Ecole des Mines de Paris.
Feature request #SF1890581: Attempt to clean up a UNIX domain
socket in the non-AutoRestart case as well.  Requested
by Daniel Black.
Add "MilterDebug" configuration file option for requesting debugging
output from the filter.
Add "FixCRLF" configuration file option which activates the
DKIM_LIBFLAGS_FIXCRLF flag (see below).
Update to draft-ietf-dkim-ssp-03.  In doing so, rename the
"UseSSPDeny" configuration option to "UseASPDiscard".
Handle an error from dkim_getsighdr() properly in mlfi_eom().
When VERIFY_DOMAINKEYS is active, don't short-circuit mlfi_eoh()
between dk_verify() and dk_eoh() or a segmentation fault below
dk_body() could result.
LIBDKIM: Feature request #SF1823059: Export key, signature and
policy syntax checking capability via the API.  Based on
a patch from Chris Behrens of Concentric Network Corporation.
LIBDKIM: Assert defaults for "c" and "q" tags when parsing
signature headers.  Patch from Chris Behrens of Concentric
Network Corporation.
LIBDKIM: Better handling of truncated DNS replies; instead of
just giving up if the "tc" (truncated) bit is set in the
reply, see if there was enough of a reply returned to be able
to complete the request.
LIBDKIM: Fix recycling bug in header canonicalizations which was
causing signatures other than the first one to fail in most
cases.
LIBDKIM: Add new dkim_chunk() interface.
LIBDKIM: Enforce DKIM_OPTS_QUERYMETHOD library option even if there
were no valid signatures.
LIBDKIM: New DKIM_LIBFLAGS_FIXCRLF which requests that "naked"
CRs and LFs be converted to CRLFs during canonicalization
when signing.
LIBDKIM: Fix bounds checking in dkim_canon_selecthdrs().
LIBAR: Eliminate a possible race condition in ar_dispatcher().
LIBAR: Timeouts passed to select() can't be bigger than 10^8.
Problem noted by S. Moonesamy of Eland Systems.
BUILD: Feature request #SF1876242: Install the filter in EBINDIR
and everything else in UBINDIR.

5 files changed, 23 insertions, 21 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 0adc0bcc4bf..98b4fc6ec22 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2008/03/09 14:02:08 adrianp Exp $
+# $NetBSD: Makefile,v 1.13 2008/03/09 15:09:26 adrianp Exp $
 
-DISTNAME=	dkim-milter-2.4.4
-PKGREVISION=	1
+DISTNAME=	dkim-milter-2.5.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
 
diff --git a/mail/dkim-milter/PLIST b/mail/dkim-milter/PLIST
index 1253d1d47c3..4a684899dfd 100644
--- a/mail/dkim-milter/PLIST
+++ b/mail/dkim-milter/PLIST
@@ -1,9 +1,9 @@
-@comment $NetBSD: PLIST,v 1.3 2008/03/09 14:02:08 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.4 2008/03/09 15:09:26 adrianp Exp $
 ${WITH_ARLIB}lib/libar.a
 ${WITH_ARLIB}man/man3/ar.3
 lib/libdkim.a
 include/dkim.h
-bin/dkim-filter
+libexec/dkim-filter
 bin/dkim-genkey
 bin/dkim-testkey
 bin/dkim-testssp
@@ -20,10 +20,10 @@ share/doc/dkim-milter/README
 share/doc/dkim-milter/RELEASE_NOTES
 share/examples/dkim-milter/dkim-filter.conf.sample
 share/doc/dkim-milter/draft-hoffman-dac-vbr-02.txt
-share/doc/dkim-milter/draft-ietf-dkim-deployment-00.txt
-share/doc/dkim-milter/draft-ietf-dkim-overview-07.txt
-share/doc/dkim-milter/draft-ietf-dkim-ssp-01.txt
-share/doc/dkim-milter/draft-kucherawy-sender-auth-header-10.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/libdkim/dkim.html
 share/doc/dkim-milter/libdkim/dkim_alg_t.html
 share/doc/dkim-milter/libdkim/dkim_body.html
@@ -38,7 +38,6 @@ share/doc/dkim-milter/libdkim/dkim_get_user_context.html
 share/doc/dkim-milter/libdkim/dkim_getcachestats.html
 share/doc/dkim-milter/libdkim/dkim_getdomain.html
 share/doc/dkim-milter/libdkim/dkim_geterror.html
-share/doc/dkim-milter/libdkim/dkim_gethandlingstr.html
 share/doc/dkim-milter/libdkim/dkim_getmode.html
 share/doc/dkim-milter/libdkim/dkim_getpolicystr.html
 share/doc/dkim-milter/libdkim/dkim_getpresult.html
@@ -47,7 +46,6 @@ share/doc/dkim-milter/libdkim/dkim_getresultstr.html
 share/doc/dkim-milter/libdkim/dkim_getsighdr.html
 share/doc/dkim-milter/libdkim/dkim_getsiglist.html
 share/doc/dkim-milter/libdkim/dkim_getsignature.html
-share/doc/dkim-milter/libdkim/dkim_handling_t.html
 share/doc/dkim-milter/libdkim/dkim_header.html
 share/doc/dkim-milter/libdkim/dkim_init.html
 share/doc/dkim-milter/libdkim/dkim_lib.html
@@ -92,6 +90,10 @@ share/doc/dkim-milter/libdkim/dkim_ssl_version.html
 share/doc/dkim-milter/libdkim/dkim_stat.html
 share/doc/dkim-milter/libdkim/dkim_verify.html
 share/doc/dkim-milter/libdkim/index.html
+share/doc/dkim-milter/libdkim/dkim_chunk.html
+share/doc/dkim-milter/libdkim/dkim_key_syntax.html
+share/doc/dkim-milter/libdkim/dkim_policy_syntax.html
+share/doc/dkim-milter/libdkim/dkim_sig_syntax.html
 share/doc/dkim-milter/libdkim/overview.html
 share/doc/dkim-milter/libdkim/rfc2822_mailbox_split.html
 share/doc/dkim-milter/rfc4686.txt
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 7b48b43bbbb..a09ee7d4f8c 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2008/03/09 14:02:08 adrianp Exp $
+$NetBSD: distinfo,v 1.5 2008/03/09 15:09:26 adrianp Exp $
 
-SHA1 (dkim-milter-2.4.4.tar.gz) = 0e945bdca7b70d6b1478ce3e0171f8023de50df2
-RMD160 (dkim-milter-2.4.4.tar.gz) = 744d167f86ad09b0f3856567f812787d18f40349
-Size (dkim-milter-2.4.4.tar.gz) = 617230 bytes
-SHA1 (patch-aa) = 0c4288ea10ac76547b69e3173cf2d671077a0af1
+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 (patch-aa) = 0a4c66bbf4d699d12c5b1cefbe573b13b9d6aa5d
diff --git a/mail/dkim-milter/files/dkim-filter.sh b/mail/dkim-milter/files/dkim-filter.sh
index 56cba0f0bfe..e8dce87b2a0 100644
--- a/mail/dkim-milter/files/dkim-filter.sh
+++ b/mail/dkim-milter/files/dkim-filter.sh
@@ -1,6 +1,6 @@
 #!@RCD_SCRIPTS_SHELL@
 #
-# $NetBSD: dkim-filter.sh,v 1.1 2008/02/19 13:23:06 adrianp Exp $
+# $NetBSD: dkim-filter.sh,v 1.2 2008/03/09 15:09:26 adrianp Exp $
 #
 # PROVIDE: dkimfilter
 # REQUIRE: DAEMON
@@ -12,9 +12,9 @@ fi
 
 name="dkimfilter"
 rcvar=$name
-command="@PREFIX@/bin/dkim-filter"
+command="@PREFIX@/libexec/dkim-filter"
 pidfile="@VARBASE@/run/dkim-filter/${name}.pid"
-command_args="-P ${pidfile} -l -p @VARBASE@/run/dkim-filter/${name}.sock -x @PKG_SYSCONFDIR@/dkim-filter.conf -u @DKIM_USER@:@DKIM_GROUP@"
+command_args="-p local:@VARBASE@/run/dkim-filter/${name}.sock -P ${pidfile} -l -x @PKG_SYSCONFDIR@/dkim-filter.conf -u @DKIM_USER@:@DKIM_GROUP@"
 required_files="@PKG_SYSCONFDIR@/dkim-filter.conf"
 start_precmd="dkimfilter_precmd"
 
diff --git a/mail/dkim-milter/patches/patch-aa b/mail/dkim-milter/patches/patch-aa
index 4bbdc51244b..a333fa47119 100644
--- a/mail/dkim-milter/patches/patch-aa
+++ b/mail/dkim-milter/patches/patch-aa
@@ -1,4 +1,4 @@
-$NetBSD: patch-aa,v 1.3 2008/03/09 14:02:08 adrianp Exp $
+$NetBSD: patch-aa,v 1.4 2008/03/09 15:09:26 adrianp Exp $
 
 --- devtools/Site/site.config.m4.orig	2008-03-09 11:23:02.000000000 +0000
 +++ devtools/Site/site.config.m4	2008-03-09 12:49:32.000000000 +0000
@@ -72,7 +72,7 @@ $NetBSD: patch-aa,v 1.3 2008/03/09 14:02:08 adrianp Exp $
  
  dnl smfi_addheader() -- older versions of libmilter
  dnl
-@@ -140,3 +149,21 @@
+@@ -140,3 +150,21 @@
  dnl instead.  It will still work, but it breaks the DKIM specification.
  dnl To enable this, remove the "dnl" from the front of the line.
  dnl APPENDDEF(`conf_dkim_filter_ENVDEF', `-DNO_SMFI_INSHEADER ')
@@ -83,6 +83,7 @@ $NetBSD: patch-aa,v 1.3 2008/03/09 14:02:08 adrianp Exp $
 +define(`confLIBDIR', `@PREFIX@/lib')
 +define(`confSBINDIR', `@PREFIX@/sbin')
 +define(`confUBINDIR', `@PREFIX@/bin')
++define(`confEBINDIR', `@PREFIX@/libexec')
 +define(`confMANROOT', `@PREFIX@/@PKGMANDIR@/man')
 +define(`confMANROOTMAN', `@PREFIX@/@PKGMANDIR@/man')
 +define(`confMAN4EXT', `3')