Update to 0.58.

Changes to the package itself:

- Update MASTER_SITES and HOMEPAGE.
- Change iterator variables to something other than "file" to
  placate pkglint.

From the changelog:

* 'keyword' addresses now use an identifying string like 'dated' and
  'sender' addresses do.  'keyword' by default, and customizable via
  TAGS_KEYWORD.  This means you'll need to generate new addresses
  using `tmda-address', as your old ones will no longer work.

  If you want your old keyword addresses to be accepted until you can
  transition to the new format, you can add entries for them in your
  FILTER_INCOMING.  e.g,

  to jason-promos.8d06eu@mastaler.com ok
  to jason-stupid_promo.289j76@mastaler.com ok

* RECIPIENT_DELIMITER is no longer allowed to be part of the keyword
  in a keyword address.  `?' will be substituted for it when a new
  keyword address is created.

* The format for a confirmation request address is now:

  RECIPIENT-confirm-TIMESTAMP.PID.HMAC, instead of
  RECIPIENT-confirm-accept.TIMESTAMP.PID.HMAC

  The new format is detailed in CRYPTO.  Because of this change, it's
  recommended that you run tmda-pending to make sure your queue is
  free of legitimate messages, since the old confirmation addresses
  will no longer work.

  If you are unable to do this and need temporary backward
  compatibility with the old format, there is a patch against 0.56
  available at:
  <URL:http://mla.libertine.org/tmda-users/200206/msg00193.html>

* Confirmed messages are now reinjected to the original envelope
  recipient address (RECIPIENT) rather than to:
  RECIPIENT-confirm-done.TIMESTAMP.PID.HMAC

  See CRYPTO for more details.

* TMDA now sends outgoing mail by handing it off to an SMTP server
  instead of the /usr/sbin/sendmail program.  By default it will use
  the standard SMTP port (25) on the local host.  You can modify this
  by setting the "SMTPHOST" variable in your tmdarc.  See
  TMDA/Defaults.py for further information.

* tmdarc variable SENDMAIL has been renamed SENDMAIL_PROGRAM, but is
  irrelevant unless OUTGOINGMAIL = "sendmail".

* tmdarc variable PURGED_HEADERS now lists "Bcc:" and "Resent-Bcc" by
  default.  If you define this variable in your tmdarc, be sure to add
  these two headers.

* CRYPT_KEY should be removed from ~/.tmdarc or ~/.tmda/config.  Your
  secret key is now read from CRYPT_KEY_FILE, which defaults to
  ~/.tmda/crypt_key.  To make this conversion, move your existing
  CRYPT_KEY to ~/.tmda/crypt_key, but without the double-quotes.  e.g,

  if CRYPT_KEY = "df7a18a8d95f02ff94bf6463a8ec214cf20cb9e8"

  ~/.tmda/crypt_key should contain:
  df7a18a8d95f02ff94bf6463a8ec214cf20cb9e8

* ~/.tmdarc and ~/.tmda/config are no longer checked for file
  permissions.  Instead, make sure ~/.tmda/crypt_key is chmod 400 or
  600 (or 640 if ALLOW_MODE_640 = 1).

* An exception is no longer be raised if ~/.tmdarc or ~/.tmda/config
  is missing.  However, a ~/.tmda/crypt_key file is required.

* tmda-keygen now outputs an unquoted key instead of a CRYPT_KEY line.

* Template variables dated_cookie_address and sender_cookie_address
  were replaced with dated_recipient_address and
  sender_recipient_address, which are based on the RECIPIENT address.

3 files changed, 19 insertions, 16 deletions

diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index 146c3332740..491857cd2ef 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,14 +1,14 @@
-# $NetBSD: Makefile,v 1.6 2002/05/14 14:38:56 schmonz Exp $
+# $NetBSD: Makefile,v 1.7 2002/07/23 20:05:47 schmonz Exp $
 #
 
-DISTNAME=	tmda-0.55
+DISTNAME=	tmda-0.58
 CATEGORIES=	mail python
-MASTER_SITES=	http://software.libertine.org/tmda/releases/ \
-		http://software.libertine.org/tmda/releases/old/
+MASTER_SITES=	http://tmda.net/releases/ \
+		http://tmda.net/releases/old/
 EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	schmonz@netbsd.org
-HOMEPAGE=	http://tmda.sourceforge.net/
+HOMEPAGE=	http://tmda.net/
 COMMENT=	Python-based SPAM reduction system
 
 PY_PATCHPLIST=		# defined
@@ -28,6 +28,7 @@ TMDA_PROGRAMS+=	bin/tmda-check-address
 TMDA_PROGRAMS+=	bin/tmda-filter
 TMDA_PROGRAMS+=	bin/tmda-inject
 TMDA_PROGRAMS+=	bin/tmda-keygen
