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

1 files changed, 47 insertions, 22 deletions

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"