update spamassassin to 3.4.3

drop already applied patch bug_7577_freemail_plugin

Signed-off-by: Stoiko Ivanov <s.ivanov@proxmox.com>

diff --git a/Mail-SpamAssassin-3.4.2.tar.gz b/Mail-SpamAssassin-3.4.2.tar.gz
deleted file mode 100644 (file)
index a438a5f..0000000
Binary files a/Mail-SpamAssassin-3.4.2.tar.gz and /dev/null differ

diff --git a/Mail-SpamAssassin-3.4.3.tar.gz b/Mail-SpamAssassin-3.4.3.tar.gz
new file mode 100644 (file)
index 0000000..75708d7
Binary files /dev/null and b/Mail-SpamAssassin-3.4.3.tar.gz differ

diff --git a/Makefile b/Makefile
index e45a365f6540e9c81f172238a482cacbe5a36f66..7d06b083bacaaf1c921e28664b3888ee3124466c 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,7 @@ include /usr/share/dpkg/pkg-info.mk
 # edit paths ($srcdir) in changes.pl 
 # update changes.diff - verify changes!
 
-# dig  -t any 2.4.3.updates.spamassassin.org
+# dig  -t any 3.4.3.updates.spamassassin.org
 # wget http://spamassassin.kluge.net/updates/501214.tar.gz
 # wget http://spamassassin.kluge.net/updates/501214.tar.gz.asc
 # gpg --verify 501214.tar.gz.asc 501214.tar.gz

diff --git a/debian/changelog b/debian/changelog
index da996771495967bbaf084cb0e91bff87a2973cf8..7a1d200379662dfb95a6ef142a74820b8673ccf8 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+proxmox-spamassassin (3.4.3-1) unstable; urgency=medium
+
+  * update to version 3.4.3
+
+ -- Proxmox Support Team <support@proxmox.com>  Thu, 12 Dec 2019 17:34:49 +0100
+
 proxmox-spamassassin (3.4.2-13) unstable; urgency=medium
 
   * update ruleset

diff --git a/debian/patches/bug_7577_freemail_plugin b/debian/patches/bug_7577_freemail_plugin
deleted file mode 100644 (file)
index b72d67a..0000000
--- a/debian/patches/bug_7577_freemail_plugin
+++ /dev/null
@@ -1,81 +0,0 @@
-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 {

diff --git a/debian/patches/series b/debian/patches/series
index ff4acec07f5ec8b0cc8a3e9800c251c91857e683..78f208c1bc22c422e4d522d1a7dcf280fa399c43 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 disable-dkim.patch
-bug_7577_freemail_plugin