also load SpamAssassin descriptions from local dir

SpamAssassin updates into
/var/lib/spamassassin/VERSION/CHANNEL/

by default, so we should get the descriptions also from there

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>

diff --git a/PMG/API2/Quarantine.pm b/PMG/API2/Quarantine.pm
index c6470bfa697e66b4eb65e4fa7cb121775820c547..052f734970bfad4cef9e6c08922963c5a696c606 100644 (file)
--- a/PMG/API2/Quarantine.pm
+++ b/PMG/API2/Quarantine.pm
@@ -8,6 +8,7 @@ use Data::Dumper;
 use Encode;
 
 use Mail::Header;
+use Mail::SpamAssassin;
 
 use PVE::SafeSyslog;
 use PVE::Exception qw(raise_param_exc raise_perm_exc);
@@ -49,7 +50,11 @@ my $verify_optional_pmail = sub {
 sub decode_spaminfo {
     my ($info) = @_;
 
-    $spamdesc = PMG::Utils::load_sa_descriptions() if !$spamdesc;
+    my $saversion = Mail::SpamAssassin->VERSION;
+
+    my $salocaldir = "/var/lib/spamassassin/$saversion/updates_spamassassin_org";
+
+    $spamdesc = PMG::Utils::load_sa_descriptions([$salocaldir]) if !$spamdesc;
 
     my $res = [];
 

diff --git a/PMG/Utils.pm b/PMG/Utils.pm
index bb389cadb399e877c440699bd6f4a68fd9d039c3..4bbe46aae758bda86139e92a811b2d0416c24594 100644 (file)
--- a/PMG/Utils.pm
+++ b/PMG/Utils.pm
@@ -963,10 +963,13 @@ sub bencode_header {
 }
 
 sub load_sa_descriptions {
+    my ($additional_dirs) = @_;
 
     my @dirs = ('/usr/share/spamassassin',
                '/usr/share/spamassassin-extra');
 
+    push @dirs, @$additional_dirs if @$additional_dirs;
+
     my $res = {};
 
     my $parse_sa_file = sub {