FIX: mail/p5-Mail-SpamAssassin-3.1.0

Previous Topic Next Topic
 
classic Classic list List threaded Threaded
6 messages Options
Reply | Threaded
Open this post in threaded view
|

FIX: mail/p5-Mail-SpamAssassin-3.1.0

Andreas Vögele
Here's a fix for the SpamAssassin port.  The included diff adds the
config files init.pre and v310.pre to the package.  Both files are
required for a smooth transition from SpamAssassin 3.0 to 3.1.

Index: Makefile
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- Makefile 9 Oct 2005 09:05:43 -0000 1.35
+++ Makefile 17 Dec 2005 16:36:28 -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 <[hidden email]>
@@ -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 "s#\@\@LOCAL_RULES_DIR\@\@#${CONFDIR}#" ${WRKSRC}/rules/*
Index: patches/patch-rules_init_pre
===================================================================
RCS file: patches/patch-rules_init_pre
diff -N patches/patch-rules_init_pre
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ patches/patch-rules_init_pre 17 Dec 2005 16:36:28 -0000
@@ -0,0 +1,9 @@
+--- rules/init.pre.orig Fri Aug 12 02:38:50 2005
++++ rules/init.pre Thu Dec  1 11:37:58 2005
+@@ -25,5 +25,5 @@
+
+ # SPF - perform SPF verification.
+ #
+-loadplugin Mail::SpamAssassin::Plugin::SPF
++#loadplugin Mail::SpamAssassin::Plugin::SPF
+
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/mail/p5-Mail-SpamAssassin/pkg/PLIST,v
retrieving revision 1.16
diff -u -r1.16 PLIST
--- pkg/PLIST 9 Oct 2005 09:05:43 -0000 1.16
+++ pkg/PLIST 17 Dec 2005 16:36:28 -0000
@@ -152,6 +152,10 @@
 share/examples/SpamAssassin/
 share/examples/SpamAssassin/local.cf
 @sample ${CONFDIR}/local.cf
+share/examples/SpamAssassin/init.pre
+@sample ${CONFDIR}/init.pre
+share/examples/SpamAssassin/v310.pre
+@sample ${CONFDIR}/v310.pre
 share/spamassassin/
 share/spamassassin/10_misc.cf
 share/spamassassin/20_advance_fee.cf

Reply | Threaded
Open this post in threaded view
|

Re: FIX: mail/p5-Mail-SpamAssassin-3.1.0

Ben Lovett
On Sat, Dec 17, 2005 at 05:48:50PM +0100, Andreas Vögele wrote:
> Here's a fix for the SpamAssassin port.  The included diff adds the
> config files init.pre and v310.pre to the package.  Both files are
> required for a smooth transition from SpamAssassin 3.0 to 3.1.

...

>  MAINTAINER= Ben Lovett <[hidden email]>

This patch is OK with me.

--ben

Reply | Threaded
Open this post in threaded view
|

Re: FIX: mail/p5-Mail-SpamAssassin-3.1.0

steven mestdagh
On Tue, Dec 27, 2005 at 09:54:45AM -0800, Ben Lovett wrote:

> On Sat, Dec 17, 2005 at 05:48:50PM +0100, Andreas Vögele wrote:
> > Here's a fix for the SpamAssassin port.  The included diff adds the
> > config files init.pre and v310.pre to the package.  Both files are
> > required for a smooth transition from SpamAssassin 3.0 to 3.1.
>
> ...
>
> >  MAINTAINER= Ben Lovett <[hidden email]>
>
> This patch is OK with me.

do regression tests pass for you? one test is failing if i apply this
patch, it did not before.

Disclaimer: http://www.kuleuven.be/cwis/email_disclaimer.htm

Reply | Threaded
Open this post in threaded view
|

Re: FIX: mail/p5-Mail-SpamAssassin-3.1.0

Ben Lovett
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.
I'll try to look at it if I get a chance in the upcoming week or
two.

If anyone else has any ideas, I'm open to them.

--ben

Reply | Threaded
Open this post in threaded view
|

Re: FIX: mail/p5-Mail-SpamAssassin-3.1.0

Andreas Vögele
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.
> I'll try to look at it if I get a chance in the upcoming week or
> two.
>
> If anyone else has any ideas, I'm open to them.

The problem is my init.pre patch, which disables the SPF plugin since
Mail::SPF::Query isn't available in the ports tree.

Instead of a patch, `sed' could be used during post-install to copy a
modified version of init.pre to the fake installation directory.  This
way the regression tests wouldn't be affected.

I'll send a new patch as soon as I've got a better connection to the
net, which will probably in two or three days.

BTW, I've got a port of Mail::SPF::Query, but I didn't want to add
another dependency.

Reply | Threaded
Open this post in threaded view
|

Re: FIX: mail/p5-Mail-SpamAssassin-3.1.0

Andreas Vögele
In reply to this post by Ben Lovett
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 <[hidden email]>
@@ -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 "s#\@\@LOCAL_RULES_DIR\@\@#${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
+@sample ${CONFDIR}/init.pre
+share/examples/SpamAssassin/v310.pre
+@sample ${CONFDIR}/v310.pre
 share/spamassassin/
 share/spamassassin/10_misc.cf
 share/spamassassin/20_advance_fee.cf