Update to dkim-milter 2.8.2, contributed from Fredrik Pettai <pettai@nordu.net>

2.8.2           2009/02/17
        Request a signature with an "i=" tag if signing for subdomains and
                a keylist entry matches.  Previously this only occurred when
                using an explicit domain list.  Problem noted by
                S. Moonesamy of Eland Systems.
        Fixes in and around dkim_socket_cleanup().  Problem noted by
                S. Moonesamy of Eland Systems.
        LIBDKIM: When logging a d2i_PUBKEY_bio() or EVP_PKEY_get1_RSA()
                failure, also log the selector and domain involved so manual
                diagnostics are possible.
        LIBDKIM/LIBAR: Feature request #SF2380508: Add new test for
                WITHOUT_LIBSM which removes references to libsm's sm_strl*()
                functions, so that libdkim and libar can stand on their own
                on systems which provide the strl*() functions.  Requested by
                Frederik Pettai.
        LIBDKIM: Report DKIM_STAT_NOSIG if the caller commands that all
                signatures should be ignored.
        LIBDKIM: Plug a memory leak caused when responding to a malloc()
                failure.
        LIBDKIM: New signature error code DKIM_SIGERROR_KEYDECODE, used if
                 d2i_PUBKEY_BIO() or EVP_PKEY_get1_RSA fails in
                dkim_sig_process().
        LIBAR: Make reference to the "_res" structure more thread-safe.
        BUILD: Make use of conf_dkim_filter_ENVDEF since site.config.m4.dist
                refers to it.  Problem noted by S. Moonesamy of Eland Systems.

5 files changed, 46 insertions, 28 deletions

diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 280324b5e9b..8fee8bebede 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.19 2009/02/24 23:41:44 joerg Exp $
+# $NetBSD: Makefile,v 1.20 2009/02/28 15:44:55 manu Exp $
 
-DISTNAME=	dkim-milter-2.8.1
+DISTNAME=	dkim-milter-2.8.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
 
@@ -50,7 +50,7 @@ SUBST_MESSAGE.libs=	Fixing Makefile references and man pages.
 CONF_FILES=		${EGDIR}/dkim-filter.conf.sample \
 			${PKG_SYSCONFDIR}/dkim-filter.conf
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 libexec \
+INSTALLATION_DIRS=	${PKGMANDIR}/man5 ${PKGMANDIR}/man8 \
 			share/doc/dkim-milter ${EGDIR} \
 			share/doc/dkim-milter/libdkim
 
diff --git a/mail/dkim-milter/PLIST b/mail/dkim-milter/PLIST
index ef0fadf6da9..199eb86d366 100644
--- a/mail/dkim-milter/PLIST
+++ b/mail/dkim-milter/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2009/01/19 23:24:28 adrianp Exp $
+@comment $NetBSD: PLIST,v 1.10 2009/02/28 15:44:55 manu Exp $
 ${PLIST.arlib}lib/libar.a
 ${PLIST.arlib}man/man3/ar.3
 lib/libdkim.a
@@ -21,11 +21,11 @@ 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-05.txt
-share/doc/dkim-milter/draft-ietf-dkim-deployment-02.txt
+share/doc/dkim-milter/draft-ietf-dkim-deployment-03.txt
 share/doc/dkim-milter/draft-ietf-dkim-overview-10.txt
-share/doc/dkim-milter/draft-ietf-dkim-ssp-08.txt
+share/doc/dkim-milter/draft-ietf-dkim-ssp-09.txt
 share/doc/dkim-milter/draft-kucherawy-dkim-reporting-04.txt
-share/doc/dkim-milter/draft-kucherawy-sender-auth-header-19.txt
+share/doc/dkim-milter/draft-kucherawy-sender-auth-header-20.txt
 share/doc/dkim-milter/draft-shafranovich-feedback-report-06.txt
 share/doc/dkim-milter/libdkim/dkim_dnssec.html
 share/doc/dkim-milter/libdkim/dkim_policy_getdnssec.html
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index d63af081ec1..15fdfe067ad 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.8 2009/01/19 23:24:28 adrianp Exp $
+$NetBSD: distinfo,v 1.9 2009/02/28 15:44:55 manu Exp $
 
