razor2 -> spamassassin

diff --git a/PerlMail/Config.pm b/PerlMail/Config.pm
index 980c4df..9416b0f 100644 (file)
--- a/PerlMail/Config.pm
+++ b/PerlMail/Config.pm
@@ -43,7 +43,7 @@ require Mail::Alias;
 
 BEGIN {
        for (qw(headerhas store headeris did dnsbl store_muttrc_alternates Received_for parts_linear mime_type
 
 BEGIN {
        for (qw(headerhas store headeris did dnsbl store_muttrc_alternates Received_for parts_linear mime_type

-                       body_first mimehead razor2 header_remap)) {
+                       body_first mimehead spamassassin header_remap)) {

                eval 'sub '.$_.' { return ::'.$_.'(@_); }';
                }
        }
                eval 'sub '.$_.' { return ::'.$_.'(@_); }';
                }
        }


@@ -251,7 +251,6 @@ our $store_ignore;  # imported
 sub audit
 {
        $store_profile=undef();
 sub audit
 {
        $store_profile=undef();

-       # TODO: <short-m@> storage?

 
        # never spawn new mail if FROM_MAILER
        # $isFROM_MAILER postponed after maillists as they may look as FROM_MAILER
 
        # never spawn new mail if FROM_MAILER
        # $isFROM_MAILER postponed after maillists as they may look as FROM_MAILER


@@ -290,7 +289,7 @@ sub audit
                # Do not local $store_file as it is our-imported
                $store_profile="silent";
                local $_;
                # Do not local $store_file as it is our-imported
                $store_profile="silent";
                local $_;

-               store "=spam".($_ eq 1 ? "" : ";$_")      if $_=razor2();
+               store "=spam".($_ eq 1 ? "" : ";$_")      if $_=spamassassin();

                };
        $store_profile=undef();
        return if did sub {
                };
        $store_profile=undef();
        return if did sub {