... and what would be the point of those monthly releases, if no distribution will ever pick them up ...
On Sat, May 01, 2021 at 12:54:42PM +0300, Henrik Krohns wrote: > > These kinds of changes just make you wonder what's the point of doing such > plugins inside SA distribution.. if we ever do get 4.0 released, I really > doubt if there are enough resources in the project to even release monthly > updates after that.. > > > On Sat, May 01, 2021 at 09:41:28AM -0000, [email protected] wrote: > > Author: gbechis > > Date: Sat May 1 09:41:28 2021 > > New Revision: 1889364 > > > > URL: http://svn.apache.org/viewvc?rev=1889364&view=rev > > Log: > > cope with recent MailUP changes > > > > Modified: > > spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Esp.pm > > > > Modified: spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Esp.pm > > URL: > > http://svn.apache.org/viewvc/spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Esp.pm?rev=1889364&r1=1889363&r2=1889364&view=diff > > ============================================================================== > > --- spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Esp.pm (original) > > +++ spamassassin/trunk/lib/Mail/SpamAssassin/Plugin/Esp.pm Sat May 1 > > 09:41:28 2021 > > @@ -388,20 +388,27 @@ sub esp_sendinblue_check { > > > > sub esp_mailup_check { > > my ($self, $pms) = @_; > > - my $mailup_id; > > + my ($mailup_id, $xabuse, $listid); > > > > my $rulename = $pms->get_current_eval_rule_name(); > > > > # All Mailup emails have the X-CSA-Complaints header set to > > [email protected] > > my $xcsa = $pms->get("X-CSA-Complaints", undef); > > - if((not defined $xcsa) or ($xcsa !~ /whitelist-complaints\@eco\.de/)) { > > + if((not defined $xcsa) or ($xcsa !~ /complaints\@eco\.de/)) { > > return; > > } > > # All Mailup emails have the X-Abuse header that must match > > - $mailup_id = $pms->get("X-Abuse", undef); > > - return if not defined $mailup_id; > > - $mailup_id =~ /Please report abuse here: > > http\:\/\/.*\.musvc([0-9]+)\.net\/p\?c=([0-9]+)/; > > - $mailup_id = $2; > > + $xabuse = $pms->get("X-Abuse", undef); > > + return if not defined $xabuse; > > + if($xabuse =~ /Please report abuse here: > > http\:\/\/.*\.musvc([0-9]+)\.net\/p\?c=([0-9]+)/) { > > + $mailup_id = $2; > > + } > > + if(not defined $mailup_id) { > > + $listid = $pms->get("list-id", undef); > > + if($listid =~ /\<(\d+)\.\d+\>/) { > > + $mailup_id = $1; > > + } > > + } > > # if regexp doesn't match it's not Mailup > > return if not defined $mailup_id; > > chomp($mailup_id); > >
