- Update to 20090825

PR:		138165
Submitted by:	Daniel Roethlisberger <daniel@roe.ch> (maintainer)

5 files changed, 13 insertions, 72 deletions

diff --git a/mail/dma/Makefile b/mail/dma/Makefile
index 86fdfccd7a3a..744cf5214b62 100644
--- a/mail/dma/Makefile
+++ b/mail/dma/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	dma
-PORTVERSION=	20090208
-PORTREVISION=	2
+PORTVERSION=	20090825
 CATEGORIES=	mail ipv6
 MASTER_SITES=	http://mirror.roe.ch/dist/dma/
 
diff --git a/mail/dma/distinfo b/mail/dma/distinfo
index 9c6684314f4e..4495e817410c 100644
--- a/mail/dma/distinfo
+++ b/mail/dma/distinfo
@@ -1,3 +1,3 @@
-MD5 (dma-20090208.tar.bz2) = 3284c870aad1c5248254aeee9cb2ae9d
-SHA256 (dma-20090208.tar.bz2) = 77524d6f6366e69d730c3d8cdcf2fe35a0cd28a6da7425def11bd4881043eaa3
-SIZE (dma-20090208.tar.bz2) = 17252
+MD5 (dma-20090825.tar.bz2) = d76ef92def1992c836888c8451afce23
+SHA256 (dma-20090825.tar.bz2) = 9fcff7cffd4b5a9ef9413b733f2e3dffebdee00f8a449e7908db480d4302a531
+SIZE (dma-20090825.tar.bz2) = 19992
diff --git a/mail/dma/files/patch-libexec_dma_dma.c b/mail/dma/files/patch-libexec_dma_dma.c
deleted file mode 100644
index 8361f7613744..000000000000
--- a/mail/dma/files/patch-libexec_dma_dma.c
+++ /dev/null
@@ -1,38 +0,0 @@
---- libexec/dma/dma.c.orig	2009-02-09 01:36:50.000000000 +0100
-+++ libexec/dma/dma.c	2009-07-04 00:12:53.000000000 +0200
-@@ -612,6 +612,7 @@
- 	const char *errmsg = "unknown bounce reason";
- 	struct timeval now;
- 	struct stat st;
-+	struct flock fl;
- 
- 	syslog(LOG_INFO, "%s: mail from=<%s> to=<%s>",
- 	       it->queueid, it->sender, it->addr);
-@@ -620,11 +621,27 @@
- 	syslog(LOG_INFO, "%s: trying delivery",
- 	       it->queueid);
- 
-+	bzero(&fl, sizeof(fl));
-+	fl.l_type = F_WRLCK;
-+	fl.l_whence = SEEK_SET;
-+	if (fcntl(fileno(it->queuef), F_SETLKW, &fl) == -1) {
-+		syslog(LOG_ERR, "%s: failed to lock queue file: %m",
-+				it->queueid);
-+	}
-+
- 	if (it->remote)
- 		error = deliver_remote(it, &errmsg);
- 	else
- 		error = deliver_local(it, &errmsg);
- 
-+	bzero(&fl, sizeof(fl));
-+	fl.l_type = F_UNLCK;
-+	fl.l_whence = SEEK_SET;
-+	if (fcntl(fileno(it->queuef), F_SETLKW, &fl) == -1) {
-+		syslog(LOG_ERR, "%s: failed to unlock queue file: %m",
-+				it->queueid);
-+	}
-+
- 	switch (error) {
- 	case 0:
- 		unlink(it->queuefn);
diff --git a/mail/dma/files/patch-libexec_dma_net.c b/mail/dma/files/patch-libexec_dma_net.c
deleted file mode 100644
index 0319794b7d09..000000000000
--- a/mail/dma/files/patch-libexec_dma_net.c
+++ /dev/null
@@ -1,21 +0,0 @@
---- libexec/dma/net.c.orig	2008-09-30 19:47:21.000000000 +0200
-+++ libexec/dma/net.c	2009-01-17 19:02:43.000000000 +0100
-@@ -342,14 +342,10 @@
- 				it->queueid);
- 		else
- 			goto out;
--	}
--
--	/*
--	 * If the user doesn't want STARTTLS, but SSL encryption, we
--	 * have to enable SSL first, then send EHLO
--	 */
--	if (((config->features & STARTTLS) == 0) &&
--	    ((config->features & SECURETRANS) != 0)) {
-+		/*
-+		 * The client SHOULD send an EHLO command as the
-+		 * first command after a successful TLS negotiation.
-+		 */
- 		send_remote_command(fd, "EHLO %s", hostname());
- 		if (read_remote(fd, 0, NULL) != 2) {
- 			syslog(LOG_ERR, "%s: remote delivery deferred: "
diff --git a/mail/dma/pkg-descr b/mail/dma/pkg-descr
index 85dd00774063..07bad93d905d 100644
--- a/mail/dma/pkg-descr
+++ b/mail/dma/pkg-descr
@@ -1,12 +1,13 @@
 The DragonFly Mail Agent is a small Mail Transport Agent (MTA),
-designed for home and office use.  It accepts mails from locally
-installed Mail User Agents (MUA) and delivers the mails either
-locally or to a remote destination.  Remote delivery includes
-several features like TLS/SSL support and SMTP authentication,
-but not MX record lookups.  Therefore, dma is currently not
-suitable for direct remote delivery.  However, it works very
-well for handling local mail plus secure mail submission to a
-remote smarthost (e.g. for travelling mobile computers).
+designed for home and office use.  It accepts e-mail messages
+from locally installed Mail User Agents (MUA) and delivers the
+messages either locally or to a remote destination.  Remote
+delivery includes several features like TLS/SSL support and
+SMTP authentication, but not MX record lookups.  Therefore,
+dma is currently not suitable for direct remote delivery.
+However, it works very well for handling local mail plus
+secure mail submission to a remote smarthost (e.g. for
+travelling mobile computers).
 
 Since dma is not intended as a replacement for real, big MTAs
 like sendmail(8) or postfix(1), it does not listen on port 25