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.

4 files changed, 268 insertions, 42 deletions

diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index a75b1716ff8..ec95eee9c34 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.35 2007/02/02 13:08:20 schmonz Exp $
+# $NetBSD: Makefile,v 1.36 2007/02/26 03:44:21 schmonz Exp $
 #
 
-DISTNAME=	tmda-1.1.10
+DISTNAME=	tmda-1.1.11
 CATEGORIES=	mail python
 MASTER_SITES=	http://tmda.net/releases/
 MASTER_SITES+=	ftp://tmda.net/pub/tmda/releases/
@@ -37,7 +37,6 @@ PLIST_SUBST+=	HTMLDIR=${HTMLDIR:Q}
 TMDA_PROGRAMS=	bin/tmda-*
 TMDA_DOCS=	CODENAMES COPYING CRYPTO ChangeLog INSTALL
 TMDA_DOCS+=	NEWS README THANKS UPGRADE
-TMDA_HTDOCS=	htdocs/*.html htdocs/*.css
 TMDA_CONTRIB=	contrib/*
 
 SUBST_CLASSES+=		etc
@@ -45,14 +44,17 @@ SUBST_STAGE.etc=	do-configure
 SUBST_FILES.etc=	bin/tmda-ofmipd TMDA/Auth.py TMDA/Defaults.py
 SUBST_SED.etc=		-e 's|/etc|${PKG_SYSCONFDIR}|g'
 
-INSTALLATION_DIRS=	bin ${SHAREDIR} ${DOCDIR} ${HTMLDIR}/img
+INSTALLATION_DIRS=	bin ${SHAREDIR} ${DOCDIR} ${HTMLDIR}
 INSTALLATION_DIRS+=	${PYSITELIB}/TMDA/pythonlib/email/mime ${EGDIR}
 
+post-extract:
+	rm ${WRKSRC}/doc/html/error.log
+
 do-build:
 	cd ${WRKSRC} && ${PYTHONBIN} ./compileall
 
 pre-install:
-	${FIND} ${WRKSRC} -name "*.orig" -print | ${XARGS} ${RM} -f
+	find ${WRKSRC} -name "*.orig" -print | xargs rm -f
 
 do-install:
 	for f in ${TMDA_PROGRAMS}; do \
@@ -81,13 +83,7 @@ do-install:
 		fi; \
 	done
 
-	for f in ${TMDA_HTDOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${HTMLDIR}; \
-	done
-
-	for f in htdocs/img/*.png htdocs/img/*.gif; do \
-		${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${HTMLDIR}/img; \
-	done
+	cp -Rp ${WRKSRC}/doc/html/* ${PREFIX}/${HTMLDIR}
 
 post-install:
 	${PREFIX}/bin/tmda-ofmipd -V >/dev/null 2>&1
diff --git a/mail/tmda/PLIST b/mail/tmda/PLIST
index a91bb403e30..56d268b9576 100644
--- a/mail/tmda/PLIST
+++ b/mail/tmda/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2006/11/07 07:42:09 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.13 2007/02/26 03:44:21 schmonz Exp $
 bin/tmda-address
 bin/tmda-check-address
 bin/tmda-filter
@@ -86,17 +86,235 @@ ${PYSITELIB}/TMDA/pythonlib/email/quoprimime.py
 ${PYSITELIB}/TMDA/pythonlib/email/quoprimime.pyc
 ${PYSITELIB}/TMDA/pythonlib/email/utils.py
 ${PYSITELIB}/TMDA/pythonlib/email/utils.pyc
-${HTMLDIR}/config-vars.html
-${HTMLDIR}/img/blocksmall.png
-${HTMLDIR}/img/stripes.gif
-${HTMLDIR}/img/tmda-186x253.png
-${HTMLDIR}/img/tmda-47x64.png
-${HTMLDIR}/img/tmda-562x765.png
-${HTMLDIR}/img/tmda-70x95.png
-${HTMLDIR}/img/tmda-93x127.png
-${HTMLDIR}/img/tmda-nt-616x616.png
+${HTMLDIR}/AbandonedPages.html
+${HTMLDIR}/AboutTmda.html
+${HTMLDIR}/AutoAdminGroup.html
+${HTMLDIR}/BadContent.html
+${HTMLDIR}/CategoryCategory.html
+${HTMLDIR}/CategoryHomepage.html
+${HTMLDIR}/CategoryTemplate.html
+${HTMLDIR}/ChallengeResponse.html
+${HTMLDIR}/ClientConfiguration.html
+${HTMLDIR}/ConfigurationOverview.html
+${HTMLDIR}/ConfigurationVariables.html
+${HTMLDIR}/DesktopEdition(2f)HowToConfigure.html
+${HTMLDIR}/DesktopEdition.html
+${HTMLDIR}/DrewRaines.html
+${HTMLDIR}/EditedSystemPages.html
+${HTMLDIR}/EventStats(2f)HitCounts.html
+${HTMLDIR}/EventStats(2f)UserAgents.html
+${HTMLDIR}/EventStats.html
+${HTMLDIR}/FilterSources.html
+${HTMLDIR}/FilterSpecification.html
+${HTMLDIR}/FindPage.html
+${HTMLDIR}/FortuneCookies.html
+${HTMLDIR}/FrontPage.html
+${HTMLDIR}/HeadHoncho.html
+${HTMLDIR}/HelpContents.html
+${HTMLDIR}/HelpForBeginners.html
+${HTMLDIR}/HelpForDevelopers.html
+${HTMLDIR}/HelpIndex.html
+${HTMLDIR}/HelpMiscellaneous(2f)ExperimentalFeatures.html
+${HTMLDIR}/HelpMiscellaneous(2f)FrequentlyAskedQuestions.html
+${HTMLDIR}/HelpMiscellaneous.html
+${HTMLDIR}/HelpOnAccessControlLists.html
+${HTMLDIR}/HelpOnActions(2f)AttachFile.html
+${HTMLDIR}/HelpOnActions.html
+${HTMLDIR}/HelpOnAdministration.html
+${HTMLDIR}/HelpOnAuthentication.html
+${HTMLDIR}/HelpOnAutoAdmin.html
+${HTMLDIR}/HelpOnCategories.html
+${HTMLDIR}/HelpOnConfiguration(2f)ApacheVoodoo.html
+${HTMLDIR}/HelpOnConfiguration(2f)CascadingStyleSheets.html
+${HTMLDIR}/HelpOnConfiguration(2f)EmailSupport.html
+${HTMLDIR}/HelpOnConfiguration(2f)FileAttachments.html
+${HTMLDIR}/HelpOnConfiguration(2f)IntegratingWithApache.html
+${HTMLDIR}/HelpOnConfiguration(2f)SecurityPolicy.html
+${HTMLDIR}/HelpOnConfiguration(2f)SurgeProtection.html
+${HTMLDIR}/HelpOnConfiguration(2f)UserPreferences.html
+${HTMLDIR}/HelpOnConfiguration.html
+${HTMLDIR}/HelpOnEditLocks.html
+${HTMLDIR}/HelpOnEditing(2f)SubPages.html
+${HTMLDIR}/HelpOnEditing.html
+${HTMLDIR}/HelpOnFormatting.html
+${HTMLDIR}/HelpOnGraphicalEditor.html
+${HTMLDIR}/HelpOnHeadlines.html
+${HTMLDIR}/HelpOnInstalling(2f)AolServer.html
+${HTMLDIR}/HelpOnInstalling(2f)ApacheOnLinux.html
+${HTMLDIR}/HelpOnInstalling(2f)ApacheOnLinuxFtp.html
+${HTMLDIR}/HelpOnInstalling(2f)ApacheOnMacOsx.html
+${HTMLDIR}/HelpOnInstalling(2f)ApacheOnWin32.html
+${HTMLDIR}/HelpOnInstalling(2f)ApacheWithModPython.html
+${HTMLDIR}/HelpOnInstalling(2f)BasicInstallation.html
+${HTMLDIR}/HelpOnInstalling(2f)FastCgi.html
+${HTMLDIR}/HelpOnInstalling(2f)InternetInformationServer.html
+${HTMLDIR}/HelpOnInstalling(2f)MinimalWiki.html
+${HTMLDIR}/HelpOnInstalling(2f)StandaloneServer.html
+${HTMLDIR}/HelpOnInstalling(2f)TroubleShooting.html
+${HTMLDIR}/HelpOnInstalling(2f)TwistedWeb.html
+${HTMLDIR}/HelpOnInstalling(2f)WebLogic.html
+${HTMLDIR}/HelpOnInstalling(2f)WikiInstanceCreation.html
+${HTMLDIR}/HelpOnInstalling.html
+${HTMLDIR}/HelpOnLanguages.html
+${HTMLDIR}/HelpOnLinking.html
+${HTMLDIR}/HelpOnLists.html
+${HTMLDIR}/HelpOnMacros(2f)ImageLink.html
+${HTMLDIR}/HelpOnMacros(2f)Include.html
+${HTMLDIR}/HelpOnMacros(2f)MailTo.html
+${HTMLDIR}/HelpOnMacros.html
+${HTMLDIR}/HelpOnNavigation.html
+${HTMLDIR}/HelpOnPackageInstaller.html
+${HTMLDIR}/HelpOnPageCreation.html
+${HTMLDIR}/HelpOnPageDeletion.html
+${HTMLDIR}/HelpOnParsers(2f)ReStructuredText(2f)RstPrimer.html
+${HTMLDIR}/HelpOnParsers(2f)ReStructuredText.html
+${HTMLDIR}/HelpOnParsers.html
+${HTMLDIR}/HelpOnProcessingInstructions.html
+${HTMLDIR}/HelpOnProcessors.html
+${HTMLDIR}/HelpOnRules.html
+${HTMLDIR}/HelpOnSearching.html
+${HTMLDIR}/HelpOnSkins.html
+${HTMLDIR}/HelpOnSlideShows(2f)000_Introduction.html
+${HTMLDIR}/HelpOnSlideShows(2f)100_Creating_the_slides.html
+${HTMLDIR}/HelpOnSlideShows(2f)900_Last_but_not_least(3a)_Running_your_presentation(2e).html
+${HTMLDIR}/HelpOnSlideShows.html
+${HTMLDIR}/HelpOnSmileys.html
+${HTMLDIR}/HelpOnSpellCheck.html
+${HTMLDIR}/HelpOnSuperUser.html
+${HTMLDIR}/HelpOnTables.html
+${HTMLDIR}/HelpOnTemplates.html
+${HTMLDIR}/HelpOnThemes.html
+${HTMLDIR}/HelpOnUpdating.html
+${HTMLDIR}/HelpOnUpdatingPython.html
+${HTMLDIR}/HelpOnUserHandling.html
+${HTMLDIR}/HelpOnUserPreferences.html
+${HTMLDIR}/HelpOnVariables.html
+${HTMLDIR}/HelpOnXmlPages.html
+${HTMLDIR}/HelpTemplate.html
+${HTMLDIR}/HomepageGroupsTemplate.html
+${HTMLDIR}/HomepagePrivatePageTemplate.html
+${HTMLDIR}/HomepageReadPageTemplate.html
+${HTMLDIR}/HomepageReadWritePageTemplate.html
+${HTMLDIR}/HomepageTemplate.html
+${HTMLDIR}/InterWiki.html
+${HTMLDIR}/JasonMastaler.html
+${HTMLDIR}/LocalBadContent.html
+${HTMLDIR}/LocalSpellingWords.html
+${HTMLDIR}/MailingLists.html
+${HTMLDIR}/MarkHorn.html
+${HTMLDIR}/MissingHomePage.html
+${HTMLDIR}/MissingPage.html
+${HTMLDIR}/MoinMoin(2f)InstallDocs.html
+${HTMLDIR}/MoinMoin(2f)TextFormatting.html
+${HTMLDIR}/MoinMoin.html
+${HTMLDIR}/MoinPagesEditorGroup.html
+${HTMLDIR}/OrphanedPages.html
+${HTMLDIR}/PageHits.html
+${HTMLDIR}/PageSize.html
+${HTMLDIR}/PreConfiguration.html
+${HTMLDIR}/ProjectGroupsTemplate.html
+${HTMLDIR}/ProjectTemplate.html
+${HTMLDIR}/RandomPage.html
+${HTMLDIR}/RecentChanges.html
+${HTMLDIR}/ServerConfiguration.html
+${HTMLDIR}/SiteNavigation.html
+${HTMLDIR}/SlideShowHandOutTemplate.html
+${HTMLDIR}/SlideShowTemplate.html
+${HTMLDIR}/SlideTemplate.html
+${HTMLDIR}/SpamAssassin.html
+${HTMLDIR}/SyntaxReference.html
+${HTMLDIR}/SystemInfo.html
+${HTMLDIR}/SystemPagesGroup.html
+${HTMLDIR}/SystemPagesInEnglishGroup.html
+${HTMLDIR}/TemplateHowto.html
+${HTMLDIR}/TitleIndex.html
+${HTMLDIR}/TmdaBouncedDeletePendingHowto.html
+${HTMLDIR}/TmdaCgi.html
+${HTMLDIR}/TmdaCode.html
+${HTMLDIR}/TmdaCommercialSupport.html
+${HTMLDIR}/TmdaConfiguration.html
+${HTMLDIR}/TmdaDocumentation.html
+${HTMLDIR}/TmdaDonations.html
+${HTMLDIR}/TmdaDownload.html
+${HTMLDIR}/TmdaFaq.html
+${HTMLDIR}/TmdaFeatures.html
+${HTMLDIR}/TmdaFetchMailHowTo.html
+${HTMLDIR}/TmdaFingerprint.html
+${HTMLDIR}/TmdaHashCashHowto.html
+${HTMLDIR}/TmdaHistory.html
+${HTMLDIR}/TmdaHowtos.html
+${HTMLDIR}/TmdaInUse.html
+${HTMLDIR}/TmdaInstall.html
+${HTMLDIR}/TmdaInstallation.html
+${HTMLDIR}/TmdaLogos.html
+${HTMLDIR}/TmdaOfmipdHowto.html
+${HTMLDIR}/TmdaOneDotTwoDesign.html
+${HTMLDIR}/TmdaOneDotTwoTodoList.html
+${HTMLDIR}/TmdaPatchSubmissions.html
+${HTMLDIR}/TmdaPendingAsMaildir.html
+${HTMLDIR}/TmdaPendingAsMaildirHowto.html
+${HTMLDIR}/TmdaPostfixPolicy.html
+${HTMLDIR}/TmdaPressCoverage.html
+${HTMLDIR}/TmdaProviders.html
+${HTMLDIR}/TmdaRequirements.html
+${HTMLDIR}/TmdaServices.html
+${HTMLDIR}/TmdaSupport.html
+${HTMLDIR}/TmdaTestimonials.html
+${HTMLDIR}/TmdaTipsAndTricks.html
+${HTMLDIR}/TmdaUpgrade.html
+${HTMLDIR}/ToddJacobs.html
+${HTMLDIR}/TroubleShooting.html
+${HTMLDIR}/UserPreferences.html
+${HTMLDIR}/VirtualDomainsHowto.html
+${HTMLDIR}/WantedPages.html
+${HTMLDIR}/WhyWikiWorks.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)000_What_is_a_Wiki(3f).html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)050_First_Steps.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)060_How_do_I_navigate(3f).html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)090_The_Editor.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)091_Tips_on_the_Editor.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)100_Text_markup.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)110_Headlines_and_Paragraphs.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)130_Lists.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)150_Tables.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)180_Macros.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)191_Creating_new_Pages.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)195_Actions.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)200_Wikiquette.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)210_Organisation_and_Structure.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction(2f)900_Exercises.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroduction.html
+${HTMLDIR}/WikiCourse(2f)BasicIntroductionHandOut.html
+${HTMLDIR}/WikiCourse.html
+${HTMLDIR}/WikiHomePage.html
+${HTMLDIR}/WikiName.html
+${HTMLDIR}/WikiSandBox.html
+${HTMLDIR}/WikiWikiWeb.html
+${HTMLDIR}/WordIndex.html
+${HTMLDIR}/XsltVersion.html
+${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip1.png
+${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip2.png
+${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip3a.png
+${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip3b.png
+${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip5.png
+${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip6.png
+${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip6b.png
+${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile/unzip7.png
+${HTMLDIR}/attachments/HelpOnInstalling(2f)ApacheOnLinuxFtp/explore.py
+${HTMLDIR}/attachments/HelpOnInstalling(2f)ApacheOnLinuxFtp/explore.pyc
+${HTMLDIR}/attachments/HelpOnInstalling(2f)BasicInstallation/pythontest.cgi
+${HTMLDIR}/attachments/HelpOnInstalling(2f)WikiInstanceCreation/createinstance.sh
+${HTMLDIR}/attachments/HelpOnTables/MiniPage.png
+${HTMLDIR}/attachments/TmdaFetchMailHowTo/xtmdaheader-1.1.c
+${HTMLDIR}/attachments/TmdaFingerprint/tmda-fingerprint
+${HTMLDIR}/attachments/TmdaPostfixPolicy/tmda-postfix-policy.sh
+${HTMLDIR}/attachments/WikiSandBox/mytest.png
+${HTMLDIR}/bounce_address(2e)py.html
+${HTMLDIR}/deletepending_from_bouncemsg(2e)sh.html
+${HTMLDIR}/delpenbounce.html
 ${HTMLDIR}/index.html
-${HTMLDIR}/tmda.css
+${HTMLDIR}/tmda(2d)fingerprint.html
+${HTMLDIR}/tmda(2d)postfix(2d)policy(2e)sh.html
 ${DOCDIR}/CODENAMES
 ${DOCDIR}/COPYING
 ${DOCDIR}/CRYPTO
@@ -131,26 +349,38 @@ ${EGDIR}/dot-tmda/filters/outgoing
 ${EGDIR}/dot-tmda/lists/blacklist
 ${EGDIR}/dot-tmda/lists/confirmed
 ${EGDIR}/dot-tmda/lists/whitelist
+${EGDIR}/ofmipd-stunnel-daemons/README.txt
+${EGDIR}/ofmipd-stunnel-daemons/stunnel.conf
 ${EGDIR}/ofmipd-stunnel-xinetd/README.txt
 ${EGDIR}/ofmipd-stunnel-xinetd/stunnel-wrapper
 ${EGDIR}/ofmipd-stunnel-xinetd/stunnel.conf
 ${EGDIR}/ofmipd-stunnel-xinetd/tmda-ofmipd-wrapper
 ${EGDIR}/ofmipd-stunnel-xinetd/xinetd.d-tmda-ofmipd-starttls
+${SHAREDIR}/bounce_expired_dated.txt
+${SHAREDIR}/bounce_fail_dated.txt
+${SHAREDIR}/bounce_fail_keyword.txt
+${SHAREDIR}/bounce_fail_sender.txt
+${SHAREDIR}/bounce_incoming.txt
+${SHAREDIR}/bounce_invalid_confirmation.txt
+${SHAREDIR}/bounce_missing_pending.txt
+${SHAREDIR}/confirm_accept.txt
+${SHAREDIR}/confirm_request.txt
 share/examples/rc.d/tofmipd
-share/tmda/bounce_expired_dated.txt
-share/tmda/bounce_fail_dated.txt
-share/tmda/bounce_fail_keyword.txt
-share/tmda/bounce_fail_sender.txt
-share/tmda/bounce_incoming.txt
-share/tmda/bounce_invalid_confirmation.txt
-share/tmda/bounce_missing_pending.txt
-share/tmda/confirm_accept.txt
-share/tmda/confirm_request.txt
-@dirrm share/tmda
+@dirrm ${SHAREDIR}
 @dirrm ${DOCDIR}
-@dirrm ${HTMLDIR}/img
+@dirrm ${HTMLDIR}/attachments/HelpOnActions(2f)AttachFile
+@dirrm ${HTMLDIR}/attachments/HelpOnInstalling(2f)ApacheOnLinuxFtp
+@dirrm ${HTMLDIR}/attachments/HelpOnInstalling(2f)BasicInstallation
+@dirrm ${HTMLDIR}/attachments/HelpOnInstalling(2f)WikiInstanceCreation
+@dirrm ${HTMLDIR}/attachments/HelpOnTables
+@dirrm ${HTMLDIR}/attachments/TmdaFetchMailHowTo
+@dirrm ${HTMLDIR}/attachments/TmdaFingerprint
+@dirrm ${HTMLDIR}/attachments/TmdaPostfixPolicy
+@dirrm ${HTMLDIR}/attachments/WikiSandBox
+@dirrm ${HTMLDIR}/attachments
 @dirrm ${HTMLDIR}
 @dirrm ${EGDIR}/ofmipd-stunnel-xinetd
+@dirrm ${EGDIR}/ofmipd-stunnel-daemons
 @dirrm ${EGDIR}/dot-tmda/lists
 @dirrm ${EGDIR}/dot-tmda/filters
 @dirrm ${EGDIR}/dot-tmda
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index 5237699ef0c..a21365f61b7 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.19 2007/02/02 13:08:20 schmonz Exp $
+$NetBSD: distinfo,v 1.20 2007/02/26 03:44:21 schmonz Exp $
 
-SHA1 (tmda-1.1.10.tgz) = cf414f95195cf3a848f056850726c217b100b59a
-RMD160 (tmda-1.1.10.tgz) = 1c73eecc5ece3e9c793e114af2114b270cb9f9d1
-Size (tmda-1.1.10.tgz) = 332865 bytes
-SHA1 (patch-ab) = 82715854cfdedb0ec92c5d77580d09ccda553073
+SHA1 (tmda-1.1.11.tgz) = 790ab6f4258451cb5f18a39883015b896a48a9c1
+RMD160 (tmda-1.1.11.tgz) = cc8160a3b60e927611e2363d530d9e539f92dbc0
+Size (tmda-1.1.11.tgz) = 1422504 bytes
+SHA1 (patch-ab) = 4cac0a76d160eebedc06e1789728be5872113fee
diff --git a/mail/tmda/patches/patch-ab b/mail/tmda/patches/patch-ab
index 0367d017738..ed85c23fec2 100644
--- a/mail/tmda/patches/patch-ab
+++ b/mail/tmda/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.1 2007/01/11 19:22:43 schmonz Exp $
+$NetBSD: patch-ab,v 1.2 2007/02/26 03:44:21 schmonz Exp $
 
---- TMDA/Util.py.orig	2006-10-29 22:07:56.000000000 -0500
+--- TMDA/Util.py.orig	2007-02-23 15:20:10.000000000 -0500
 +++ TMDA/Util.py
-@@ -596,7 +596,13 @@ def sendmail(msgstr, envrecip, envsender
+@@ -584,7 +584,13 @@ def sendmail(msgstr, envrecip, envsender
             Defaults.MAIL_TRANSFER_AGENT in ('postfix', 'qmail') and \
             Defaults.MAIL_TRANSPORT == 'sendmail':
          envsender = ''