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

10 files changed, 165 insertions, 155 deletions

diff --git a/mail/dkim-milter/MESSAGE b/mail/dkim-milter/MESSAGE
new file mode 100644
index 00000000000..ea40b5062ee
--- /dev/null
+++ b/mail/dkim-milter/MESSAGE
@@ -0,0 +1,9 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2008/02/19 13:23:06 adrianp Exp $
+
+Note that there is a difference between "dkim-filter" and "dkim-milter".
+"dkim-milter" is a package containing a library, a filter and some tools to
+be used in testing your DKIM installation.  "dkim-filter" is the filter
+program contained in the "dkim-milter" package.
+
+===========================================================================
diff --git a/mail/dkim-milter/Makefile b/mail/dkim-milter/Makefile
index 049f0a0f243..0a2106ff071 100644
--- a/mail/dkim-milter/Makefile
+++ b/mail/dkim-milter/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2008/01/18 05:08:22 tnn Exp $
+# $NetBSD: Makefile,v 1.11 2008/02/19 13:23:06 adrianp Exp $
 
-DISTNAME=	dkim-milter-0.1.1
-PKGREVISION=	1
+DISTNAME=	dkim-milter-2.4.4
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=dkim-milter/}
 
@@ -10,47 +9,73 @@ HOMEPAGE=	http://sourceforge.net/projects/dkim-milter/
 COMMENT=	Open source DKIM filter software from Sendmail, Inc
 
 BUILDLINK_API_DEPENDS.libmilter+=	libmilter>=8.13.0
+BUILDLINK_API_DEPENDS.openssl+=		openssl>=0.9.8
 
 LICENSE=		sendmail-open-source-license
 
 MAKE_ENV+=		M4=${M4:Q}
-RCD_SCRIPTS=		dkim-milter
+RCD_SCRIPTS=		dkim-filter
 USE_BUILTIN.libmilter=	no
 USE_TOOLS+=		gm4
+PKG_OPTIONS_VAR=	PKG_OPTIONS.dkim-milter
+PKG_SUPPORTED_OPTIONS=	inet6
+EGDIR=			${PREFIX}/share/examples/dkim-milter
+FILES_SUBST+=		DKIM_USER=${DKIM_USER:Q} DKIM_GROUP=${DKIM_GROUP:Q}
+BUILD_DEFS+=		VARBASE DKIM_USER DKIM_GROUP
+
+DKIM_USER?=		dkim
+DKIM_GROUP?=		dkim
+PKG_GROUPS=		${DKIM_USER}
+PKG_USERS=		${DKIM_USER}:${DKIM_GROUP}
+PKG_GROUPS_VARS+=	DKIM_GROUP
+PKG_USERS_VARS+=	DKIM_USER
+OWN_DIRS_PERMS+=	${VARBASE}/run/dkim-filter \
+			${DKIM_USER} ${DKIM_GROUP} 0750
+
+.include "../../mk/bsd.options.mk"
 
 SUBST_CLASSES+=		libs
 SUBST_STAGE.libs=	pre-configure
-SUBST_FILES.libs=	dkim-filter/Makefile.m4 libdk/Makefile.m4
-SUBST_SED.libs=		-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g' \
-			-e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g' \
-			-e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g' \
-			-e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
-SUBST_MESSAGE.libs=	Fixing makefile references.
+SUBST_FILES.libs=	${WRKSRC}/devtools/Site/site.config.m4
+SUBST_FILES.libs+=	dkim-filter/dkim-filter.conf.5 dkim-filter/dkim-stats.8
+SUBST_SED.libs=		-e 's|@SSLBASE@|${BUILDLINK_PREFIX.openssl}|g'
+SUBST_SED.libs+=	-e 's|@LMBASE@|${BUILDLINK_PREFIX.libmilter}|g'
+SUBST_SED.libs+=	-e 's|@PTHREAD@|${BUILDLINK_PREFIX.pthread}|g'
+SUBST_SED.libs+=	-e 's|@PTHREAD_LDFLAGS@|${PTHREAD_LDFLAGS} ${PTHREAD_LIBS}|g'
+SUBST_SED.libs+=	-e 's|@PREFIX@|${PREFIX}|g'
+SUBST_SED.libs+=	-e 's|@PKGMANDIR@|${PKGMANDIR}|g'
+SUBST_SED.libs+=	-e 's|/etc/mail|${PKG_SYSCONFDIR}|g'
+SUBST_SED.libs+=	-e 's|.I /etc/dkim-filter.conf|.I ${PKG_SYSCONFDIR}/dkim-filter.conf|g'
+.if !empty(PKG_OPTIONS:Minet6)
+SUBST_SED.libs+=	-e 's|@INET6@||'
+.else
+SUBST_SED.libs+=	-e 's|@INET6@|dnl|'
+.endif
+SUBST_MESSAGE.libs=	Fixing Makefile references and man pages.
+
+CONF_FILES=		${EGDIR}/dkim-filter.conf.sample \
+			${PKG_SYSCONFDIR}/dkim-filter.conf
 
