2.7.3 2012/11/29

        Log DB error string in dkimf_add_signrequest(), and fix a DSN handling
                error in dkimf_db_strerror().
        LIBOPENDKIM: Ignore entries in the oversign header field name list
                that are empty, and an oversign header field name list that
                is present but empty.
        LIBOPENDKIM: Allow header field lists to be empty, flushing any that
                were previously defined.
        BUILD: Improve tests for including <strl.h>.
        REPUTATION: Use lowercase for keywords in REPUTE query generation
                and handling.
        STATS: Clean up a dead link in opendkim-genstats.

2.7.2           2012/11/14
        Log the author domain name when rejecting or discarding due to ADSP.
        LIBOPENDKIM: Improve re-entrancy of dkim_eoh() when verifying.
        LIBOPENDKIM: Only do a single read attempt of a private key under
                GNUTLS to avoid hiding a useful error code.
        STATS: Add long option support for opendkim-importstats.
        STATS: Fix overly-strict domain name rules in opendkim-reportstats.
        TOOLS: Fix opendkim-genkey subdomains default.
        TOOLS: Fix opendkim-testmsg GNUTLS initialization.
        TOOLS: Add ability to assert a reporter ID to opendkim-spam.
        TOOLS: Add ability to skip a fixed number of Received: fields.
        TOOLS: Print a warning when asked to generate a key smaller than
                the recommended minimum.
        BUILD: Fix bug #SF3585163: Use a provided libstrl if detected.
        BUILD: Portability fixes for Solaris 10 from Claus Assmann and
                Leena Heino.

2.7.1           2012/10/30
        Fix bug #SF3581657: Fix faulty logic in LDAP open code.
        Fix bug #SF3581743: Properly handle NULLs returned from OpenDBX
                queries and low field counts in dkimf_db_walk().
        In the _FFR_REPUTATION code, free JSON objects when done with them.
        TOOLS: Fix argument parsing in new version of opendkim-genkey.

