svn commit: r792947 - /spamassassin/trunk/rulesrc/sandbox/jhardin/20_fillform.cf

[jh...@apache.org]

Author: jhardin
Date: Fri Jul 10 13:30:28 2009
New Revision: 792947

URL: http://svn.apache.org/viewvc?rev=792947&view=rev
Log:
Tweak fillform - spammers are adapting already

Modified:
    spamassassin/trunk/rulesrc/sandbox/jhardin/20_fillform.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=792947&r1=792946&r2=792947&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/jhardin/20_fillform.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/jhardin/20_fillform.cf Fri Jul 10 13:30:28 2009
@@ -19,7 +19,7 @@
   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}(?:[-=_\.,:;*]{3,80}\s?){1,})
-  replace_tag FF_BLANK2 (?:[\s\W]{0,3}[-=_\.,:;\*]{1,80}\s?)
+  replace_tag FF_BLANK2 (?:[\s\W]{0,3}[-=_\.,:;*]{1,80}\s?)
 
   # Address variations
   replace_tag FF_A1 (?:(?:address|country|county|states?|city|province|territory|(?:zip|postal)(?:\s?code)?)<ANDOR>?){1,3}(?:\sof\s(?:residence|birth|employment|citizenship))?
@@ -59,7 +59,7 @@
   score    FILL_THIS_FORM_LONG 1.80
 
   # 5+ fields that body paragraph processing didn't paste together
-  body     __FILL_THIS_FORM_PARTIAL /^<FF_LNNO>?<FF_YOUR><FF_ALL><FF_SUFFIX>(?:<FF_BLANK1>|[:;.\s]$)/im
+  rawbody  __FILL_THIS_FORM_PARTIAL /^<FF_LNNO>?<FF_YOUR><FF_ALL><FF_SUFFIX>(?:<FF_BLANK1>|[-=_\.,:;*\s]$)/im
   replace_rules   __FILL_THIS_FORM_PARTIAL
   tflags   __FILL_THIS_FORM_PARTIAL multiple
   describe FILL_THIS_FORM_ML Fill in a form, 5+ questions, multiline