Mailing List Archive

Author: gbechis
Date: Mon Jun 21 21:21:58 2021
New Revision: 1890951

URL: http://svn.apache.org/viewvc?rev=1890951&view=rev
Log:
Mail::DMARC::PurePerl is needed for Dmarc plugin to work

Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
spamassassin/trunk/t/dmarc.t

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm?rev=1890951&r1=1890950&r2=1890951&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util/DependencyInfo.pm Mon Jun 21 21:21:58 2021
@@ -304,9 +304,9 @@ our @OPTIONAL_MODULES = (
be used by internal parser to process complex lists.',
},
{
- module => 'Mail::Dmarc',
+ module => 'Mail::Dmarc::PurePerl',
version => 0,
- desc => 'Mail::Dmarc is a Perl implementation of DMARC protocol.
+ desc => 'Mail::Dmarc::PurePerl is a Perl implementation of DMARC protocol.
It is used by the optional Dmarc Plugin.',
},
);

Modified: spamassassin/trunk/t/dmarc.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dmarc.t?rev=1890951&r1=1890950&r2=1890951&view=diff
==============================================================================
--- spamassassin/trunk/t/dmarc.t (original)
+++ spamassassin/trunk/t/dmarc.t Mon Jun 21 21:21:58 2021
@@ -12,9 +12,11 @@ use constant HAS_DKIM_VERIFIER => eval {
require Mail::DKIM::Verifier;
version->parse(Mail::DKIM::Verifier->VERSION) >= version->parse(0.31);
};
+use constant HAS_MAILDMARC => eval { require Mail::DMARC::PurePerl; };

plan skip_all => "Net tests disabled" unless conf_bool('run_net_tests');
-plan skip_all => "Need Mail::SPF" unless HAS_MAILSPF;
+plan skip_all => "Needs Mail::SPF" unless HAS_MAILSPF;
+plan skip_all => "Needs Mail::DMARC::PurePerl" unless HAS_MAILDMARC;
plan skip_all => "Needs Mail::DKIM::Verifier >= 0.31" unless HAS_DKIM_VERIFIER ;
plan tests => 9;