spamo: +<e4luck@lists.opt4email.com>

[PerlMail.git] / My-Audit.pm

diff --git a/My-Audit.pm b/My-Audit.pm
index 6619e11..8bb5d6c 100644 (file)
--- a/My-Audit.pm
+++ b/My-Audit.pm
@@ -49,6 +49,8 @@ sub audit
                store "=spamo"        if headeris "From",'<newsletter@levnapc.cz>';
                store "=spamo"        if headeris "From",'<Tomas@dtpstudio.cz>';
                store "=spamo"        if headeris "From",'<BNcom@email.bn.com>';
+               store "=spamo"        if headeris "From",'<e4luck@lists.opt4email.com>';
+               store "=spamo"        if headeris "From",'<mailcontests@lists.servitall.com>';
                {
                        # weak detection: files with text/html w/o text/plain are usually a spam
                        my @types_linear=map({ mime_type($_); } parts_linear());
@@ -61,6 +63,7 @@ sub audit
        return if did sub {
                local $store_profile="silent";
                local $_;
+               store "=spam-orbs"                 .";$_","log" if $_=dnsbl '.relays.ordb.org.' ,1;     # all hosts
                store "=spam-abuse"                .";$_","log" if $_=dnsbl '.blackholes.mail-abuse.org.' ,1;   # all hosts
                # we don't check all hosts as they can be "dialup" category, FIXME: check for it
                store "=spam-five"                 .";$_","log" if $_=dnsbl '.blackholes.five-ten-sg.com.',0; # just first
@@ -74,13 +77,14 @@ sub audit
 
        # ppl-wished foreign remapping, Reply-To is left untouched!
        header_remap("From",{
-                       'kerere@post.cz'            =>'kamzik@k332.feld.cvut.cz',
-                       'profes@mbox.vol.cz'        =>'kratochvilova@egp.cz',
-                       'jkrouzek@mbox.vol.cz'      =>'krouzek@mbox.fsv.cuni.cz',
-                       'jakub.gorner@lidovky.cz'   =>'tonda@disnet.cz',
-                       'jan.kolar@videoprogress.cz'=>'jenda.kolar@volny.cz',
-                       'daniel.rulicek@cponline.cz'=>'daniel.rulicek@cpress.cz',
-                       'pavel@suse.cz'             =>'pavel@ucw.cz',
+                       'kerere@post.cz'               =>'kamzik@k332.feld.cvut.cz',
+                       'profes@mbox.vol.cz'           =>'kratochvilova@egp.cz',
+                       'jkrouzek@mbox.vol.cz'         =>'krouzek@mbox.fsv.cuni.cz',
+                       'jakub.gorner@lidovky.cz'      =>'tonda@disnet.cz',
+                       'jan.kolar@videoprogress.cz'   =>'jenda.kolar@volny.cz',
+                       'daniel.rulicek@cponline.cz'   =>'daniel.rulicek@cpress.cz',
+                       'pavel@suse.cz'                =>'pavel@ucw.cz',
+
                        });
 
        # My obsolete e-mail addresses
@@ -88,7 +92,7 @@ sub audit
 
        # nasty public lists with $store_ignore
        {
-               local $store_profile="bell";
+               local $store_profile="log";
                local $store_ignore;
                $store_ignore="smsmail"    if 1==$Audit->body() && length(join "",$Audit->body())<180;  # SMS mail
                $store_ignore="sms OS"     if $Audit->subject()=~/^Email pro: /;        # "^Email pro: gsm@sh\.cvut\.cz$";
@@ -110,23 +114,24 @@ sub audit
 
        # lists
        store "=mozillabug","log"    if headeris "From"     ,'<bugzilla-daemon@mozilla.org>';
-       store "=9kc","bell"          if headeris "List-Post",'<n9k@pandora.cz>';
-       store "=9kcd","bell"         if headeris "List-Post",'<dev9k@pandora.cz>';
+       store "=9kc","log"           if headeris "List-Post",'<n9k@pandora.cz>';
+       store "=9kcd","log"          if headeris "List-Post",'<dev9k@pandora.cz>';
        store "=9ku","log"           if headeris "List-Id"  ,'<9000.listman.net>';
        store "=9kd","log"           if headeris "Sender"   ,'<owner-9000-developers@geekstuff.co.uk>';
        store "=spong","log"         if headeris "List-Id"  ,'<spong-users.lists.sourceforge.net>';
-       store "=gtkd","log"          if headeris "List-Id"  ,'<gtk-devel-list.gnome.org>';
+       store "=gtkd","silent"       if headeris "List-Id"  ,'<gtk-devel-list.gnome.org>';
        store "=mffstatnice","bell"  if headeris "List-Post",'<statnice@atrey.karlin.mff.cuni.cz>';
        store "=hw","log"            if headeris "List-Post",'<hw-news@list.gin.cz>';
        store "=gnokii","log"        if headeris "List-Id"  ,'<gnokii-users.mail.freesoftware.fsf.org>';
        store "=winelic","log"       if headeris "List-Id"  ,'<wine-license.winehq.com>';
-       store "=wined","log"         if headeris "List-Id"  ,'<wine-devel.winehq.com>';
+       store "=wined","silent"      if headeris "List-Id"  ,'<wine-devel.winehq.com>';
        store "=winepat","silent"    if headeris "List-Id"  ,'<wine-patches.winehq.com>';
        store "=winecvs","silent"    if headeris "List-Id"  ,'<wine-cvs.winehq.com>';
        store "=wineann","log"       if headeris "List-Id"  ,'<wine-announce.winehq.com>';
        store "=ros","log"           if headeris "List-Post",'<ros-general@reactos.com>';
        store "=roskernel","log"     if headeris "List-Post",'<ros-kernel@reactos.com>';
        store "=roscvs","silent"     if headeris "List-Post",'<ros-cvs@reactos.com>';
+       store "=rosbug","log"        if headeris "Reply-To" ,'<scarab@reactos.wox.org>';
        store "=fsd","log"           if headeris "X-Mailing-List",'<linux-fsdevel@vger.kernel.org>';
        store "=surprise","sms"      if headeris "List-Post",'<surprise@atrey.karlin.mff.cuni.cz>';
        store "=surprisesuse","sms"  if headeris "Sender"   ,'<owner-surprise@suse.cz>';
@@ -147,6 +152,8 @@ sub audit
        store "=sourceforge","bell"  if headeris "From"     ,'<noreply@sourceforge.net>';
        store "=gsmperlcvs","silent" if headeris("From"     ,'<johan@intra.tektonica.com>')
                                        && $Audit->subject()=~/^'.*' has been updated!$/;
+       store "=libtoold","log"      if headeris "List-Id"  ,'<libtool.gnu.org>';
+       store "=libtoolpat","log"    if headeris "List-Id"  ,'<libtool-patches.gnu.org>';
        # own webs
        store "=energie","bell"      if headeris "From"     ,qr/^EnergieWeb/;
 
@@ -169,12 +176,12 @@ my($obj)=@_;
        my %aliases=muttrc_aliases();
        if (my $alias=$aliases{lc $address}) {
                local $_=$alias;
-               s/\.cz$//i;
+               s/\b(Bus)siness$/$1/i;
+               s/\.ident$//i;
                return $_;
                }
        local $_=$address;
-       s/\b(Bus)siness$/$1/i;
-       s/\.ident$//i;
+       s/\.cz$//i;
        return $_;
 }