2.3.0 2011/02/21

        Feature request #SF2964396: Allow SignHeaders, OmitHeaders and
                SenderHeaders to be specified as deltas to the default lists.
        Feature request #SF3053094: Correct documentation and improve function
                of the AuthservID configuration setting.  Requested by
                Andreas Schulze.
        Feature request #SF3060152: Add odkim.replace_header() function.
        Feature request #SF3060161: Add odkim.del_header() function.
        Feature request #SF3061189: Add new "quarantine" option to all the
                various "On-" settings.
        Feature request #SF3066104: Add "AnonymousDomains" configuration
                option.
        Feature request #SF3074290: Add _FFR_ATPS, experimental support for
                draft-kucherawy-dkim-atps.
        Feature request #SF3076684: Add "VBR-TrustedCertifiersOnly" flag.
        Feature request #SF3080604: Add odkim.parse_field() function.
                Requested by Todd Lyons.
        Feature request #SF3081697: Add "OversignHeaders" configuration
                option.
        Feature request #SF3085536: Activate _FFR_STATS_I, providing
                statistics reporting about use of "i=" in signatures.
        Feature request #SF3096630: Add odkim.rbl_check() function.
        Feature request #SF3097083: Make SigningTable accessible from Lua.
        Feature request #SF3103095: Allow "%" in a KeyTable entry's filename
                component as well as the domain name.
        Feature request #SF3105480: Improved VBR correctness; don't conduct
                VBR checks at all if there are disagreeing "mc" values in
                multiple VBR-Info header fields.
        Feature request #SF3106132: Allow "%" in a SigningTable's value.
        Feature request #SF3109963: Add "MaximumSignaturesToVerify" setting.
                Suggested by John Wood.
        Feature request #SF3110593: Add compile-time support for GnuTLS as
                an alternative to OpenSSL.  Suggested by Alessandro Vesely.
        Feature request #SF3136772: Sign the VBR-Info header field, if added.
                Requested by Frederik Pettai.
        Fix bug #SF3134119: With AutoRestart enabled, arrange to relay
                SIGUSR1 from the parent to the child rather than terminating.
                Reported by Yoshiaki Yanagihara.
        Fix bug #SF3141313: Trim whitespace from values in in-core data
                sets.  Reported by Todd Lyons.
        Fix bug #SF3156124: More robust handling of database disconnects.
                Also add _FFR_POSTGRESQL_RECONNECT_HACK, which will hopefully
                be temporary.  Reported by Miha Vrhovnik.
        Fix bug #SF3181180: Correct handling of quoted strings containing
                parentheses (and the opposite) when parsing
                Authentication-Results header fields.  Reported by
                Mark Martinec.
        Fix back-compatibility with very old implementations of milter in MTAs.
        Fix case-insensitive matching for domain names when doing signing
                selection.  Problem noted by John Espiro.
        New configuration file options:
                - "CaptureUnknownErrors", replacing the FFR of the same name
                - "DNSConnect", requesting the resolver use TCP mode
                - "KeepAuthResults", suppressing required removal of
                  Authentication-Results header fields
                - "ResolverTracing", adding detailed logging of libar activity
                - "StrictHeaders", requesing libopendkim to assert header
                  field counts according to the standards
                - "UnboundConfigFile", passing a configuration file name to
                  libunbound (suggested by Andreas Schulze)
                - "VBR-PurgeFields", removing "X-VBR-*" fields after using them
        Trim whitespace from the end of all values in a config file, not just
                strings.  Problem noted by Reuben Farrelly.
        Assume a default location for opendkim.conf.  Suggested by Andreas
                Schulze.
        Don't needlessly demand milter features, causing aborts when they're
                not available.  Problem noted by Todd Lyons.
        Make odkim.get_clienthost(), odkim.get_clientip() and
                odkim.get_fromdomain() available in the final script.
        When "SyslogSuccess" is active, log the selector and domain used.
                Suggested by Miha Vrhovnik.
        LIBAR: Feature request #SF3115073: Add flag for fine-grained activity
                logging for debugging purposes.
        LIBAR: Add support for using poll() instead of socket().
        LIBOPENDKIM: Feature request #SF3087029: Add DKIM_LIBFLAGS_STRICTHDRS.
        LIBOPENDKIM: Feature request #SF3089990: Add dkim_sig_getsignedhdrs().
        LIBOPENDKIM: Fix bug #SF3079094: Have dkim_diffheaders() take
                canonicalization into account when generating its results
                to avoid false positives.
        LIBOPENDKIM: Fix bug #SF3184670: Add error codes for missing and empty
                "v=" tags, thus avoiding a possible assertion failure when
                DKIM_LIBFLAGS_BADSIGHANDLES is in use.  Reported by J. Coloos.
        LIBOPENDKIM: Fix up handling of multi-TXT DNS replies inside
                dkim_get_policy_dns().
        LIBOPENDKIM: Add dkim_getid().
        LIBOPENDKIM: Treat no answers as an NXDOMAIN with respect to
                retrieving ADSP records.
        LIBOPENDKIM: When an unexpected DNS type or class is received,
                log the received values.
        LIBVBR: Feature request #SF3105477: Copy the generic DNS work from
                libopendkim.
        STATS: Feature request #SF3085536: Activate _FFR_STATS_I, providing
                statistics reporting about use of "i=" in signatures.
        STATS: Feature request #SF3125701: Add "s=" key value tracking.
        STATS: Feature request #SF3137445: Track key sizes.  Suggested by
                Todd Lyons.
        MILTERTEST: When asserting negotiation state, don't forget to capture
                what was negotiated.
        TOOLS: Feature request #SF3106876: Amend opendkim-testkey to return
                the DNSSEC results as well.
        TOOLS: Fix bug #SF3143922: Command line parameters to opendkim-testkey
                now override their configuration file counterparts.
        TOOLS: Experimental new "opendkim-spam" tool to let users update a
                stats database to indicate a message is spam, for possible
                later correlation use.
        BUILD: opendkim-genzone needs LIBCRYPTO_LDFLAGS.  Reported by
                John Smith.
        Activate _FFR_CAPTURE_UNKNOWN_ERRORS.

