svn commit: r1872935 - in /spamassassin/branches/3.4: INSTALL lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm

[gb...@apache.org]

Author: gbechis
Date: Fri Jan 17 23:24:35 2020
New Revision: 1872935

URL: http://svn.apache.org/viewvc?rev=1872935&view=rev
Log:
make SpamAssassin compatible with Perl 5.8.x again

Modified:
    spamassassin/branches/3.4/INSTALL
    spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm

Modified: spamassassin/branches/3.4/INSTALL
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/INSTALL?rev=1872935&r1=1872934&r2=1872935&view=diff
==============================================================================
--- spamassassin/branches/3.4/INSTALL (original)
+++ spamassassin/branches/3.4/INSTALL Fri Jan 17 23:24:35 2020
@@ -222,7 +222,11 @@ through those mechanisms, too, if you pr
 Required Perl Interpreter
 -------------------------
 
-Perl 5.10.1 or a later version is required.
+Perl 5.8.1 or a later version is required.
+Preferred versions are 5.8.8, or 5.10.1 or later.
+
+Most of the functions might still work with Perl 5.6.1 or 5.6.2,
+but 5.6.* is no longer a supported version.
 
 
 Required Perl Modules

Modified: spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm
URL: http://svn.apache.org/viewvc/spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm?rev=1872935&r1=1872934&r2=1872935&view=diff
==============================================================================
--- spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm (original)
+++ spamassassin/branches/3.4/lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm Fri Jan 17 23:24:35 2020
@@ -262,7 +262,9 @@ sub check_fromname_spoof
   my ($self, $pms, $check_lvl) = @_;
   $self->_check_fromnamespoof($pms);
 
-  $check_lvl //= $pms->{conf}->{fns_check};
+  if ( not defined $check_lvl ) {
+    $check_lvl = $pms->{conf}->{fns_check};
+  }
 
   my @array = (
     ($pms->{fromname_address_different}) ,
@@ -348,7 +350,7 @@ sub _check_fromnamespoof
 
   $fnd{'addr'} = $pms->get("From:name");
 
-  if ($fnd{'addr'} =~ /\b([\w\.\!\#\$\%\&\'\*\+\/\=\?\^\_\`\{\|\}\~\-]+@[\w\-\.]+\.[\w\-\.]++)\b/i) {
+  if ($fnd{'addr'} =~ /\b((?>[\w\.\!\#\$\%\&\'\*\+\/\=\?\^\_\`\{\|\}\~\-]+@[\w\-\.]+\.[\w\-\.]+))\b/i) {
     my $nochar = ($fnd{'addr'} =~ y/A-Za-z0-9//c);
     $nochar -= ($1 =~ y/A-Za-z0-9//c);