Hi all,

amavisd-new-2.6.0 wants to load both Mail::SpamAssassin::BayesStore::MySQL 
and Mail::SpamAssassin::BayesStore::PgSQL on startup, wether it is
used or not.

This causes a dependency on PgSQL which we do not have on our systems.

Attached patch introduces two new configuration variables which can be
set to load either or both modules.

Please consider this patch, or at least its concept, for applying to the
next release.

-- 
Leo Baltus, internetbeheerder                         /\
NPO ICT Internet Services                            /NPO/\
Sumatralaan 45, 1217 GP Hilversum, Filmcentrum, west \  /\/
[EMAIL PROTECTED], 035-6773555                         \/
--- amavisd     2008-04-23 20:50:05.000000000 +0200
+++ amavisd.patched     2008-05-22 15:18:35.849322969 +0200
@@ -377,6 +377,7 @@
     [qw(
       $helpers_home $dspam $sa_spawned
       $sa_local_tests_only $sa_auto_whitelist $sa_timeout $sa_debug
+      $sa_bayes_mysql $sa_bayes_pgsql
     )],
     'platform' => [qw(
       $can_truncate $unicode_aware $eol $my_pid
@@ -20030,14 +20031,14 @@
 }
 
 sub getSA31Modules {
-  qw(Mail::SpamAssassin::BayesStore::MySQL
-     Mail::SpamAssassin::BayesStore::PgSQL);
+  ( $sa_bayes_mysql ? qw(Mail::SpamAssassin::BayesStore::MySQL) : () ),
+  ( $sa_bayes_pgsql ? qw(Mail::SpamAssassin::BayesStore::PgSQL) : () )
 }
 
 sub getSA32Modules {
-  qw(Mail::SpamAssassin::BayesStore::MySQL
-     Mail::SpamAssassin::BayesStore::PgSQL
-     Mail::SpamAssassin::Bayes Mail::SpamAssassin::Bayes::CombineChi
+  ( $sa_bayes_mysql ? qw(Mail::SpamAssassin::BayesStore::MySQL) : () ),
+  ( $sa_bayes_pgsql ? qw(Mail::SpamAssassin::BayesStore::PgSQL) : () ),
+  qw(Mail::SpamAssassin::Bayes Mail::SpamAssassin::Bayes::CombineChi
      Mail::SpamAssassin::Locales
      Encode::Detect
   );
-------------------------------------------------------------------------
This SF.net email is sponsored by: Microsoft
Defy all challenges. Microsoft(R) Visual Studio 2008.
http://clk.atdmt.com/MRT/go/vse0120000070mrt/direct/01/
_______________________________________________
AMaViS-user mailing list
AMaViS-user@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/amavis-user
AMaViS-FAQ:http://www.amavis.org/amavis-faq.php3
AMaViS-HowTos:http://www.amavis.org/howto/

Reply via email to