6 files changed, 27 insertions, 65 deletions

diff --git a/mail/opendkim/Makefile b/mail/opendkim/Makefile
index b99c6fae54d..fc23a64c5da 100644
--- a/mail/opendkim/Makefile
+++ b/mail/opendkim/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.2 2011/02/21 00:04:21 pettai Exp $
+# $NetBSD: Makefile,v 1.3 2011/03/13 23:31:31 pettai Exp $
 #
 
-DISTNAME=	opendkim-2.2.2
+DISTNAME=	opendkim-2.3.0
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=opendkim/}
 
diff --git a/mail/opendkim/PLIST b/mail/opendkim/PLIST
index 85d23815e58..2e190bd0838 100644
--- a/mail/opendkim/PLIST
+++ b/mail/opendkim/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2011/02/21 00:04:21 pettai Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/03/13 23:31:31 pettai Exp $
 bin/opendkim-genkey
 bin/opendkim-genzone
 bin/opendkim-testadsp
@@ -15,6 +15,7 @@ share/doc/opendkim/KNOWNBUGS
 share/doc/opendkim/LICENSE
 share/doc/opendkim/LICENSE.Sendmail
 share/doc/opendkim/README
+share/doc/opendkim/README.SQL
 share/doc/opendkim/README.opendkim-reportstats
 share/doc/opendkim/RELEASE_NOTES.Sendmail
 share/doc/opendkim/authheaders-check-setup-hook.lua
@@ -40,6 +41,7 @@ share/doc/opendkim/dkim_get_user_context.html
 share/doc/opendkim/dkim_getcachestats.html
 share/doc/opendkim/dkim_getdomain.html
 share/doc/opendkim/dkim_geterror.html
+share/doc/opendkim/dkim_getid.html
 share/doc/opendkim/dkim_getmode.html
 share/doc/opendkim/dkim_getpartial.html
 share/doc/opendkim/dkim_getpolicystr.html
@@ -99,6 +101,7 @@ share/doc/opendkim/dkim_sig_getkeysize.html
 share/doc/opendkim/dkim_sig_getreportinfo.html
 share/doc/opendkim/dkim_sig_getselector.html
 share/doc/opendkim/dkim_sig_getsignalg.html
