SpamAssassin::Plugin::SPF, Mail::SPF and libspf2

[Petar Bogdanovic <petar%smokva.net@localhost>]

Hi again,

back in 2006, a default SA plugin (SpamAssassin::Plugin::SPF) was
disabled because of misleading warnings/errors:

        http://gnats.netbsd.org/cgi-bin/query-pr-single.pl?number=32514

just a few months later, the mentioned plugin was rewritten:

        
http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SPF.pm?r1=440974&r2=486461&diff_format=h

the rewrite seems to have removed the errors and also added support for
Mail::SPF (now prefered to the old Mail::SPF::Query).

The original patch (patch-ay) should therefore be removed (see
attachment).

A subsequent problem is that Mail::SPF seems to be in conflict with
libspf2 (and libspf-alt) because of sbin/spfd.

Now, libspf2 and libspf-alt both have bin/spfd while p5-Mail-SPF has
sbin/spfd.  Does this still constitute a conflict?

Patch for both problems is attached.

Thanks,

                Petar


Index: libspf-alt/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/libspf-alt/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- libspf-alt/Makefile 6 Apr 2013 14:22:40 -0000       1.24
+++ libspf-alt/Makefile 4 Jul 2014 09:41:24 -0000
@@ -14,7 +14,6 @@
 CONFIGURE_ARGS+=       --with-bind=${BUILDLINK_PREFIX.libbind}
 
 CONFLICTS+=    libspf2-[0-9]*
-CONFLICTS+=    p5-Mail-SPF-[0-9]*
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../mk/resolv.buildlink3.mk"
Index: libspf2/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/libspf2/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- libspf2/Makefile    6 Jul 2013 11:09:26 -0000       1.11
+++ libspf2/Makefile    4 Jul 2014 09:41:24 -0000
@@ -13,6 +13,5 @@
 USE_LIBTOOL=   YES
 
 CONFLICTS+=    libspf_alt-[0-9]*
-CONFLICTS+=    p5-Mail-SPF-[0-9]*
 
 .include "../../mk/bsd.pkg.mk"
Index: p5-Mail-SPF/Makefile
===================================================================
RCS file: /cvsroot/pkgsrc/mail/p5-Mail-SPF/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- p5-Mail-SPF/Makefile        29 May 2014 23:36:50 -0000      1.6
+++ p5-Mail-SPF/Makefile        4 Jul 2014 09:41:25 -0000
@@ -14,10 +14,6 @@
 
 PKG_INSTALLATION_TYPES=        overwrite pkgviews
 
-# sbin/spfd
-CONFLICTS+=    libspf2-[0-9]*
-CONFLICTS+=    libspf-alt-[0-9]*
-
 BUILD_DEPENDS+=                
p5-Net-DNS-Resolver-Programmable-[0-9]*:../../net/p5-Net-DNS-Resolver-Programmable
 BUILD_DEPENDS+=                
{perl>=5.6.2,p5-Test-Simple>=0.10}:../../devel/p5-Test-Simple
 
Index: spamassassin/distinfo
===================================================================
RCS file: /cvsroot/pkgsrc/mail/spamassassin/distinfo,v
retrieving revision 1.62
diff -u -r1.62 distinfo
--- spamassassin/distinfo       26 Apr 2014 13:55:10 -0000      1.62
+++ spamassassin/distinfo       4 Jul 2014 09:41:26 -0000
@@ -15,7 +15,6 @@
 SHA1 (patch-Makefile.PL) = 965e6aa223f2e714630db45131918485a5730c48
 SHA1 (patch-ae) = d46b1d8f56c8c61936c307f74b39a49da1b1f353
 SHA1 (patch-aq) = 3a273c7742275647c2334382fed29c0ea33dfbd8
-SHA1 (patch-ay) = ca8ea0b1e6d8fddd29d6ae960e1bf6e534d2f424
 SHA1 (patch-lib_Mail_SpamAssassin_Message.pm) = 
402b9769df65ae87c3beebcc9441e29619eed367
 SHA1 (patch-sa-compile) = e8a92060eefbc1c95b7b2c674fc69686a66f230b
 SHA1 (patch-sa-update) = 6ea354aa6b11740df1d25a807f5610115218294a
Index: spamassassin/patches/patch-ay
===================================================================
RCS file: spamassassin/patches/patch-ay
diff -N spamassassin/patches/patch-ay
--- spamassassin/patches/patch-ay       22 Jun 2008 22:41:01 -0000      1.2
+++ /dev/null   1 Jan 1970 00:00:00 -0000
@@ -1,18 +0,0 @@
-$NetBSD: patch-ay,v 1.2 2008/06/22 22:41:01 heinz Exp $
-
-  Change default behaviour of SpamAssassin for pkgsrc in order to shut up
-  unwanted warnings in the log files.
-  If the users want to use SPF, they can enable the plugin.
-
---- rules/init.pre.orig        2006-03-10 20:30:02.000000000 +0100
-+++ rules/init.pre
-@@ -25,5 +25,8 @@ loadplugin Mail::SpamAssassin::Plugin::H
- 
- # SPF - perform SPF verification.
- #
--loadplugin Mail::SpamAssassin::Plugin::SPF
-+# By default SPF is _not_ a prerequisite for SpamAssassin so we disable it
-+# in pkgsrc to avoid confusing warnings in the log file.
-+# If you use SPF, just reenable it.
-+#loadplugin Mail::SpamAssassin::Plugin::SPF
-