2.7.0           2012/10/24
        Feature request #SF2964375: Reject configuration files that have
                a SigningTable referencing a missing or malformed KeyTable
                entry.
        Feature request #SF3544764: Support for libar has been discontinued.
                For asynchronous and/or thread-safe resolver service,
                use libunbound or a suitable version of BIND.
        Feature request #SF3545658: Replace "ResolvConf" with "Nameservers"
                and add support for NS list overrides for versions of bind
                that have res_setservers().  Also rename "UnboundConfigFile"
                to "ResolverConfiguration", and make "TrustAnchorFile"
                generally available.
        Feature request #SF3547124: Skip reputation checks on passing
                signatures whose keys had a "t=y" value.
        Feature request #SF3555842: Add "ReputationTest" setting.
        Feature request #SF3556439: Update opendkim-atpszone per RFC6541.
        Feature request #SF3559744: Add library option DKIM_OPTS_MINKEYBITS
                allowing one to specify a minimum number of key bits for
                acceptable keys and signatures.  This is exposed through new
                configuration file option "MinimumKeyBits".  The default
                is 1024.
        Fix bug #SF3536414: Activate _FFR_OVERSIGN, and remove
                DKIM_OPTS_ALWAYSHDRS.
        Fix bug #SF3536655: Rename "X-Header" to "SoftwareHeader", and rename
                all header fields added that start "X-" to remove that prefix,
                per RFC6648.  The old name will be accepted through the end
                of the 2.7.x line.
        Fix bug #SF3538896: Remove antiquated CVS Id: tags, which cleans up
                some (harmless) build warnings.
        Fix bug #SF3548741: Add "ReputationTimeout" for use inside
                _FFR_REPUTATION, rather than using the built-in default
                or a hard-coded one.
        Fix bug #SF3549307: Remove _FFR_REPUTATION_CACHE, as it is redundant
                to caching code that's part of _FFR_REPUTATION already.
        Fix bug #SF3555844: Get repute client code in sync with repute.php
                (and the current REPUTE WG drafts).
        Fix bounds checking in the dstring printf functions.
        Fix loop structure in the C side of odkim.get_rcpt().
        Change all temporary directory defaults from /var/tmp to /tmp.
        Activate _FFR_LUA_GLOBALS.
        Request the milter permissions required to get _FFR_REDIRECT working.
        Add _FFR_REPRRD, which is a second approach to DKIM-based reputation
                using round robin databases and Holt-Winters foreacasting
                using rrdtool (see http://oss.oetiker.ch/rrdtool/).  Still
                experimental.
        Patch #SF3555843: With sufficient verbosity, report the default
                configuration file path.  Patch from Andreas Schulze.
        BUILD: Fix bug #SF3531658: Move the strlcat() and strlcpy()
                implementations to their own library so that programs don't
                drag in crypto and other dependencies they don't need.
                Also clean up several other unnecessary dependencies imposed
                by imprecise use of autoconf.
        BUILD: Patch #SF3555845: Add support for older versions of libcurl.
        BUILD: Install non-user things in sbin instead of bin.
        LIBOPENDKIM: Feature request #SF3565006: Add dkim_add_querymethod()
                and dkim_sig_seterror(), define DKIM_CBSTAT_DEFAULT, and
                remove an assertion in dkim_get_key_dns(), which together
                allow for applications to develop non-standard key retrieval
                mechanisms.
        LIBOPENDKIM: Fix bug #SF3559080: Log correct domains and selectors
                with SSL errors.
        LIBOPENDKIM: Add DNS functions dkim_dns_config(), dkim_dns_init(),
                dkim_dns_nslist(), dkim_dns_set_init(), dkim_dns_set_close(),
                dkim_dns_set_nslist(), dkim_dns_set_config(),
                dkim_dns_set_trustanchor(), dkim_dns_trustanchor().
        LIBOPENDKIM: Patch #SF3562496: Add DKIM_OPTS_REQUIREDHDRS to allow
                alteration of the mandatory header field set.
        LIBOPENDKIM: If "q=" is present and method "dns" is specified, it
                must be followed by "/txt", per RFC6376.
        LIBOPENDKIM: For dkim_add_xtag(), copy the provided values so the
                caller doesn't have to keep them around.
        LIBOPENDKIM: Allow dual signing of a single body with dkim_resign().
        STATS: Fix bug #SF3555847: Add "--nocircles" to opendkim-gengraphs
                to allow operation with versions of gnuplot that don't know
                what "with circles" means.
        STATS: Patch #SF3555841: Temporary table SQL correction.
        TOOLS: Feature request #SF3553918: Add "-u" flag to opendkim-atpszone
                and opendkim-genzone enabling them to produce output suitable
                for use as input to nsupdate(8).
        TOOLS: Feature request #SF3558818: Teach opendkim-testkey about the new
                "ResolverConfiguration" setting.
        TOOLS: Fix bug #SF3565013: Replace opendkim-genkey with a perl script
                that knows how to do splitting of character-strings in DNS
                TXT records.
        TOOLS: Fix bug #SF3568846: Add "-t" to opendkim-testmsg to allow
                override of the directory where temporary files go.  Also,
                clean up temporary files after creating them.
        TOOLS: Add opendkim-rephistory.

This should fix PR pkg/47370.

6 files changed, 59 insertions, 30 deletions

diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index 4778b2be269..3a1530c91e6 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2012/11/12 19:23:35 pettai Exp $
+# $NetBSD: Makefile,v 1.10 2013/01/05 17:05:07 pettai Exp $
 
-DISTNAME=	opendkim-2.6.7
+DISTNAME=	opendkim-2.7.3
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opendkim/}
 
@@ -10,10 +10,12 @@ COMMENT=	Open source DKIM library, MTA filter implementation and tools
 LICENSE=	sendmail-open-source-license
 
 USE_LIBTOOL=		yes
-USE_TOOLS+=		pkg-config
+USE_TOOLS+=		pkg-config perl:run
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
+REPLACE_PERL+=	opendkim/opendkim-genkey.in
+
 FILES_SUBST+=	DKIM_USER=${DKIM_USER} DKIM_GROUP=${DKIM_GROUP}
 BUILD_DEFS+=	VARBASE DKIM_USER DKIM_GROUP
 
@@ -26,9 +28,7 @@ PKG_USERS_VARS+=	DKIM_USER
 OWN_DIRS_PERMS+=	${VARBASE}/run/opendkim \
 			${DKIM_USER} ${DKIM_GROUP} 0750
 
-PKGCONFIG_OVERRIDE+=	libar/ar.pc.in
 PKGCONFIG_OVERRIDE+=	libopendkim/opendkim.pc.in
-PKGCONFIG_OVERRIDE+=	libvbr/vbr.pc.in
 
 .include "options.mk"
 
