From 0858d743c9581d1353d403cfc6dd091fce8ed311 Mon Sep 17 00:00:00 2001
From: schmonz <schmonz>
Date: Thu, 11 Jan 2007 19:22:43 +0000
Subject: Avoid passing "-i" to qmail-inject: it's an invalid option and the
 intended behavior is already the default. Fixes a longstanding problem using
 TMDA with qmail. While here, mollify pkglint slightly.

Bump PKGREVISION.
---
 mail/tmda/patches/patch-ab | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)
 create mode 100644 mail/tmda/patches/patch-ab

(limited to 'mail/tmda/patches')

diff --git a/mail/tmda/patches/patch-ab b/mail/tmda/patches/patch-ab
new file mode 100644
index 00000000000..0367d017738
--- /dev/null
+++ b/mail/tmda/patches/patch-ab
@@ -0,0 +1,19 @@
+$NetBSD: patch-ab,v 1.1 2007/01/11 19:22:43 schmonz Exp $
+
+--- TMDA/Util.py.orig	2006-10-29 22:07:56.000000000 -0500
++++ TMDA/Util.py
+@@ -596,7 +596,13 @@ def sendmail(msgstr, envrecip, envsender
+            Defaults.MAIL_TRANSFER_AGENT in ('postfix', 'qmail') and \
+            Defaults.MAIL_TRANSPORT == 'sendmail':
+         envsender = ''
+-    if Defaults.MAIL_TRANSPORT == 'sendmail':
++    if Defaults.MAIL_TRANSPORT == 'sendmail' and \
++           Defaults.MAIL_TRANSFER_AGENT == 'qmail':
++        # skip "-i" for qmail-inject (invalid option, and it's the default)
++        cmd = (Defaults.SENDMAIL_PROGRAM,
++               '-f', envsender, '--', envrecip)
++        pipecmd(cmd, msgstr)
++    elif Defaults.MAIL_TRANSPORT == 'sendmail':
+         # You can avoid the shell by passing a tuple of arguments as
+         # the command instead of a string.  This will cause the
+         # popen2.Popen3() code to execvp() "/usr/bin/sendmail" with
-- 
cgit v1.2.3