Ben Lovett writes: > On Tue, Dec 27, 2005 at 07:52:31PM +0100, steven mestdagh wrote: >> do regression tests pass for you? one test is failing if i apply this >> patch, it did not before. > > No, you're right. They don't pass. I'm not quite sure why the SPF > stuff is even being evaluated though, since the plugin is not > explicitly loaded in any of the configs. Not quite sure why this is. > [...]
Here's finally an updated patch. The patch adds a dependency on p5-Mail-SPF-Query, which is now in the ports tree. Index: Makefile =================================================================== RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v retrieving revision 1.35 diff -u -u -r1.35 Makefile --- Makefile 9 Oct 2005 09:05:43 -0000 1.35 +++ Makefile 22 Jan 2006 11:18:36 -0000 @@ -3,7 +3,7 @@ COMMENT= "mailfilter to identify and mark spam" DISTNAME= Mail-SpamAssassin-3.1.0 -PKGNAME= p5-${DISTNAME} +PKGNAME= p5-${DISTNAME}p0 CATEGORIES= mail perl5 MAINTAINER= Ben Lovett <[EMAIL PROTECTED]> @@ -22,7 +22,7 @@ BUILD_DEPENDS= :p5-HTML-Parser-*:www/p5-HTML-Parser \ :p5-Digest-SHA1-*:security/p5-Digest-SHA1 \ :p5-Net-DNS-*:net/p5-Net-DNS \ - :p5-HTML-Parser-*:www/p5-HTML-Parser \ + :p5-Mail-SPF-Query-*:mail/p5-Mail-SPF-Query \ :p5-IO-INET6-*:net/p5-IO-INET6 \ :p5-IO-Socket-SSL-*:security/p5-IO-Socket-SSL \ :p5-libwww-*:www/p5-libwww \ @@ -55,7 +55,7 @@ FAQ= OpenBSD-SpamAssassin-mini-howto.html DOCS= README UPGRADE LICENSE procmailrc.example \ sample-nonspam.txt sample-spam.txt -LOCALCF= rules/local.cf +LOCALCF= rules/local.cf rules/init.pre rules/v310.pre post-patch: @perl -pi -e "[EMAIL PROTECTED]@[EMAIL PROTECTED]@#${CONFDIR}#" ${WRKSRC}/rules/* Index: pkg/PLIST =================================================================== RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v retrieving revision 1.16 diff -u -u -r1.16 PLIST --- pkg/PLIST 9 Oct 2005 09:05:43 -0000 1.16 +++ pkg/PLIST 22 Jan 2006 11:18:36 -0000 @@ -152,6 +152,10 @@ share/examples/SpamAssassin/ share/examples/SpamAssassin/local.cf @sample ${CONFDIR}/local.cf +share/examples/SpamAssassin/init.pre [EMAIL PROTECTED] ${CONFDIR}/init.pre +share/examples/SpamAssassin/v310.pre [EMAIL PROTECTED] ${CONFDIR}/v310.pre share/spamassassin/ share/spamassassin/10_misc.cf share/spamassassin/20_advance_fee.cf