svn commit: rev 10053 - incubator/spamassassin/trunk/rules

[qu...@apache.org]

Author: quinlan
Date: Fri Apr 16 13:39:21 2004
New Revision: 10053

Modified:
   incubator/spamassassin/trunk/rules/20_uri_tests.cf
   incubator/spamassassin/trunk/rules/70_testing.cf
Log:
TLD rules


Modified: incubator/spamassassin/trunk/rules/20_uri_tests.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/20_uri_tests.cf	(original)
+++ incubator/spamassassin/trunk/rules/20_uri_tests.cf	Fri Apr 16 13:39:21 2004
@@ -91,8 +91,12 @@
 uri BZ_TLD			/^(?:https?:\/\/|mailto:)[^\/]+\.bz(?:\/|$)/i
 describe BZ_TLD			Contains a URL in the BZ top-level domain    
 
-uri BIZ_TLD			/^(?:https?:\/\/|mailto:)[^\/]+\.biz(?:\/|$)/i
+# this is somewhat loose, but results are good
+uri BIZ_TLD_2			/\.biz(?:\/|$)/i
 describe BIZ_TLD		Contains a URL in the BIZ top-level domain    
+
+uri INFO_TLD			/^(?:https?:\/\/|mailto:)[^\/]+\.info(?:\/|$)/i
+describe INFO_TLD		Contains a URL in the INFO top-level domain    
 
 # Matt Cline
 # Pretty good for most folks, except for jm: I have a really stupid

Modified: incubator/spamassassin/trunk/rules/70_testing.cf
==============================================================================
--- incubator/spamassassin/trunk/rules/70_testing.cf	(original)
+++ incubator/spamassassin/trunk/rules/70_testing.cf	Fri Apr 16 13:39:21 2004
@@ -469,18 +469,6 @@
 header T_X_MESSAGE_INFO         X-Message-Info =~ /\+/
 describe T_X_MESSAGE_INFO       Ratware signature (X-Message-Info)
 
-# looser
-uri T_BIZ_TLD_1			/^(?:https?:\/\/|mailto:)\S+\.biz(?:\/|$)/i
-uri T_BIZ_TLD_2			/\.biz(?:\/|$)/i
-
-# bug 2957
-# really not sure if this is a good idea
-uri T_INFO_TLD			/^(?:https?:\/\/|mailto:)[^\/]+\.info(?:\/|$)/i
-describe T_INFO_TLD		Contains a URL in the INFO top-level domain    
-# see how these fare too...
-uri T_INFO_TLD_1		/^(?:https?:\/\/|mailto:)\S+\.info(?:\/|$)/i
-uri T_INFO_TLD_2		/\.info(?:\/|$)/i
-
 # REIMPLEMENT: ADVERT_CODE tests.
 header T_ADVERT_CODE	Subject =~ /^[^0-9a-z]*adv(?:ert)?\b/i
 # may need a negative lookahead between in front of first \b for "ADV."