+share/doc/opendkim/dkim_sig_getsignedhdrs.html
 share/doc/opendkim/dkim_sig_getsigntime.html
 share/doc/opendkim/dkim_sig_gettagvalue.html
 share/doc/opendkim/dkim_sig_hdrsigned.html
@@ -115,19 +118,23 @@ share/doc/opendkim/dkim_verify.html
 share/doc/opendkim/dns.html
 share/doc/opendkim/draft-ietf-dkim-implementation-report-05.txt
 share/doc/opendkim/draft-ietf-dkim-mailinglists-04.txt
-share/doc/opendkim/draft-ietf-marf-dkim-reporting-00.txt
-share/doc/opendkim/draft-kucherawy-authres-vbr-00.txt
+share/doc/opendkim/draft-ietf-marf-dkim-reporting-01.txt
+share/doc/opendkim/draft-kucherawy-authres-vbr-04.txt
+share/doc/opendkim/draft-kucherawy-dkim-atps-02.txt
 share/doc/opendkim/index.html
+share/doc/opendkim/opendkim
 share/doc/opendkim/opendkim-reportstats
-share/examples/opendkim/opendkim.conf.sample
-share/examples/opendkim/opendkim.conf.simple
-share/examples/opendkim/opendkim.conf.simple-verify
-share/doc/opendkim/opendkim.init
-share/doc/opendkim/opendkim.spec
+share/doc/opendkim/opendkim.conf.sample
+share/doc/opendkim/opendkim.conf.simple
+share/doc/opendkim/opendkim.conf.simple-verify
+share/doc/opendkim/opendkim.spec.in
+share/doc/opendkim/opendkim.xml
 share/doc/opendkim/overview.html
+share/doc/opendkim/rfc3447.txt
 share/doc/opendkim/rfc4686.txt
 share/doc/opendkim/rfc4871.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
@@ -136,3 +143,4 @@ share/doc/opendkim/rfc5672.txt
 share/doc/opendkim/rfc5863.txt
 share/doc/opendkim/rfc5965.txt
 share/doc/opendkim/rfc6008.txt
+share/examples/rc.d/opendkim
diff --git a/mail/opendkim/PLIST.vbr b/mail/opendkim/PLIST.vbr
index ca6ad50cfe8..5b339f2d4b2 100644
--- a/mail/opendkim/PLIST.vbr
+++ b/mail/opendkim/PLIST.vbr
@@ -1,4 +1,5 @@
-@comment $NetBSD: PLIST.vbr,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $
+@comment $NetBSD: PLIST.vbr,v 1.2 2011/03/13 23:31:31 pettai Exp $
 include/vbr/vbr.h
 lib/libvbr.la
 lib/pkgconfig/vbr.pc
+man/man3/vbr.3
diff --git a/mail/opendkim/distinfo b/mail/opendkim/distinfo
index f7f1907e334..8aceb70fd3b 100644
--- a/mail/opendkim/distinfo
+++ b/mail/opendkim/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.2 2011/02/21 00:04:21 pettai Exp $
+$NetBSD: distinfo,v 1.3 2011/03/13 23:31:31 pettai Exp $
 
-SHA1 (opendkim-2.2.2.tar.gz) = cd79dacf24ce1ba742618d7cf676f990841172ba
-RMD160 (opendkim-2.2.2.tar.gz) = 6122e160b79de039d5ae0ab5a2f8689d51c81938
-Size (opendkim-2.2.2.tar.gz) = 1098812 bytes
-SHA1 (patch-aa) = 47c743d72d2cb0eb40043a71fa87b959dd62b9d2
+SHA1 (opendkim-2.3.0.tar.gz) = 99fd2afcd67d92aeca95615c9a4ede2d8bea8ab0
+RMD160 (opendkim-2.3.0.tar.gz) = 72342fc3e8915682f638301e0806ad9bb6d2616c
+Size (opendkim-2.3.0.tar.gz) = 1275560 bytes
diff --git a/mail/opendkim/options.mk b/mail/opendkim/options.mk
index 04d0c405c7e..9178a1db020 100644
--- a/mail/opendkim/options.mk
+++ b/mail/opendkim/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2010/10/19 23:11:42 pettai Exp $
+# $NetBSD: options.mk,v 1.2 2011/03/13 23:31:31 pettai Exp $
 
 PKG_OPTIONS_VAR=        PKG_OPTIONS.opendkim
 PKG_SUPPORTED_OPTIONS=  filter debug dkim-stats vbr
