Upgrade to tmda-0.65:

What's new?

* New feature: A new header called ``X-Primary-Address'' is now
  supported in order to reduce the amount of thinking and planning
  ahead you need to do when sending mail to a new correspondent who
  may or may not use a challenge/response system like
  TMDA. Essentially, this header allows a sender to specify the
  address he prefers be whitelisted once he confirms his first
  message.

  For more information, see the following URLs:

  <URL:http://tmda.net/config-vars.html#PRIMARY_ADDRESS_MATCH>
  <URL:http://tmda.net/faq.cgi?req=show&file=faq04.005.htp>

* New feature. You can customize the header lines displayed by
  tmda-pending in interactive mode by setting SUMMARY_HEADERS. See
  <URL:http://tmda.net/config-vars.html#SUMMARY_HEADERS> for more
  information.

* New version of Josh Huber's tmda.el.

* Bugfixes.

Here are the new additions to UPGRADE:

* If you are using customized templates, you should replace
  %(envelope_sender)s with %(confirm_append_address)s in your
  confirm_request.txt. This is to support the new
  <URL:http://tmda.net/config-vars.html#PRIMARY_ADDRESS_MATCH>
  feature.

* When doing program deliveries to procmail, you should no longer be
  using the ``-f'' option. e.g,

  DELIVERY = "|/usr/bin/procmail -f $SENDER ~/.procmailrc-tmda"

  becomes

  DELIVERY = "|/usr/bin/procmail ~/.procmailrc-tmda"

* contrib/sample.tmdarc has been renamed contrib/sample.config.

4 files changed, 12 insertions, 9 deletions

diff --git a/doc/CHANGES b/doc/CHANGES
index fe329eb8c03..045acbd079e 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.754 2002/12/12 03:24:52 dmcmahill Exp $
+$NetBSD: CHANGES,v 1.755 2002/12/12 04:39:56 kim Exp $
 
 Changes to the packages collection and infrastructure in 2002:
 
@@ -3912,3 +3912,4 @@ Changes to the packages collection and infrastructure in 2002:
 	Added fontconfig-2.1 [jmmv 2002-12-11]
 	Added vifm-0.1 [jmmv 2002-12-11]
 	Updated gawk to 3.1.1 [dmcmahill 2002-12-11]
+	Updated tmda to 0.65 [kim 2002-12-12]
diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile
index fa005c8404f..fabe319ad26 100644
--- a/mail/tmda/Makefile
+++ b/mail/tmda/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.11 2002/11/14 04:25:31 kim Exp $
+# $NetBSD: Makefile,v 1.12 2002/12/12 04:38:30 kim Exp $
 #
 
-DISTNAME=	tmda-0.64
+DISTNAME=	tmda-0.65
 CATEGORIES=	mail python
 MASTER_SITES=	http://tmda.net/releases/ \
 		http://tmda.net/releases/old/
@@ -11,7 +11,7 @@ MAINTAINER=	schmonz@netbsd.org
 HOMEPAGE=	http://tmda.net/
 COMMENT=	Python-based SPAM reduction system
 
-PYTHON_VERSIONS_ACCEPTED=	22
+PYTHON_VERSIONS_ACCEPTED=	22 21
 
 PY_PATCHPLIST=		# defined
 PYTHON_PATCH_SCRIPTS=	${TMDA_PROGRAMS}
@@ -66,6 +66,8 @@ do-install:
 		${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${DOCDIR}; \
 	done
 
+	# the cgi directory currently has nothing
+	${RM} -rf ${WRKSRC}/contrib/cgi
 	${INSTALL_DATA_DIR} ${PREFIX}/${CONTRIBDIR}
 	${INSTALL_DATA} ${WRKSRC}/contrib/* ${PREFIX}/${CONTRIBDIR}
 
diff --git a/mail/tmda/PLIST b/mail/tmda/PLIST
index 83fcbf81ac4..08eea7cb70b 100644
--- a/mail/tmda/PLIST
+++ b/mail/tmda/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2002/11/11 05:28:07 schmonz Exp $
+@comment $NetBSD: PLIST,v 1.7 2002/12/12 04:38:30 kim Exp $
 bin/tmda-address
 bin/tmda-check-address
 bin/tmda-filter
@@ -112,7 +112,7 @@ ${DOCDIR}/contrib/collectaddys
 ${DOCDIR}/contrib/def2html
 ${DOCDIR}/contrib/printcdb
 ${DOCDIR}/contrib/printdbm
-${DOCDIR}/contrib/sample.tmdarc
+${DOCDIR}/contrib/sample.config
 ${DOCDIR}/contrib/tmda.el
 ${DOCDIR}/contrib/tmda.spec
 ${SHAREDIR}/bounce.txt
diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo
index 1621f5fdd2b..6d3b723c1e0 100644
--- a/mail/tmda/distinfo
+++ b/mail/tmda/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.10 2002/11/14 04:25:31 kim Exp $
+$NetBSD: distinfo,v 1.11 2002/12/12 04:38:30 kim Exp $
 
-SHA1 (tmda-0.64.tgz) = 796482c04f49e86d90baa1ce7cd312158250b777
-Size (tmda-0.64.tgz) = 234295 bytes
+SHA1 (tmda-0.65.tgz) = 75a29ae2b4612757d772d713630d7a4b1233334b
+Size (tmda-0.65.tgz) = 237575 bytes