diff --git a/mail/opendkim/PLIST b/mail/opendkim/PLIST
index e3dd85d557b..f5299195657 100644
--- a/mail/opendkim/PLIST
+++ b/mail/opendkim/PLIST
@@ -1,17 +1,20 @@
-@comment $NetBSD: PLIST,v 1.7 2012/11/12 19:23:35 pettai Exp $
-bin/opendkim-genkey
-bin/opendkim-genzone
-bin/opendkim-testadsp
-bin/opendkim-testkey
-bin/opendkim-testmsg
+@comment $NetBSD: PLIST,v 1.8 2013/01/05 17:05:07 pettai Exp $
 include/opendkim/dkim.h
 lib/libopendkim.la
 lib/pkgconfig/opendkim.pc
+man/man5/opendkim.conf.5
 man/man8/opendkim-genkey.8
 man/man8/opendkim-genzone.8
 man/man8/opendkim-testadsp.8
 man/man8/opendkim-testkey.8
 man/man8/opendkim-testmsg.8
+man/man8/opendkim.8
+sbin/opendkim
+sbin/opendkim-genkey
+sbin/opendkim-genzone
+sbin/opendkim-testadsp
+sbin/opendkim-testkey
+sbin/opendkim-testmsg
 share/doc/opendkim/FEATURES
 share/doc/opendkim/KNOWNBUGS
 share/doc/opendkim/LICENSE
@@ -26,6 +29,7 @@ share/doc/opendkim/authheaders-check-setup-hook.lua
 share/doc/opendkim/chroot
 share/doc/opendkim/convert_keylist.sh
 share/doc/opendkim/dkim.html
+share/doc/opendkim/dkim_add_querymethod.html
 share/doc/opendkim/dkim_add_xtag.html
 share/doc/opendkim/dkim_alg_t.html
 share/doc/opendkim/dkim_body.html
@@ -34,10 +38,20 @@ share/doc/opendkim/dkim_cbstat.html
 share/doc/opendkim/dkim_chunk.html
 share/doc/opendkim/dkim_close.html
 share/doc/opendkim/dkim_diffheaders.html
+share/doc/opendkim/dkim_dns_close.html
+share/doc/opendkim/dkim_dns_config.html
+share/doc/opendkim/dkim_dns_init.html
+share/doc/opendkim/dkim_dns_nslist.html
+share/doc/opendkim/dkim_dns_set_close.html
+share/doc/opendkim/dkim_dns_set_config.html
+share/doc/opendkim/dkim_dns_set_init.html
+share/doc/opendkim/dkim_dns_set_nslist.html
 share/doc/opendkim/dkim_dns_set_query_cancel.html
 share/doc/opendkim/dkim_dns_set_query_service.html
 share/doc/opendkim/dkim_dns_set_query_start.html
 share/doc/opendkim/dkim_dns_set_query_waitreply.html
+share/doc/opendkim/dkim_dns_set_trustanchor.html
+share/doc/opendkim/dkim_dns_trustanchor.html
 share/doc/opendkim/dkim_dnssec.html
 share/doc/opendkim/dkim_eoh.html
 share/doc/opendkim/dkim_eom.html
@@ -146,3 +160,4 @@ share/doc/opendkim/opendkim.spec.in
 share/doc/opendkim/opendkim.xml
 share/doc/opendkim/overview.html
 share/doc/opendkim/stats.lua
+share/examples/rc.d/opendkim
diff --git a/mail/opendkim/PLIST.filter b/mail/opendkim/PLIST.filter
index c81a4c03eb9..ab9d6f4a4ab 100644
--- a/mail/opendkim/PLIST.filter
+++ b/mail/opendkim/PLIST.filter
@@ -1,5 +1,6 @@
-@comment $NetBSD: PLIST.filter,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $
+@comment $NetBSD: PLIST.filter,v 1.2 2013/01/05 17:05:07 pettai Exp $
 man/man5/opendkim.conf.5
 man/man8/opendkim.8
 sbin/opendkim
+share/examples/opendkim/opendkim.conf.sample
 share/examples/rc.d/opendkim
diff --git a/mail/opendkim/PLIST.stats b/mail/opendkim/PLIST.stats
index 0f349d1290c..fbdac435ec0 100644
--- a/mail/opendkim/PLIST.stats
+++ b/mail/opendkim/PLIST.stats
@@ -1,5 +1,11 @@
-@comment $NetBSD: PLIST.stats,v 1.5 2012/06/16 20:20:15 pettai Exp $
-bin/opendkim-spam
-bin/opendkim-stats
-man/man1/opendkim-spam.1
+@comment $NetBSD: PLIST.stats,v 1.6 2013/01/05 17:05:07 pettai Exp $
+man/man8/opendkim-expire.8
+man/man8/opendkim-gengraphs.8
+man/man8/opendkim-genstats.8
 man/man8/opendkim-stats.8
