head 1.3; access; symbols pkgsrc-2024Q1:1.2.0.142 pkgsrc-2024Q1-base:1.2 pkgsrc-2023Q4:1.2.0.140 pkgsrc-2023Q4-base:1.2 pkgsrc-2023Q3:1.2.0.138 pkgsrc-2023Q3-base:1.2 pkgsrc-2023Q2:1.2.0.136 pkgsrc-2023Q2-base:1.2 pkgsrc-2023Q1:1.2.0.134 pkgsrc-2023Q1-base:1.2 pkgsrc-2022Q4:1.2.0.132 pkgsrc-2022Q4-base:1.2 pkgsrc-2022Q3:1.2.0.130 pkgsrc-2022Q3-base:1.2 pkgsrc-2022Q2:1.2.0.128 pkgsrc-2022Q2-base:1.2 pkgsrc-2022Q1:1.2.0.126 pkgsrc-2022Q1-base:1.2 pkgsrc-2021Q4:1.2.0.124 pkgsrc-2021Q4-base:1.2 pkgsrc-2021Q3:1.2.0.122 pkgsrc-2021Q3-base:1.2 pkgsrc-2021Q2:1.2.0.120 pkgsrc-2021Q2-base:1.2 pkgsrc-2021Q1:1.2.0.118 pkgsrc-2021Q1-base:1.2 pkgsrc-2020Q4:1.2.0.116 pkgsrc-2020Q4-base:1.2 pkgsrc-2020Q3:1.2.0.114 pkgsrc-2020Q3-base:1.2 pkgsrc-2020Q2:1.2.0.110 pkgsrc-2020Q2-base:1.2 pkgsrc-2020Q1:1.2.0.90 pkgsrc-2020Q1-base:1.2 pkgsrc-2019Q4:1.2.0.112 pkgsrc-2019Q4-base:1.2 pkgsrc-2019Q3:1.2.0.108 pkgsrc-2019Q3-base:1.2 pkgsrc-2019Q2:1.2.0.106 pkgsrc-2019Q2-base:1.2 pkgsrc-2019Q1:1.2.0.104 pkgsrc-2019Q1-base:1.2 pkgsrc-2018Q4:1.2.0.102 pkgsrc-2018Q4-base:1.2 pkgsrc-2018Q3:1.2.0.100 pkgsrc-2018Q3-base:1.2 pkgsrc-2018Q2:1.2.0.98 pkgsrc-2018Q2-base:1.2 pkgsrc-2018Q1:1.2.0.96 pkgsrc-2018Q1-base:1.2 pkgsrc-2017Q4:1.2.0.94 pkgsrc-2017Q4-base:1.2 pkgsrc-2017Q3:1.2.0.92 pkgsrc-2017Q3-base:1.2 pkgsrc-2017Q2:1.2.0.88 pkgsrc-2017Q2-base:1.2 pkgsrc-2017Q1:1.2.0.86 pkgsrc-2017Q1-base:1.2 pkgsrc-2016Q4:1.2.0.84 pkgsrc-2016Q4-base:1.2 pkgsrc-2016Q3:1.2.0.82 pkgsrc-2016Q3-base:1.2 pkgsrc-2016Q2:1.2.0.80 pkgsrc-2016Q2-base:1.2 pkgsrc-2016Q1:1.2.0.78 pkgsrc-2016Q1-base:1.2 pkgsrc-2015Q4:1.2.0.76 pkgsrc-2015Q4-base:1.2 pkgsrc-2015Q3:1.2.0.74 pkgsrc-2015Q3-base:1.2 pkgsrc-2015Q2:1.2.0.72 pkgsrc-2015Q2-base:1.2 pkgsrc-2015Q1:1.2.0.70 pkgsrc-2015Q1-base:1.2 pkgsrc-2014Q4:1.2.0.68 pkgsrc-2014Q4-base:1.2 pkgsrc-2014Q3:1.2.0.66 pkgsrc-2014Q3-base:1.2 pkgsrc-2014Q2:1.2.0.64 pkgsrc-2014Q2-base:1.2 pkgsrc-2014Q1:1.2.0.62 pkgsrc-2014Q1-base:1.2 pkgsrc-2013Q4:1.2.0.60 pkgsrc-2013Q4-base:1.2 pkgsrc-2013Q3:1.2.0.58 pkgsrc-2013Q3-base:1.2 pkgsrc-2013Q2:1.2.0.56 pkgsrc-2013Q2-base:1.2 pkgsrc-2013Q1:1.2.0.54 pkgsrc-2013Q1-base:1.2 pkgsrc-2012Q4:1.2.0.52 pkgsrc-2012Q4-base:1.2 pkgsrc-2012Q3:1.2.0.50 pkgsrc-2012Q3-base:1.2 pkgsrc-2012Q2:1.2.0.48 pkgsrc-2012Q2-base:1.2 pkgsrc-2012Q1:1.2.0.46 pkgsrc-2012Q1-base:1.2 pkgsrc-2011Q4:1.2.0.44 pkgsrc-2011Q4-base:1.2 pkgsrc-2011Q3:1.2.0.42 pkgsrc-2011Q3-base:1.2 pkgsrc-2011Q2:1.2.0.40 pkgsrc-2011Q2-base:1.2 pkgsrc-2011Q1:1.2.0.38 pkgsrc-2011Q1-base:1.2 pkgsrc-2010Q4:1.2.0.36 pkgsrc-2010Q4-base:1.2 pkgsrc-2010Q3:1.2.0.34 pkgsrc-2010Q3-base:1.2 pkgsrc-2010Q2:1.2.0.32 pkgsrc-2010Q2-base:1.2 pkgsrc-2010Q1:1.2.0.30 pkgsrc-2010Q1-base:1.2 pkgsrc-2009Q4:1.2.0.28 pkgsrc-2009Q4-base:1.2 pkgsrc-2009Q3:1.2.0.26 pkgsrc-2009Q3-base:1.2 pkgsrc-2009Q2:1.2.0.24 pkgsrc-2009Q2-base:1.2 pkgsrc-2009Q1:1.2.0.22 pkgsrc-2009Q1-base:1.2 pkgsrc-2008Q4:1.2.0.20 pkgsrc-2008Q4-base:1.2 pkgsrc-2008Q3:1.2.0.18 pkgsrc-2008Q3-base:1.2 cube-native-xorg:1.2.0.16 cube-native-xorg-base:1.2 pkgsrc-2008Q2:1.2.0.14 pkgsrc-2008Q2-base:1.2 cwrapper:1.2.0.12 pkgsrc-2008Q1:1.2.0.10 pkgsrc-2008Q1-base:1.2 pkgsrc-2007Q4:1.2.0.8 pkgsrc-2007Q4-base:1.2 pkgsrc-2007Q3:1.2.0.6 pkgsrc-2007Q3-base:1.2 pkgsrc-2007Q2:1.2.0.4 pkgsrc-2007Q2-base:1.2 pkgsrc-2007Q1:1.2.0.2 pkgsrc-2007Q1-base:1.2; locks; strict; comment @# @; 1.3 date 2024.06.06.19.18.02; author wiz; state dead; branches; next 1.2; commitid 43h2D7XpfuWioXcF; 1.2 date 2007.02.26.03.44.21; author schmonz; state Exp; branches; next 1.1; 1.1 date 2007.01.11.19.22.43; author schmonz; state Exp; branches; next ; desc @@ 1.3 log @tmda: remove Spam reduction system, last updated in 2007, Python 2 only. @ text @$NetBSD: patch-ab,v 1.2 2007/02/26 03:44:21 schmonz Exp $ --- TMDA/Util.py.orig 2007-02-23 15:20:10.000000000 -0500 +++ TMDA/Util.py @@@@ -584,7 +584,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 @ 1.2 log @Update to 1.1.11. From the changelog: * The snapshot of the wiki documentation is now included within the main tmda-1.1.x.tgz tarball in the 'doc' directory rather than in a separate tmda-1.1.x-doc.tgz tarball. * New feature courtesy of Vitor Espindola. A new configuration variable, TIMEOUT_UNITS, to give users the ability to customize the timeout unit value strings in the templates instead of using the English defaults of "years", "months", "weeks", "days", "hours", "minutes", and "seconds". For more information, see http://wiki.tmda.net/ConfigurationVariables#TIMEOUT_UNITS * Virtual domain improvements to tmda-pending courtesy of Lloyd Zusman. A '--vhost-script' command-line option has been added to match tmda-ofmipd and tmda-filter. Also two new options have been added, '--vhost-user' and '--vhost-domain'. See the tmda-pending --help output for more information, or for greater detail, see http://article.gmane.org/gmane.mail.spam.tmda.devel/6584 * An alternative "simpler" example of how to use TLS with tmda-ofmipd via stunnel has been added. See the contrib/ofmipd-stunnel-daemons/ directory. * A bug that broke tmda-filter's '-e' command-line option has been fixed. @ text @d1 1 a1 1 $NetBSD: patch-ab,v 1.1 2007/01/11 19:22:43 schmonz Exp $ @ 1.1 log @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. @ text @d1 1 a1 1 $NetBSD$ d3 1 a3 1 --- TMDA/Util.py.orig 2006-10-29 22:07:56.000000000 -0500 d5 1 a5 1 @@@@ -596,7 +596,13 @@@@ def sendmail(msgstr, envrecip, envsender @