You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2022/04/25 15:47:58 UTC
svn commit: r1900267 - in /spamassassin/trunk: lib/Mail/SpamAssassin/Conf.pm lib/Mail/SpamAssassin/Conf/Parser.pm t/dmarc.t t/welcomelist_subject.t t/whitelist_subject.t
Author: hege
Date: Mon Apr 25 15:47:57 2022
New Revision: 1900267
URL: http://svn.apache.org/viewvc?rev=1900267&view=rev
Log:
Fix ifplugin Dmarc/WhiteListSubject backwards compatibility
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
spamassassin/trunk/t/dmarc.t
spamassassin/trunk/t/welcomelist_subject.t
spamassassin/trunk/t/whitelist_subject.t
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm?rev=1900267&r1=1900266&r2=1900267&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf.pm Mon Apr 25 15:47:57 2022
@@ -4245,11 +4245,13 @@ See C<Mail::SpamAssassin::Plugin> for mo
return $INVALID_VALUE;
}
# trunk Dmarc.pm was renamed to DMARC.pm
- if ($package eq 'Mail::SpamAssassin::Plugin::Dmarc' && !defined $path) {
+ # (same check also in Conf/Parser.pm handle_conditional)
+ if ($package eq 'Mail::SpamAssassin::Plugin::Dmarc') {
$package = 'Mail::SpamAssassin::Plugin::DMARC';
}
# backwards compatible - removed in 4.1
- elsif ($package eq 'Mail::SpamAssassin::Plugin::WhiteListSubject' && !defined $path) {
+ # (same check also in Conf/Parser.pm handle_conditional)
+ elsif ($package eq 'Mail::SpamAssassin::Plugin::WhiteListSubject') {
$package = 'Mail::SpamAssassin::Plugin::WelcomeListSubject';
}
$self->load_plugin ($package, $path);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm?rev=1900267&r1=1900266&r2=1900267&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Conf/Parser.pm Mon Apr 25 15:47:57 2022
@@ -558,6 +558,16 @@ sub handle_conditional {
elsif ($token =~ /^\w[\w\:]+$/) { # class name
# Strictly controlled form:
if ($token =~ /^(?:\w+::){0,10}\w+$/) {
+ # trunk Dmarc.pm was renamed to DMARC.pm
+ # (same check also in Conf.pm loadplugin)
+ if ($token eq 'Mail::SpamAssassin::Plugin::Dmarc') {
+ $token = 'Mail::SpamAssassin::Plugin::DMARC';
+ }
+ # backwards compatible - removed in 4.1
+ # (same check also in Conf.pm loadplugin)
+ elsif ($token eq 'Mail::SpamAssassin::Plugin::WhiteListSubject') {
+ $token = 'Mail::SpamAssassin::Plugin::WelcomeListSubject';
+ }
my $u = untaint_var($token);
$eval .= "'$u'";
} else {
Modified: spamassassin/trunk/t/dmarc.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/dmarc.t?rev=1900267&r1=1900266&r2=1900267&view=diff
==============================================================================
--- spamassassin/trunk/t/dmarc.t (original)
+++ spamassassin/trunk/t/dmarc.t Mon Apr 25 15:47:57 2022
@@ -25,6 +25,11 @@ loadplugin Mail::SpamAssassin::Plugin::D
");
tstprefs("
+# Check that rename backwards compatibility works with if's
+ifplugin Mail::SpamAssassin::Plugin::Dmarc
+if plugin ( Mail::SpamAssassin::Plugin::Dmarc)
+ifplugin Mail::SpamAssassin::Plugin::DMARC
+
header DMARC_NONE eval:check_dmarc_none()
priority DMARC_NONE 500
describe DMARC_NONE DMARC none policy
@@ -40,6 +45,10 @@ describe DMARC_REJECT DMARC reject polic
header DMARC_MISSING eval:check_dmarc_missing()
priority DMARC_MISSING 500
describe DMARC_MISSING Missing DMARC policy
+
+endif
+endif
+endif
");
%patterns = ();
Modified: spamassassin/trunk/t/welcomelist_subject.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/welcomelist_subject.t?rev=1900267&r1=1900266&r2=1900267&view=diff
==============================================================================
--- spamassassin/trunk/t/welcomelist_subject.t (original)
+++ spamassassin/trunk/t/welcomelist_subject.t Mon Apr 25 15:47:57 2022
@@ -15,11 +15,15 @@ use Test::More tests => 4;
);
tstprefs ("
- loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
- use_bayes 0
- use_auto_welcomelist 0
+ loadplugin Mail::SpamAssassin::Plugin::WelcomeListSubject
+
+ # Check that rename backwards compatibility works with if's
+ ifplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+ if plugin(Mail::SpamAssassin::Plugin::WelcomeListSubject)
welcomelist_subject [HC Anno*]
blocklist_subject whitelist test
+ endif
+ endif
");
%patterns = %is_welcomelist_patterns;
Modified: spamassassin/trunk/t/whitelist_subject.t
URL: http://svn.apache.org/viewvc/spamassassin/trunk/t/whitelist_subject.t?rev=1900267&r1=1900266&r2=1900267&view=diff
==============================================================================
--- spamassassin/trunk/t/whitelist_subject.t (original)
+++ spamassassin/trunk/t/whitelist_subject.t Mon Apr 25 15:47:57 2022
@@ -18,10 +18,14 @@ disable_compat "welcomelist_blocklist";
tstprefs ("
loadplugin Mail::SpamAssassin::Plugin::WhiteListSubject
- use_bayes 0
- use_auto_whitelist 0
+
+ # Check that rename backwards compatibility works with if's
+ ifplugin Mail::SpamAssassin::Plugin::WhiteListSubject
+ if plugin(Mail::SpamAssassin::Plugin::WelcomeListSubject)
whitelist_subject [HC Anno*]
blacklist_subject whitelist test
+ endif
+ endif
");
%patterns = %is_whitelist_patterns;