4 files changed, 13 insertions, 117 deletions

diff --git a/mail/dk-milter/Makefile b/mail/dk-milter/Makefile
index 0a591cf2e452..ba625caeae2e 100644
--- a/mail/dk-milter/Makefile
+++ b/mail/dk-milter/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dk-milter
-PORTVERSION=	0.4.1
-PORTREVISION=	4
+PORTVERSION=	0.4.2
 CATEGORIES=	mail
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	dk-milter
@@ -17,6 +16,11 @@ COMMENT=	Domainkeys milter for Sendmail
 
 USE_RC_SUBR=	milter-dk.sh
 
+IPCCHECK!=	ipcrm -q 0 2>&1 || true
+.if ${IPCCHECK:Mimplemented}
+IGNORE=		your system does not support sysvipc
+.endif
+
 .if defined(WITH_POSTFIX_MILTER) || defined(WITH_POSTFIX) || defined(WITH_POSTFIX_CURRENT)
 SENDMAIL_MILTER_IN_BASE=	yes
 PKGMESSAGE=	pkg-message.postfix
diff --git a/mail/dk-milter/distinfo b/mail/dk-milter/distinfo
index 33929efc8671..08913cbda69e 100644
--- a/mail/dk-milter/distinfo
+++ b/mail/dk-milter/distinfo
@@ -1,3 +1,3 @@
-MD5 (dk-milter-0.4.1.tar.gz) = ec5f4fa17d53a2f39ebb0025caccabe0
-SHA256 (dk-milter-0.4.1.tar.gz) = 51f19981cbd1f4fea343982912a92cee7e2e302b7b48fe1703430afa414bcfb1
-SIZE (dk-milter-0.4.1.tar.gz) = 313092
+MD5 (dk-milter-0.4.2.tar.gz) = d8dad2ad6a03179364829ec5df1bdc73
+SHA256 (dk-milter-0.4.2.tar.gz) = ec5a62babaf9f0e969e0f94b36246bbeae0c6c3a538e2871010679c5ddd4bfd6
+SIZE (dk-milter-0.4.2.tar.gz) = 342403
diff --git a/mail/dk-milter/files/patch-libar-Makefile.m4 b/mail/dk-milter/files/patch-libar-Makefile.m4
index 4d0ec0f73139..04b5b1a6745d 100644
--- a/mail/dk-milter/files/patch-libar-Makefile.m4
+++ b/mail/dk-milter/files/patch-libar-Makefile.m4
@@ -1,9 +1,9 @@
---- libar/Makefile.m4.bak	Thu Sep  2 03:42:21 2004
-+++ libar/Makefile.m4	Sun May 22 13:29:22 2005
-@@ -6,7 +6,6 @@
+--- libar/Makefile.m4.orig	Sun Sep 17 01:00:43 2006
++++ libar/Makefile.m4	Wed Apr 11 16:24:39 2007
+@@ -12,7 +12,6 @@
  
  bldPRODUCT_START(`library', `libar')
- define(`bldSOURCES', `ar.c fix.c ')
+ define(`bldSOURCES', `ar.c manual.c ')
 -define(`bldINSTALLABLE', `true')
  bldPRODUCT_END
  
diff --git a/mail/dk-milter/files/patch-vendor-postfix b/mail/dk-milter/files/patch-vendor-postfix
deleted file mode 100644
index eaa27d69c7d4..000000000000
--- a/mail/dk-milter/files/patch-vendor-postfix
+++ /dev/null
@@ -1,108 +0,0 @@
---- dk-filter/dk-filter.c	19 May 2006 21:42:05 -0000	1.158
-+++ dk-filter/dk-filter.c	31 Aug 2006 21:37:17 -0000
-@@ -1582,15 +1582,7 @@
- 
- 	dfc->mctx_jobid = smfi_getsymval(ctx, "i");
- 	if (dfc->mctx_jobid == NULL)
--	{
--		if (no_i_whine && dolog)
--		{
--			syslog(LOG_WARNING,
--			       "WARNING: sendmail symbol 'i' not available");
--			no_i_whine = FALSE;
--		}
- 		dfc->mctx_jobid = JOBIDUNKNOWN;
--	}
- 
- #if _FFR_REQUIRED_HEADERS
- 	/* if requested, verify RFC2822-required headers */
-@@ -1625,6 +1617,8 @@
- 	}
- #endif /* _FFR_REQUIRED_HEADERS */
- 
-+	msgsigned = (dkf_findheader(dfc, DK_SIGNHEADER, 0) != NULL);
-+
- 	/* find the Sender: or From: header */
- 	memset(addr, '\0', sizeof addr);
- 	from = dkf_findheader(dfc, "Sender", 0);
-@@ -1639,7 +1633,8 @@
- 			       dfc->mctx_jobid);
- 		}
- 
--		dfc->mctx_addheader = TRUE;
-+		if (msgsigned)
-+			dfc->mctx_addheader = TRUE;
- 		dfc->mctx_headeronly = TRUE;
- 		dfc->mctx_status = DKF_STATUS_BADFORMAT;
- 		return SMFIS_CONTINUE;
-@@ -1669,7 +1664,6 @@
- 	originok = FALSE;
- 
- 	/* is it a domain we sign for? */
--	msgsigned = (dkf_findheader(dfc, DK_SIGNHEADER, 0) != NULL);
- 	if (!msgsigned && domains != NULL && dfc->mctx_domain != NULL)
- 	{
- 		int n;
-@@ -2075,6 +2069,26 @@
- 	assert(cc != NULL);
- 	dfc = cc->cctx_msg;
- 	assert(dfc != NULL);
-+
-+	/*
-+	**  If necessary, try again to get the job ID in case it came down
-+	**  later than expected (e.g. postfix).
-+	*/
-+
-+	if (dfc->mctx_jobid == JOBIDUNKNOWN)
-+	{
-+		dfc->mctx_jobid = smfi_getsymval(ctx, "i");
-+		if (dfc->mctx_jobid == NULL)
-+		{
-+			if (no_i_whine && dolog)
-+			{
-+				syslog(LOG_WARNING,
-+				       "WARNING: sendmail symbol 'i' not available");
-+				no_i_whine = FALSE;
-+			}
-+			dfc->mctx_jobid = JOBIDUNKNOWN;
-+		}
-+	}
- 
- 	/* get hostname; used in the X header and in new MIME boundaries */
- 	hostname = smfi_getsymval(ctx, "j");
-Index: libdk/dk.c
-===================================================================
-RCS file: /cvs/libdk/dk.c,v
-retrieving revision 1.168
-retrieving revision 1.169
-diff -u -r1.168 -r1.169
---- libdk/dk.c	6 Jun 2006 23:22:45 -0000	1.168
-+++ libdk/dk.c	26 Jun 2006 19:40:00 -0000	1.169
-@@ -1890,8 +1890,6 @@
- 	else
- 		hdr = sender;
- 
--	/* if we found a signature but the sender doesn't match it, say so */
--
- 	/* if verifying and no from/sender header was found, short-circuit */
- 	if (hdr == NULL && dk->dk_mode == DK_MODE_VERIFY)
- 	{
-@@ -1924,6 +1922,7 @@
- 			return DK_STAT_OK;
- 	}
- 
-+	/* if we found a signature but the sender doesn't match it, say so */
- 	if (hdr != NULL)
- 	{
- 		int status;
-@@ -2418,7 +2417,7 @@
- 		int status;
- 
- 		/* no sender header was found below the signature */
--		if (dk->dk_skipbody)
-+		if (dk->dk_skipbody && dk->dk_processing)
- 			return DK_STAT_SYNTAX;
- 
- 		if (dk->dk_key == NULL)
-
-