+sbin/opendkim-expire
+sbin/opendkim-gengraphs
+sbin/opendkim-genstats
+sbin/opendkim-reportstats
+sbin/opendkim-stats
+share/doc/opendkim/mkdb.mysql
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index 5fdb0ceddd4..b9faeabfe41 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.8 2012/11/19 18:39:34 pettai Exp $
+$NetBSD: distinfo,v 1.9 2013/01/05 17:05:07 pettai Exp $
 
-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 (opendkim-2.7.3.tar.gz) = abaab329ccea5f27166d99030a6e3cac3db63d76
+RMD160 (opendkim-2.7.3.tar.gz) = 83270cc71246b21806e6c3ca83f3e2dcdae6c845
+Size (opendkim-2.7.3.tar.gz) = 1157432 bytes
 SHA1 (patch-configure) = 8e635d41c213f899b31b392b1cdb96c8d5113ca4
diff --git a/mail/opendkim/options.mk b/mail/opendkim/options.mk
index 9f0efec290b..5762819b820 100644
--- a/mail/opendkim/options.mk
+++ b/mail/opendkim/options.mk
@@ -1,8 +1,8 @@
-# $NetBSD: options.mk,v 1.3 2011/04/29 11:48:24 adam Exp $
+# $NetBSD: options.mk,v 1.4 2013/01/05 17:05:07 pettai Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.opendkim
-PKG_SUPPORTED_OPTIONS=	filter debug dkim-stats vbr
-PKG_SUGGESTED_OPTIONS=	filter
+PKG_SUPPORTED_OPTIONS=	opendkim-filter debug dkim-stats vbr
+PKG_SUGGESTED_OPTIONS=	opendkim-filter
 
 .include "../../mk/bsd.options.mk"
 
@@ -18,30 +18,34 @@ CONFIGURE_ARGS+=	--disable-debug
 ###
 ### Install filter (milter) plugin
 ###
-.if !empty(PKG_OPTIONS:Mfilter)
+.if !empty(PKG_OPTIONS:Mopendkim-filter)
 EGDIR=		${PREFIX}/share/examples/opendkim
 RCD_SCRIPTS=	opendkim
 
 CONFIGURE_ARGS+=	--enable-filter
 CONFIGURE_ARGS+=	--with-milter=${PREFIX}
-SUBST_CLASSES+=		conf
-SUBST_STAGE.conf=	pre-configure
-SUBST_FILES.conf=	opendkim/Makefile.in
-SUBST_SED.conf+=	-e 's|@EGDIR@|${EGDIR}|g'
 
-#CONF_FILES=		${EGDIR}/opendkim.conf.sample \
-#			${PKG_SYSCONFDIR}/opendkim.conf
+CONF_FILES=		${EGDIR}/opendkim.conf.sample \
+			${PKG_SYSCONFDIR}/opendkim.conf
+
+INSTALLATION_DIRS=	${EGDIR}
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/opendkim/opendkim.conf.sample \
+				${DESTDIR}${EGDIR}/opendkim.conf.sample
 
 PLIST_SRC+=		${PKGDIR}/PLIST.filter
 .else
 CONFIGURE_ARGS+=	--disable-filter
 .endif
 
+
 ###
 ### Build with VBR support
 ###
 .if !empty(PKG_OPTIONS:Mvbr)
 CONFIGURE_ARGS+=	--enable-vbr
+PKGCONFIG_OVERRIDE+=	libvbr/vbr.pc.in
 PLIST_SRC+=		${PKGDIR}/PLIST.vbr
 .else
 CONFIGURE_ARGS+=	--disable-vbr
@@ -54,6 +58,9 @@ CONFIGURE_ARGS+=	--disable-vbr
 #.include "../../mk/db1.builtin.mk"
 CONFIGURE_ARGS+=	--enable-stats
 PLIST_SRC+=		${PKGDIR}/PLIST.stats
+REPLACE_PERL+=		stats/opendkim-expire.in
+REPLACE_PERL+=		stats/opendkim-gengraphs.in
+REPLACE_PERL+=		stats/opendkim-genstats.in
 .else
 CONFIGURE_ARGS+=	--disable-stats
 .endif