X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;ds=sidebyside;f=common%2Fcommon_spam;h=84addfde2570d70e767df3ccd22f4566fc3bd0ee;hb=f473c48249af835e51db6c9dc24d6b8b9b706cc8;hp=4801f1236351d14619bb4aeff0b8e83256097590;hpb=3558ce2c2f0ab8ff53ae0191ff9fd8d594a66647;p=spamassassin_config.git

diff --git a/common/common_spam b/common/common_spam
index 4801f12..84addfd 100644
--- a/common/common_spam
+++ b/common/common_spam
@@ -16,13 +16,18 @@ 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
-include image_spam
-
+if (plugin (Mail::SpamAssassin::Plugin::ImageInfo))
+  include image_spam
+endif
 
 meta DIGEST_MULTIPLE            RAZOR2_CHECK + PYZOR_CHECK > 1
 describe DIGEST_MULTIPLE        Message hits more than one network digest check
@@ -34,3 +39,20 @@ 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
+
+#formorer 2012-10-02
+header CLUB_PROGRAMADORES      	From =~ /Club\s+de\s+Programadores/i
+describe CLUB_PROGRAMADORES	ACP - Club-de-Programadores spam
+score CLUB_PROGRAMADORES	5
+
+
+#formorer 2014-02-06
+rawbody  LOCAL_VIEWINBROWSER /View this message in a browser/
+describe LOCAL_VIEWINBROWSER "View this message in a browser"
+score    LOCAL_VIEWINBROWSER 1.0
+