Update to 2.4.4

* LIBDKIM: Fix bug #SF1867839: 64-bit portability in rfc2822.c.
  Patch from Geoff Adams.
* Update for latest Authentication-Results: header draft.
* Take advantage of some more features that were introduced with
  milter v2 in sendmail 8.14.0:
* Report "hardfail" instead of "fail" on authentication failures,
  in compliance with the Authentication-Results: draft.
* Fix use of "UseSSPDeny" to include handling of unsigned messages.
* Replace "gentxt.csh" with more robust "dkim-genkey" utility.

And *lots* more (the package in pkgsrc was 2 years+ old)

See RELEASE_NOTES for all the details

3 files changed, 50 insertions, 80 deletions

diff --git a/mail/dkim-milter/patches/patch-aa b/mail/dkim-milter/patches/patch-aa
index 926adf97c20..1a16a4429ea 100644
--- a/mail/dkim-milter/patches/patch-aa
+++ b/mail/dkim-milter/patches/patch-aa
@@ -1,37 +1,54 @@
-$NetBSD: patch-aa,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
+$NetBSD: patch-aa,v 1.2 2008/02/19 13:23:06 adrianp Exp $
 
---- dkim-filter/Makefile.m4.orig	2005-09-28 13:27:11.000000000 +0200
-+++ dkim-filter/Makefile.m4
-@@ -4,10 +4,10 @@ include(confBUILDTOOLSDIR`/M4/switch.m4'
- define(`confMT', `TRUE')
- define(`confREQUIRE_LIBSM', `true')
+--- devtools/Site/site.config.m4.orig	2008-02-16 12:17:49.000000000 +0000
++++ devtools/Site/site.config.m4
+@@ -87,6 +87,14 @@ dnl have v0.9.8 or later for SHA256 supp
+ dnl lines by deleting "dnl" from the front of them and edit paths as needed.
+ dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
+ dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ')
++APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include ')
++APPENDDEF(`confLIBDIRS', `-L@SSLBASE@/lib ')
++
++dnl pthread support
++dnl
++APPENDDEF(`confLIBS', `@PTHREAD_LDFLAGS@ ')
++APPENDDEF(`confINCDIRS', `-I@PTHREAD@/include ')
++APPENDDEF(`confLIBDIRS', `-L@PTHREAD@/lib ')
  
--APPENDDEF(`confLIBS', `-lssl -lcrypto')
-+APPENDDEF(`confLIBS', `-lssl -lcrypto @PTHREAD_LDFLAGS@ ')
- dnl Enable and edit these paths as needed:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
--dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/ssl/lib ')
-+APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include -I@PTHREAD@/include ')
-+APPENDDEF(`confLIBDIRS', `-L@SSLBASE@/lib -L@PTHREAD@/lib ')
- 
- dnl To use the asynchronous resolver library provided, enable this line:
- dnl bldPUSH_SMLIB(`ar')
-@@ -19,15 +19,15 @@ bldPUSH_SMLIB(`sm')
- 
- dnl Enable these next line if needed to specify the locations of libmilter.a
- dnl and the libmilter include files:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/sendmail/include')
--dnl APPENDDEF(`confLIBDIRS', `-L/usr/local/sendmail/lib')
-+APPENDDEF(`confINCDIRS', `-I@LMBASE@/include ')
-+APPENDDEF(`confLIBDIRS', `-L@LMBASE@/lib')
- 
- 
- dnl Enable for IPv6 support:
- dnl APPENDDEF(`confENVDEF', `-DNETINET6 ')
- 
- dnl Compile time options, especially FFRs:
--dnl APPENDDEF(`confENVDEF', `-DNO_SMFI_INSHEADER ')
+ dnl TRE -- Approximate regular expression matching
+ dnl
+@@ -117,6 +125,7 @@ dnl APPENDDEF(`confENVDEF', `-D_FFR_SELE
+ dnl APPENDDEF(`confENVDEF', `-D_FFR_STATS ')
+ dnl APPENDDEF(`confENVDEF', `-D_FFR_VBR ')
+ dnl APPENDDEF(`confENVDEF', `-D_FFR_ZTAGS ')
 +@INET6@ APPENDDEF(`confENVDEF', `-DNETINET6 ')
  
- dnl APPENDDEF(`confENVDEF', `-D_FFR_EXTERNAL_IGNORE_LIST ')
- dnl APPENDDEF(`confENVDEF', `-D_FFR_FLUSH_HEADERS ')
+ dnl DomainKeys -- Yahoo DomainKeys verification support
+ dnl 
+@@ -130,8 +139,8 @@ dnl
+ dnl This must be in the search rules for your compile.  If necessary,
+ dnl adjust the paths below and enable the lines by deleting "dnl" from the
+ 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')
++APPENDDEF(`bld_dkim_filter_INCDIRS', `-I@LMBASE@/include')
++APPENDDEF(`bld_dkim_filter_LIBDIRS', `-L@LMBASE@/lib')
+ 
+ dnl smfi_addheader() -- older versions of libmilter
+ dnl
+@@ -140,3 +149,15 @@ dnl primitive, you can enable this to ha
+ 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(`confSBINDIR', `@PREFIX@/sbin')
++define(`confUBINDIR', `@PREFIX@/bin')
++define(`confMANROOT', `@PREFIX@/@PKGMANDIR@/man')
++define(`confMANROOTMAN', `@PREFIX@/@PKGMANDIR@/man')
++define(`confMAN4EXT', `3')
++define(`confMAN5EXT', `5')
++define(`confMAN8EXT', `8')
++define(`confINSTALL_RAWMAN', 'yes')
++define(`confDONT_INSTALL_CATMAN', 'yes')
diff --git a/mail/dkim-milter/patches/patch-ab b/mail/dkim-milter/patches/patch-ab
deleted file mode 100644
index 7093123a5c4..00000000000
--- a/mail/dkim-milter/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-
---- libdkim/Makefile.m4.orig	2005-09-28 13:29:30.000000000 +0200
-+++ libdkim/Makefile.m4
-@@ -9,8 +9,7 @@ dnl APPENDDEF(`confENVDEF', `-DUSE_ARLIB
- dnl APPENDDEF(`confINCDIRS', `-I../libar/ ')
- 
- dnl Enable and edit this as appropriate for your system:
--dnl APPENDDEF(`confINCDIRS', `-I/usr/local/ssl/include ')
--
-+APPENDDEF(`confINCDIRS', `-I@SSLBASE@/include ')
- 
- define(`confMT', `true')
- 
diff --git a/mail/dkim-milter/patches/patch-ac b/mail/dkim-milter/patches/patch-ac
deleted file mode 100644
index 851334121d2..00000000000
--- a/mail/dkim-milter/patches/patch-ac
+++ /dev/null
@@ -1,33 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2006/01/08 18:20:30 joerg Exp $
-
---- include/sm/os/sm_os_freebsd.h.orig	2006-01-08 18:09:08.000000000 +0000
-+++ include/sm/os/sm_os_freebsd.h
-@@ -13,10 +13,18 @@
- **  Platform definitions for FreeBSD
- */
- 
--#define SM_OS_NAME	"freebsd"
--
- #define SM_CONF_SYS_CDEFS_H	1
- 
-+#ifdef __DragonFly__)
-+#define SM_OS_NAME	"dragonfly"
-+#define MI_SOMAXCONN	-1
-+#ifndef SM_CONF_STRL
-+#  define SM_CONF_STRL		1
-+#endif
-+
-+#else
-+#define SM_OS_NAME	"freebsd"
-+
- #if __FreeBSD__ >= 2
- #  include <osreldate.h> /* defines __FreeBSD_version */
- #  if __FreeBSD_version >= 199512	/* 2.2-current when it appeared */
-@@ -29,6 +37,7 @@
- #    endif
- #  endif
- #endif
-+#endif
- 
- #ifndef SM_CONF_SHM
- # define SM_CONF_SHM	1