spamassassin-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jhar...@apache.org
Subject svn commit: r953067 - in /spamassassin/trunk/rulesrc/sandbox/jhardin: 20_fillform.cf 20_lotsa_money.cf
Date Wed, 09 Jun 2010 16:09:40 GMT
Author: jhardin
Date: Wed Jun  9 16:09:39 2010
New Revision: 953067

URL: http://svn.apache.org/viewvc?rev=953067&view=rev
Log:
Loosen fillform a tiny bit; fix some more "malformed UTF8" problems in lotsa money

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

Modified: spamassassin/trunk/rulesrc/sandbox/jhardin/20_fillform.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/jhardin/20_fillform.cf?rev=953067&r1=953066&r2=953067&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_fillform.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_fillform.cf Wed Jun  9 16:09:39 2010
@@ -18,7 +18,7 @@ ifplugin Mail::SpamAssassin::Plugin::Rep
   # Repetitive syntactic bits
   replace_tag FF_LNNO   (?:(?:\d+[)}\]:.,]+|\W?\([\div]+\)|\W?\{\d+\}|\[\d+\]|\*{1,5}|\#{1,5}|\(?[A-K][)}\]:.,]{1,3})\s?)
   replace_tag FF_YOUR   (?:a?\s?copy\sof\s)?(?:your[\s,:]{1,5})?(?:present\s|c[uo]rrent\s|full\s?|complete\s|direct\s|private\s|valid\s|personal\s){0,3}
-  replace_tag ANDOR     (?:\s?[\/&+,]\s?|\sor\s|\sand\s)
+  replace_tag ANDOR     (?:\s?[\/&+,]\s?|\sor\s|\sand?\s)
   replace_tag NUMBER    (?:num(?:ber)?s?|nos?\.|no\b|\#s?|nbrs?\.?)
   replace_tag FF_SUFFIX (?:\sin\s(?:full|words))?:?(?:\s?[({][^)}]{1,30}[)}])?
   replace_tag FF_BLANK1 (?:[\s:;]{0,4}(?:(?:[-=_.,:;*\s]|&\#\d+;){3,100}))

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=953067&r1=953066&r2=953067&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_lotsa_money.cf Wed Jun  9 16:09:39 2010
@@ -97,7 +97,7 @@ describe MONEY_LOTTERY    Lots of money 
 score    MONEY_LOTTERY    1.5
 
 body     __DEAL           /\b(?:business|financial|this|the|mutual|die(?:se)?|cette)\s(?:deal|transa[ck]tion|proposal|offer|venture|suggestion|partnership)/i
-body     __HUSH_HUSH      /\b(?:confiden[tc]i[ae]l(?:it[y\xe9]|it[\xc3][\xa9]\s?)?|private|secre(?:te?|cy)|sensitive|concealed|obscured|discre(?:et|tion)|vertraulich(?:en)?|geheim|priv(?:\xe9|[\xc3][\xa9]\s?))\b/i
+body     __HUSH_HUSH      /\b(?:confiden[tc]i[ae]l(?:it[y\xe9]|it[\xc3][\xa9]\s?)?|private|secre(?:te?|cy)|sensitive|concealed|obscured|discre(?:et|tion)|vertraulich(?:en)?|geheim|priv(?:[\xe9]|[\xc3][\xa9]\s?))\b/i
 body     __IS_LEGAL       /\b(?:this\s(?:deal|offer|transaction|proposal|exchange|arrangement)|it)?\sis\s(?:(?:guaranteed|completely|absolutely|perfectly|100%|very)\s)?(?:legal|hitch-free)\b/i
 body     __NOT_SCAM       /\bnot\sa\sscam\b/i
 body     __BACK_SCRATCH   /\bmutual+y?\sbenefi(?:t|cial)\b/i
@@ -143,8 +143,8 @@ body     __NOT_DEAD_YET   /\bwill\sinher
 body     __AM_DYING       /\bam\s(?:\S+\s)?dying\b/i
 body     __I_WILL_YOU     /\bwill(?:ed)?\s(?:[a-z\s]{0,20}\s(?:fortune|money)\s)?to\syou\b/i
 body     __NEXT_OF_KIN    /\bnext[-\s]of[-\s]kin\b/i
-body     __EX_CUSTOMER    /\b(?:(?:dead|deceased|late|verstorbenen)\s(?:[ck]lient|customer|account|investor|mr\.|kunde|engr?\.)|titulaire
du compte est (?:d\xe9c\xe9d\xe9|d[\xc3][\xa9]c[\xc3][\xa9]d[\xc3][\xa9]))/i
-body     __DECEASED       /\b(?:the|my|der|du)\s(?:deceased|late|verstorbenen|d\xe9funt|d[\xc3][\xa9]nt)\b/i
+body     __EX_CUSTOMER    /\b(?:(?:dead|deceased|late|verstorbenen)\s(?:[ck]lient|customer|account|investor|mr\.|kunde|engr?\.?)|titulaire
du compte est (?:d[\xe9]c[\xe9]d[\xe9]|d[\xc3][\xa9]c[\xc3][\xa9]d[\xc3][\xa9]))/i
+body     __DECEASED       /\b(?:the|my|der|du)\s(?:deceased|late|verstorbenen|d[\xe9]funt|d[\xc3][\xa9]nt)\b/i
 body     __SURVIVORS      /\b(?:widow|son|daughter|husband|wife|brother|sister|attorney)\s(?:of|to)\s(?:the\s)?late\s\w+\b/i
 body     __DEAD_PARENT    /\bmy\s(?:deceased|dead)\s(?:father|mother)/i
 body     __DORMANT_ACCT   /\b(?:dormant|abandoned|left\s?over)\s(?:account|fund|transaction|sum)/i



Mime
View raw message