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 2023/05/18 16:05:29 UTC
svn commit: r1909909 - in /spamassassin/trunk/lib/Mail/SpamAssassin: AutoWelcomelist.pm NetSet.pm Plugin/TxRep.pm Plugin/WLBLEval.pm Util.pm
Author: hege
Date: Thu May 18 16:05:28 2023
New Revision: 1909909
URL: http://svn.apache.org/viewvc?rev=1909909&view=rev
Log:
Remove redundant "use NetAddr::IP", it's always loaded via Util.pm
Modified:
spamassassin/trunk/lib/Mail/SpamAssassin/AutoWelcomelist.pm
spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/AutoWelcomelist.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/AutoWelcomelist.pm?rev=1909909&r1=1909908&r2=1909909&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/AutoWelcomelist.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/AutoWelcomelist.pm Thu May 18 16:05:28 2023
@@ -46,8 +46,6 @@ use warnings;
# use bytes;
use re 'taint';
-use NetAddr::IP 4.000;
-
use Mail::SpamAssassin;
use Mail::SpamAssassin::Logger;
use Mail::SpamAssassin::Util qw(untaint_var);
@@ -309,7 +307,7 @@ sub ip_to_awl_key {
my $origip_obj = NetAddr::IP->new6($origip . '/' . $mask_len);
if (!defined $origip_obj) { # invalid IPv6 address
dbg("auto-welcomelist: bad IPv6 address $origip");
- } elsif (NetAddr::IP->can('full6')) { # since NetAddr::IP 4.010
+ } else {
$result = $origip_obj->network->full6; # string in a canonical form
$result =~ s/(:0000){1,7}\z/::/; # compress zero tail
}
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm?rev=1909909&r1=1909908&r2=1909909&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm Thu May 18 16:05:28 2023
@@ -23,7 +23,6 @@ use warnings;
# use bytes;
use re 'taint';
use Time::HiRes qw(time);
-use NetAddr::IP 4.000;
use Mail::SpamAssassin::Util;
use Mail::SpamAssassin::Logger;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm?rev=1909909&r1=1909908&r2=1909909&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm Thu May 18 16:05:28 2023
@@ -204,7 +204,6 @@ use warnings;
# use bytes;
use re 'taint';
-use NetAddr::IP 4.000; # qw(:upper);
use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Plugin::Bayes;
use Mail::SpamAssassin::Util qw(untaint_var);
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm?rev=1909909&r1=1909908&r2=1909909&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm Thu May 18 16:05:28 2023
@@ -22,8 +22,6 @@ use warnings;
# use bytes;
use re 'taint';
-use NetAddr::IP 4.000;
-
use Mail::SpamAssassin::Plugin;
use Mail::SpamAssassin::Logger;
Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm?rev=1909909&r1=1909908&r2=1909909&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Thu May 18 16:05:28 2023
@@ -75,10 +75,10 @@ use Fcntl;
use Errno qw(ENOENT EACCES EEXIST);
use POSIX qw(:sys_wait_h WIFEXITED WIFSIGNALED WIFSTOPPED WEXITSTATUS
WTERMSIG WSTOPSIG);
+use NetAddr::IP 4.010;
###########################################################################
-use constant HAS_NETADDR_IP => eval { require NetAddr::IP; };
use constant HAS_MIME_BASE64 => eval { require MIME::Base64; };
use constant RUNNING_ON_WINDOWS => ($^O =~ /^(?:mswin|dos|os2)/i);
@@ -1190,8 +1190,6 @@ sub reverse_ip_address {
$revip = "$4.$3.$2.$1";
} elsif (index($ip, ':') == -1 || $ip !~ /^[0-9a-fA-F:.]{2,}\z/) { # triage
# obviously unrecognized syntax
- } elsif (!HAS_NETADDR_IP || !NetAddr::IP->can('full6')) { # since NetAddr::IP 4.010
- info("util: sufficiently new NetAddr::IP not found, IPv6 not supported");
} else {
# looks like an IPv6 address, let NetAddr::IP check the details
my $ip_obj = NetAddr::IP->new6($ip);