X-Git-Url: https://git.donarmstrong.com/?p=spamassassin_config.git;a=blobdiff_plain;f=common%2Fcommon_spam;h=8ddf73b7a44e219e92ac33532ba76857c0eec12d;hp=0bb003816b50db9e0993a14df66b915ca8d2aa61;hb=4841f3adec50cbac06160e8c65d81b241afba6aa;hpb=edecc55f42910dfa2d35789af6124759d522a181

diff --git a/common/common_spam b/common/common_spam
index 0bb0038..8ddf73b 100644
--- a/common/common_spam
+++ b/common/common_spam
@@ -16,14 +16,17 @@ include url_spam
 
 include virus_spam
 
+include blacklists
+
+include relay_blacklists
+
 # this is the set of automatic response spam scores
 include auto_response_spam
 
 # this is a set of image-specific spam rules
 tryplugin Mail::SpamAssassin::Plugin::ImageInfo
-if plugin(Mail::SpamAssassin::Plugin::ImageInfo)
-   include image_spam
-endif
+include image_spam
+
 
 meta DIGEST_MULTIPLE            RAZOR2_CHECK + PYZOR_CHECK > 1
 describe DIGEST_MULTIPLE        Message hits more than one network digest check
@@ -35,3 +38,9 @@ score DIGEST_MULTIPLE 0
 header NODAY	date =~ /^\s+\,/
 describe NODAY	bad date format
 score NODAY	2
+
+#formorer 2012-07-20
+header CLUB_PROGRAMADORES      	From =~ /Club-de-Programadores/i
+describe CLUB_PROGRAMADORES	ACP - Club-de-Programadores spam
+score CLUB_PROGRAMADORES	5
+