-SHA1 (dkim-milter-2.8.1.tar.gz) = 0bfc8839c21da7208670f39e8d054579d56865df
-RMD160 (dkim-milter-2.8.1.tar.gz) = 76745d9fba95cfd0a05f62aa334293a56f6715d1
-Size (dkim-milter-2.8.1.tar.gz) = 726239 bytes
-SHA1 (patch-aa) = 27b4ad93e1f97ba072eaaf28d06801f765b74ec4
+SHA1 (dkim-milter-2.8.2.tar.gz) = d39840bbbc572e455fa617b1ab297694a1c23156
+RMD160 (dkim-milter-2.8.2.tar.gz) = f1f114f7cd1842404d58e2681f539015953b65c7
+Size (dkim-milter-2.8.2.tar.gz) = 740258 bytes
+SHA1 (patch-aa) = e3564e641979ae4e94a85790c699e14f7c6c8ca1
 SHA1 (patch-ab) = ab99d7cbc6cf3ad5aff905d32c50caac7d5c02e0
 SHA1 (patch-ac) = 863ff7ec1ac1ebf06732a78c8429fcc1b2799ac4
diff --git a/mail/dkim-milter/options.mk b/mail/dkim-milter/options.mk
index c1fee1ed162..f9a0d84a553 100644
--- a/mail/dkim-milter/options.mk
+++ b/mail/dkim-milter/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.6 2008/04/20 17:36:15 adrianp Exp $
+# $NetBSD: options.mk,v 1.7 2009/02/28 15:44:55 manu Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.dkim-milter
-PKG_SUPPORTED_OPTIONS=	inet6 dkim-milter-arlib debug dkim-stats
+PKG_SUPPORTED_OPTIONS=	inet6 dkim-milter-arlib debug dkim-stats without-libsm
 
 .include "../../mk/bsd.options.mk"
 
@@ -37,6 +37,15 @@ SUBST_SED.libs+=	-e 's|@ARLIB@|dnl|g'
 .endif
 
 ###
+### Build with native strl*()
+###
+.if !empty(PKG_OPTIONS:Mwithout-libsm)
+SUBST_SED.libs+=	-e 's|@WITHOUTLIBSM@||g'
+.else
+SUBST_SED.libs+=	-e 's|@WITHOUTLIBSM@|dnl|g'
+.endif
+
+###
 ### Install dkim-stats(8) which outputs dkim-milter statistics
 ###
 PLIST_VARS+=		stats
diff --git a/mail/dkim-milter/patches/patch-aa b/mail/dkim-milter/patches/patch-aa
index eb4775f51cd..3fc25385510 100644
--- a/mail/dkim-milter/patches/patch-aa
+++ b/mail/dkim-milter/patches/patch-aa
@@ -1,27 +1,36 @@
-$NetBSD: patch-aa,v 1.6 2009/01/19 23:24:28 adrianp Exp $
+$NetBSD: patch-aa,v 1.7 2009/02/28 15:44:55 manu Exp $
 
---- devtools/Site/site.config.m4.orig	2009-01-19 23:11:46.000000000 +0000
+--- devtools/Site/site.config.m4.orig	2009-02-18 11:02:11.000000000 +0100
 +++ devtools/Site/site.config.m4
