2.6.7 2012/07/23

        Fix input handling for file data sets for the macro case.
        Ensure NULL-termination of macro value tests.
        STATS: Fix hang bug in opendkim-reportstats.
        STATS: Fix bug #SF3547363: Fix "Top 10" and DNSSEC trend reports.

2.6.6           2012/07/18
        LIBAR: Fix bug #SF3544522: Not all systems define a "_len" member for
                the sockaddr structures.
        LIBOPENDKIM: Fix bug #SF3545490: If the body handed to the library was
                missing a trailing line terminator, then dkim_canon_closebody()
                would end the hashes with some data not included.  Now, if
                DKIM_LIBFLAGS_FIXCRLF is set, it will detect this condition
                and correct it; if not, an error is returned.
        LIBOPENDKIM: If the job ID passed in during handle creation includes
                slashes and temporary file creation is enabled, convert the
                slashes to dots in the temporary file template.

2.6.5           2012/07/14
        Swap order of "header.d" and "header.i" values in
                Authentication-Results fields.
        BUILD: Fix bug #SF3543282: Corrections to Darwin/libar build adjustment
                made in 2.6.3.

2.6.4           2012/07/12
        Feature request #SF3542099: Include "header.d" in all
                Authentication-Results fields, not just "header.i".  This
                makes life easier for users of OpenDMARC.
        BUILD: Fix SHA256 test on some systems.

2.6.3           2012/07/11
        Add "ResolvConf" setting, allowing the ability to pass a
                resolv.conf-like file to unbound to allow specific nameservers
                to be used instead of the default.
        LIBOPENDKIM: Return the correct error code when a SHA1-only library
                encounters a SHA1 signature that references a SHA256-only key.
        LIBAR: Add ar_resolvconf().
        BUILD: Fix bug #SF3538676: Build with -DDARWIN on MacOSX, and default
                to arlib if unbound isn't selected.

2.6.2           2012/07/02
        Fix build confusion between _FFR_RATE_LIMIT and _FFR_RESIGN.
        Fix bug #SF3538639: Fix error when --domain is not provided to
                opendkim-genrates.  Problem noted by Andreas Schulze.
        Fix bug #SF3539449: Clarify legal "Socket" values.
        Fix bug #SF3539493: Handle certain cases of data set names that
                appear to be comma-separated lists which include IPv6
                addresses.

2.6.1           2012/06/25
        Restore and activate _FFR_SELECT_CANONICALIZATION.  Also adds a
                SelectCanonicalizationHeader configuration option.
        Remove _FFR_SELECTOR_HEADER.
        Update Authentication-Results parsing to understand "dkim-atps"
                (RFC6541) and no longer understand "hardfail" (RFC6577).
        LIBAR: Fix bug #SF3309946: Ensure the dispatcher doesn't hold the
                master lock when it might enter a read wait.
        STATS: Add a database index on messages.msgtime to aid with
                expiration performance.
        TOOLS: Feature request #SF3536385: Add "-a" to opendkim-genkey to
                include a domain name in the generated TXT record.

2.6.0           2012/06/07
        Feature request #SF3502777: Log all authentication results rather than
                relying on logging of Authentication-Results header fields.
        Feature request #SF3512286: Add "LDAPSoftStart" flag so the filter
                doesn't abort on startup when LDAP is not available.
        Feature request #SF3512836: Add _FFR_SOCKETDB, which enables support
                for a generic socket data set.
        Feature request #SF3514982: Add Erlang data set support.
        Feature request #SF3516253: Update to newest "repute" working group
                documents, which mainly means adding JSON support and
                promoting application-specific extensions to the top level
                in the reputon structure.
        Feature request #SF3518593: Add support for OpenLDAP's MDB as a
                data set backend.
        Feature request #SF3519002: Put reason information inside a "reason"
                tag in Authentication-Results header fields rather than in
                comments.
        Feature request #SF3521000: Log hostname and daemon name (taken from
                macros) when logging "no MTA name match".
        Feature request #SF3524756: Add ability to request TCP keepalive
                features via the OpenLDAP client library.
        Feature request #SF3529233: Add odkim.get_envfrom() to all Lua scripts.
        Fix bug #SF3518877: Separate variable expansion from literal text in
                opendkim-genkey.
        Fix bug #SF3522883: Allow TLS for ldapi URIs.  Problem noted by
                Quanah Gibson-Mount.
        Fix bug #SF3527428: Construct the LDAP URI list properly, rather than
                only keeping the last one, and add failover code.
        Patch #SF3522895: Add contrib/ldap/opendkim.ldif.
        Activate _FFR_XTAGS.
        Remove _FFR_SELECT_CANONICALIZATION.
        LIBAR: Fix bug #SF3444318: Do proper buffer size calculations to
                avoid valgrind warnings about references to unaddressable
                space.
        LIBOPENDKIM: Fix bug #SF3496041: Remove _FFR_PARSETIME.
        LIBOPENDKIM: Fix bug #SF3516653: By default, treat a syntax error
                in an ADSP record as an NXDOMAIN.  Add new library flag
                DKIM_LIBFLAGS_REPORTBADADSP to restore the original
                behaviour.
        LIBOPENDKIM: Fix bug #SF3524865: Disallow generation of signatures
                where signer and signing domain don't match per the DKIM
                specification.  Add DKIM_LIBFLAGS_DROPSIGNER which, if set,
                will still generate signatures in that case, but with the
                signer omitted so the signature is still compliant.
        BUILD: Fix bug #SF3425384: Add missing support for compiling
                against libevent2, which is an option for unbound.
        BUILD: Fix bug #SF3475799: Don't do a manual check for libdb.a.
                Use the AC_CHECK_* macros instead.
        DOCS: Fix bug #SF3518864: The license for IETF documents is not
                compatible with free software licensing, which makes packaging
                a bit of a chore.  Replace all the text files in the "docs"
                directory with a single HTML page that includes links to
                all the things we used to include here.
        STATS: Feature request #SF3110059: Move opendkim-reportstats from
                contrib/stats to stats, making it fully supported.
        STATS: Feature request #SF3525786: Add opendkim-expire script.
        STATS: Feature request #SF3528652: Allow a specific list of domains,
                possibly read from a file, for opendkim-gengraphs and
                opendkim-genrates.

4 files changed, 38 insertions, 35 deletions

diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 7f108b2e269..4778b2be269 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2012/10/08 12:19:19 asau Exp $
+# $NetBSD: Makefile,v 1.9 2012/11/12 19:23:35 pettai Exp $
 
-DISTNAME=	opendkim-2.5.2
+DISTNAME=	opendkim-2.6.7
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opendkim/}
 
diff --git a/mail/opendkim/PLIST b/mail/opendkim/PLIST
index 8001176a04b..e3dd85d557b 100644
--- a/mail/opendkim/PLIST
+++ b/mail/opendkim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2012/06/16 20:20:15 pettai Exp $
+@comment $NetBSD: PLIST,v 1.7 2012/11/12 19:23:35 pettai Exp $
 bin/opendkim-genkey
 bin/opendkim-genzone
 bin/opendkim-testadsp
@@ -20,6 +20,7 @@ share/doc/opendkim/README
 share/doc/opendkim/README.LDAP
 share/doc/opendkim/README.SQL
 share/doc/opendkim/README.opendkim-reportstats
+share/doc/opendkim/README.specs.html
 share/doc/opendkim/RELEASE_NOTES.Sendmail
 share/doc/opendkim/authheaders-check-setup-hook.lua
 share/doc/opendkim/chroot
@@ -131,44 +132,17 @@ share/doc/opendkim/dkim_ssl_version.html
 share/doc/opendkim/dkim_stat.html
 share/doc/opendkim/dkim_verify.html
 share/doc/opendkim/dns.html
-share/doc/opendkim/draft-ietf-marf-as-11.txt
-share/doc/opendkim/draft-ietf-marf-authfailure-report-10.txt
-share/doc/opendkim/draft-ietf-marf-dkim-reporting-16.txt
-share/doc/opendkim/draft-ietf-repute-email-identifiers-02.txt
-share/doc/opendkim/draft-ietf-repute-media-type-01.txt
-share/doc/opendkim/draft-ietf-repute-model-01.txt
-share/doc/opendkim/draft-ietf-repute-query-http-01.txt
 share/doc/opendkim/example.com.ldif
 share/doc/opendkim/index.html
 share/doc/opendkim/opendkim
 share/doc/opendkim/opendkim-fixipaddrs.pl
