block halftone systems; move header rules to phrase_spam from url_spam

git-svn-id: svn+ssh://svn.debian.org/svn/pkg-listmaster/trunk/spamassassin_config@402 0b7a5b0c-1f2c-0410-bd74-c376f8064c91

diff --git a/common/phrase_spam b/common/phrase_spam
index 1e9c2e9807dff70568f73522308857a478199453..114754ba45f3855598c784a5812ad263c87eccb0 100644 (file)
--- a/common/phrase_spam
+++ b/common/phrase_spam
@@ -1043,3 +1043,13 @@ header MYNAMEIS          subject =~ /hello(.*)my name is/i
 describe MYNAMEIS      Name spam
 score  MYNAMEIS        2.5
 
+# formorer 2012-02-28
+header VOTREANN     Subject =~ /(votre|Petites) annonce/i
+describe VOTREANN   Votre annonce
+score VOTREANN      4
+
+# formorer 2010-01-23
+header LEXCHANGE       subject =~ /(?:for|4)\s+L[i1]nks?\s+E?xcha?nge/i
+describe LEXCHANGE     ask for link exchange
+score LEXCHANGE                4
+

diff --git a/common/url_spam b/common/url_spam
index cc9fb07882b599fe71c96882d6590272b8b431c4..4306c758e0f7930cfbda66e8e0eeac77d87ad32c 100644 (file)
--- a/common/url_spam
+++ b/common/url_spam
@@ -553,11 +553,6 @@ uri        ISUISSE         /\bisuisse\.com/
 describe ISUISSE       isuisse.com
 score ISUISSE          4
 
-# formorer 2010-01-23
-header LEXCHANGE       subject =~ /(?:for|4)\s+L[i1]nks?\s+E?xcha?nge/i
-describe LEXCHANGE     ask for link exchange
-score LEXCHANGE                4
-
 # don 2010-03-16
 uri EMAILSPARKLE       /emailsparkle.com/
 describe EMAILSPARKLE  emailsparkle.com uri
@@ -573,7 +568,7 @@ uri OROUNRU         /oruon.ru/
 describe OROUNRU       oruon.ru uri
 score OROUNRU          4
 
-# formorer 2012-02-28
-header VOTREANN     Subject =~ /(votre|Petites) annonce/i
-score VOTREANN      4
-
+# don 2012-03-07
+uri HALFTONESYSTEMS    /halftonesystems.com/i
+describe HALFTONESYSTEMS Links to halftonesystems.com
+score HALFTONESYSTEMS 4
\ No newline at end of file