move some of the common rbl sites around; add multi.surbl.org

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

diff --git a/common/common_rbl b/common/common_rbl
index 9fddd0285ccab7188bce72a70be787a653939fda..9dba1e4b0258384a3cca20dda7b8a1a91f855409 100644 (file)
--- a/common/common_rbl
+++ b/common/common_rbl
@@ -22,3 +22,28 @@ describe RCVD_IN_NIX1                Received in NiX filter http://www.ix.de/nixspam/dnsbl/
 tflags         RCVD_IN_NIX1            net
 score  RCVD_IN_NIX1            1.5
 
+
+# blarson 2007-09-14
+uridnsbl URIBL_CNKR    cn-kr.blackholes.us.    A
+body   URIBL_CNKR      eval:check_uridnsbl('URIBL_CNKR')
+describe URIBL_CNKR    china or korea hosted web site
+tflags URIBL_CNKR      net
+score URIBL_CNKR       2.5
+
+# blarson 2007-09-14
+uridnsbl_skip_domain   debian.org debian.net yahoo.com google.com
+
+# blarson 2007-09-14
+uridnsbl        URIBL_SBL       sbl.spamhaus.org.       A
+body            URIBL_SBL       eval:check_uridnsbl('URIBL_SBL')
+describe        URIBL_SBL       Contains an URL listed in the SBL blocklist
+tflags          URIBL_SBL       net
+#reuse          URIBL_SBL
+score          URIBL_SBL       3.5
+
+# don 2008-03-24
+uridnsbl        URIBL_SURBL    multi.surbl.org.       A
+body            URIBL_SURBL    eval:check_uridnsbl('URIBL_SURBL')
+describe        URIBL_SURBL    Contains an URL listed in the mutli surbl blocklist
+score          URIBL_SURBL     3.5
+

diff --git a/common/url_spam b/common/url_spam
index feb5da4369f5413d5877eb70ca353a0a004a5602..1968f10507efcc680e11f44fcb65a44002779ba7 100644 (file)
--- a/common/url_spam
+++ b/common/url_spam
@@ -161,24 +161,6 @@ body FROMAD                /\bhttp\:\/\/(?:budhipps|fromad|conavel|cliensy|comnoe|mybudshop)\.
 describe FROMAD                more penis spam
 score FROMAD           4
 
-# blarson 2007-09-14
-uridnsbl URIBL_CNKR    cn-kr.blackholes.us.    A
-body   URIBL_CNKR      eval:check_uridnsbl('URIBL_CNKR')
-describe URIBL_CNKR    china or korea hosted web site
-tflags URIBL_CNKR      net
-score URIBL_CNKR       2.5
-
-# blarson 2007-09-14
-uridnsbl_skip_domain   debian.org debian.net yahoo.com google.com
-
-# blarson 2007-09-14
-uridnsbl        URIBL_SBL       sbl.spamhaus.org.       A
-body            URIBL_SBL       eval:check_uridnsbl('URIBL_SBL')
-describe        URIBL_SBL       Contains an URL listed in the SBL blocklist
-tflags          URIBL_SBL       net
-#reuse          URIBL_SBL
-score          URIBL_SBL       3.5
-
 # blarson 2007-09-17
 body MYCHEAP           /\b(?:my)?cheap(?:xp|adobe)?(?:oem|soft)+(?:now|ware)?(?:(?:4|for)?less)?\d*\s*\.\s*com\b/i
 describe MYCHEAP       software spam