+TMDA_PROGRAMS+=	bin/tmda-ofmipd
 TMDA_PROGRAMS+=	bin/tmda-pending
 TMDA_PROGRAMS+=	bin/tmda-rfilter
 TMDA_PROGRAMS+=	bin/tmda-sendmail
@@ -44,8 +45,8 @@ do-build:
 	cd ${WRKSRC}; ${PYTHONBIN} ./compileall
 
 do-install:
-	for file in ${TMDA_PROGRAMS}; do \
-		${INSTALL_SCRIPT} ${WRKSRC}/$${file} ${PREFIX}/bin; \
+	for f in ${TMDA_PROGRAMS}; do \
+		${INSTALL_SCRIPT} ${WRKSRC}/$${f} ${PREFIX}/bin; \
 	done
 
 	${INSTALL_SCRIPT_DIR} ${PREFIX}/${PYSITELIB}/TMDA
@@ -55,8 +56,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/templates/*.txt ${PREFIX}/${SHAREDIR}
 
 	${INSTALL_DATA_DIR} ${PREFIX}/${DOCDIR}
-	for file in ${TMDA_DOCS}; do \
-		${INSTALL_DATA} ${WRKSRC}/$${file} ${PREFIX}/${DOCDIR}; \
+	for f in ${TMDA_DOCS}; do \
+		${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${DOCDIR}; \
 	done
 
 	${INSTALL_DATA_DIR} ${PREFIX}/${CONTRIBDIR}
diff --git a/mail/tmda/PLIST b/mail/tmda/PLIST
index 486a1adddab..132a56be1f0 100644
--- a/mail/tmda/PLIST
+++ b/mail/tmda/PLIST
@@ -1,9 +1,10 @@
-@comment $NetBSD: PLIST,v 1.3 2002/04/07 06:56:34 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.4 2002/07/23 20:05:47 schmonz Exp $
 bin/tmda-address
 bin/tmda-check-address
 bin/tmda-filter
 bin/tmda-inject
 bin/tmda-keygen
+bin/tmda-ofmipd
 bin/tmda-pending
 bin/tmda-rfilter
 bin/tmda-sendmail
@@ -21,6 +22,8 @@ ${PYSITELIB}/TMDA/HMAC.py
 ${PYSITELIB}/TMDA/HMAC.pyc
 ${PYSITELIB}/TMDA/MTA.py
 ${PYSITELIB}/TMDA/MTA.pyc
+${PYSITELIB}/TMDA/SMTP.py
+${PYSITELIB}/TMDA/SMTP.pyc
 ${PYSITELIB}/TMDA/Util.py
 ${PYSITELIB}/TMDA/Util.pyc
 ${PYSITELIB}/TMDA/Version.py
@@ -34,15 +37,16 @@ ${HTMLDIR}/config-pre.html
 ${HTMLDIR}/config-server.html
 ${HTMLDIR}/config.html
 ${HTMLDIR}/download.html
-${HTMLDIR}/faq.html
 ${HTMLDIR}/features.html
 ${HTMLDIR}/history.html
+${HTMLDIR}/howtos.html
 ${HTMLDIR}/index.html
 ${HTMLDIR}/install.html
 ${HTMLDIR}/inuse.html
 ${HTMLDIR}/requirements.html
 ${HTMLDIR}/resources.html
 ${HTMLDIR}/results.html
+${HTMLDIR}/tmda-ofmipd.html
 ${HTMLDIR}/trouble.html
 ${DOCDIR}/COPYING
 ${DOCDIR}/CRYPTO
@@ -52,11 +56,9 @@ ${DOCDIR}/README
 ${DOCDIR}/THANKS
 ${DOCDIR}/UPGRADE
 ${CONTRIBDIR}/ChangeLog
-${CONTRIBDIR}/README.RELAY
 ${CONTRIBDIR}/collectaddys
 ${CONTRIBDIR}/printcdb
 ${CONTRIBDIR}/printdbm
-${CONTRIBDIR}/qmail-smtpd_auth.patch
 ${CONTRIBDIR}/sample.tmdarc
 ${CONTRIBDIR}/tmda.spec
 ${SHAREDIR}/bounce.txt
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index 6d3ff23ab19..66c26aaca9c 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/05/14 14:38:56 schmonz Exp $
+$NetBSD: distinfo,v 1.7 2002/07/23 20:05:47 schmonz Exp $
 
-SHA1 (tmda-0.55.tgz) = 993ea1fc1034051b864e407f130da652c5b98c93
-Size (tmda-0.55.tgz) = 127568 bytes
+SHA1 (tmda-0.58.tgz) = b7c7d64bf146b471b1c73b757951d7e559424892
+Size (tmda-0.58.tgz) = 134229 bytes