X-Git-Url: http://git.jankratochvil.net/?p=PerlMail.git;a=blobdiff_plain;f=My-Audit.pm;h=d187f69ce5d0850110fe7593427dc3ecee6c5d61;hp=8bb5d6ce35004e7ee366f60a5dffa764e305162c;hb=4ea6c626ca41fa841069b2755e6331a90d4dea48;hpb=ed4f028cce9d980a11a342c201884b6556ec22d5

diff --git a/My-Audit.pm b/My-Audit.pm
index 8bb5d6c..d187f69 100644
--- a/My-Audit.pm
+++ b/My-Audit.pm
@@ -24,6 +24,15 @@ sub audit_init
 			"atrey.karlin.mff.cuni.cz",	# short@atrey.karlin.mff.cuni.cz
 			"k332.feld.cvut.cz",	# short@k332.feld.cvut.cz
 			);
+	@dnsbl_whitelist=(
+			"195.250.128.83",	# smtp3.vol.cz; vol.cz.multistage.blackholes.five-ten-sg.com.
+			"64.49.222.22",		# mail.pm.org: rackspace.com.spam-support.blackholes.five-ten-sg.com.
+			"208.147.243.5",	# gambit.liquidcomm.net: cw.net.spam-support.blackholes.five-ten-sg.com.
+			"213.235.135.70",	# smtp.tiscali.cz: tiscali.cz.multistage.blackholes.five-ten-sg.com.
+			"205.139.198.11",	# eniac.disaster.com: cw.net.spam-support.blackholes.five-ten-sg.com.
+			"127.0.0.2",	# 2.0.0.127.relays.ordb.org.
+			"65.113.40.131",	# bozo.vmware.com: qwest.net.spam-support.blackholes.five-ten-sg.com.
+			);
 }
 
 sub audit
@@ -51,6 +60,7 @@ sub audit
 		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>';
+		store "=spamo"        if headeris "From",'<canda@lica.cz>';
 		{
 			# weak detection: files with text/html w/o text/plain are usually a spam
 			my @types_linear=map({ mime_type($_); } parts_linear());
@@ -63,11 +73,15 @@ sub audit
 	return if did sub {
 		local $store_profile="silent";
 		local $_;
+		store "=spam-razor".($_ eq 1 ? "" : ";$_")      if $_=razor2();
+		};
+	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
-		store "=spam-razor".($_ eq 1 ? "" : ";$_")      if $_=razor2();
 		# I don't send viruses but viruses propagate mails of mine
 		store "=spam-av"                                if headeris "X-Mailer",'ravmd/8.3.2';
 		};
@@ -76,6 +90,7 @@ sub audit
 	store "=err","bell" and return if headerhas \&Received_for,'<short+err@>';
 
 	# ppl-wished foreign remapping, Reply-To is left untouched!
+	# FIXME: modifications are now being dropped by &write_message!
 	header_remap("From",{
 			'kerere@post.cz'               =>'kamzik@k332.feld.cvut.cz',
 			'profes@mbox.vol.cz'           =>'kratochvilova@egp.cz',
@@ -106,20 +121,22 @@ sub audit
 				<vithous@attorney.cz> <viroman@attorney.cz>
 				<konf@klain.cz>
 				<stein@tiscali.cz>
+				<barevnej@volny.cz>
 				);
 
 		store "=gsm"               if headeris  "Sender"   ,'<owner-gsm@sh.cvut.cz>';
 		store "=gsmpand"           if headeris  "List-Post",'<gsm@pandora.cz>';
+		store "=9kc","log"         if headeris  "List-Post",'<n9k@pandora.cz>';
+		store "=9kcd","log"        if headeris  "List-Post",'<dev9k@pandora.cz>';
 		}
 
 	# lists
 	store "=mozillabug","log"    if headeris "From"     ,'<bugzilla-daemon@mozilla.org>';
-	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","silent"       if headeris "List-Id"  ,'<gtk-devel-list.gnome.org>';
+	store "=gnomevfs","log"      if headeris "List-Id"  ,'<gnome-vfs-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>';
@@ -132,11 +149,13 @@ sub audit
 	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 "=fsd","silent"        if headeris "X-Mailing-List",'<linux-fsdevel@vger.kernel.org>';
+	store "=kerneld","silent"    if headeris "X-Mailing-List",'<linux-kernel@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>';
 	store "=tacacs","log"        if headeris "Sender"   ,'<tacplus-l@disaster.com>';
-	store "=tacacsd","log"       if headerhas \&Received_for,'devel@tacplus.org';	# TODO: fix when real list
+	store "=tacacs","log"        if headeris "Sender"   ,'<owner-tacplus-l@disaster.com>';
+	store "=tacacs","log"        if headeris "List-Id"  ,'<devel.lists.tacplus.org>';
 	store "=pm","sms"            if headeris "Sender"   ,'<owner-prague-pm@pm.org>';
 	store "=radary","log"        if headeris "Reply-To" ,'<pha@radary.cz>';
 	store "=dnet","log"          if headeris "Sender"   ,'<@lists.distributed.net>';
@@ -156,6 +175,11 @@ sub audit
 	store "=libtoolpat","log"    if headeris "List-Id"  ,'<libtool-patches.gnu.org>';
 	# own webs
 	store "=energie","bell"      if headeris "From"     ,qr/^EnergieWeb/;
+	store "=ats","log"           if headeris("From"     ,'<root@ms.atspraha.cz>')
+	                                || (headeris("From",'<online@ringier.cz>') && headerhas("To",'<blesk@atspraha.cz>'));
+	store "=atscasablanca","log" if headeris "From"     ,'<casablanca@ms.atspraha.cz>';
+	store "=www-sms","log"       if headeris "List-Id"  ,'<www-sms-developers.lists.sourceforge.net>';
+
 
 	# Petr Koutecky does not mark his Stuff
 	store "=koutecky","log"      if headeris "From"     ,'<velkyhroch@seznam.cz>';