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 2018/11/04 21:36:58 UTC
svn commit: r1845749 - in /spamassassin/trunk/lib/Mail/SpamAssassin/Plugin:
HeaderEval.pm PhishTag.pm ReplaceTags.pm SpamCop.pm
Author: hege
Date: Sun Nov 4 21:36:58 2018
New Revision: 1845749
URL: http://svn.apache.org/viewvc?rev=1845749&view=rev
Log:
Cleanup some module usage
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/PhishTag.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm?rev=1845749&r1=1845748&r2=1845749&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/HeaderEval.pm Sun Nov 4 21:36:58 2018
@@ -26,7 +26,7 @@ use Errno qw(EBADF);
use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Locales;
use Mail::SpamAssassin::Util qw(get_my_locales parse_rfc822_date
- idn_to_ascii is_valid_utf_8);
+ is_valid_utf_8);
use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::Constants qw(:sa :ip);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/PhishTag.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/PhishTag.pm?rev=1845749&r1=1845748&r2=1845749&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/PhishTag.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/PhishTag.pm Sun Nov 4 21:36:58 2018
@@ -22,7 +22,8 @@ package Mail::SpamAssassin::Plugin::Phis
use strict;
use warnings;
use Errno qw(EBADF);
-use Mail::SpamAssassin;
+
+use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Logger;
our @ISA = qw(Mail::SpamAssassin::Plugin);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm?rev=1845749&r1=1845748&r2=1845749&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/ReplaceTags.pm Sun Nov 4 21:36:58 2018
@@ -49,7 +49,6 @@ SpamAssasin; it is not guaranteed to wor
package Mail::SpamAssassin::Plugin::ReplaceTags;
-use Mail::SpamAssassin;
use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Logger;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm?rev=1845749&r1=1845748&r2=1845749&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/SpamCop.pm Sun Nov 4 21:36:58 2018
@@ -49,7 +49,6 @@ use warnings;
# use bytes;
use re 'taint';
-use constant HAS_NET_DNS => eval { require Net::DNS; };
use constant HAS_NET_SMTP => eval { require Net::SMTP; };
our @ISA = qw(Mail::SpamAssassin::Plugin);
@@ -63,7 +62,7 @@ sub new {
bless ($self, $class);
# are network tests enabled?
- if (!$mailsaobject->{local_tests_only} && HAS_NET_DNS && HAS_NET_SMTP) {
+ if (!$mailsaobject->{local_tests_only} && HAS_NET_SMTP) {
$self->{spamcop_available} = 1;
dbg("reporter: network tests on, attempting SpamCop");
}