From fa18bda4511a9e42c81b5da17731d279a97efc29 Mon Sep 17 00:00:00 2001 From: schmonz Date: Sun, 6 Jun 2004 05:08:34 +0000 Subject: Update to 1.0.3. From the changelog: * Fixed a small bug in the auto-response rate limiting code that choked on extremely long addresses. (http://mla.libertine.org/tmda-users/2004-01/msg00375.html) * Fixed a small bug in the X-Primary-Address header handling code that was triggered by a broken MTA. (http://mla.libertine.org/tmda-users/2004-01/msg00100.html) * Fixed a bug in TMDAINJECT that caused Message-ID and Date headers to differ when sending to multiple recipients. * Fixed a bug that would cause pending message release to fail under certain MTAs (particularily Exim) if the envelope sender was null <>. pkgsrc changes: * Add rc.d script for tmda-ofmipd. * Create "tofmipd" user for tmda-ofmipd. * Require Python 2.2 or higher, as needed by tmda-ofmipd. * Use subst.mk to honor PKG_SYSCONFDIR. * Set PKG_SYSCONFSUBDIR, as TMDA potentially has several config files. * Update MASTER_SITES. * Use shell globs to simplify some definitions. * Remove MESSAGE, as TMDA provides its own upgrade instructions. * Pass one file at a time to install(1) for the benefit of some of our differently-abled platforms. --- mail/tmda/MESSAGE | 10 -------- mail/tmda/Makefile | 57 ++++++++++++++++++++++++---------------------- mail/tmda/PLIST | 10 +------- mail/tmda/distinfo | 6 ++--- mail/tmda/files/tofmipd.sh | 17 ++++++++++++++ 5 files changed, 51 insertions(+), 49 deletions(-) delete mode 100644 mail/tmda/MESSAGE create mode 100755 mail/tmda/files/tofmipd.sh (limited to 'mail/tmda') diff --git a/mail/tmda/MESSAGE b/mail/tmda/MESSAGE deleted file mode 100644 index e0b4579293b..00000000000 --- a/mail/tmda/MESSAGE +++ /dev/null @@ -1,10 +0,0 @@ -=========================================================================== -$NetBSD: MESSAGE,v 1.1 2004/01/28 00:12:53 kim Exp $ - -* The OUTGOINGMAIL variable has been renamed MAIL_TRANSPORT, and its - default value has also been changed from 'smtp' to 'sendmail'. - -* Future versions of ${PKGNAME} will no longer support ~/.tmdarc so - considering renaming it to ~/.tmda/config now. - -=========================================================================== diff --git a/mail/tmda/Makefile b/mail/tmda/Makefile index 183d601841a..e72691a1f84 100644 --- a/mail/tmda/Makefile +++ b/mail/tmda/Makefile @@ -1,22 +1,30 @@ -# $NetBSD: Makefile,v 1.18 2004/04/18 04:42:32 snj Exp $ +# $NetBSD: Makefile,v 1.19 2004/06/06 05:08:34 schmonz Exp $ # -DISTNAME= tmda-1.0 +DISTNAME= tmda-1.0.3 CATEGORIES= mail python -MASTER_SITES= http://tmda.net/releases/ \ - http://tmda.net/releases/old/ +MASTER_SITES= http://tmda.net/releases/stable/ EXTRACT_SUFX= .tgz MAINTAINER= kim@tac.nyc.ny.us HOMEPAGE= http://tmda.net/ COMMENT= Python-based SPAM reduction system -PYTHON_VERSIONS_ACCEPTED= 23 23pth 22 22pth 21 21pth - USE_BUILDLINK3= yes +USE_PKGINSTALL= yes PY_PATCHPLIST= # defined PYTHON_PATCH_SCRIPTS= ${TMDA_PROGRAMS} +PKG_SYSCONFSUBDIR= ${PKGBASE} + +PYTHON_VERSIONS_ACCEPTED= 23 23pth 22 22pth + +PKG_GROUPS= tofmipd +PKG_USERS= tofmipd:tofmipd::TMDA\\ ofmipd\\ User + +RCD_SCRIPTS= tofmipd +FILES_SUBST+= PYTHONBIN=${PYTHONBIN} + SHAREDIR= share/${PKGBASE} DOCDIR= share/doc/${PKGBASE} CONTRIBDIR= share/doc/${PKGBASE}/contrib @@ -26,27 +34,18 @@ PLIST_SUBST+= DOCDIR="${DOCDIR}" PLIST_SUBST+= CONTRIBDIR="${CONTRIBDIR}" PLIST_SUBST+= HTMLDIR="${HTMLDIR}" -TMDA_PROGRAMS= bin/tmda-address -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 - -TMDA_DOCS= CODENAMES -TMDA_DOCS+= COPYING -TMDA_DOCS+= CRYPTO -TMDA_DOCS+= ChangeLog -TMDA_DOCS+= INSTALL -TMDA_DOCS+= README -TMDA_DOCS+= THANKS -TMDA_DOCS+= UPGRADE +TMDA_PROGRAMS= bin/tmda-* +TMDA_DOCS= CODENAMES COPYING CRYPTO ChangeLog INSTALL README THANKS UPGRADE +TMDA_HTDOCS= htdocs/*.html +TMDA_CONTRIB= contrib/* + +SUBST_CLASSES+= etc +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' do-build: - cd ${WRKSRC}; ${PYTHONBIN} ./compileall + cd ${WRKSRC} && ${PYTHONBIN} ./compileall do-install: for f in ${TMDA_PROGRAMS}; do \ @@ -69,10 +68,14 @@ do-install: done ${INSTALL_DATA_DIR} ${PREFIX}/${CONTRIBDIR} - ${INSTALL_DATA} ${WRKSRC}/contrib/* ${PREFIX}/${CONTRIBDIR} + for f in ${TMDA_CONTRIB}; do \ + ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${CONTRIBDIR}; \ + done ${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR} - ${INSTALL_DATA} ${WRKSRC}/htdocs/*.html ${PREFIX}/${HTMLDIR} + for f in ${TMDA_HTDOCS}; do \ + ${INSTALL_DATA} ${WRKSRC}/$${f} ${PREFIX}/${HTMLDIR}; \ + done ${INSTALL_DATA_DIR} ${PREFIX}/${HTMLDIR}/img ${INSTALL_DATA} ${WRKSRC}/htdocs/img/*.png ${PREFIX}/${HTMLDIR}/img diff --git a/mail/tmda/PLIST b/mail/tmda/PLIST index b8cd22ca323..6d05bf40d2d 100644 --- a/mail/tmda/PLIST +++ b/mail/tmda/PLIST @@ -1,4 +1,4 @@ -@comment $NetBSD: PLIST,v 1.9 2004/01/28 00:12:53 kim Exp $ +@comment $NetBSD: PLIST,v 1.10 2004/06/06 05:08:34 schmonz Exp $ bin/tmda-address bin/tmda-check-address bin/tmda-filter @@ -84,7 +84,6 @@ ${PYSITELIB}/TMDA/pythonlib/email/base64MIME.py ${PYSITELIB}/TMDA/pythonlib/email/base64MIME.pyc ${PYSITELIB}/TMDA/pythonlib/email/quopriMIME.py ${PYSITELIB}/TMDA/pythonlib/email/quopriMIME.pyc -${HTMLDIR}/bugs.html ${HTMLDIR}/challengeresponse.html ${HTMLDIR}/config-client.html ${HTMLDIR}/config-filter.html @@ -98,7 +97,6 @@ ${HTMLDIR}/features.html ${HTMLDIR}/filter-sources.html ${HTMLDIR}/history.html ${HTMLDIR}/howto-template.html -${HTMLDIR}/howtos.html ${HTMLDIR}/img/tmda-186x253.png ${HTMLDIR}/img/tmda-47x64.png ${HTMLDIR}/img/tmda-562x765.png @@ -107,14 +105,8 @@ ${HTMLDIR}/img/tmda-93x127.png ${HTMLDIR}/img/tmda-nt-616x616.png ${HTMLDIR}/index.html ${HTMLDIR}/install.html -${HTMLDIR}/inuse.html ${HTMLDIR}/logos.html -${HTMLDIR}/mirrors.html -${HTMLDIR}/press.html ${HTMLDIR}/requirements.html -${HTMLDIR}/resources.html -${HTMLDIR}/results.html -${HTMLDIR}/support-commercial.html ${HTMLDIR}/tmda-ofmipd.html ${HTMLDIR}/tmda-vdomains.html ${HTMLDIR}/trouble.html diff --git a/mail/tmda/distinfo b/mail/tmda/distinfo index 50e66badda2..8983fac02a6 100644 --- a/mail/tmda/distinfo +++ b/mail/tmda/distinfo @@ -1,4 +1,4 @@ -$NetBSD: distinfo,v 1.13 2004/01/28 00:12:53 kim Exp $ +$NetBSD: distinfo,v 1.14 2004/06/06 05:08:34 schmonz Exp $ -SHA1 (tmda-1.0.tgz) = 2fdc470493039c488e8351bbd01c552c67e6de29 -Size (tmda-1.0.tgz) = 399384 bytes +SHA1 (tmda-1.0.3.tgz) = 77a813c3a6d55eecf3fab30b82fdb9004354ae55 +Size (tmda-1.0.3.tgz) = 392608 bytes diff --git a/mail/tmda/files/tofmipd.sh b/mail/tmda/files/tofmipd.sh new file mode 100755 index 00000000000..035881bb848 --- /dev/null +++ b/mail/tmda/files/tofmipd.sh @@ -0,0 +1,17 @@ +#!@RCD_SCRIPTS_SHELL@ +# +# $NetBSD: tofmipd.sh,v 1.1 2004/06/06 05:08:34 schmonz Exp $ +# + +# PROVIDE: mail +# REQUIRE: LOGIN + +. /etc/rc.subr + +name="tofmipd" +rcvar=$name +command="@PREFIX@/bin/tmda-ofmipd" +command_interpreter="@PYTHONBIN@" + +load_rc_config $name +run_rc_command "$1" -- cgit v1.2.3