Mailing List Archive

Author: sidney
Date: Sat Dec 9 12:12:54 2023
New Revision: 1914481

URL: http://svn.apache.org/viewvc?rev=1914481&view=rev
Log:
bug 8196 - Revert commits regarding NetAddr::IP that were not really neccessary

Modified:
spamassassin/trunk/Makefile.PL
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/Makefile.PL
URL: http://svn.apache.org/viewvc/spamassassin/trunk/Makefile.PL?rev=1914481&r1=1914480&r2=1914481&view=diff
==============================================================================
--- spamassassin/trunk/Makefile.PL (original)
+++ spamassassin/trunk/Makefile.PL Sat Dec 9 12:12:54 2023
@@ -196,7 +196,6 @@ my %makefile = (

'CONFIGURE_REQUIRES' => {
'ExtUtils::MakeMaker' => MIN_MAKEMAKER_VERSION,
- 'NetAddr::IP' => 4.010, # used by Util which is used by DependencyInfo when Makefile.PL is run
},

# The modules that are not core or that require a minimum version that are used in default tests

Modified: spamassassin/trunk/lib/Mail/SpamAssassin/AutoWelcomelist.pm
URL: http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/AutoWelcomelist.pm?rev=1914481&r1=1914480&r2=1914481&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/AutoWelcomelist.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/AutoWelcomelist.pm Sat Dec 9 12:12:54 2023
@@ -46,6 +46,8 @@ 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);
@@ -307,7 +309,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");
- } else {
+ } elsif (NetAddr::IP->can('full6')) { # since NetAddr::IP 4.010
$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=1914481&r1=1914480&r2=1914481&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/NetSet.pm Sat Dec 9 12:12:54 2023
@@ -23,6 +23,7 @@ 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=1914481&r1=1914480&r2=1914481&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/TxRep.pm Sat Dec 9 12:12:54 2023
@@ -204,6 +204,7 @@ 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=1914481&r1=1914480&r2=1914481&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/WLBLEval.pm Sat Dec 9 12:12:54 2023
@@ -22,6 +22,8 @@ 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=1914481&r1=1914480&r2=1914481&view=diff
==============================================================================
--- spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm (original)
+++ spamassassin/trunk/lib/Mail/SpamAssassin/Util.pm Sat Dec 9 12:12:54 2023
@@ -76,11 +76,9 @@ use Errno qw(ENOENT EACCES EEXIST);
use POSIX qw(:sys_wait_h WIFEXITED WIFSIGNALED WIFSTOPPED WEXITSTATUS
WTERMSIG WSTOPSIG);

-# Lazy require, otherwise Makefile.PL fails if module not installed (Bug 8196)
-eval { require NetAddr::IP; };
-
###########################################################################

+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);

@@ -1192,6 +1190,8 @@ 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);