-INSTALLATION_DIRS=	${PKGMANDIR}/man8 sbin share/doc/dkim-milter
+INSTALLATION_DIRS=	share/doc/dkim-milter ${EGDIR}
 
 post-extract:
-	${LN} -s FreeBSD ${WRKSRC}/devtools/OS/DragonFly
+	${CP} ${WRKSRC}/site.config.m4.dist \
+		${WRKSRC}/devtools/Site/site.config.m4
 
 do-build:
-	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ./Build)
-
-post-build:
-	${SED} -e 's|dkim-filter|dkim-milter|g' \
-		${WRKSRC}/dkim-filter/dkim-filter.8 \
-		>${WRKSRC}/dkim-filter/dkim-milter.8
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build
 
 do-install:
-	cd ${WRKSRC}/obj.`${UNAME} -srm | ${TR} \  . | ${TR} \/ -` && \
-		${INSTALL_PROGRAM} dkim-filter/dkim-filter ${PREFIX}/sbin/dkim-milter
-	${INSTALL_MAN} ${WRKSRC}/dkim-filter/dkim-milter.8 ${PREFIX}/${PKGMANDIR}/man8/
+	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ./Build install
+
+post-install:
+	${INSTALL_DATA} ${WRKSRC}/dkim-filter/dkim-filter.conf.sample ${EGDIR}
 	${INSTALL_DATA} ${WRKSRC}/FEATURES ${PREFIX}/share/doc/dkim-milter
 	${INSTALL_DATA} ${WRKSRC}/INSTALL ${PREFIX}/share/doc/dkim-milter
 	${INSTALL_DATA} ${WRKSRC}/KNOWNBUGS ${PREFIX}/share/doc/dkim-milter
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/dkim-milter
 	${INSTALL_DATA} ${WRKSRC}/RELEASE_NOTES ${PREFIX}/share/doc/dkim-milter
 
-.include "options.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../mail/libmilter/buildlink3.mk"
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/mail/dkim-milter/PLIST b/mail/dkim-milter/PLIST
index 2bdaf1e7435..343a8a40070 100644
--- a/mail/dkim-milter/PLIST
+++ b/mail/dkim-milter/PLIST
@@ -1,10 +1,20 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-man/man8/dkim-milter.8
-sbin/dkim-milter
+@comment $NetBSD: PLIST,v 1.2 2008/02/19 13:23:06 adrianp Exp $
+bin/dkim-filter
+bin/dkim-genkey
+bin/dkim-testkey
+bin/dkim-testssp
+man/man5/dkim-filter.conf.5
+man/man8/dkim-filter.8
+man/man8/dkim-genkey.8
+man/man8/dkim-stats.8
+man/man8/dkim-testkey.8
+man/man8/dkim-testssp.8
 share/doc/dkim-milter/FEATURES
 share/doc/dkim-milter/INSTALL
 share/doc/dkim-milter/KNOWNBUGS
 share/doc/dkim-milter/README
 share/doc/dkim-milter/RELEASE_NOTES
-share/examples/rc.d/dkim-milter
+share/examples/dkim-milter/dkim-filter.conf.sample
+share/examples/rc.d/dkim-filter
 @dirrm share/doc/dkim-milter
+@dirrm share/examples/dkim-milter
diff --git a/mail/dkim-milter/distinfo b/mail/dkim-milter/distinfo
index 94a2e8812b3..e53205aa2f3 100644
--- a/mail/dkim-milter/distinfo
+++ b/mail/dkim-milter/distinfo
@@ -1,8 +1,6 @@
-$NetBSD: distinfo,v 1.2 2006/01/08 18:20:30 joerg Exp $
+$NetBSD: distinfo,v 1.3 2008/02/19 13:23:06 adrianp Exp $
 