-@@ -11,7 +11,7 @@ dnl
+@@ -11,7 +11,7 @@
  dnl If you are encountering coredumps and want to be able to analyze them
  dnl using something like "gdb", enable this next line by deleting the "dnl"
  dnl at the front of it.
 -dnl define(`confOPTIMIZE', `-g')
-+@DEBUG@ dnl define(`confOPTIMIZE', `-g')
++@DEBUG@ define(`confOPTIMIZE', `-g')
  
  dnl Shared library for libdkim
  dnl
-@@ -26,7 +26,7 @@ dnl If you want libdkim and dkim.h to be
+@@ -26,7 +26,7 @@
  dnl the package, enable this next line by deleting the "dnl" at the front
  dnl of it.  This is done automatically if you've requested the shared
  dnl library.
 -dnl define(`bld_LIBDKIM_INSTALL', `true')
 +define(`bld_LIBDKIM_INSTALL', `true')
  
- dnl Faster strtoul()/strtoull() implementations
+ dnl Use native strlcat()/strlcpy() functions
  dnl
-@@ -40,7 +40,7 @@ dnl libar -- asynchronous resolver libra
+@@ -37,7 +37,7 @@
+ dnl On the other hand, you can just use your native strlcat() and strlcpy()
+ dnl if you have them, avoiding this dependency.  If that's the case, enable
+ dnl this next line by deleting the "dnl" at the front of it.
+-dnl APPENDDEF(`confENVDEF', `-DWITHOUT_LIBSM')
++@WITHOUTLIBSM@ APPENDDEF(`confENVDEF', `-DWITHOUT_LIBSM')
+ 
+ dnl Faster strtoul()/strtoull() implementations
  dnl
+@@ -53,7 +53,7 @@
+ dnl 
  dnl If you want to use the provided asynchronous resolver library, enable this
  dnl next line by deleting the "dnl" at the front of it.
 -dnl define(`bld_USE_ARLIB', `true')
@@ -29,7 +38,7 @@ $NetBSD: patch-aa,v 1.6 2009/01/19 23:24:28 adrianp Exp $
  dnl 
  dnl libar normally uses res_init() or res_ninit() to load the contents
  dnl of resolv.conf for its use.  If neither of these work on your system
-@@ -49,7 +49,7 @@ dnl may need to enable code that parses 
+@@ -62,7 +62,7 @@
  dnl also be required if you've got any IPv6 addresses in /etc/resolv.conf.
  dnl In that case, enable this next line by deleting the "dnl" at the front
  dnl of it.
@@ -38,13 +47,13 @@ $NetBSD: patch-aa,v 1.6 2009/01/19 23:24:28 adrianp Exp $
  
  dnl libunbound -- "unbound" asynchronous resolver library
  dnl
-@@ -64,6 +64,14 @@ dnl Finally, you may need to enable and 
+@@ -79,6 +79,14 @@
  dnl can find your installation.
  dnl APPENDDEF(`confINCDIRS', `-I/usr/local/unbound/include ')
  dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/unbound/lib ')
 +APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include ')                       
 +APPENDDEF(`confLIBDIRS', `-L@SSLBASE@/lib ')                           
-+                                     
++
 +dnl pthread support                  
 +dnl                                  
 +APPENDDEF(`confLIBS', `@PTHREAD_LDFLAGS@ ')                            
@@ -53,7 +62,7 @@ $NetBSD: patch-aa,v 1.6 2009/01/19 23:24:28 adrianp Exp $
  
  dnl POPAUTH -- POP-before-SMTP authentication
  dnl
-@@ -131,9 +139,10 @@ dnl APPENDDEF(`confENVDEF', `-D_FFR_REPL
+@@ -146,9 +154,10 @@
  dnl APPENDDEF(`confENVDEF', `-D_FFR_REPORT_INTERVALS ')
  dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECT_CANONICALIZATION ')
  dnl APPENDDEF(`confENVDEF', `-D_FFR_SELECTOR_HEADER ')
@@ -65,7 +74,7 @@ $NetBSD: patch-aa,v 1.6 2009/01/19 23:24:28 adrianp Exp $
  
  dnl DomainKeys -- Yahoo DomainKeys verification support
  dnl 
-@@ -149,6 +158,8 @@ dnl adjust the paths below and enable th
+@@ -164,6 +173,8 @@
  dnl front of them.
  dnl APPENDDEF(`bld_dkim_filter_INCDIRS', `-I/usr/local/sendmail/include')
  dnl APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L/usr/local/sendmail/lib')
@@ -74,11 +83,11 @@ $NetBSD: patch-aa,v 1.6 2009/01/19 23:24:28 adrianp Exp $
  
  dnl smfi_addheader() -- older versions of libmilter
  dnl
-@@ -157,3 +168,22 @@ dnl primitive, you can enable this to ha
+@@ -172,3 +183,22 @@
  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 ')
-+                                     
++
 +dnl path fixes for pkgsrc            
 +dnl                                  
 +define(`confINCLUDEDIR', `@PREFIX@/include')