You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spamassassin.apache.org by he...@apache.org on 2011/05/11 06:27:48 UTC
svn commit: r1101743 - in /spamassassin/trunk: rules/20_drugs.cf
rules/50_scores.cf rulesrc/10_force_active.cf
rulesrc/sandbox/emailed/00_FVGT_File001.cf rulesrc/sandbox/hege/20_bug6448.cf
Author: hege
Date: Wed May 11 04:27:47 2011
New Revision: 1101743
URL: http://svn.apache.org/viewvc?rev=1101743&view=rev
Log:
Bug 6448: merge NO_PRESCRIPTION with FB_NO_SCRIP_NEEDED
Modified:
spamassassin/trunk/rules/20_drugs.cf
spamassassin/trunk/rules/50_scores.cf
spamassassin/trunk/rulesrc/10_force_active.cf
spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf
spamassassin/trunk/rulesrc/sandbox/hege/20_bug6448.cf
Modified: spamassassin/trunk/rules/20_drugs.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/20_drugs.cf?rev=1101743&r1=1101742&r2=1101743&view=diff
==============================================================================
--- spamassassin/trunk/rules/20_drugs.cf (original)
+++ spamassassin/trunk/rules/20_drugs.cf Wed May 11 04:27:47 2011
@@ -77,7 +77,8 @@ describe DRUG_ED_ONLINE Fast Viagra Del
body ONLINE_PHARMACY /\bonline pharmacy|\b(?:drugs|medications) online/i
describe ONLINE_PHARMACY Online Pharmacy
-body NO_PRESCRIPTION /no.{1,10}P(?:er|re)scription.{1,10}(?:needed|require|necessary)/i
+# Updated bug 6448
+body NO_PRESCRIPTION /N[o0].{1,10}P(?:er|re)scr[i1]pt[i1][o0]n.{1,10}(?:n[e3][e3]d[e3]d|requ[1i]re|n[e3]c[e3]ssary)/i
describe NO_PRESCRIPTION No prescription needed
# too easy
Modified: spamassassin/trunk/rules/50_scores.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rules/50_scores.cf?rev=1101743&r1=1101742&r2=1101743&view=diff
==============================================================================
--- spamassassin/trunk/rules/50_scores.cf (original)
+++ spamassassin/trunk/rules/50_scores.cf Wed May 11 04:27:47 2011
@@ -140,7 +140,6 @@ score FB_MORE_SIZE 0 # n=0 n=1 n=2 n=3
score FB_NOT_PHONE_NUM1 0 # n=0 n=1 n=2 n=3
score FB_NOT_PHONE_NUM3 0 # n=0 n=1 n=2 n=3
score FB_NOT_SCHOOL 0 # n=0 n=1 n=2 n=3
-score FB_NO_SCRIP_NEEDED 1.656 1.469 2.133 0.922 # n=2
score FB_NUMYO 0 # n=0 n=1 n=2 n=3
score FB_NUMYO2 0 # n=0 n=1 n=2 n=3
score FB_ODD_SPACED_MONEY 0 # n=0 n=1 n=2 n=3
Modified: spamassassin/trunk/rulesrc/10_force_active.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/10_force_active.cf?rev=1101743&r1=1101742&r2=1101743&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/10_force_active.cf (original)
+++ spamassassin/trunk/rulesrc/10_force_active.cf Wed May 11 04:27:47 2011
@@ -168,7 +168,6 @@ publish FB_LETTERS_21B
publish FB_LOSE_WEIGHT_CAP
publish FB_LOWER_PAYM
publish FB_MORE_SIZE
-publish FB_NO_SCRIP_NEEDED
publish FB_NOT_PHONE_NUM1
publish FB_NOT_PHONE_NUM3
publish FB_NOT_SCHOOL
Modified: spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf?rev=1101743&r1=1101742&r2=1101743&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/emailed/00_FVGT_File001.cf Wed May 11 04:27:47 2011
@@ -1245,8 +1245,9 @@ describe FB_NO_MORE_OFFER Phrase:
#counts FB_NO_MORE_OFFER 1s/0h of 47019 corpus (37183s/9836h FVGT) 12/23/06
-body FB_NO_SCRIP_NEEDED /No.{1,10}P(?:er|re)scr[i1]pt[i1][o0]n (?:needed|requ[1i]re)/i
-describe FB_NO_SCRIP_NEEDED Phrase: no prescription needed.
+# Bug 6448: replaced with NO_PRESCRIPTION
+#body FB_NO_SCRIP_NEEDED /No.{1,10}P(?:er|re)scr[i1]pt[i1][o0]n (?:needed|requ[1i]re)/i
+#describe FB_NO_SCRIP_NEEDED Phrase: no prescription needed.
##score FB_NO_SCRIP_NEEDED 10.357
#counts FB_NO_SCRIP_NEEDED 722s/0h of 207630 corpus (200121s/7509h FT) 12/13/05
#counts FB_NO_SCRIP_NEEDED 1042s/0h of 107818 corpus (99658s/8160h FVGT) 03/13/06
Modified: spamassassin/trunk/rulesrc/sandbox/hege/20_bug6448.cf
URL: http://svn.apache.org/viewvc/spamassassin/trunk/rulesrc/sandbox/hege/20_bug6448.cf?rev=1101743&r1=1101742&r2=1101743&view=diff
==============================================================================
--- spamassassin/trunk/rulesrc/sandbox/hege/20_bug6448.cf (original)
+++ spamassassin/trunk/rulesrc/sandbox/hege/20_bug6448.cf Wed May 11 04:27:47 2011
@@ -1 +1 @@
-body T_BUG6448_NO_PRESCRIPTION /N[o0].{1,10}P(?:er|re)scr[i1]pt[i1][o0]n.{1,10}(?:n[e3][e3]d[e3]d|requ[1i]re|n[e3]c[e3]ssary)/i
+#body T_BUG6448_NO_PRESCRIPTION /N[o0].{1,10}P(?:er|re)scr[i1]pt[i1][o0]n.{1,10}(?:n[e3][e3]d[e3]d|requ[1i]re|n[e3]c[e3]ssary)/i