You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by jh...@apache.org on 2009/08/31 00:06:31 UTC

svn commit: r809423 - /spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf

Author: jhardin
Date: Sun Aug 30 22:06:30 2009
New Revision: 809423

URL: http://svn.apache.org/viewvc?rev=809423&view=rev
Log:
lotsa_money tweaks

Modified:
    spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf

Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf?rev=809423&r1=809422&r2=809423&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf Sun Aug 30 22:06:30 2009
@@ -2,9 +2,9 @@
 ifplugin Mail::SpamAssassin::Plugin::ReplaceTags
   replace_tag  CURRENCY   [\(\[]?(?:GBP|=[Aa][34]|\xa3|\xa4|EUR|[Ee]uros?|US[D\$]{1,2}|\$)[\]\)]?
 
-  body     __LOTSA_MONEY_01   /<CURRENCY>\s?\d[\d.,\sO]{7,20}[\dO]/
-  body     __LOTSA_MONEY_02   /\d[\d.,\sO]{7,20}[\dO]\s?<CURRENCY>/
-  body     __LOTSA_MONEY_03   /<CURRENCY>\s?\d[\d.,\sO]{1,4}[\dO]\s?(?:[Mm]|[Hh][Uu][Nn][Dd][Rr][Ee][Dd]|[Tt][Hh][Oo][Uu][Ss][Aa][Nn][Dd])/
+  body     __LOTSA_MONEY_01   /<CURRENCY>\s?\d[\d.,\sO]{5,20}[\dO]/
+  body     __LOTSA_MONEY_02   /\d[\d.,\sO]{5,20}[\dO]\s?<CURRENCY>/
+  body     __LOTSA_MONEY_03   /<CURRENCY>\s?\d[\d.,\sO]{1,4}[\dO]\s?(?:[Mm]\b|[Mm][Ii][Ll][Ll]|[Hh][Uu][Nn][Dd][Rr][Ee][Dd]|[Tt][Hh][Oo][Uu][Ss][Aa][Nn][Dd])/
   body     __LOTSA_MONEY_04   /(?:mill(?:e|ion)|hundred[^\.]{1,20}thousand)[^\.]{1,50}(?:(?:U\.?S\.?\s)?dollars|U\.?K\.?\spounds|(?:U\.?K\.?\s)?pounds\ssterling|euros?francs?)/i
   replace_rules   __LOTSA_MONEY_01 __LOTSA_MONEY_02 __LOTSA_MONEY_03
 
@@ -13,7 +13,7 @@
   score    LOTS_OF_MONEY    0.01
 
   # now combine with other stuff in metas to weed out FPs
-  meta     MONEY_FREEMAIL   LOTS_OF_MONEY && FREEMAIL_FROM
+  meta     MONEY_FREEMAIL   LOTS_OF_MONEY && (FREEMAIL_FROM || FREEMAIL_REPLYTO)
   describe MONEY_FREEMAIL   Lots of money from someone using free email?
 
   meta     MONEY_FROM_MISSP LOTS_OF_MONEY && FROM_MISSPACED
@@ -31,19 +31,19 @@
   describe LOTTO_WIN_01     Winning *
   score    LOTTO_WIN_01     0.20
 
-  body     LOTTO_AGENT      /\b(?:claims?|fiduciary)\s?(?:agent|manager|officer)/i
+  body     LOTTO_AGENT      /\b(?:claim(?:s|ing)?|fiduciary)\s?(?:agent|manager|officer)/i
   describe LOTTO_AGENT      Claims Agent
   score    LOTTO_AGENT      0.50
 
-  body     LOTTO_DEPT       /\b(?:claims?|fiduciary)\s?(?:department|unit|group)/i
+  body     LOTTO_DEPT       /\b(?:claim(?:s|ing)?|fiduciary)\s?(?:department|unit|group)/i
   describe LOTTO_DEPT       Claims Department
   score    LOTTO_DEPT       0.20
 
-  header   LOTTO_AGENT_FM   From =~ /(?:claims?|fiduciary|dispatch)[\s_]?(?:agent|manager|officer)/i
+  header   LOTTO_AGENT_FM   From =~ /(?:claim(?:s|ing)?|fiduciary|dispatch)[\s_]?(?:agent|manager|officer)/i
   describe LOTTO_AGENT_FM   Claims Agent
   score    LOTTO_AGENT_FM   0.50
 
-  header   LOTTO_AGENT_RPLY Reply-To =~ /(?:claims?|fiduciary|dispatch)[\s_]?(?:agent|manager|officer)/i
+  header   LOTTO_AGENT_RPLY Reply-To =~ /(?:claim(?:s|ing)?|fiduciary|dispatch)[\s_]?(?:agent|manager|officer)/i
   describe LOTTO_AGENT_RPLY Claims Agent
   score    LOTTO_AGENT_RPLY 0.50
 
@@ -51,7 +51,7 @@
   describe LOTTO_ADMITS     Admits to being a lottery
   score    LOTTO_ADMITS     0.20
 
-  meta     MONEY_LOTTERY    LOTS_OF_MONEY && (LOTTO_WINNINGS || LOTTO_WIN_01 || LOTTO_AGENT || LOTTO_DEPT || LOTTO_AGENT_FM || LOTTO_AGENT_RPLY || LOTTO_ADMITS)
+  meta     MONEY_LOTTERY    LOTS_OF_MONEY && (LOTTO_WINNINGS || LOTTO_WIN_01 || LOTTO_AGENT || LOTTO_DEPT || LOTTO_AGENT_FM || LOTTO_AGENT_RPLY || LOTTO_ADMITS || DEAR_WINNER)
   describe MONEY_LOTTERY    Lots of money from a lottery
 
 endif