-SHA1 (dkim-milter-0.1.1.tar.gz) = 6bfb5a3b7530864e09ed55b343fd747c78ddb2fa
-RMD160 (dkim-milter-0.1.1.tar.gz) = c8fae0456b8418ebeafdf6a5be22a86415b74578
-Size (dkim-milter-0.1.1.tar.gz) = 312318 bytes
-SHA1 (patch-aa) = 1d20c660bba8f6a754ca343434daf021559b41bd
-SHA1 (patch-ab) = f254cbee630fb18fc7f18daffd689753eb9dd467
-SHA1 (patch-ac) = 403e565640e3a67f26f04d9df5bb0833305d308a
+SHA1 (dkim-milter-2.4.4.tar.gz) = 0e945bdca7b70d6b1478ce3e0171f8023de50df2
+RMD160 (dkim-milter-2.4.4.tar.gz) = 744d167f86ad09b0f3856567f812787d18f40349
+Size (dkim-milter-2.4.4.tar.gz) = 617230 bytes
+SHA1 (patch-aa) = edf63a6c5376cb8fefbcd40ab46f944462eb94ab
diff --git a/mail/dkim-milter/files/dkim-filter.sh b/mail/dkim-milter/files/dkim-filter.sh
new file mode 100644
index 00000000000..56cba0f0bfe
--- /dev/null
+++ b/mail/dkim-milter/files/dkim-filter.sh
@@ -0,0 +1,40 @@
+#!@RCD_SCRIPTS_SHELL@
+#
+# $NetBSD: dkim-filter.sh,v 1.1 2008/02/19 13:23:06 adrianp Exp $
+#
+# PROVIDE: dkimfilter
+# REQUIRE: DAEMON
+# BEFORE: mail
+
+if [ -f /etc/rc.subr ]; then
+	. /etc/rc.subr
+fi
+
+name="dkimfilter"
+rcvar=$name
+command="@PREFIX@/bin/dkim-filter"
+pidfile="@VARBASE@/run/dkim-filter/${name}.pid"
+command_args="-P ${pidfile} -l -p @VARBASE@/run/dkim-filter/${name}.sock -x @PKG_SYSCONFDIR@/dkim-filter.conf -u @DKIM_USER@:@DKIM_GROUP@"
+required_files="@PKG_SYSCONFDIR@/dkim-filter.conf"
+start_precmd="dkimfilter_precmd"
+
+dkimfilter_precmd()
+{
+	if [ ! -d @VARBASE@/run/dkim-filter ]; then
+		@MKDIR@ @VARBASE@/run/dkim-filter
+		@CHMOD@ 0750 @VARBASE@/run/dkim-filter
+		@CHOWN@ @DKIM_USER@:@DKIM_GROUP@ @VARBASE@/run/dkim-filter
+	fi
+
+	if [ -f @VARBASE@/run/dkim-filter/${name}.sock ]; then
+		@RM@ -f @VARBASE@/run/dkim-filter/${name}.sock
+	fi
+}
+
+if [ -f /etc/rc.subr ]; then
+        load_rc_config $name
+	run_rc_command "$1"
+else
+	echo -n " ${name}"
+	${command} ${dkimfilter_flags} ${command_args}
+fi
diff --git a/mail/dkim-milter/files/dkim-milter.sh b/mail/dkim-milter/files/dkim-milter.sh
deleted file mode 100644
index 98b8e5322a3..00000000000
--- a/mail/dkim-milter/files/dkim-milter.sh
+++ /dev/null
@@ -1,27 +0,0 @@
-#!@RCD_SCRIPTS_SHELL@
-#
-# $NetBSD: dkim-milter.sh,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-#
-# PROVIDE: dkimmilter
-# REQUIRE: DAEMON
-# BEFORE: mail
-
-dkimmilter_flags="-h -l -p /var/run/dkimmilter.sock"
-
-if [ -f /etc/rc.subr ]; then
-	. /etc/rc.subr
-fi
-
-name="dkimmilter"
-rcvar=$name
-command="@PREFIX@/sbin/dkim-milter"
-pidfile="/var/run/${name}.pid"
-command_args="-P ${pidfile}"
-
-if [ -f /etc/rc.subr ]; then
-        load_rc_config $name
-	run_rc_command "$1"
-else
-	echo -n " ${name}"
-	${command} ${dkimmilter_flags} ${command_args}
-fi
diff --git a/mail/dkim-milter/options.mk b/mail/dkim-milter/options.mk
deleted file mode 100644
index 46f5bf2061a..00000000000
--- a/mail/dkim-milter/options.mk
+++ /dev/null
@@ -1,15 +0,0 @@
-# $NetBSD: options.mk,v 1.1.1.1 2005/10/27 19:49:07 minskim Exp $
-
-PKG_OPTIONS_VAR=	PKG_OPTIONS.dk-milter
-PKG_SUPPORTED_OPTIONS=	inet6
-
-.include "../../mk/bsd.options.mk"
-
-###
-### IPv6 support.
-###
-.if !empty(PKG_OPTIONS:Minet6)
-SUBST_SED.libs+=	-e 's|@INET6@||'
-.else
-SUBST_SED.libs+=	-e 's|@INET6@|dnl|'
-.endif
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