@@ -29,8 +29,8 @@ 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
 
 PLIST_SRC+=		${PKGDIR}/PLIST.filter
 .else
diff --git a/mail/opendkim/patches/patch-aa b/mail/opendkim/patches/patch-aa
deleted file mode 100644
index 22838132312..00000000000
--- a/mail/opendkim/patches/patch-aa
+++ /dev/null
@@ -1,46 +0,0 @@
-$NetBSD: patch-aa,v 1.2 2011/02/21 00:04:22 pettai Exp $
-
---- opendkim/Makefile.in.orig	2011-02-20 23:52:59.000000000 +0000
-+++ opendkim/Makefile.in
-@@ -255,7 +255,7 @@ man8dir = $(mandir)/man8
- NROFF = nroff
- MANS = $(man_MANS)
- am__dist_doc_DATA_DIST = opendkim.conf.sample opendkim.conf.simple \
--	opendkim.conf.simple-verify README.SQL setup.lua.sample \
-+	opendkim.conf.simple-verify setup.lua.sample \
- 	screen.lua.sample final.lua.sample
- am__vpath_adj_setup = srcdirstrip=`echo "$(srcdir)" | sed 's|.|.|g'`;
- am__vpath_adj = case $$p in \
-@@ -422,6 +422,7 @@ builddir = @builddir@
- datadir = @datadir@
- datarootdir = @datarootdir@
- docdir = @docdir@
-+EGDIR = @EGDIR@
- domainname = @domainname@
- dvidir = @dvidir@
- exec_prefix = @exec_prefix@
-@@ -462,7 +463,7 @@ top_srcdir = @top_srcdir@
- @DEBUG_TRUE@AM_CFLAGS = -g
- dist_bin_SCRIPTS = opendkim-genkey
- dist_doc_DATA = opendkim.conf.sample opendkim.conf.simple \
--	opendkim.conf.simple-verify README.SQL $(am__append_51)
-+	opendkim.conf.simple-verify $(am__append_51)
- @BUILD_FILTER_TRUE@opendkim_SOURCES = opendkim.c opendkim.h opendkim-ar.c opendkim-ar.h opendkim-arf.c opendkim-arf.h opendkim-config.h opendkim-crypto.c opendkim-crypto.h opendkim-db.c opendkim-db.h opendkim-dns.c opendkim-dns.h opendkim-lua.c opendkim-lua.h config.c config.h stats.c stats.h test.c test.h util.c util.h
- @BUILD_FILTER_TRUE@opendkim_CC = $(PTHREAD_CC)
- @BUILD_FILTER_TRUE@opendkim_CFLAGS = $(PTHREAD_CFLAGS) \
-@@ -1187,12 +1188,12 @@ uninstall-man8:
- 	done
- install-dist_docDATA: $(dist_doc_DATA)
- 	@$(NORMAL_INSTALL)
--	test -z "$(docdir)" || $(MKDIR_P) "$(DESTDIR)$(docdir)"
-+	test -z "$(EGDIR)" || $(MKDIR_P) "$(DESTDIR)$(EGDIR)"
- 	@list='$(dist_doc_DATA)'; for p in $$list; do \
- 	  if test -f "$$p"; then d=; else d="$(srcdir)/"; fi; \
- 	  f=$(am__strip_dir) \
--	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(docdir)/$$f'"; \
--	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(docdir)/$$f"; \
-+	  echo " $(dist_docDATA_INSTALL) '$$d$$p' '$(DESTDIR)$(EGDIR)/$$f'"; \
-+	  $(dist_docDATA_INSTALL) "$$d$$p" "$(DESTDIR)$(EGDIR)/$$f"; \
- 	done
- 
- uninstall-dist_docDATA: