X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fmisc_spam;fp=common%2Fmisc_spam;h=ffcd57e7e1fadacff056a908cc67b6669b4a5bc8;hp=a034e4e6d3aedf47fdf6b292548c23c52d1131d3;hb=bd91f22ed46f80ec03e802bb0b112b7d42189f9c;hpb=bd529732103b008d261726be9dfa47237e0c4027

diff --git a/common/misc_spam b/common/misc_spam
index a034e4e..ffcd57e 100644
--- a/common/misc_spam
+++ b/common/misc_spam
@@ -27,21 +27,13 @@ describe PGPSIGNATURE	Has a pgp signature (may not be valid, but who cares?)
 score	 PGPSIGNATURE	-5
 
 
-# TODO: The rules below seem to be very similar; possibly fix them.
+body WORD_WITHOUT_VOWELS  /\b[bcdfghjklmnpqrstvwxz]{6,20}\b/
+describe WORD_WITHOUT_VOWELS Long word without any vowels
+score WORD_WITHOUT_VOWELS 1
 
-# These might trip up on non-english lists. We'll see.
-# They're fucking up on GPG signatures
-body MURPHY_WRONG_WORD1	/[bcdfghjklmnpqrstvwxz]{7,}/i
-score MURPHY_WRONG_WORD1 0.1
-
-body MURPHY_WRONG_WORD2 /[bcdfghjklmnpqrstvwxz]{6,}/i
-score MURPHY_WRONG_WORD2 0.2
-
-#Impronounceable. Need to check this one for accuracy (from airmax.cf)
-body IMPRONONCABLE_1                            /([bcdfghjklmnpqrstvwxz]){6,20}/
-describe IMPRONONCABLE_1                        Some words aren't easy to pronounce (too much vowels)
-body IMPRONONCABLE_2                            /(([abcdefghijklmnopqrstvwxyz]){1,9}\d{1,4}){2,9}/
-describe IMPRONONCABLE_2                        Some words aren't easy to pronounce (mixed numbers and lower-case letters)
+body DIGITS_LETTERS /(([abcdefghijklmnopqrstvwxyz]){1,9}\d{1,4}){2,9}/
+describe DIGITS_LETTERS Mixed groups of letters followed by numbers
+score DIGITS_LETTERS 1
 
 # From http://www.exit0.us/index.php/FredsRules
 # Added by pasc 2004/06/20