[prev in list] [next in list] [prev in thread] [next in thread] 

List:       spamassassin-devel
Subject:    Re: 3.4 "EOL" status
From:       Giovanni Bechis <gbechis () apache ! org>
Date:       2020-01-16 15:41:24
Message-ID: ce83c9ff-4241-1212-93db-ef65cd7c3ae1 () apache ! org
[Download RAW message or body]

On 1/15/20 3:18 PM, Henrik K wrote:
> On Wed, Jan 15, 2020 at 08:57:21AM -0500, Kevin A. McGrail wrote:
>> Yeah, I retract the EOL statement.   We have 3.4 in serious bugfixes only mode
>> and hopefully this week.we can get the svn 4.0 branching done.
>>
>> Can you fix the fromnamespoof plugin regex for 5.8.8 compatibility and revert
>> the INSTALL to the previous text?
> 
> I'll let Giovanni look at why the possessive quantifier is there..  my head
> hurts trying to understand what's going on here :-D
> 
>   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);
> 
>     return 0 unless ((length($fnd{'addr'})+$nochar) - length($1) <= $conf->{'fns_extrachars'});
> 
>     $fnd{'addr'} = lc $1;
> 
>> I will work on rolling a 3.4.4 this week and maybe even a 4.0.0pre1 next week
>> so people can start testing that.
>>
This works on 5.8.8, not sure about all the regexp bits though.

>> Then we can agree to start saying EOL a year after the first 4.0 release?
> 
> Sure.
> 
> There is bunch of stuff in bugzilla that's supposed to go to 4.0 though. 
> But I don't think there is anything lacking or needing immediate attention
> in trunk, so we could just retarget all future improvements to 4.1 and say
> that IDN support etc is much better, but still subject to be improved etc..
> 


["FromNameSpoof-5.8.8.diff" (text/x-patch)]

Index: lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm
===================================================================
--- lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm	(revision 1872882)
+++ lib/Mail/SpamAssassin/Plugin/FromNameSpoof.pm	(working copy)
@@ -262,7 +262,9 @@
   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 @@
 
   $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);
 


[prev in list] [next in list] [prev in thread] [next in thread]