bump version to 3.4.2-13

[proxmox-spamassassin.git] / debian / patches / bug_7577_freemail_plugin

backport bugfix for https://bz.apache.org/SpamAssassin/show_bug.cgi?id=7577 
see https://svn.apache.org/viewvc?view=revision&revision=1844813
Index: Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Phishing.pm
===================================================================
--- Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/Phishing.pm
+++ Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/Phishing.pm
@@ -170,15 +170,11 @@ sub _read_configfile {
 sub check_phishing {
   my ($self, $pms) = @_;
 
-  my $desc;
   my $feedname;
   my $domain;
   my $uris = $pms->get_uri_detail_list();
 
   my $rulename = $pms->get_current_eval_rule_name();
-  if (defined $pms->{conf}->{descriptions}->{$rulename}) {
-    $desc = $pms->{conf}->{descriptions}->{$rulename};
-  }
 
   while (my($uri, $info) = each %{$uris}) {
     # we want to skip mailto: uris
@@ -194,7 +190,8 @@ sub check_phishing {
              $domain = $self->{main}->{registryboundaries}->uri_to_domain($cluri);
              $feedname = $pms->{PHISHING}->{phishinfo}->{$domain}[0];
              dbg("HIT! $domain [$cluri] found in $feedname feed");
-             $pms->got_hit($rulename, "", description => $desc . " $feedname ($domain)", ruletype => 'eval');
+             $pms->test_log("$feedname ($domain)");
+             $pms->got_hit($rulename, "", ruletype => 'eval');
              return 1;
            }
         }
Index: Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/HashBL.pm
===================================================================
--- Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/HashBL.pm
+++ Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/HashBL.pm
@@ -166,14 +166,11 @@ sub _parse_body {
 }
 
 sub _got_hit {
-    my ($self, $pms, $rulename, $email, $desc) = @_;
-
-    if (defined $pms->{conf}->{descriptions}->{$rulename}) {
-        $desc = $pms->{conf}->{descriptions}->{$rulename};
-    }
+    my ($self, $pms, $rulename, $email) = @_;
 
     $email =~ s/\@/[at]/g;
-    $pms->got_hit($rulename, "", description => $desc." ($email)", ruletype => 'eval');
+    $pms->test_log($email);
+    $pms->got_hit($rulename, "", ruletype => 'eval');
 }
 
 sub _submit_email_query {
@@ -255,7 +252,6 @@ sub check_hashbl_emails {
     $#emails = 9 if (scalar @emails > 10);
 
     foreach my $email (@emails) {
-        #$self->_got_hit($pms, $email, "Email found in list $list");
         dbg("BODY: $email");
         $self->_submit_email_query($pms, $list, (($type) ? $type : 'SHA1'), $email);
     }
Index: Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
===================================================================
--- Mail-SpamAssassin-3.4.2.orig/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
+++ Mail-SpamAssassin-3.4.2/lib/Mail/SpamAssassin/Plugin/FreeMail.pm
@@ -395,11 +395,10 @@ sub _got_hit {
 
     if ($pms->{main}->{conf}->{freemail_add_describe_email}) {
         $email =~ s/\@/[at]/g;
-        $pms->got_hit($rulename, "", description => $desc." ($email)", ruletype => 'eval');
-    }
-    else {
-        $pms->got_hit($rulename, "", description => $desc, ruletype => 'eval');
+        $pms->test_log($email);
     }
+
+    $pms->got_hit($rulename, "", description => $desc, ruletype => 'eval');
 }
 
 sub check_freemail_header {