- Update to 20091004

- Add license
- Remove the now useless dma.rb

Approved by:	rene@ (mentor vacation)

4 files changed, 11 insertions, 74 deletions

diff --git a/mail/dma/files/dma.rb b/mail/dma/files/dma.rb
deleted file mode 100644
index 348626b3b8f5..000000000000
--- a/mail/dma/files/dma.rb
+++ /dev/null
@@ -1,59 +0,0 @@
-#!/usr/bin/env ruby
-# Copyright (c) 2009 Daniel Roethlisberger <daniel@roe.ch>
-# All rights reserved.
-# 
-# Redistribution and use in source and binary forms, with or without
-# modification, are permitted provided that the following conditions
-# are met:
-# 1. Redistributions of source code must retain the above copyright
-#    notice unmodified, this list of conditions, and the following
-#    disclaimer.
-# 2. Redistributions in binary form must reproduce the above copyright
-#    notice, this list of conditions and the following disclaimer in the
-#    documentation and/or other materials provided with the distribution.
-# 
-# THIS SOFTWARE IS PROVIDED BY THE AUTHOR AND CONTRIBUTORS ``AS IS'' AND
-# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
-# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
-# ARE DISCLAIMED. IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
-# FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
-# DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
-# OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
-# HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
-# LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
-# OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
-# SUCH DAMAGE.
-# 
-# $FreeBSD$
-
-# Wrapper around dma(8) which implements the missing -t sendmail option.
-# WARNING: The address parsing is very incomplete and might break.
-
-require 'open3'
-
-dma = $0.gsub(/.rb$/, '')
-
-if ARGV.delete "-t"
-	msg = STDIN.read
-	head, cr, body = msg.split(/\n(\r?)\n/, 2)
-	head = head + "\n"
-	tmphead = head.gsub(/\r?\n\s+/m, ' ')
-	rcpts = []
-	tmphead.gsub(/^(?:to|cc|bcc):\s.*$/i) do |match|
-		match.sub(/^[^:]+:\s*/, '').split(/\s*[,;]\s*/).each do |addr|
-			rcpts << addr.sub(/.*<([^<>]+)>.*/, '\\1')
-		end
-	end
-	head.gsub!(/^bcc:.*\n/i, '')
-	Open3.popen3(dma, *ARGV.concat(rcpts)) do |i,o,e|
-		i.write head
-		i.write "#{cr}\n"
-		i.write body
-		i.close_write
-		print o.read
-		print e.read
-	end
-else
-	exec(dma, *ARGV)
-end
-
diff --git a/mail/dma/files/patch-Makefile b/mail/dma/files/patch-Makefile
deleted file mode 100644
index f0fdffdf85df..000000000000
--- a/mail/dma/files/patch-Makefile
+++ /dev/null
@@ -1,6 +0,0 @@
---- /dev/null	2009-01-17 17:24:56.000000000 +0100
-+++ Makefile	2009-01-17 17:25:04.000000000 +0100
-@@ -0,0 +1,3 @@
-+DISTRIBUTION=portsmaildma
-+SUBDIR=libexec/dma
-+.include <bsd.subdir.mk>
diff --git a/mail/dma/files/patch-dma.c b/mail/dma/files/patch-dma.c
new file mode 100644
index 000000000000..8fdd730cd224
--- /dev/null
+++ b/mail/dma/files/patch-dma.c
@@ -0,0 +1,11 @@
+--- ./dma.c.orig	2010-08-10 17:48:35.000000000 +0200
++++ ./dma.c	2010-08-11 08:02:15.966237154 +0200
+@@ -295,7 +295,7 @@
+ 			exit(1);
+ 		}
+ 		if (gettimeofday(&now, NULL) == 0 &&
+-		    (now.tv_sec - st.st_mtim.tv_sec > MAX_TIMEOUT)) {
++		    (now.tv_sec - st.st_mtime > MAX_TIMEOUT)) {
+ 			asprintf(__DECONST(void *, &errmsg),
+ 				 "Could not deliver for the last %d seconds. Giving up.",
+ 				 MAX_TIMEOUT);
diff --git a/mail/dma/files/pkg-message.in b/mail/dma/files/pkg-message.in
index 37d7cc6be3b6..84f9ec179a51 100644
--- a/mail/dma/files/pkg-message.in
+++ b/mail/dma/files/pkg-message.in
@@ -5,15 +5,6 @@ referring to another MTA with the following:
 sendmail	%%PREFIX%%/libexec/dma
 send-mail	%%PREFIX%%/libexec/dma
 
-If you need sendmail -t compatibility, e.g. for send-pr(1), you may use the
-ruby wrapper script instead (make sure to install lang/ruby as well):
-
-sendmail	%%PREFIX%%/libexec/dma.rb
-send-mail	%%PREFIX%%/libexec/dma.rb
-
-Note that the ruby wrapper only supports a subset of what is considered valid
-email address syntax by the relevant RFCs.
-
 If you not need sendmail anymore, please add in your rc.conf:
 
 sendmail_enable="NO"