-share/doc/opendkim/opendkim-reportstats
 share/doc/opendkim/opendkim-spam-ignore-cmdswitch.patch
 share/doc/opendkim/opendkim.conf.sample
 share/doc/opendkim/opendkim.conf.simple
 share/doc/opendkim/opendkim.conf.simple-verify
+share/doc/opendkim/opendkim.ldif
 share/doc/opendkim/opendkim.schema
 share/doc/opendkim/opendkim.spec.in
 share/doc/opendkim/opendkim.xml
 share/doc/opendkim/overview.html
-share/doc/opendkim/report-rfc4871.txt
-share/doc/opendkim/rfc2254.txt
-share/doc/opendkim/rfc3447.txt
-share/doc/opendkim/rfc4686.txt
-share/doc/opendkim/rfc5016.txt
-share/doc/opendkim/rfc5322.txt
-share/doc/opendkim/rfc5451.txt
-share/doc/opendkim/rfc5518.txt
-share/doc/opendkim/rfc5585.txt
-share/doc/opendkim/rfc5617.txt
-share/doc/opendkim/rfc5672.txt
-share/doc/opendkim/rfc5863.txt
-share/doc/opendkim/rfc5965.txt
-share/doc/opendkim/rfc6008.txt
-share/doc/opendkim/rfc6212.txt
-share/doc/opendkim/rfc6376.txt
-share/doc/opendkim/rfc6377.txt
-share/doc/opendkim/rfc6522.txt
-share/doc/opendkim/rfc6541.txt
-share/doc/opendkim/rfc6570.txt
 share/doc/opendkim/stats.lua
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index 84a2680fa7c..49821600234 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2012/06/16 20:20:15 pettai Exp $
+$NetBSD: distinfo,v 1.7 2012/11/12 19:23:35 pettai Exp $
 
-SHA1 (opendkim-2.5.2.tar.gz) = 778f27162501879dec6ac3c957055d5bc9a1ac42
-RMD160 (opendkim-2.5.2.tar.gz) = 1fe0ea26cd00728226d1788e72f48366b3fafb03
-Size (opendkim-2.5.2.tar.gz) = 1475225 bytes
+SHA1 (opendkim-2.6.7.tar.gz) = db689bbb9c2df7c0140a470504f050e6ffe2c24b
+RMD160 (opendkim-2.6.7.tar.gz) = 54fc6693d610f5e746360904415c003396ab5012
+Size (opendkim-2.6.7.tar.gz) = 1129124 bytes
+SHA1 (patch-configure) = 22f29d4d166df0fa870a0223ad95131d2b022a24
diff --git a/mail/opendkim/patches/patch-configure b/mail/opendkim/patches/patch-configure
new file mode 100644
index 00000000000..91fb89878be
--- /dev/null
+++ b/mail/opendkim/patches/patch-configure
@@ -0,0 +1,28 @@
+$NetBSD: patch-configure,v 1.1 2012/11/12 19:23:36 pettai Exp $
+
+Portability fixes
+
+--- configure.orig	2012-11-12 18:55:05.000000000 +0000
++++ configure
+@@ -18989,18 +18989,18 @@ then
+ 	as_fn_error $? "reputation requires libxml2 or libjansson" "$LINENO" 5
+ fi
+ 
+-if test  x"$xml2_found" == x"yes" -a x"$jansson_found" == x"yes"
++if test  x"$xml2_found" = x"yes" -a x"$jansson_found" = x"yes"
+ then
+ 	as_fn_error $? "cannot use both libxml2 and libjansson" "$LINENO" 5
+ fi
+ 
+-if test x"$xml2_found" == x"yes"
++if test x"$xml2_found" = x"yes"
+ then
+ 
+ $as_echo "#define USE_XML2 1" >>confdefs.h
+ 
+ fi
+-if test x"$jansson_found" == x"yes"
++if test x"$jansson_found" = x"yes"
+ then
+ 
+ $as_echo "#define USE_JANSSON 1" >>confdefs.h